appbundler 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb63d63d943dde32830345ad2f83ea1870a7a6c0f108c59f51caef60f47ede88
-  data.tar.gz: e14be84a66065ed787f1914086a0f6e9e349163f81f46d314c97663c607040ee
+  metadata.gz: 703fb5ac8b8bcf4d7cd65d46f4bfaa625d4977957d9d5b6791ed4780336062e4
+  data.tar.gz: 8125c71999832e0cb96e60287a56d839fd77ff633520c2c05e2dfd8ea0cc9224
 SHA512:
-  metadata.gz: 90af3d7038ac9b7ddcfc811b5f1bed8dd75f4d0a2717ed714931527dbdae1034b40064070c98c17e5034692c0ad5837d81589ccc73b324a42715454b3ced76fc
-  data.tar.gz: 21be3d9fd2d0973c4897fd0fb3e856857d18ba27df2db39453b8697f5bf44467aa274cd5e6d37f158b8ab53c1eb87db938941a381c8fdcb2b507005f4059bd2e
+  metadata.gz: fef53c32469cd9c1bc30b0bfe281eb4c5af74b76cd4da0d91e153e4a443a26f3e741c0dc5ec1ddcf3c32ad64da696a39b39b5db09db696f344f03e0d48f63442
+  data.tar.gz: ac1190460a4d7ff1a0d7760b0ebcaa1923549516477f5e3972f504c36a40124ee5d392dc621d2faa3ffed1ac3bf783d3fd0ff91c70b309ac33c4f9c827f75e59

data/lib/appbundler/app.rb

@@ -226,7 +226,6 @@ E
     # exists to make tests run correctly on travis.ci (which uses rvm).
     def env_sanitizer
       <<-EOS
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
 require "rubygems"
 
 begin
@@ -236,13 +235,19 @@ rescue LoadError
   # probably means rubygems is too old or too new to have this class, and we don't care
 end
 
-::Gem.clear_paths
+# avoid appbundling if we are definitely running within a Bundler bundle.
+# most likely the check for defined?(Bundler) is enough since we don't require
+# bundler above, but just for paranoia's sake also we test to see if Bundler is
+# really doing its thing or not.
+unless defined?(Bundler) && Bundler.instance_variable_defined?("@load")
+  ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil unless ENV["APPBUNDLER_ALLOW_RVM"] == "true"
+  ::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"
@@ -258,9 +263,12 @@ EOS
       name, version = app_spec.name, app_spec.version
       bin_basename = File.basename(bin_file)
       <<-E
-gem "#{name}", "= #{version}"
+  gem "#{name}", "= #{version}"
+  spec = Gem::Specification.find_by_name("#{name}", "= #{version}")
+else
+  spec = Gem::Specification.find_by_name("#{name}")
+end
 
-spec = Gem::Specification.find_by_name("#{name}", "= #{version}")
 bin_file = spec.bin_file("#{bin_basename}")
 
 Kernel.load(bin_file)

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Dan DeLeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake