Merge pull request #417 from chef/mp/remove-components

Remove cucumber, dco, knife-spork
chef · Jul 22, 2019 · 7edd196 · 7edd196
2 parents c3e984a + d9de144
commit 7edd196
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 61 deletions.
diff --git a/components/gems/Gemfile b/components/gems/Gemfile
@@ -19,7 +19,7 @@ source "https://rubygems.org"
 
 # gemspec
 
-gem "bundler"
+gem "bundler", "< 2"
 
 group(:omnibus_package, :development, :test) do
   # we pin these gems as they are installed in the ruby source and if we let them
@@ -81,7 +81,6 @@ group(:omnibus_package) do
   gem "net-ssh", ">= 4.2.0"
   gem "test-kitchen", ">= 2.0"
   gem "listen"
-  gem "dco" # TODO - dksplit - Planned for removal
 
   # many layers down these bring in ethon which uses ffi / libcurl and breaks on windows
   # we want to get this working, but for now it's disabled so we can get a build out
@@ -93,7 +92,7 @@ group(:omnibus_package) do
   gem "ed25519"
   gem "bcrypt_pbkdf"
 
-  gem "chef-cli", ">= 1.0.3"
+  gem "chef-cli", ">= 1.0.9"
 
   gem "chef-apply", ">= 0.3.3"
 
@@ -106,7 +105,6 @@ group(:omnibus_package) do
   gem "knife-push"
 
   # All of the following used to be software definitions we included:
-  gem "knife-spork"    # TODO - dksplit - Planned for removal
   gem "mixlib-install"
   gem "nokogiri"
   gem "pry-byebug"
@@ -116,7 +114,6 @@ group(:omnibus_package) do
   gem "rubocop"
   gem "winrm-fs"
   gem "winrm-elevated"
-  gem "cucumber"       # TODO - dksplit - Planned for removal
   gem "stove"
 end
 
@@ -132,8 +129,7 @@ end
 
 gem "chefstyle", group: :test
 
-# TODO delete this when we figure out how to include the pushy windows dependencies
-# correctly
+# Ensure support for push-client on Windows
 platforms :mswin, :mingw do
   gem "rdp-ruby-wmi"
   gem "windows-pr"

diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
@@ -8,14 +8,13 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    app_conf (0.4.2)
     appbundler (0.13.1)
       mixlib-cli (>= 1.4, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
     artifactory (3.0.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.189.0)
+    aws-partitions (1.190.0)
     aws-sdk-apigateway (1.33.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
@@ -52,13 +51,13 @@ GEM
     aws-sdk-codecommit (1.25.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.24.0)
+    aws-sdk-codedeploy (1.25.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-codepipeline (1.22.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.33.0)
+    aws-sdk-configservice (1.34.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-core (3.59.0)
@@ -78,13 +77,13 @@ GEM
     aws-sdk-ecr (1.19.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.43.0)
+    aws-sdk-ecs (1.44.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.23.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.21.0)
+    aws-sdk-elasticache (1.22.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.24.0)
@@ -151,7 +150,7 @@ GEM
     aws-sdk-sns (1.18.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.18.0)
+    aws-sdk-sqs (1.19.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ssm (1.52.0)
@@ -283,7 +282,7 @@ GEM
       tty-spinner
     chef-bin (15.1.36)
       chef (= 15.1.36)
-    chef-cli (1.0.6)
+    chef-cli (1.0.9)
       addressable (>= 2.3.5, < 2.6)
       chef (>= 14.0)
       cookbook-omnifetch (~> 0.5)
@@ -334,25 +333,11 @@ GEM
       mixlib-archive (>= 0.4, < 2.0)
     cookstyle (5.0.4)
       rubocop (= 0.72.0)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
     cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
       gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    dco (1.0.1)
-      git (~> 1.3)
-      thor (~> 0.19)
     debug_inspector (0.0.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
@@ -363,7 +348,6 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    diffy (3.3.0)
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
@@ -416,7 +400,6 @@ GEM
     gcewinpass (1.1.0)
       google-api-client (~> 0.13)
     gherkin (5.1.0)
-    git (1.5.0)
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -463,7 +446,7 @@ GEM
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (4.7.3)
+    inspec (4.7.18)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -490,8 +473,8 @@ GEM
       train-habitat (~> 0.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-bin (4.7.3)
-      inspec (= 4.7.3)
+    inspec-bin (4.7.18)
+      inspec (= 4.7.18)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.3)
@@ -547,11 +530,6 @@ GEM
     knife-opc (0.4.1)
     knife-push (1.1.2)
       chef (>= 13.0)
-    knife-spork (1.7.2)
-      app_conf (>= 0.4.0)
-      chef (>= 11.0.0)
-      diffy (>= 3.0.1)
-      git (>= 1.2.5)
     knife-tidy (2.0.1)
     knife-vsphere (3.0.1)
       chef-vault (>= 2.6.0)
@@ -618,7 +596,6 @@ GEM
       ms_rest (~> 0.7.4)
       unf_ext (= 0.0.7.2)
     multi_json (1.13.1)
-    multi_test (0.1.2)
     multipart-post (2.1.1)
     necromancer (0.4.0)
     nenv (0.3.0)
@@ -789,7 +766,7 @@ GEM
     thread_safe (0.3.6)
     timeliness (0.3.10)
     timers (4.3.0)
-    tins (1.21.0)
+    tins (1.21.1)
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.8)
@@ -968,19 +945,17 @@ DEPENDENCIES
   artifactory
   bcrypt_pbkdf
   berkshelf (>= 7.0.5)
-  bundler
+  bundler (< 2)
   chef (= 15.1.36)
   chef-apply (>= 0.3.3)
   chef-bin (= 15.1.36)
-  chef-cli (>= 1.0.3)
+  chef-cli (>= 1.0.9)
   chef-sugar
   chef-vault (>= 3.4.1)
   cheffish (>= 14.0.1)
   chefspec (>= 8.0.0)
   chefstyle
   cookstyle (~> 5.0)
-  cucumber
-  dco
   dep-selector-libgecode
   dep_selector
   ed25519
@@ -1004,7 +979,6 @@ DEPENDENCIES
   knife-google (>= 3.3.3)
   knife-opc (>= 0.4.0)
   knife-push
-  knife-spork
   knife-tidy (>= 1.2.0)
   knife-vsphere (>= 2.1.1)
   knife-windows (>= 3.0)

diff --git a/omnibus/config/software/gems.rb b/omnibus/config/software/gems.rb
@@ -21,8 +21,8 @@
 
 dependency "ruby"
 dependency "rubygems"
-# Removed - r26 ships with bundler
-# dependency "bundler" # technically a gem, but we gotta solve the chicken-egg problem here
+# Remove? - r26 ships with bundler
+dependency "bundler" # technically a gem, but we gotta solve the chicken-egg problem here
 
 #
 # NOTE: Do not add any gem dependencies here.  This will cause gemsets to solve without
@@ -49,10 +49,6 @@
 
 build do
   env = with_standard_compiler_flags(with_embedded_path)
-  # Cross platform way to sed. Need to cleanup the backup fail.
-  # TODO - check what our version output/bheaviors look like then figure out best approach
-  # command("sed -i.bak 's/\\$CHEF_WS_VERSION\\$/#{project.build_version}/' #{project_dir}/lib/chef-dk/cli.rb", env: env)
-  # command("rm #{project_dir}/lib/chef-dk/cli.rb.bak")
 
   # TODO - reevaluate groups
   excluded_groups = %w{server docgen maintenance pry travis integration ci}
@@ -62,15 +58,23 @@
   # install the whole bundle first
   bundle "install --jobs 10 --without #{excluded_groups.join(" ")}", env: env
 
+  # TODO - we'll want a better way to manage this - likely some kind of callback
+  # from chef-cli so that we can hook in our own version output.
+  #
+  # Cross platform way to sed. Need to cleanup the backup fail.
+  # command("sed -i.bak 's/\\$CHEF_WS_VERSION\\$/#{project.build_version}/' #{project_dir}/lib/chef-dk/cli.rb", env: env)
+  # command("rm #{project_dir}/lib/chef-dk/cli.rb.bak")
   appbundle "chef", lockdir: project_dir, gem: "chef", without: %w{docgen chefstyle}, env: env
 
-  appbundle "foodcritic", lockdir: project_dir, gem: "foodcritic", without: %w{development}, env: env
-  appbundle "test-kitchen", lockdir: project_dir, gem: "test-kitchen", without: %w{changelog debug docs}, env: env
+  appbundle "foodcritic", lockdir: project_dir, gem: "foodcritic", without: %w{development test}, env: env
+  appbundle "test-kitchen", lockdir: project_dir, gem: "test-kitchen", without: %w{changelog debug docs development}, env: env
   appbundle "inspec", lockdir: project_dir, gem: "inspec-bin", without: %w{deploy tools maintenance integration}, env: env
   appbundle "chef-run", lockdir: project_dir, gem: "chef-apply", without: %w{changelog docs debug}, env: env
   appbundle "chef-cli", lockdir: project_dir, gem: "chef-cli", without: %w{changelog docs debug}, env: env
+  appbundle "berkshelf", lockdir: project_dir, gem: "berkshelf", without: %w{changelog docs debug development}, env: env
 
-  %w{chef-bin chef-apply chef-vault ohai opscode-pushy-client cookstyle dco berkshelf}.each do |gem|
+  # Note - 'chef-apply' gem provides 'chef-run', not 'chef-apply' which ships with chef-bin...
+  %w{chef-bin chef-apply chef-vault ohai opscode-pushy-client cookstyle}.each do |gem|
     appbundle gem, lockdir: project_dir, gem: gem, without: %w{changelog}, env: env
   end
 

diff --git a/omnibus/package-scripts/chef-workstation/postinst b/omnibus/package-scripts/chef-workstation/postinst
@@ -15,7 +15,7 @@ error_exit()
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" 2>&1 >/dev/null
+  uname -v | grep "^Darwin" >/dev/null 2>&1
 }
 
 if is_darwin; then
@@ -25,11 +25,10 @@ else
     PREFIX="/usr"
 fi
 
-chefdk_binaries="berks chef chef-apply chef-shell chef-solo chef-vault cookstyle dco delivery foodcritic inspec kitchen knife ohai push-apply pushy-client pushy-service-manager chef-client"
-binaries="chef-run $chefdk_binaries"
+binaries="chef-run berks chef chef-apply chef-shell chef-solo chef-vault cookstyle delivery foodcritic inspec kitchen knife ohai push-apply pushy-client pushy-service-manager chef-client"
 
 for binary in $binaries; do
-  ln -sf $INSTALLER_DIR/bin/$binary $PREFIX/bin || error_exit "Cannot link $binary to $PREFIX/bin"
+  ln -sf "$INSTALLER_DIR/bin/$binary" $PREFIX/bin || error_exit "Cannot link $binary to $PREFIX/bin"
 done
 
 if is_darwin; then

diff --git a/omnibus/package-scripts/chef-workstation/preinst b/omnibus/package-scripts/chef-workstation/preinst
@@ -27,7 +27,7 @@ if is_darwin; then
       rm -rf '/opt/chefdk'
       echo "Removing binary links in /usr/local/bin"
       find /usr/local/bin -lname '/opt/chefdk/*' -delete
-      echo "Forgeting $pkgId"
+      echo "Forgetting $pkgId"
       pkgutil --forget $pkgId
     fi
-fi
+fi