appbundler 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1fd7bc87996da30552d62721509d3a484bae9a
-  data.tar.gz: baa24d302fe668c28c6effde641deefb15bd7d4c
+  metadata.gz: dd0a654c110cf3a6b807f33d19689b79efd7a262
+  data.tar.gz: 16c4a093480e83d996a0c5dfc57445a734f80897
 SHA512:
-  metadata.gz: 18bf2d0045537e2470b3e207bf8d440735fdeb1d3d176365b70d8c177b366b33aa9f652830da18e45777c014f42c4142ba668cfd9110fdd21ca9ef68e488013a
-  data.tar.gz: bdf6397f23af82894d6abab6a01728ee484b11a4c394f2bcaac88cf7c42767cfd18db858cb6cd9b625f21ada3145e02abefbd6f139935f270a6e77b46e44c030
+  metadata.gz: acf6f4adf3b2c5b276c67f5c052b43b71d6bf1edec7bb81eed0c77e7df50742f7ed2250a106d3e3beea53c4b86dba01e2a2f15518ad7c5d576c86da64bf48c1b
+  data.tar.gz: a655313efa7c602cb1f700fdcdf0ce876627a61b8149d808c7e4ea792116ab19cce9b16ae4eb860fac490f51645b8b97cd1de90afb8d720cfd5580a5245a18a8

data/lib/appbundler/app.rb

@@ -107,7 +107,6 @@ E
         activate_code = ""
         activate_code << env_sanitizer << "\n"
         activate_code << statements.join("\n") << "\n"
-        activate_code << %Q|$:.unshift(File.expand_path("#{relative_app_lib_dir}", File.dirname(__FILE__)))\n|
         activate_code
       end
     end
@@ -117,7 +116,15 @@ E
     end
 
     def load_statement_for(bin_file)
-      "Kernel.load(File.expand_path('#{relative_bin_file(bin_file)}', File.dirname(__FILE__)))\n"
+      <<-E
+bin_dir = File.dirname(__FILE__)
+if File.symlink?(__FILE__)
+  bin_dir = File.dirname(File.readlink(__FILE__))
+end
+
+$:.unshift(File.expand_path("#{relative_app_lib_dir}", bin_dir))
+Kernel.load(File.expand_path('#{relative_bin_file(bin_file)}', bin_dir))
+E
     end
 
     def relative_bin_file(bin_file)
@@ -127,24 +134,8 @@ E
     end
 
     def executables
-      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
-
+      bin_dir_glob = File.join(app_root, "bin", "*")
+      Dir[bin_dir_glob]
     end
 
     def relative_app_lib_dir

data/lib/appbundler/version.rb

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

data/spec/appbundler/app_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tmpdir'
 require 'fileutils'
 require 'mixlib/shellout'
 require 'appbundler/app'
@@ -51,6 +52,8 @@ describe Appbundler do
       double_spec(:app, "1.0.0", [:first_level_dep_a, :first_level_dep_b])
     end
 
+    let(:bin_path) { File.join(target_bindir, "foo") }
+
     let(:app_root) { "/opt/app/embedded/apps/app" }
 
     let(:app) do
@@ -92,6 +95,17 @@ 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
+
+      expect(app.load_statement_for(bin_path)).to include(symlink_code)
+    end
+
     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
@@ -101,8 +115,8 @@ describe Appbundler do
       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)
+        %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)
     end
 
     it "generates code to override GEM_HOME and GEM_PATH (e.g., rvm)" do
@@ -207,12 +221,6 @@ gem "puma", "= 1.6.3"
 gem "rest-client", "= 1.6.7"
 E
       expect(app.runtime_activate).to include(expected_gem_activates)
-      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
@@ -234,7 +242,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', File.dirname(__FILE__)))\n]
+      expected_load_path = %Q[Kernel.load(File.expand_path('../../fixtures/example-app/bin/app-binary-1', bin_dir))\n]
 
       expect(load_binary).to eq(expected_load_path)
     end
@@ -243,16 +251,45 @@ E
       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")
       expect(shellout!(binary_2).stdout).to eq("binary 2 ran\n")
     end
 
+    context "and the executable is symlinked to a different directory" do
+
+      let(:symlinks_root_dir) do
+        Dir.mktmpdir
+      end
+
+      let(:symlinks_bin_dir) do
+        d = File.join(symlinks_root_dir, "bin")
+        FileUtils.mkdir(d)
+        d
+      end
+
+      let(:binary_symlinked_path) { File.join(symlinks_bin_dir, "app-binary-1") }
+
+      let(:binary_orignal_path) { File.join(target_bindir, "app-binary-1") }
+
+      before do
+        app.write_executable_stubs
+        FileUtils.ln_s(binary_orignal_path, binary_symlinked_path)
+      end
+
+      after do
+        FileUtils.rm_rf(symlinks_root_dir)
+      end
+
+      it "correctly runs the executable via the symlinked executable" do
+        expect(shellout!(binary_symlinked_path).stdout).to eq("binary 1 ran\n")
+      end
+
+    end
+
     context "on windows" do
 
       let(:expected_ruby_relpath) do

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("{lib,spec}/**/*").reject {|f| File.directory?(f) }
-  spec.executables   = %w(app-binary-1 app-binary-2)
+  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"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - danielsdeleo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,7 +94,6 @@ 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
@@ -129,7 +128,6 @@ 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

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

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