Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Update cookstyle and update habtitat plan to match omnibus #1883

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Update cookstyle and update habtitat plan to match omnibus #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ GEM
mixlib-shellout (~> 2.0)
artifactory (3.0.0)
ast (2.4.0)
aws-sdk (2.11.190)
aws-sdk-resources (= 2.11.190)
aws-sdk-core (2.11.190)
aws-sdk (2.11.191)
aws-sdk-resources (= 2.11.191)
aws-sdk-core (2.11.191)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.190)
aws-sdk-core (= 2.11.190)
aws-sdk-resources (2.11.191)
aws-sdk-core (= 2.11.191)
aws-sigv4 (1.0.3)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -220,7 +220,7 @@ GEM
concurrent-ruby (1.1.3)
cookbook-omnifetch (0.8.0)
mixlib-archive (~> 0.4)
cookstyle (3.0.1)
cookstyle (3.0.2)
rubocop (= 0.55.0)
cucumber (3.1.2)
builder (>= 2.1.2)
Expand Down
5 changes: 5 additions & 0 deletions habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ do_install() {
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin test-kitchen
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin berkshelf
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin inspec
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin cookstyle
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-apply
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-vault
bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin dco

if [[ `readlink /usr/bin/env` = "$(pkg_path_for coreutils)/bin/env" ]]; then
build_line "Removing the symlink we created for '/usr/bin/env'"
Expand All @@ -119,6 +123,7 @@ do_install() {
wrap_ruby_bin "foodcritic"
wrap_ruby_bin "inspec"
wrap_ruby_bin "chef-resource-inspector"
wrap_ruby_bin "dco"
}

# Stubs
Expand Down
4 changes: 2 additions & 2 deletions omnibus/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 23e12509574a66f079b00fc4f99cc8665a4ed50e
revision: e551136c73499d7cacf550163b5f1832adb5a675
branch: master
specs:
omnibus-software (4.0.0)
Expand Down Expand Up @@ -32,7 +32,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
aws-partitions (1.123.0)
aws-partitions (1.124.0)
aws-sdk-core (3.44.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
Expand Down