appbundler 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867a7edc3b0cb2bb729b3ec62f2c7afde7c9fcb46a58d7812d5ff261e1fe864e
-  data.tar.gz: 4c1edc5d6e127e064332406396574b28ae38891eb3c62ff92006dc8f399b18e8
+  metadata.gz: f15da5b9078e6f6d17af1820b954af197b850ac2ca507ae6c678c034064535d5
+  data.tar.gz: d8241883373c4379b3ccd93ba6ed432a9c41f9049859947e300daf7d58a471ee
 SHA512:
-  metadata.gz: c9b76a7be7c70f2cb91e5fe25d80d70133f64abccc55fc40632b44f1d8e6edfceeb9b30111118b566859629b7b4360c6c7f92ef4a0db98e97eea2203c2b736a8
-  data.tar.gz: 1567880de2199ad880710c06169871be66dbb40af131c133ee18f940fe27658618a6f25474cb41b96d0e85d21f6cd8cbe5861071fd6a10e2cd2d57b67e86bac3
+  metadata.gz: 04d7af42ad5838e535c1ed71a3a3b676c075412badd816174a13bd8392e5cc916479da4bf223371195b16210b53264d7d89e5dca495d3a673a55d4cee21003a4
+  data.tar.gz: e87ff8982761e09218e2b021349be15d9309c7e7db98fcab98ebcb61ed4f1840d506fc09921eb28e75df6a60784c293bb14fcbd5be5a272aae34696fdcb32211

data/lib/appbundler/app.rb

@@ -53,7 +53,7 @@ module Appbundler
     ]
 
     def external_lockfile?
-      app_dir != File.dirname(gemfile_lock)
+      app_dir != bundle_path
     end
 
     def local_gemfile_lock_specs
@@ -244,7 +244,7 @@ E
     end
 
     def executables
-      spec = app_gemspec
+      spec = installed_spec
       spec.executables.map { |e| spec.bin_file(e) }
     end
 
@@ -260,16 +260,24 @@ E
       @app_dependency_names ||= app_spec.dependencies.map(&:name)
     end
 
-    def app_gemspec
+    def installed_spec
       Gem::Specification.find_by_name(app_spec.name, app_spec.version)
     end
 
     def app_spec
-      spec_for(name)
+      if name.nil?
+        Gem::Specification.load("#{bundle_path}/#{File.basename(@bundle_path)}.gemspec")
+      else
+        spec_for(name)
+      end
     end
 
     def app_dir
-      app_gemspec.gem_dir
+      if name.nil?
+        File.dirname(app_spec.loaded_from)
+      else
+        installed_spec.gem_dir
+      end
     end
 
     def gemfile_lock_specs

data/lib/appbundler/cli.rb

@@ -73,11 +73,9 @@ BANNER
         @bundle_path = File.expand_path(cli_arguments[0])
         @bin_path = File.expand_path(cli_arguments[1])
         @gems = cli_arguments[2..-1]
-        @gems = [ File.basename(@bundle_path) ] if @gems.empty?
+        @gems = [ nil ] if @gems.empty?
         verify_bundle_path
         verify_bin_path
-        verify_gems_installed
-        verify_deps_are_accessible
       end
     end
 
@@ -98,31 +96,6 @@ BANNER
       end
     end
 
-    def verify_gems_installed
-      gems.each do |g|
-        begin
-          app = App.new(bundle_path, bin_path, g)
-          app.app_gemspec
-        rescue Gem::LoadError
-          err("Unable to find #{app.app_spec.name} #{app.app_spec.version} installed as a gem")
-          err("You must install the top-level app as a gem before calling app-bundler")
-          usage_and_exit!
-        end
-      end
-    end
-
-    def verify_deps_are_accessible
-      gems.each do |g|
-        begin
-          app = App.new(bundle_path, bin_path, g)
-          app.verify_deps_are_accessible!
-        rescue InaccessibleGemsInLockfile => e
-          err(e.message)
-          exit 1
-        end
-      end
-    end
-
     def run
       gems.each do |g|
         app = App.new(bundle_path, bin_path, g)

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Dan DeLeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation