appbundler 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdcdbca4e10ef8f04ec364fad2250690e062992
-  data.tar.gz: 4c0408acd0c32ab33376397d78616c1a50dcca7a
+  metadata.gz: b6d3790061544bed9cee8bd44d5c94bcd235b46b
+  data.tar.gz: 050a352e5d29f64ad1dd512abeef8759f9a17dfd
 SHA512:
-  metadata.gz: 144df4d360bfebafd5b99730dfc428d7ecc409efcdcd54bb68c0f7c1624eeb913be17a575ee83aff3960d5aacace7f409c2593a11481932172abe75f0184eaba
-  data.tar.gz: 625f02ebeefb40ee421047c6c406f248b5d35bbe7ad7f43cd2711a8963cbf816ffe806acd1e47c74c2bf0ef5ded3816e711f6c5ae762ff4ebf5c51558d1d2bc0
+  metadata.gz: 46f7c7536c8090ba2ebd83b4678041e89965344cacc40d3d455897884beea826c258080f5add78a1d2387ba397e986863d95abaf4393aad1741e88fbb9d9a37e
+  data.tar.gz: 4b2a888810f9199e41f17ffda7d4be4043d6569be893e46cbb7f9239793a6ad60ca837949d5774b552c2c1308822657e152c161d5647073bf7024058b3520836

data/.travis.yml

@@ -3,9 +3,8 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.0.0
-  - 2.1.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
 
 branches:
   only:
@@ -13,4 +12,3 @@ branches:
 
 # The integration tests need to see installed gems.
 script: rspec --color --format progress
-

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in appbundler.gemspec
 gemspec

data/README.md

@@ -1,70 +1,80 @@
 # Appbundler
 
-Appbundler reads a Gemfile.lock and generates code with
-`gem "some-dep", "= VERSION"` statements to lock the app's dependencies
-to the versions selected by bundler. This code is used in binstubs for
-the application so that running (e.g.) `chef-client` on the command line
-activates the locked dependencies for `chef` before running the command.
+[![Build Status Master](https://travis-ci.org/chef/appbundler.svg?branch=master)](https://travis-ci.org/chef/appbundler) [![Gem Version](https://badge.fury.io/rb/appbundler.svg)](https://badge.fury.io/rb/appbundler)
+
+Appbundler reads a Gemfile.lock and generates code with `gem "some-dep", "= VERSION"` statements to lock the app's dependencies to the versions selected by bundler. This code is used in binstubs for the application so that running (e.g.) `chef-client` on the command line activates the locked dependencies for `chef` before running the command.
 
 This provides the following benefits:
-* The application loads faster because rubygems is not resolving
-  dependency constraints at runtime.
-* The application runs with the same dependencies that it would if
-  bundler was used, so we can test applications (that will be installed
-  in an omnibus package) using the default bundler workflow.
-* There's no need to `bundle exec` or patch the bundler runtime into the
-  app.
-* The app can load gems not included in the Gemfile/gemspec. Our use
-  case for this is to load plugins (e.g., for knife and test kitchen).
-* A user can use rvm and still use the application (see below).
-* The application is protected from installation of incompatible
-  dependencies.
-
-# Usage
-
-Install via rubygems: `gem install appbundler` or clone this project and
-bundle install:
 
-```
-git clone https://github.com/opscode/appbundler.git
+- The application loads faster because rubygems is not resolving dependency constraints at runtime.
+- The application runs with the same dependencies that it would if bundler was used, so we can test applications (that will be installed in an omnibus package) using the default bundler workflow.
+- There's no need to `bundle exec` or patch the bundler runtime into the app.
+- The app can load gems not included in the Gemfile/gemspec. Our use case for this is to load plugins (e.g., for knife and test kitchen).
+- A user can use rvm and still use the application (see below).
+- The application is protected from installation of incompatible dependencies.
+
+## Usage
+
+Install via rubygems: `gem install appbundler` or clone this project and bundle install:
+
+```shell
+git clone https://github.com/chef/appbundler.git
 cd appbundler
 bundle install
 ```
 
-Clone whatever project you want to appbundle somewhere else, and bundle
-install it:
+Clone whatever project you want to appbundle somewhere else, and bundle install it:
 
-```
+```shell
 mkdir ~/oc
 cd ~/oc
-git clone https://github.com/opscode/chef.git
+git clone https://github.com/chef/chef.git
 cd chef
 bundle install
 ```
 
 Create a bin directory where your bundled binstubs will live:
 
-```
+```shell
 mkdir ~/appbundle-bin
 # Add to your PATH if you like
 ```
 
 Now you can app bundle your project (chef in our example):
 
-```
+```shell
 bin/appbundler ~/oc/chef ~/appbundler-bin
 ```
 
 Now you can run all of the app's executables with locked down deps:
 
-```
+```shell
 ~/appbunlder-bin/chef-client -v
 ```
 
+## RVM
+
+The generated binstubs explicitly disable rvm, so the above won't work if you're using rvm. This is intentional, because our use case is for omnibus applications where rvm's environment variables can break the embedded application by making ruby look for gems in rvm's gem repo.
+
+## Contributing
+
+For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>
 
-# RVM
+## License
 
-The generated binstubs explicitly disable rvm, so the above won't work
-if you're using rvm. This is intentional, because our use case is for
-omnibus applications where rvm's environment variables can break the
-embedded application by making ruby look for gems in rvm's gem repo.
+- Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
+- License:: Apache License, Version 2.0
+
+```text
+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.
+```

data/appbundler.gemspec

@@ -1,27 +1,29 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'appbundler/version'
+require "appbundler/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "appbundler"
   spec.version       = Appbundler::VERSION
-  spec.authors       = ["danielsdeleo"]
-  spec.email         = ["dan@opscode.com"]
+  spec.authors       = ["Dan DeLeo"]
+  spec.email         = ["dan@chef.io"]
   spec.description   = %q{Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation}
   spec.summary       = spec.description
-  spec.homepage      = ""
-  spec.license       = "Apache2"
+  spec.homepage      = "https://github.com/chef/appbundler"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.2.0"
+
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "mixlib-shellout", "~> 1.0"
+  spec.add_development_dependency "mixlib-shellout", "~> 2.0"
 
   spec.add_dependency "mixlib-cli", "~> 1.4"
 end

data/bin/appbundler

@@ -3,11 +3,10 @@
 Kernel.trap(:INT) { exit 1 }
 
 begin
-  require 'appbundler/cli'
+  require "appbundler/cli"
 rescue LoadError
   $:.unshift File.expand_path("../../lib", __FILE__)
-  require 'appbundler/cli'
+  require "appbundler/cli"
 end
 
 Appbundler::CLI.run(ARGV)
-

data/lib/appbundler.rb

@@ -1,4 +1,3 @@
 
 module Appbundler
 end
-

data/lib/appbundler/app.rb

@@ -1,7 +1,6 @@
-require 'bundler'
-require 'fileutils'
-require 'pp'
-
+require "bundler"
+require "fileutils"
+require "pp"
 
 module Appbundler
 
@@ -11,7 +10,7 @@ module Appbundler
 
   class App
 
-    BINSTUB_FILE_VERSION=1
+    BINSTUB_FILE_VERSION = 1
 
     attr_reader :bundle_path
     attr_reader :target_bin_dir
@@ -71,7 +70,7 @@ module Appbundler
     end
 
     def batchfile_stub
-      ruby_relpath_windows = ruby_relative_path.gsub('/', '\\')
+      ruby_relpath_windows = ruby_relative_path.tr("/", '\\')
       <<-E
 @ECHO OFF
 "%~dp0\\#{ruby_relpath_windows}" "%~dpn0" %*
@@ -89,7 +88,7 @@ E
     end
 
     def shebang
-      "#!#{ruby}\n"
+      "#!#{ruby} --disable-gems\n"
     end
 
     # A specially formatted comment that documents the format version of the
@@ -113,13 +112,16 @@ 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
-      %Q{ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"}
+      <<-EOS
+ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+require "rubygems"
+::Gem.clear_paths
+EOS
     end
 
     def runtime_activate
-
       @runtime_activate ||= begin
-        statements = runtime_dep_specs.map {|s| %Q|gem "#{s.name}", "= #{s.version}"|}
+        statements = runtime_dep_specs.map { |s| %Q{gem "#{s.name}", "= #{s.version}"} }
         activate_code = ""
         activate_code << env_sanitizer << "\n"
         activate_code << statements.join("\n") << "\n"
@@ -146,7 +148,7 @@ E
 
     def executables
       spec = app_gemspec
-      spec.executables.map {|e| spec.bin_file(e)}
+      spec.executables.map { |e| spec.bin_file(e) }
     end
 
     def runtime_dep_specs
@@ -236,9 +238,9 @@ MESSAGE
       false
     end
 
-    def add_dependencies_from(spec, collected_deps=[])
+    def add_dependencies_from(spec, collected_deps = [])
       spec.dependencies.each do |dep|
-        next if collected_deps.any? {|s| s.name == dep.name }
+        next if collected_deps.any? { |s| s.name == dep.name }
         # a bundler dep will not get pinned in Gemfile.lock
         next if dep.name == "bundler"
         next_spec = spec_for(dep.name)
@@ -249,7 +251,7 @@ MESSAGE
     end
 
     def spec_for(dep_name)
-      gemfile_lock_specs.find {|s| s.name == dep_name } or raise "No spec #{dep_name}"
+      gemfile_lock_specs.find { |s| s.name == dep_name } || raise("No spec #{dep_name}")
     end
   end
 end

data/lib/appbundler/cli.rb

@@ -1,6 +1,6 @@
-require 'appbundler/version'
-require 'appbundler/app'
-require 'mixlib/cli'
+require "appbundler/version"
+require "appbundler/app"
+require "mixlib/cli"
 
 module Appbundler
   class CLI
@@ -21,11 +21,11 @@ will point to the gem, not your working copy.
 BANNER
 
     option :version,
-      :short => '-v',
-      :long => '--version',
-      :description => 'Show appbundler version',
+      :short => "-v",
+      :long => "--version",
+      :description => "Show appbundler version",
       :boolean => true,
-      :proc => lambda {|v| $stdout.puts("Appbundler Version: #{::Appbundler::VERSION}")},
+      :proc => lambda { |v| $stdout.puts("Appbundler Version: #{::Appbundler::VERSION}") },
       :exit => 0
 
     option :help,

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/appbundler/app_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
-require 'tmpdir'
-require 'fileutils'
-require 'mixlib/shellout'
-require 'appbundler/app'
+require "spec_helper"
+require "tmpdir"
+require "fileutils"
+require "mixlib/shellout"
+require "appbundler/app"
 
 describe Appbundler do
 
@@ -11,7 +11,7 @@ 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)
     all_specs << spec
@@ -19,7 +19,7 @@ describe Appbundler do
   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
@@ -83,7 +83,7 @@ describe Appbundler do
       expect(app.runtime_dep_specs).to include(second_level_dep_a_a)
       expect(app.runtime_dep_specs).to include(second_level_dep_b_a)
       expect(app.runtime_dep_specs).to include(second_level_dep_shared)
-      expect(app.runtime_dep_specs.select {|s| s == second_level_dep_shared}.size).to eq(1)
+      expect(app.runtime_dep_specs.select { |s| s == second_level_dep_shared }.size).to eq(1)
     end
 
     it "generates gem activation code for the app" do
@@ -111,7 +111,12 @@ CODE
     end
 
     it "generates code to override GEM_HOME and GEM_PATH (e.g., rvm)" do
-      expected = %Q{ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"}
+      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)
     end
@@ -129,7 +134,7 @@ CODE
       end
 
       it "generates batchfile stub code" do
-        expected_batch_code=<<-E
+        expected_batch_code = <<-E
 @ECHO OFF
 "%~dp0\\..\\embedded\\bin\\ruby.exe" "%~dpn0" %*
 E
@@ -183,7 +188,7 @@ E
   end
 
   context "when created with the example application" do
-    FIXTURES_PATH =  File.expand_path("../../fixtures/", __FILE__).freeze
+    FIXTURES_PATH = File.expand_path("../../fixtures/", __FILE__).freeze
 
     APP_ROOT = File.join(FIXTURES_PATH, "appbundler-example-app").freeze
 
@@ -232,9 +237,12 @@ E
     end
 
     it "generates runtime activation code for the app" do
-      expected_gem_activates= if windows?
-                          <<-E
+      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"
@@ -294,9 +302,12 @@ gem "win32-service", "= 0.8.6"
 gem "windows-api", "= 0.4.4"
 gem "windows-pr", "= 1.2.4"
 E
-                          else
-          <<-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"
@@ -344,13 +355,13 @@ gem "net-telnet", "= 0.1.1"
 gem "sfl", "= 2.2"
 gem "syslog-logger", "= 1.6.8"
 E
-                            end
+                               end
       expect(app.runtime_activate).to include(expected_gem_activates)
     end
 
     it "lists the app's executables" do
       spec = Gem::Specification.find_by_name("appbundler-example-app", "= 1.0.0")
-      expected_executables = %w[app-binary-1 app-binary-2].map do |basename|
+      expected_executables = %w{app-binary-1 app-binary-2}.map do |basename|
         File.join(spec.gem_dir, "/bin", basename)
       end
       expect(app.executables).to match_array(expected_executables)
@@ -368,7 +379,7 @@ E
 
       load_binary = executable_content.lines.to_a.last
 
-      expected_load_path = %Q[Kernel.load(bin_file)\n]
+      expected_load_path = %Q{Kernel.load(bin_file)\n}
 
       expect(load_binary).to eq(expected_load_path)
     end
@@ -390,15 +401,15 @@ 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.exists?(File.join(gem_path, "Gemfile.lock"))).to be(true)
     end
 
     it "copies over .bundler to the gem directory" do
       spec = Gem::Specification.find_by_name("appbundler-example-app", "= 1.0.0")
       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.directory?(File.join(gem_path, ".bundle"))).to be(true)
+      expect(File.exists?(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
 
@@ -434,7 +445,7 @@ E
     context "on windows" do
 
       let(:expected_ruby_relpath) do
-        app.ruby_relative_path.gsub('/', '\\')
+        app.ruby_relative_path.tr("/", '\\')
       end
 
       let(:expected_batch_code) do

data/spec/fixtures/appbundler-example-app/appbundler-example-app.gemspec

@@ -4,13 +4,13 @@ Gem::Specification.new do |spec|
   spec.name          = "appbundler-example-app"
   spec.version       = "1.0.0"
   spec.authors       = ["danielsdeleo"]
-  spec.email         = ["dan@opscode.com"]
+  spec.email         = ["dan@chef.io"]
   spec.description   = %q{test fixture app}
   spec.summary       = spec.description
   spec.homepage      = ""
   spec.license       = "Apache2"
 
-  spec.files         = Dir.glob("{bin,lib,spec}/**/*").reject {|f| File.directory?(f) }
+  spec.files         = Dir.glob("{bin,lib,spec}/**/*").reject { |f| File.directory?(f) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -19,4 +19,3 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
-- danielsdeleo
+- Dan DeLeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
 description: Extracts a dependency solution from bundler's Gemfile.lock to speed gem
   activation
 email:
-- dan@opscode.com
+- dan@chef.io
 executables:
 - appbundler
 extensions: []
@@ -113,9 +113,9 @@ files:
 - spec/fixtures/appbundler-example-app/bin/app-binary-2
 - spec/fixtures/appbundler-example-app/lib/example_app.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/chef/appbundler
 licenses:
-- Apache2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation
@@ -149,4 +149,3 @@ test_files:
 - spec/fixtures/appbundler-example-app/bin/app-binary-2
 - spec/fixtures/appbundler-example-app/lib/example_app.rb
 - spec/spec_helper.rb
-has_rdoc: