appbundle-updater 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8138b8ba721779391f93cb5af5c03e4ac34e95af1181a3d6ac38478f010442be
-  data.tar.gz: c1694ec12f05275e409cbc51df222771188d20c240320c0b99da6c37e5ab6403
+  metadata.gz: 35e852a7a413c901a80af3afb028df575256847915bf2eda64eefd768a3ba358
+  data.tar.gz: 2dbd4e1a942a872ca0fe06f2929b1c52971aa2525d39b146e154acf5f507a717
 SHA512:
-  metadata.gz: dd87244b8046dc16cf9822ee5020221ca23e4edcf7f5f9c03260dc31bd163de65b09b796b51ccd1cb1eb082d27a7c262d6790dee09c10f03ac903ecae495557b
-  data.tar.gz: 3173f62a44bfe6737c5d4a76adc170cc3d90519df4eb8a68c6f071da5bf6017541d89f210f2d67008702057cf6907f56b4bb43e06f639f1e7ae26354f76e0589
+  metadata.gz: 34fdca0eabb8c1561e1b159b8854b52e61f90e70e185f38c001e610b49f25850a4fed75bd16f4f4df3538685d860bbc653f0f5835bbd1fbf8c1792b97cc428fe
+  data.tar.gz: fc7aad393794a2389cd16fc07f17ba9abd55b0e8bd1d1bdb4bfee443c6c001a50091f1891da3de5067463ab93045299b7de3aeb08479ac346a40ea1e21eda315

data/CHANGELOG.md

@@ -1,25 +1,50 @@
 # appbundle-updater Change Log
 
-<!-- latest_release 1.0.0 -->
-## [v1.0.0](https://github.com/chef/appbundle-updater/tree/v1.0.0) (2020-03-11)
+<!-- latest_release 1.0.5 -->
+## [v1.0.5](https://github.com/chef/appbundle-updater/tree/v1.0.5) (2020-05-29)
 
 #### Merged Pull Requests
-- Time to add chef-15 support [#48](https://github.com/chef/appbundle-updater/pull/48) ([lamont-granquist](https://github.com/lamont-granquist))
+- switch from `open` to `URI.open` [#54](https://github.com/chef/appbundle-updater/pull/54) ([lamont-granquist](https://github.com/lamont-granquist))
 <!-- latest_release -->
 
-<!-- release_rollup since=0.6.18 -->
+<!-- release_rollup since=1.0.4 -->
 ### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
-- Time to add chef-15 support [#48](https://github.com/chef/appbundle-updater/pull/48) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 1.0.0 -->
+- switch from `open` to `URI.open` [#54](https://github.com/chef/appbundle-updater/pull/54) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 1.0.5 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.0.4](https://github.com/chef/appbundle-updater/tree/v1.0.4) (2020-04-28)
+
+#### Merged Pull Requests
+- update gem groups in appbundler [#53](https://github.com/chef/appbundle-updater/pull/53) ([lamont-granquist](https://github.com/lamont-granquist))
+<!-- latest_stable_release -->
+
+## [v1.0.3](https://github.com/chef/appbundle-updater/tree/v1.0.3) (2020-03-12)
+
+#### Merged Pull Requests
+- fix a local variable [#51](https://github.com/chef/appbundle-updater/pull/51) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v1.0.2](https://github.com/chef/appbundle-updater/tree/v1.0.2) (2020-03-12)
+
+#### Merged Pull Requests
+- omit the right groups for ohai [#50](https://github.com/chef/appbundle-updater/pull/50) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v1.0.1](https://github.com/chef/appbundle-updater/tree/v1.0.1) (2020-03-12)
+
+#### Merged Pull Requests
+- more chef-15 updates [#49](https://github.com/chef/appbundle-updater/pull/49) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v1.0.0](https://github.com/chef/appbundle-updater/tree/v1.0.0) (2020-03-11)
+
+#### Merged Pull Requests
+- Time to add chef-15 support [#48](https://github.com/chef/appbundle-updater/pull/48) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v0.6.18](https://github.com/chef/appbundle-updater/tree/v0.6.18) (2020-03-11)
 
 #### Merged Pull Requests
 - need output logging so that we can debug [#47](https://github.com/chef/appbundle-updater/pull/47) ([lamont-granquist](https://github.com/lamont-granquist))
-<!-- latest_stable_release -->
 
 ## [v0.6.17](https://github.com/chef/appbundle-updater/tree/v0.6.17) (2019-09-30)
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.5

data/bin/appbundle-updater

@@ -119,7 +119,7 @@ def extract_tgz(file, destination = ".")
   end
 end
 
-App = Struct.new(:name, :repo, :bundle_without, :install_command, :gems) do
+App = Struct.new(:name, :repo, :bundle_without, :install_commands, :gems) do
   def initialize(*)
     super
     self.gems ||= {}
@@ -134,7 +134,7 @@ chef_install_command =
   if windows?
     "#{bin_dir.join("gem")} build chef-windows.gemspec & #{bin_dir.join("gem")} install chef*.gem --no-document"
   else
-    "#{bin_dir.join("rake")} install"
+    "#{bin_dir.join("bundle")} exec #{bin_dir.join("rake")} install"
   end
 
 CHEFDK_APPS = [
@@ -147,13 +147,13 @@ CHEFDK_APPS = [
   App.new(
     "chef",
     "chef/chef",
-    "development docgen chefstyle",
-    "#{bin_dir.join("bundle")} install --without server,docgen,maintenance,pry,travis,integration,ci,chefstyle",
+    "server docgen maintenance pry travis integration ci chefstyle",
+    chef_install_command,
     {
-      "chef" => %w{server docgen maintenance pry travis integration ci chefstyle},
-      "chef-bin" => %w{server docgen maintenance pry travis integration ci chefstyle},
-      "ohai" =>  %w{server docgen maintenance pry travis integration ci chefstyle},
-      "inspec-core-bin" =>  %w{server docgen maintenance pry travis integration ci chefstyle},
+      "chef" => %w{docgen chefstyle},
+      "chef-bin" => %w{development},
+      "ohai" =>  %w{development docs debug},
+      "inspec-core-bin" =>  %w{development},
     },
   ),
   App.new(
@@ -204,7 +204,7 @@ CHEFDK_APPS = [
   App.new(
     "ohai",
     "chef/ohai",
-    "ci docs debug",
+    "development docs debug",
     "#{bin_dir.join("rake")} install"
   ),
   App.new(
@@ -216,7 +216,7 @@ CHEFDK_APPS = [
 ].freeze
 
 class Updater
-  attr_reader :app, :ref, :tarball, :repo, :gems
+  attr_reader :app, :ref, :tarball, :repo, :gems, :install_commands
 
   def initialize(options)
     @app = options[:app]
@@ -226,6 +226,7 @@ class Updater
     @binstubs_source = options[:binstubs_source]
     @repo = options[:repo] || @app.repo
     @gems = @app.gems
+    @install_commands = @app.install_commands
   end
 
   def start
@@ -252,7 +253,7 @@ class Updater
       Dir.chdir(chefdk.join("embedded/apps")) do
         Tempfile.open("appbundle-updater") do |tempfile|
           tempfile.binmode
-          open(git_url) do |uri|
+          URI.open(git_url) do |uri|
             tempfile.write(uri.read)
           end
           tempfile.close
@@ -281,7 +282,9 @@ class Updater
 
     banner("Installing gem")
     Dir.chdir(app_dir) do
-      ruby("#{bin_dir.join("bundle")} exec #{app.install_command}")
+      Array(install_commands).each do |command|
+        ruby(command)
+      end
     end
 
     banner("Updating appbundler binstubs for #{app}")
@@ -296,7 +299,7 @@ class Updater
       gems.each do |gem_name, without|
         Dir.chdir(app_dir) do
           cmd = "#{bin_dir.join("appbundler")} #{app_dir} #{chefdk.join("bin")} #{gem_name}"
-          cmd += " --without #{@without.join(",")}" if @without
+          cmd += " --without #{without.join(",")}" if without
           cmd += " --extra-bin-files #{@extra_bin_files}" if @extra_bin_files
           cmd += " --binstubs-source #{@binstubs_source}" if @binstubs_source
           ruby(cmd)

data/lib/appbundle_updater/version.rb

@@ -1,3 +1,3 @@
 module AppbundleUpdater
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundle-updater
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Updates appbundled apps in Chef's omnibus packages
 email: