appbundler 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd0a654c110cf3a6b807f33d19689b79efd7a262
-  data.tar.gz: 16c4a093480e83d996a0c5dfc57445a734f80897
+  metadata.gz: a3f810a4157e852584ec425ed6eb051c607c4038
+  data.tar.gz: 5dfe2fbde8fad33d18e81a7957307853bace76cd
 SHA512:
-  metadata.gz: acf6f4adf3b2c5b276c67f5c052b43b71d6bf1edec7bb81eed0c77e7df50742f7ed2250a106d3e3beea53c4b86dba01e2a2f15518ad7c5d576c86da64bf48c1b
-  data.tar.gz: a655313efa7c602cb1f700fdcdf0ce876627a61b8149d808c7e4ea792116ab19cce9b16ae4eb860fac490f51645b8b97cd1de90afb8d720cfd5580a5245a18a8
+  metadata.gz: 7fe06ba8ebe2ee5938206d4f755d1ebc4a14fb8e540c230bb85eca0fbc151dd7c843097581f4491a5c697820ef4ae0558945a88f4f4221bd53a23911bada2075
+  data.tar.gz: 0f7afde6c93689b42d62e28c61bf96523b83ad092a14cea4ae873ea3cbc3caa2d8a96d514d9fc67573c044a6cb37264ede3d3a529a8e21aa854bffbaf4d4f8a7

data/.rspec

@@ -1 +1,2 @@
--cfs
+-c
+-f doc

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2
 
 branches:
   only:

data/appbundler.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.13"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "mixlib-shellout", "~> 1.0"
+
+  spec.add_dependency "mixlib-cli", "~> 1.4"
 end

data/lib/appbundler/app.rb

@@ -116,14 +116,15 @@ E
     end
 
     def load_statement_for(bin_file)
+      name, version = app_spec.name, app_spec.version
+      bin_basename = File.basename(bin_file)
       <<-E
-bin_dir = File.dirname(__FILE__)
-if File.symlink?(__FILE__)
-  bin_dir = File.dirname(File.readlink(__FILE__))
-end
+gem "#{name}", "= #{version}"
+
+spec = Gem::Specification.find_by_name("#{name}", "= #{version}")
+bin_file = spec.bin_file("#{bin_basename}")
 
-$:.unshift(File.expand_path("#{relative_app_lib_dir}", bin_dir))
-Kernel.load(File.expand_path('#{relative_bin_file(bin_file)}', bin_dir))
+Kernel.load(bin_file)
 E
     end
 

data/lib/appbundler/cli.rb

@@ -1,11 +1,38 @@
 require 'appbundler/version'
 require 'appbundler/app'
+require 'mixlib/cli'
 
 module Appbundler
   class CLI
+    include Mixlib::CLI
+
+    banner(<<-BANNER)
+Usage: appbundler APPLICATION_DIR BINSTUB_DIR
+
+  APPLICATION_DIR is the root directory of your app
+  BINSTUB_DIR is the directory where you want generated executables to be written
+BANNER
+
+    option :version,
+      :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
 
     def self.run(argv)
       cli = new(argv)
+      cli.handle_options
       cli.validate!
       cli.run
     end
@@ -17,17 +44,19 @@ module Appbundler
 
     def initialize(argv)
       @argv = argv
+      super()
+    end
+
+    def handle_options
+      parse_options(@argv)
     end
 
     def validate!
-      if argv.any? {|arg| %w{-h --help help -v --version}.include?(arg) }
-        $stdout.print(usage)
-        exit 0
-      elsif argv.size != 2
+      if cli_arguments.size != 2
         usage_and_exit!
       else
-        @app_path = File.expand_path(argv[0])
-        @bin_path = File.expand_path(argv[1])
+        @app_path = File.expand_path(cli_arguments[0])
+        @bin_path = File.expand_path(cli_arguments[1])
         verify_app_path
         verify_bin_path
       end
@@ -62,18 +91,8 @@ module Appbundler
     end
 
     def usage_and_exit!
-      err(usage)
+      err(banner)
       exit 1
     end
-
-    def usage
-      <<-E
-Usage: appbundler APPLICATION_DIR BINSTUB_DIR
-
-  APPLICATION_DIR is the root directory of your app
-  BINSTUB_DIR is the directory where you want generated executables to be written
-E
-    end
-
   end
 end

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/appbundler/app_spec.rb

@@ -24,7 +24,9 @@ describe Appbundler do
     s
   end
 
-  let(:target_bindir) { File.expand_path("../../test-tmp/bin", __FILE__) }
+  def target_bindir
+    File.expand_path("../../test-tmp/bin", __FILE__)
+  end
 
   context "given an app with multiple levels of dependencies" do
 
@@ -61,7 +63,7 @@ describe Appbundler do
     end
 
     before do
-      app.stub(:gemfile_lock_specs).and_return(all_specs)
+      allow(app).to receive(:gemfile_lock_specs).and_return(all_specs)
     end
 
     it "finds the running ruby interpreter" do
@@ -80,7 +82,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}).to have(1).item
+      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
@@ -95,28 +97,16 @@ describe Appbundler do
       expect(app.runtime_activate).to_not include(%q{gem "app"})
     end
 
-    it "adds symlink resolution to the code that activates the app" do
-      symlink_code = <<-E
-bin_dir = File.dirname(__FILE__)
-if File.symlink?(__FILE__)
-  bin_dir = File.dirname(File.readlink(__FILE__))
-end
-E
+    it "locks the main app's gem via rubygems, and loads the proper binary" do
+      expected_loading_code = <<-CODE
+gem "app", "= 1.0.0"
 
-      expect(app.load_statement_for(bin_path)).to include(symlink_code)
-    end
+spec = Gem::Specification.find_by_name("app", "= 1.0.0")
+bin_file = spec.bin_file("foo")
 
-    it "adds the app code to the load path" do
-      # Our test setup makes an executable that needs to load a path in the
-      # fictitious /opt/app/embedded/apps/app/lib path, so the relative path
-      # will traverse all the way to the root and then back up. Therefore, the
-      # expected output is dependent on how many directories deep this source
-      # clone is from the root:
-      relpath_to_root = Pathname.new("/").relative_path_from(Pathname.new(File.dirname(__FILE__))).to_s
-
-      expected_code_path =
-        %Q[$:.unshift(File.expand_path("#{relpath_to_root}/../opt/app/embedded/apps/app/lib", bin_dir))]
-      expect(app.load_statement_for(bin_path)).to include(expected_code_path)
+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
@@ -130,7 +120,7 @@ E
       let(:target_bindir) { "C:/opscode/chef/bin" }
 
       before do
-        app.stub(:ruby).and_return("C:/opscode/chef/embedded/bin/ruby.exe")
+        allow(app).to receive(:ruby).and_return("C:/opscode/chef/embedded/bin/ruby.exe")
       end
 
       it "computes the relative path to ruby" do
@@ -152,7 +142,7 @@ E
   context "when created with the example application" do
     FIXTURES_PATH =  File.expand_path("../../fixtures/", __FILE__).freeze
 
-    APP_ROOT = File.join(FIXTURES_PATH, "example-app").freeze
+    APP_ROOT = File.join(FIXTURES_PATH, "appbundler-example-app").freeze
 
     let(:app_root) { APP_ROOT }
 
@@ -163,6 +153,8 @@ E
     before(:all) do
       Dir.chdir(APP_ROOT) do
         shellout!("bundle install")
+        shellout!("gem build appbundler-example-app.gemspec")
+        shellout!("gem install appbundler-example-app-1.0.0.gem")
       end
     end
 
@@ -172,6 +164,7 @@ E
     end
 
     after(:all) do
+      shellout!("gem uninstall appbundler-example-app -a -q -x")
       FileUtils.rm_rf(target_bindir) if File.exist?(target_bindir)
     end
 
@@ -180,7 +173,7 @@ E
     end
 
     it "names the app using the directory basename" do
-      app.name.should == "example-app"
+      expect(app.name).to eq("appbundler-example-app")
     end
 
     it "lists the app's dependencies" do
@@ -191,34 +184,52 @@ E
     it "generates runtime activation code for the app" do
       expected_gem_activates=<<-E
 ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
-gem "chef", "= 11.10.4"
-gem "chef-zero", "= 1.7.3"
-gem "hashie", "= 2.0.5"
-gem "json", "= 1.8.1"
+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 "moneta", "= 0.6.0"
-gem "rack", "= 1.5.2"
+gem "rack", "= 1.6.4"
+gem "uuidtools", "= 2.1.5"
 gem "diff-lcs", "= 1.2.5"
 gem "erubis", "= 2.7.0"
-gem "highline", "= 1.6.20"
-gem "mime-types", "= 1.25.1"
+gem "highline", "= 1.7.3"
 gem "mixlib-authentication", "= 1.3.0"
-gem "mixlib-cli", "= 1.4.0"
-gem "mixlib-config", "= 2.1.0"
-gem "mixlib-shellout", "= 1.3.0"
-gem "net-ssh", "= 2.8.0"
-gem "net-ssh-multi", "= 1.2.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", "= 6.20.0"
+gem "ohai", "= 8.5.1"
+gem "ffi", "= 1.9.10"
 gem "ipaddress", "= 0.8.0"
-gem "systemu", "= 2.5.2"
-gem "yajl-ruby", "= 1.2.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 "puma", "= 1.6.3"
-gem "rest-client", "= 1.6.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
       expect(app.runtime_activate).to include(expected_gem_activates)
     end
@@ -242,7 +253,7 @@ E
 
       load_binary = executable_content.lines.to_a.last
 
-      expected_load_path = %Q[Kernel.load(File.expand_path('../../fixtures/example-app/bin/app-binary-1', bin_dir))\n]
+      expected_load_path = %Q[Kernel.load(bin_file)\n]
 
       expect(load_binary).to eq(expected_load_path)
     end
@@ -251,10 +262,10 @@ E
       app.write_executable_stubs
       binary_1 = File.join(target_bindir, "app-binary-1")
       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)).to be_true
-      expect(File.executable?(binary_1)).to be_true
+      expect(File.exist?(binary_1)).to be(true)
+      expect(File.exist?(binary_2)).to be(true)
+      expect(File.executable?(binary_1)).to be(true)
+      expect(File.executable?(binary_1)).to be(true)
       expect(shellout!(binary_1).stdout).to eq("binary 1 ran\n")
       expect(shellout!(binary_2).stdout).to eq("binary 2 ran\n")
     end
@@ -311,8 +322,8 @@ E
         app.write_executable_stubs
         binary_1 = File.join(target_bindir, "app-binary-1.bat")
         binary_2 = File.join(target_bindir, "app-binary-2.bat")
-        expect(File.exist?(binary_1)).to be_true
-        expect(File.exist?(binary_2)).to be_true
+        expect(File.exist?(binary_1)).to be(true)
+        expect(File.exist?(binary_2)).to be(true)
         expect(IO.read(binary_1)).to eq(expected_batch_code)
         expect(IO.read(binary_2)).to eq(expected_batch_code)
       end

data/spec/fixtures/{example-app/example-app.gemspec → appbundler-example-app/appbundler-example-app.gemspec}

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 Gem::Specification.new do |spec|
-  spec.name          = "example-app"
+  spec.name          = "appbundler-example-app"
   spec.version       = "1.0.0"
   spec.authors       = ["danielsdeleo"]
   spec.email         = ["dan@opscode.com"]

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - danielsdeleo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Extracts a dependency solution from bundler's Gemfile.lock to speed gem
   activation
 email:
@@ -89,13 +103,13 @@ files:
 - lib/appbundler/cli.rb
 - lib/appbundler/version.rb
 - spec/appbundler/app_spec.rb
-- spec/fixtures/example-app/Gemfile
-- spec/fixtures/example-app/Gemfile.lock
-- spec/fixtures/example-app/README.md
-- spec/fixtures/example-app/bin/app-binary-1
-- spec/fixtures/example-app/bin/app-binary-2
-- spec/fixtures/example-app/example-app.gemspec
-- spec/fixtures/example-app/lib/example_app.rb
+- spec/fixtures/appbundler-example-app/Gemfile
+- spec/fixtures/appbundler-example-app/Gemfile.lock
+- spec/fixtures/appbundler-example-app/README.md
+- spec/fixtures/appbundler-example-app/appbundler-example-app.gemspec
+- spec/fixtures/appbundler-example-app/bin/app-binary-1
+- spec/fixtures/appbundler-example-app/bin/app-binary-2
+- spec/fixtures/appbundler-example-app/lib/example_app.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -117,18 +131,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation
 test_files:
 - spec/appbundler/app_spec.rb
-- spec/fixtures/example-app/Gemfile
-- spec/fixtures/example-app/Gemfile.lock
-- spec/fixtures/example-app/README.md
-- spec/fixtures/example-app/bin/app-binary-1
-- spec/fixtures/example-app/bin/app-binary-2
-- spec/fixtures/example-app/example-app.gemspec
-- spec/fixtures/example-app/lib/example_app.rb
+- spec/fixtures/appbundler-example-app/Gemfile
+- spec/fixtures/appbundler-example-app/Gemfile.lock
+- spec/fixtures/appbundler-example-app/README.md
+- spec/fixtures/appbundler-example-app/appbundler-example-app.gemspec
+- spec/fixtures/appbundler-example-app/bin/app-binary-1
+- spec/fixtures/appbundler-example-app/bin/app-binary-2
+- spec/fixtures/appbundler-example-app/lib/example_app.rb
 - spec/spec_helper.rb
 has_rdoc: