appbundler 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0348af66452b0695266e8851955c74cb513c6d33
-  data.tar.gz: b433848ae1903bf318a884ec0f9488d2c348b08a
+  metadata.gz: 8a1fd7bc87996da30552d62721509d3a484bae9a
+  data.tar.gz: baa24d302fe668c28c6effde641deefb15bd7d4c
 SHA512:
-  metadata.gz: 4a8a09d3e326fc70173eccf345d80b08d9ac02bb1b06eeafcbb0f59cd9983dc43dc259616f000dd187e9426ba024aefdd92a9ef4c859b4191176893aa1951e7c
-  data.tar.gz: a4aca9f94ff5ce9ab7a57724ef189f6f847e4350fd675b3cdb32c56700d3d8a94917a38bf16910e64713a7f814c6e4097ef9bc99de6dfbace7900a890e9984bc
+  metadata.gz: 18bf2d0045537e2470b3e207bf8d440735fdeb1d3d176365b70d8c177b366b33aa9f652830da18e45777c014f42c4142ba668cfd9110fdd21ca9ef68e488013a
+  data.tar.gz: bdf6397f23af82894d6abab6a01728ee484b11a4c394f2bcaac88cf7c42767cfd18db858cb6cd9b625f21ada3145e02abefbd6f139935f270a6e77b46e44c030

data/lib/appbundler/app.rb

@@ -107,18 +107,50 @@ E
         activate_code = ""
         activate_code << env_sanitizer << "\n"
         activate_code << statements.join("\n") << "\n"
-        activate_code << %Q|$:.unshift "#{app_lib_dir}"\n|
+        activate_code << %Q|$:.unshift(File.expand_path("#{relative_app_lib_dir}", File.dirname(__FILE__)))\n|
         activate_code
       end
     end
 
     def binstub(bin_file)
-      shebang + file_format_comment + runtime_activate + "Kernel.load '#{bin_file}'\n"
+      shebang + file_format_comment + runtime_activate + load_statement_for(bin_file)
+    end
+
+    def load_statement_for(bin_file)
+      "Kernel.load(File.expand_path('#{relative_bin_file(bin_file)}', File.dirname(__FILE__)))\n"
+    end
+
+    def relative_bin_file(bin_file)
+      bin_file_pathname = Pathname.new(bin_file)
+      bindir_pathname = Pathname.new(target_bin_dir)
+      bin_file_pathname.relative_path_from(bindir_pathname).to_s
     end
 
     def executables
-      bin_dir_glob = File.join(app_root, "bin", "*")
-      Dir[bin_dir_glob]
+      spec_path = ["#{app_root}/#{name}-#{RUBY_PLATFORM}.gemspec", 
+                   "#{app_root}/#{name}.gemspec"].detect do |f|
+        File.exists?(f)
+      end
+
+      if spec_path
+        spec = nil
+        Dir.chdir(app_root) do
+          spec = Gem::Specification::load(spec_path)
+        end
+        spec.executables.map do |e|
+          File.join(app_root, spec.bindir, e)
+        end
+      else
+        bin_dir_glob = File.join(app_root, "bin", "*")
+        Dir[bin_dir_glob]
+      end
+
+    end
+
+    def relative_app_lib_dir
+      lib_dir_pathname = Pathname.new(app_lib_dir)
+      bindir_pathname = Pathname.new(target_bin_dir)
+      lib_dir_pathname.relative_path_from(bindir_pathname).to_s
     end
 
     def app_lib_dir

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/appbundler/app_spec.rb

@@ -93,7 +93,16 @@ describe Appbundler do
     end
 
     it "adds the app code to the load path" do
-      expect(app.runtime_activate).to include('$:.unshift "/opt/app/embedded/apps/app/lib"')
+      # 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", File.dirname(__FILE__)))]
+      expect(app.runtime_activate).to include(expected_code_path)
     end
 
     it "generates code to override GEM_HOME and GEM_PATH (e.g., rvm)" do
@@ -198,10 +207,14 @@ gem "puma", "= 1.6.3"
 gem "rest-client", "= 1.6.7"
 E
       expect(app.runtime_activate).to include(expected_gem_activates)
-      expected_load_path =  '$:.unshift "' + File.join(app_root, "lib") + '"'
+      expected_load_path = %q[$:.unshift(File.expand_path("../../fixtures/example-app/lib", File.dirname(__FILE__)))]
       expect(app.runtime_activate).to include(expected_load_path)
     end
 
+    it "should not contain exclude-me as a binary" do
+      expect(app.executables).not_to include(File.join(app_root, "/bin", "exclude-me"))
+    end
+
     it "lists the app's executables" do
       expected_executables = %w[app-binary-1 app-binary-2].map do |basename|
         File.join(app_root, "/bin", basename)
@@ -220,15 +233,20 @@ E
       expect(executable_content).to include(app.runtime_activate)
 
       load_binary = executable_content.lines.to_a.last
-      expect(load_binary).to eq(%Q[Kernel.load '#{app_binary_1_path}'\n])
+
+      expected_load_path = %Q[Kernel.load(File.expand_path('../../fixtures/example-app/bin/app-binary-1', File.dirname(__FILE__)))\n]
+
+      expect(load_binary).to eq(expected_load_path)
     end
 
     it "generates executable stubs for all executables in the app" do
       app.write_executable_stubs
       binary_1 = File.join(target_bindir, "app-binary-1")
       binary_2 = File.join(target_bindir, "app-binary-2")
+      excluded_binary = File.join(target_bindir, "exclude-me")
       expect(File.exist?(binary_1)).to be_true
       expect(File.exist?(binary_2)).to be_true
+      expect(File.exist?(excluded_binary)).to be_false
       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")
@@ -261,6 +279,7 @@ E
         expect(IO.read(binary_1)).to eq(expected_batch_code)
         expect(IO.read(binary_2)).to eq(expected_batch_code)
       end
+
     end
 
   end

data/spec/fixtures/example-app/bin/exclude-me

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+puts "exclude-me should not have run"

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

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "Apache2"
 
-  spec.files         = Dir.glob("{bin,lib,spec}/**/*").reject {|f| File.directory?(f) }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = Dir.glob("{lib,spec}/**/*").reject {|f| File.directory?(f) }
+  spec.executables   = %w(app-binary-1 app-binary-2)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+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,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - danielsdeleo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Extracts a dependency solution from bundler's Gemfile.lock to speed gem
@@ -75,9 +75,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,6 +94,7 @@ files:
 - 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/bin/exclude-me
 - spec/fixtures/example-app/example-app.gemspec
 - spec/fixtures/example-app/lib/example_app.rb
 - spec/spec_helper.rb
@@ -107,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation
@@ -128,6 +129,7 @@ test_files:
 - 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/bin/exclude-me
 - spec/fixtures/example-app/example-app.gemspec
 - spec/fixtures/example-app/lib/example_app.rb
 - spec/spec_helper.rb