appbundler 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e28f2e4515160806c46bb209b6c77bafc27a3ee85f3a6c150395533f71769bd
-  data.tar.gz: f1d0721a380ebfa6ff3be21e94d9fa60684e7838a8f10daae7db86e9bf4e905f
+  metadata.gz: 26e3280e87178c94ec01585647a28e6f76052491b1847005d46986d4889ef2f4
+  data.tar.gz: ad2e9e65ae31eadeec4d634ab359bd2f01b8e01dc3e5bb17f8470a6345a26853
 SHA512:
-  metadata.gz: 660b086281a966d5376a6f595afd6a059340815746733a71f85de6fb853bc20ddb22b94a07ff69dc324c094089ef6ed8c30554b75363e49b13a0aadbc35a9469
-  data.tar.gz: c763835a1fbc8a0c5a72f5c0081acb95f6380141f644c4e365fb93160d4c9cf97e6e7cad8a2b0b9e6da0875ae1a7221c424654edb727240a958e30caaf2a3877
+  metadata.gz: 1a3910fb29a86a4741d41817ba0d0f9bed3c957d7cdacfdee44b294033e893c63b8b883aead2c923562783bed56c7d49ea16a8d039e018700a057fae103c8e49
+  data.tar.gz: 70b98db9c9c46732fdaa096cb3a94cb5cb507ab64660f798efc2c13cb406f11e0678f276bf134ee82f8a13e2b7d4c320a282c7716b843f038f0ef8e9e0edbbda

data/CHANGELOG.md

@@ -2,26 +2,31 @@
 
 This file is used to document the changes between releases of Appbundler
 
-<!-- latest_release 0.12.3 -->
-## [v0.12.3](https://github.com/chef/appbundler/tree/v0.12.3) (2019-04-17)
+<!-- latest_release 0.12.4 -->
+## [v0.12.4](https://github.com/chef/appbundler/tree/v0.12.4) (2019-04-24)
 
 #### Merged Pull Requests
-- syntax fix [#52](https://github.com/chef/appbundler/pull/52) ([lamont-granquist](https://github.com/lamont-granquist))
+- add --binstub-source option [#53](https://github.com/chef/appbundler/pull/53) ([lamont-granquist](https://github.com/lamont-granquist))
 <!-- latest_release -->
 
-<!-- release_rollup since=0.12.2 -->
+<!-- release_rollup since=0.12.3 -->
 ### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
-- syntax fix [#52](https://github.com/chef/appbundler/pull/52) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 0.12.3 -->
+- add --binstub-source option [#53](https://github.com/chef/appbundler/pull/53) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 0.12.4 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v0.12.3](https://github.com/chef/appbundler/tree/v0.12.3) (2019-04-17)
+
+#### Merged Pull Requests
+- syntax fix [#52](https://github.com/chef/appbundler/pull/52) ([lamont-granquist](https://github.com/lamont-granquist))
+<!-- latest_stable_release -->
+
 ## [v0.12.2](https://github.com/chef/appbundler/tree/v0.12.2) (2019-04-16)
 
 #### Merged Pull Requests
 - fix syntax for cli options [#51](https://github.com/chef/appbundler/pull/51) ([lamont-granquist](https://github.com/lamont-granquist))
-<!-- latest_stable_release -->
 
 ## [v0.12.1](https://github.com/chef/appbundler/tree/v0.12.1) (2019-04-16)
 

data/VERSION

@@ -1 +1 @@
-0.12.3
+0.12.4

data/lib/appbundler/app.rb

@@ -86,7 +86,7 @@ module Appbundler
     # of our appbundle calls.  But to ship ChefDK 2.0 we just do this.
     SHITLIST = [
       "github_changelog_generator",
-    ]
+    ].freeze
 
     # This is a check which is equivalent to asking if we are running 2-arg or 3-arg.  If
     # we have an "external_lockfile" that means the chef-dk omnibus Gemfile.lock, e.g.:
@@ -111,11 +111,11 @@ module Appbundler
     #
     def local_gemfile_lock_specs
       gemfile_lock_specs.map do |s|
-        #if SHITLIST.include?(s.name)
+        # if SHITLIST.include?(s.name)
         #  nil
-        #else
-          safe_resolve_local_gem(s)
-        #end
+        # else
+        safe_resolve_local_gem(s)
+        # end
       end.compact
     end
 
@@ -129,13 +129,23 @@ module Appbundler
       gem_path = installed_spec.gem_dir
       # If we're already using that directory, don't copy (it won't work anyway)
       return if gem_path == File.dirname(gemfile_lock)
-      FileUtils.install(gemfile_lock, gem_path, :mode => 0644)
+      FileUtils.install(gemfile_lock, gem_path, mode: 0644)
       if File.exist?(dot_bundle_dir) && File.directory?(dot_bundle_dir)
         FileUtils.cp_r(dot_bundle_dir, gem_path)
         FileUtils.chmod_R("ugo+rX", File.join(gem_path, ".bundle"))
       end
     end
 
+    # This is used to copy the binstubs from the binstub source directory to the actual
+    # binstub location.
+    #
+    def copy_binstubs(binstubs_source)
+      gem_path = installed_spec.gem_dir
+      dst = "#{gem_path}/bin"
+      src = "#{gem_path}/#{binstubs_source}/*"
+      FileUtils.cp_r(Dir.glob(src), dst)
+    end
+
     # This is the implementation of the 3-arg version of writing the merged lockfiles,
     # when called with the 2-arg version it short-circuits, however, to the copy_bundler_env
     # version above.
@@ -155,7 +165,7 @@ module Appbundler
         locked_gems = {}
 
         gemfile_lock_specs.each do |s|
-          #next if SHITLIST.include?(s.name)
+          # next if SHITLIST.include?(s.name)
           spec = safe_resolve_local_gem(s)
           next if spec.nil?
 
@@ -197,7 +207,7 @@ module Appbundler
         end
 
         t.close
-        puts IO.read(t.path)  # debugging
+        puts IO.read(t.path) # debugging
         Dir.chdir(app_dir) do
           FileUtils.rm_f "#{app_dir}/Gemfile.lock"
           Bundler.with_clean_env do
@@ -208,7 +218,7 @@ module Appbundler
           FileUtils.mv t.path, "#{app_dir}/Gemfile"
         end
       end
-      return "#{app_dir}/Gemfile"
+      "#{app_dir}/Gemfile"
     end
 
     def write_executable_stubs
@@ -247,10 +257,10 @@ module Appbundler
 
     def batchfile_stub
       ruby_relpath_windows = ruby_relative_path.tr("/", '\\')
-      <<-E
-@ECHO OFF
-"%~dp0\\#{ruby_relpath_windows}" "%~dpn0" %*
-E
+      <<~E
+        @ECHO OFF
+        "%~dp0\\#{ruby_relpath_windows}" "%~dpn0" %*
+      E
     end
 
     # Relative path from #target_bin_dir to #ruby. This is used to
@@ -288,24 +298,24 @@ E
     # APPBUNDLER_ALLOW_RVM environment variable to "true". This feature
     # exists to make tests run correctly on travis.ci (which uses rvm).
     def env_sanitizer
-      <<-EOS
-require "rubygems"
-
-begin
-  # this works around rubygems/rubygems#2196 and can be removed in rubygems > 2.7.6
-  require "rubygems/bundler_version_finder"
-rescue LoadError
-  # probably means rubygems is too old or too new to have this class, and we don't care
-end
+      <<~EOS
+        require "rubygems"
+
+        begin
+          # this works around rubygems/rubygems#2196 and can be removed in rubygems > 2.7.6
+          require "rubygems/bundler_version_finder"
+        rescue LoadError
+          # probably means rubygems is too old or too new to have this class, and we don't care
+        end
 
-# avoid appbundling if we are definitely running within a Bundler bundle.
-# most likely the check for defined?(Bundler) is enough since we don't require
-# bundler above, but just for paranoia's sake also we test to see if Bundler is
-# really doing its thing or not.
-unless defined?(Bundler) && Bundler.instance_variable_defined?("@load")
-  ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
-  ::Gem.clear_paths
-EOS
+        # avoid appbundling if we are definitely running within a Bundler bundle.
+        # most likely the check for defined?(Bundler) is enough since we don't require
+        # bundler above, but just for paranoia's sake also we test to see if Bundler is
+        # really doing its thing or not.
+        unless defined?(Bundler) && Bundler.instance_variable_defined?("@load")
+          ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+          ::Gem.clear_paths
+      EOS
     end
 
     def runtime_activate
@@ -325,17 +335,17 @@ EOS
     def load_statement_for(bin_file)
       name, version = app_spec.name, app_spec.version
       bin_basename = File.basename(bin_file)
-      <<-E
-  gem "#{name}", "= #{version}"
-  spec = Gem::Specification.find_by_name("#{name}", "= #{version}")
-else
-  spec = Gem::Specification.find_by_name("#{name}")
-end
+      <<~E
+          gem "#{name}", "= #{version}"
+          spec = Gem::Specification.find_by_name("#{name}", "= #{version}")
+        else
+          spec = Gem::Specification.find_by_name("#{name}")
+        end
 
-bin_file = spec.bin_file("#{bin_basename}")
+        bin_file = spec.bin_file("#{bin_basename}")
 
-Kernel.load(bin_file)
-E
+        Kernel.load(bin_file)
+      E
     end
 
     def executables
@@ -413,12 +423,12 @@ E
       inaccessable_gems = inaccessable_git_sourced_gems
       return true if inaccessable_gems.empty?
 
-      message = <<-MESSAGE
-Application '#{name}' contains gems in the lockfile which are
-not accessible by rubygems. This usually occurs when you fetch gems from git in
-your Gemfile and do not install the same version of the gems beforehand.
+      message = <<~MESSAGE
+        Application '#{name}' contains gems in the lockfile which are
+        not accessible by rubygems. This usually occurs when you fetch gems from git in
+        your Gemfile and do not install the same version of the gems beforehand.
 
-MESSAGE
+      MESSAGE
 
       message << "The Gemfile.lock is located here:\n- #{gemfile_lock}\n\n"
 

data/lib/appbundler/cli.rb

@@ -6,49 +6,54 @@ module Appbundler
   class CLI
     include Mixlib::CLI
 
-    banner(<<-BANNER)
-* appbundler #{VERSION} *
+    banner(<<~BANNER)
+      * appbundler #{VERSION} *
 
-Usage: appbundler BUNDLE_DIR BINSTUB_DIR [GEM_NAME] [GEM_NAME] ...
+      Usage: appbundler BUNDLE_DIR BINSTUB_DIR [GEM_NAME] [GEM_NAME] ...
 
-  BUNDLE_DIR is the root directory to the bundle containing your app
-  BINSTUB_DIR is the directory where you want generated executables to be written
-  GEM_NAME is the name of a gem you want to appbundle. Default is the directory name
-           of BUNDLE_DIR (e.g. /src/chef -> chef)
+        BUNDLE_DIR is the root directory to the bundle containing your app
+        BINSTUB_DIR is the directory where you want generated executables to be written
+        GEM_NAME is the name of a gem you want to appbundle. Default is the directory name
+                 of BUNDLE_DIR (e.g. /src/chef -> chef)
 
-Your bundled application must already be gem installed.  Generated binstubs
-will point to the gem, not your working copy.
-BANNER
+      Your bundled application must already be gem installed.  Generated binstubs
+      will point to the gem, not your working copy.
+    BANNER
 
     # this is used by chef-dk, its probably not an external API, here be dragons
     option :without,
-      :long => "--without GROUPS",
-      :description => "Comma separated list of groups to exclude when building transitive Gemfile.locks (internal API)",
-      :proc => lambda { |o| o.split(/[\s,]+/) },
-      :default => []
+      long: "--without GROUPS",
+      description: "Comma separated list of groups to exclude when building transitive Gemfile.locks (internal API)",
+      proc: lambda { |o| o.split(/[\s,]+/) },
+      default: []
+
+    option :binstubs_source,
+      long: "--binstubs-source path/to/binstubs",
+      description: "Path to binstubs within the gem to be moved into the bindir",
+      default: nil
 
     option :extra_bin_files,
-      :long => "--extra-bin-files bin1,bin2",
-      :description => "Comma separated list of extra binstubs to wire up which are not listed in the gemspec",
-      :proc => lambda { |o| o.split(/[\s,]+/) },
-      :default => []
+      long: "--extra-bin-files bin1,bin2",
+      description: "Comma separated list of extra binstubs to wire up which are not listed in the gemspec",
+      proc: lambda { |o| o.split(/[\s,]+/) },
+      default: []
 
     option :version,
-      :short => "-v",
-      :long => "--version",
-      :description => "Show appbundler version",
-      :boolean => true,
-      :proc => lambda { |v| $stdout.puts("Appbundler Version: #{::Appbundler::VERSION}") },
-      :exit => 0
+      short: "-v",
+      long: "--version",
+      description: "Show appbundler version",
+      boolean: true,
+      proc: lambda { |v| $stdout.puts("Appbundler Version: #{::Appbundler::VERSION}") },
+      exit: 0
 
     option :help,
-      :short => "-h",
-      :long => "--help",
-      :description => "Show this message",
-      :on => :tail,
-      :boolean => true,
-      :show_options => true,
-      :exit => 0
+      short: "-h",
+      long: "--help",
+      description: "Show this message",
+      on: :tail,
+      boolean: true,
+      show_options: true,
+      exit: 0
 
     def self.run(argv)
       cli = new(argv)
@@ -111,6 +116,10 @@ BANNER
         end
         created_lockfile = app.write_merged_lockfiles(without: config[:without])
         $stdout.puts "Generated merged lockfile at #{created_lockfile}" if created_lockfile
+        if config[:binstubs_source]
+          app.copy_binstubs(config[:binstubs_source])
+          $stdout.puts "Copied binstubs"
+        end
       end
     end
 

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.12.3"
+  VERSION = "0.12.4".freeze
 end

data/spec/appbundler/app_spec.rb

@@ -11,15 +11,15 @@ describe Appbundler do
   end
 
   def double_spec(name, version, dep_names)
-    deps = dep_names.map { |n| double("Bundler::Dependency #{n}", :name => n.to_s) }
+    deps = dep_names.map { |n| double("Bundler::Dependency #{n}", name: n.to_s) }
     source = double("Bundler::Source::Rubygems")
-    spec = double("Bundler::LazySpecification '#{name}'", :name => name.to_s, :version => version, :dependencies => deps, :source => source)
+    spec = double("Bundler::LazySpecification '#{name}'", name: name.to_s, version: version, dependencies: deps, source: source)
     all_specs << spec
     spec
   end
 
   def shellout!(cmd)
-    s = Mixlib::ShellOut.new(cmd, :env => { "RUBYOPT" => nil, "BUNDLE_GEMFILE" => nil, "APPBUNDLER_ALLOW_RVM" => "true" })
+    s = Mixlib::ShellOut.new(cmd, env: { "RUBYOPT" => nil, "BUNDLE_GEMFILE" => nil, "APPBUNDLER_ALLOW_RVM" => "true" })
     s.run_command
     s.error!
     s
@@ -99,23 +99,23 @@ describe Appbundler do
     end
 
     it "locks the main app's gem via rubygems, and loads the proper binary" do
-      expected_loading_code = <<-CODE
-gem "app", "= 1.0.0"
+      expected_loading_code = <<~CODE
+        gem "app", "= 1.0.0"
 
-spec = Gem::Specification.find_by_name("app", "= 1.0.0")
-bin_file = spec.bin_file("foo")
+        spec = Gem::Specification.find_by_name("app", "= 1.0.0")
+        bin_file = spec.bin_file("foo")
 
-Kernel.load(bin_file)
-CODE
+        Kernel.load(bin_file)
+      CODE
       expect(app.load_statement_for(bin_path)).to eq(expected_loading_code)
     end
 
     it "generates code to override GEM_HOME and GEM_PATH (e.g., rvm)" do
-      expected = <<-EOS
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
-require "rubygems"
-::Gem.clear_paths
-EOS
+      expected = <<~EOS
+        ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+        require "rubygems"
+        ::Gem.clear_paths
+      EOS
 
       expect(app.env_sanitizer).to eq(expected)
       expect(app.runtime_activate).to include(expected)
@@ -134,10 +134,10 @@ EOS
       end
 
       it "generates batchfile stub code" do
-        expected_batch_code = <<-E
-@ECHO OFF
-"%~dp0\\..\\embedded\\bin\\ruby.exe" "%~dpn0" %*
-E
+        expected_batch_code = <<~E
+          @ECHO OFF
+          "%~dp0\\..\\embedded\\bin\\ruby.exe" "%~dpn0" %*
+        E
         expect(app.batchfile_stub).to eq(expected_batch_code)
       end
 
@@ -155,8 +155,8 @@ E
 
       # Ensure that the behavior we emulate in our stubs is correct:
       it "sanity checks rubygems behavior" do
-        expect { Gem::Specification.find_by_name("there-is-no-such-gem-named-this", "= 999.999.999") }.
-          to raise_error(Gem::LoadError)
+        expect { Gem::Specification.find_by_name("there-is-no-such-gem-named-this", "= 999.999.999") }
+          .to raise_error(Gem::LoadError)
       end
 
       context "and the gems are not accessible by rubygems" do
@@ -238,123 +238,123 @@ E
 
     it "generates runtime activation code for the app" do
       expected_gem_activates = if windows?
-                                 <<-E
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
-require "rubygems"
-::Gem.clear_paths
-
-gem "chef", "= 12.4.1"
-gem "chef-config", "= 12.4.1"
-gem "mixlib-config", "= 2.2.1"
-gem "mixlib-shellout", "= 2.2.0"
-gem "win32-process", "= 0.7.5"
-gem "ffi", "= 1.9.10"
-gem "chef-zero", "= 4.3.0"
-gem "ffi-yajl", "= 2.2.2"
-gem "libyajl2", "= 1.2.0"
-gem "hashie", "= 2.1.2"
-gem "mixlib-log", "= 1.6.0"
-gem "rack", "= 1.6.4"
-gem "uuidtools", "= 2.1.5"
-gem "diff-lcs", "= 1.2.5"
-gem "erubis", "= 2.7.0"
-gem "highline", "= 1.7.3"
-gem "mixlib-authentication", "= 1.3.0"
-gem "mixlib-cli", "= 1.5.0"
-gem "net-ssh", "= 2.9.2"
-gem "net-ssh-multi", "= 1.2.1"
-gem "net-ssh-gateway", "= 1.2.0"
-gem "ohai", "= 8.5.1"
-gem "ipaddress", "= 0.8.0"
-gem "mime-types", "= 2.6.1"
-gem "rake", "= 10.1.1"
-gem "systemu", "= 2.6.5"
-gem "wmi-lite", "= 1.0.0"
-gem "plist", "= 3.1.0"
-gem "pry", "= 0.9.12.6"
-gem "coderay", "= 1.1.0"
-gem "method_source", "= 0.8.2"
-gem "slop", "= 3.4.7"
-gem "win32console", "= 1.3.2"
-gem "rspec-core", "= 3.3.2"
-gem "rspec-support", "= 3.3.0"
-gem "rspec-expectations", "= 3.3.1"
-gem "rspec-mocks", "= 3.3.2"
-gem "rspec_junit_formatter", "= 0.2.3"
-gem "builder", "= 3.2.2"
-gem "serverspec", "= 2.23.1"
-gem "multi_json", "= 1.11.2"
-gem "rspec", "= 3.3.0"
-gem "rspec-its", "= 1.2.0"
-gem "specinfra", "= 2.43.3"
-gem "net-scp", "= 1.2.1"
-gem "net-telnet", "= 0.1.1"
-gem "sfl", "= 2.2"
-gem "syslog-logger", "= 1.6.8"
-gem "win32-api", "= 1.5.3"
-gem "win32-dir", "= 0.5.0"
-gem "win32-event", "= 0.6.1"
-gem "win32-ipc", "= 0.6.6"
-gem "win32-eventlog", "= 0.6.3"
-gem "win32-mmap", "= 0.4.1"
-gem "win32-mutex", "= 0.4.2"
-gem "win32-service", "= 0.8.6"
-gem "windows-api", "= 0.4.4"
-gem "windows-pr", "= 1.2.4"
-E
+                                 <<~E
+                                   ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+                                   require "rubygems"
+                                   ::Gem.clear_paths
+
+                                   gem "chef", "= 12.4.1"
+                                   gem "chef-config", "= 12.4.1"
+                                   gem "mixlib-config", "= 2.2.1"
+                                   gem "mixlib-shellout", "= 2.2.0"
+                                   gem "win32-process", "= 0.7.5"
+                                   gem "ffi", "= 1.9.10"
+                                   gem "chef-zero", "= 4.3.0"
+                                   gem "ffi-yajl", "= 2.2.2"
+                                   gem "libyajl2", "= 1.2.0"
+                                   gem "hashie", "= 2.1.2"
+                                   gem "mixlib-log", "= 1.6.0"
+                                   gem "rack", "= 1.6.4"
+                                   gem "uuidtools", "= 2.1.5"
+                                   gem "diff-lcs", "= 1.2.5"
+                                   gem "erubis", "= 2.7.0"
+                                   gem "highline", "= 1.7.3"
+                                   gem "mixlib-authentication", "= 1.3.0"
+                                   gem "mixlib-cli", "= 1.5.0"
+                                   gem "net-ssh", "= 2.9.2"
+                                   gem "net-ssh-multi", "= 1.2.1"
+                                   gem "net-ssh-gateway", "= 1.2.0"
+                                   gem "ohai", "= 8.5.1"
+                                   gem "ipaddress", "= 0.8.0"
+                                   gem "mime-types", "= 2.6.1"
+                                   gem "rake", "= 10.1.1"
+                                   gem "systemu", "= 2.6.5"
+                                   gem "wmi-lite", "= 1.0.0"
+                                   gem "plist", "= 3.1.0"
+                                   gem "pry", "= 0.9.12.6"
+                                   gem "coderay", "= 1.1.0"
+                                   gem "method_source", "= 0.8.2"
+                                   gem "slop", "= 3.4.7"
+                                   gem "win32console", "= 1.3.2"
+                                   gem "rspec-core", "= 3.3.2"
+                                   gem "rspec-support", "= 3.3.0"
+                                   gem "rspec-expectations", "= 3.3.1"
+                                   gem "rspec-mocks", "= 3.3.2"
+                                   gem "rspec_junit_formatter", "= 0.2.3"
+                                   gem "builder", "= 3.2.2"
+                                   gem "serverspec", "= 2.23.1"
+                                   gem "multi_json", "= 1.11.2"
+                                   gem "rspec", "= 3.3.0"
+                                   gem "rspec-its", "= 1.2.0"
+                                   gem "specinfra", "= 2.43.3"
+                                   gem "net-scp", "= 1.2.1"
+                                   gem "net-telnet", "= 0.1.1"
+                                   gem "sfl", "= 2.2"
+                                   gem "syslog-logger", "= 1.6.8"
+                                   gem "win32-api", "= 1.5.3"
+                                   gem "win32-dir", "= 0.5.0"
+                                   gem "win32-event", "= 0.6.1"
+                                   gem "win32-ipc", "= 0.6.6"
+                                   gem "win32-eventlog", "= 0.6.3"
+                                   gem "win32-mmap", "= 0.4.1"
+                                   gem "win32-mutex", "= 0.4.2"
+                                   gem "win32-service", "= 0.8.6"
+                                   gem "windows-api", "= 0.4.4"
+                                   gem "windows-pr", "= 1.2.4"
+                                 E
                                else
-                                 <<-E
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
-require "rubygems"
-::Gem.clear_paths
-
-gem "chef", "= 12.4.1"
-gem "chef-config", "= 12.4.1"
-gem "mixlib-config", "= 2.2.1"
-gem "mixlib-shellout", "= 2.2.0"
-gem "chef-zero", "= 4.3.0"
-gem "ffi-yajl", "= 2.2.2"
-gem "libyajl2", "= 1.2.0"
-gem "hashie", "= 2.1.2"
-gem "mixlib-log", "= 1.6.0"
-gem "rack", "= 1.6.4"
-gem "uuidtools", "= 2.1.5"
-gem "diff-lcs", "= 1.2.5"
-gem "erubis", "= 2.7.0"
-gem "highline", "= 1.7.3"
-gem "mixlib-authentication", "= 1.3.0"
-gem "mixlib-cli", "= 1.5.0"
-gem "net-ssh", "= 2.9.2"
-gem "net-ssh-multi", "= 1.2.1"
-gem "net-ssh-gateway", "= 1.2.0"
-gem "ohai", "= 8.5.1"
-gem "ffi", "= 1.9.10"
-gem "ipaddress", "= 0.8.0"
-gem "mime-types", "= 2.6.1"
-gem "rake", "= 10.1.1"
-gem "systemu", "= 2.6.5"
-gem "wmi-lite", "= 1.0.0"
-gem "plist", "= 3.1.0"
-gem "pry", "= 0.9.12.6"
-gem "coderay", "= 1.1.0"
-gem "method_source", "= 0.8.2"
-gem "slop", "= 3.4.7"
-gem "rspec-core", "= 3.3.2"
-gem "rspec-support", "= 3.3.0"
-gem "rspec-expectations", "= 3.3.1"
-gem "rspec-mocks", "= 3.3.2"
-gem "rspec_junit_formatter", "= 0.2.3"
-gem "builder", "= 3.2.2"
-gem "serverspec", "= 2.23.1"
-gem "multi_json", "= 1.11.2"
-gem "rspec", "= 3.3.0"
-gem "rspec-its", "= 1.2.0"
-gem "specinfra", "= 2.43.3"
-gem "net-scp", "= 1.2.1"
-gem "net-telnet", "= 0.1.1"
-gem "sfl", "= 2.2"
-gem "syslog-logger", "= 1.6.8"
-E
+                                 <<~E
+                                   ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+                                   require "rubygems"
+                                   ::Gem.clear_paths
+
+                                   gem "chef", "= 12.4.1"
+                                   gem "chef-config", "= 12.4.1"
+                                   gem "mixlib-config", "= 2.2.1"
+                                   gem "mixlib-shellout", "= 2.2.0"
+                                   gem "chef-zero", "= 4.3.0"
+                                   gem "ffi-yajl", "= 2.2.2"
+                                   gem "libyajl2", "= 1.2.0"
+                                   gem "hashie", "= 2.1.2"
+                                   gem "mixlib-log", "= 1.6.0"
+                                   gem "rack", "= 1.6.4"
+                                   gem "uuidtools", "= 2.1.5"
+                                   gem "diff-lcs", "= 1.2.5"
+                                   gem "erubis", "= 2.7.0"
+                                   gem "highline", "= 1.7.3"
+                                   gem "mixlib-authentication", "= 1.3.0"
+                                   gem "mixlib-cli", "= 1.5.0"
+                                   gem "net-ssh", "= 2.9.2"
+                                   gem "net-ssh-multi", "= 1.2.1"
+                                   gem "net-ssh-gateway", "= 1.2.0"
+                                   gem "ohai", "= 8.5.1"
+                                   gem "ffi", "= 1.9.10"
+                                   gem "ipaddress", "= 0.8.0"
+                                   gem "mime-types", "= 2.6.1"
+                                   gem "rake", "= 10.1.1"
+                                   gem "systemu", "= 2.6.5"
+                                   gem "wmi-lite", "= 1.0.0"
+                                   gem "plist", "= 3.1.0"
+                                   gem "pry", "= 0.9.12.6"
+                                   gem "coderay", "= 1.1.0"
+                                   gem "method_source", "= 0.8.2"
+                                   gem "slop", "= 3.4.7"
+                                   gem "rspec-core", "= 3.3.2"
+                                   gem "rspec-support", "= 3.3.0"
+                                   gem "rspec-expectations", "= 3.3.1"
+                                   gem "rspec-mocks", "= 3.3.2"
+                                   gem "rspec_junit_formatter", "= 0.2.3"
+                                   gem "builder", "= 3.2.2"
+                                   gem "serverspec", "= 2.23.1"
+                                   gem "multi_json", "= 1.11.2"
+                                   gem "rspec", "= 3.3.0"
+                                   gem "rspec-its", "= 1.2.0"
+                                   gem "specinfra", "= 2.43.3"
+                                   gem "net-scp", "= 1.2.1"
+                                   gem "net-telnet", "= 0.1.1"
+                                   gem "sfl", "= 2.2"
+                                   gem "syslog-logger", "= 1.6.8"
+                                 E
                                end
       expect(app.runtime_activate).to include(expected_gem_activates)
     end
@@ -391,8 +391,8 @@ E
       binary_2 = File.join(target_bindir, "app-binary-2")
       expect(File.exist?(binary_1)).to be(true)
       expect(File.exist?(binary_2)).to be(true)
-      expect(File.executable?(binary_1) || File.exists?(binary_1 + ".bat")).to be(true)
-      expect(File.executable?(binary_1) || File.exists?(binary_1 + ".bat")).to be(true)
+      expect(File.executable?(binary_1) || File.exist?(binary_1 + ".bat")).to be(true)
+      expect(File.executable?(binary_1) || File.exist?(binary_1 + ".bat")).to be(true)
       expect(shellout!(binary_1).stdout.strip).to eq("binary 1 ran")
       expect(shellout!(binary_2).stdout.strip).to eq("binary 2 ran")
     end
@@ -401,7 +401,7 @@ E
       spec = Gem::Specification.find_by_name("appbundler-example-app", "= 1.0.0")
       gem_path = spec.gem_dir
       app.copy_bundler_env
-      expect(File.exists?(File.join(gem_path, "Gemfile.lock"))).to be(true)
+      expect(File.exist?(File.join(gem_path, "Gemfile.lock"))).to be(true)
     end
 
     it "copies over .bundler to the gem directory" do
@@ -409,7 +409,7 @@ E
       gem_path = spec.gem_dir
       app.copy_bundler_env
       expect(File.directory?(File.join(gem_path, ".bundle"))).to be(true)
-      expect(File.exists?(File.join(gem_path, ".bundle/config"))).to be(true)
+      expect(File.exist?(File.join(gem_path, ".bundle/config"))).to be(true)
     end
     context "and the executable is symlinked to a different directory", :not_supported_on_windows do
 
@@ -449,10 +449,10 @@ E
       end
 
       let(:expected_batch_code) do
-        <<-E
-@ECHO OFF
-"%~dp0\\#{expected_ruby_relpath}" "%~dpn0" %*
-E
+        <<~E
+          @ECHO OFF
+          "%~dp0\\#{expected_ruby_relpath}" "%~dpn0" %*
+        E
       end
 
       before do

data/spec/fixtures/appbundler-example-app/lib/example_app.rb

@@ -1,3 +1,3 @@
 module ExampleApp
-  IT_WORKS = "yes"
+  IT_WORKS = "yes".freeze
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ def windows?
 end
 
 RSpec.configure do |c|
-  c.filter_run :focus => true
+  c.filter_run focus: true
   c.run_all_when_everything_filtered = true
   c.filter_run_excluding(not_supported_on_windows: true) if windows?
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake