Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shack 199/rename to chef run #131

Merged
merged 12 commits into from
May 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .expeditor/update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
set -evx

sed -i -r "s/VERSION = \".*\"/VERSION = \"$(cat VERSION)\"/" components/chef-cli/lib/chef-cli/version.rb
sed -i -r "s/VERSION = \".*\"/VERSION = \"$(cat VERSION)\"/" components/chef-run/lib/chef-run/version.rb

# Temporary workound while ChefDK has older ruby version
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
Expand All @@ -15,3 +16,8 @@ gem install bundler
# Ensure our Gemfile.lock reflects the new version
cd components/chef-cli
bundle update chef-cli
cd ../..

cd components/chef-run
bundle update chef-run
cd ../..
9 changes: 4 additions & 5 deletions ci/verify.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
REM ; This script is used in the jenkins part of our pipeline to verify our
REM ; package is working correctly after install.

REM ; chef version ensures our bin ends up on path and the basic ruby env is
REM ; chef-run version ensures our bin ends up on path and the basic ruby env is
REM ; working.
call chef version
call chef-run version

REM ; Ensure our ChefDK shims works
call chef env
call chefdk env
REM ; Ensure our ChefDK works
chef env
5 changes: 2 additions & 3 deletions ci/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# is working correctly after install.

# chef version ensures our bin ends up on path and the basic ruby env is working.
chef version
chef-run version

# Ensure our ChefDK shims works
# Ensure our ChefDK works
chef env
chefdk env
File renamed without changes.
4 changes: 4 additions & 0 deletions components/chef-run/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.rspec_status
.vagrant
*.log
coverage/
29 changes: 29 additions & 0 deletions components/chef-run/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#
# Copyright:: Copyright (c) 2018 Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

source "https://rubygems.org"
gemspec

# TODO when chef-dk 3.0 is released to Rubygems as 3.0 we can get rid of this
gem "chef-dk", git: "https://github.com/chef/chef-dk.git", branch: "master"

# Remove this once train 1.4.6 or later is released:
gem "train", git: "https://github.com/chef/train.git", branch: "v1.4.6"

group :localdev do
gem "irbtools-more", require: "irbtools/binding"
end
Loading