bundler-common_gemfile 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483b7c8354e685a0dba1b962f97b784ac525a591f5c0cb036587e20dd8d8ce53
-  data.tar.gz: 399d3025430ca6ba1c9c2e70b43860dc2ee0be2f1647369911e29028c907007c
+  metadata.gz: 952b3da2be603744242e05906ef98c83d6a2d955e7d40a7a4d706a7d6e251b8a
+  data.tar.gz: 5f8c363ed53b8663099579549d9fe40bc997c5b23ccdd9bfd3ed1abe54462aae
 SHA512:
-  metadata.gz: 79c36c71be73d1c09f45afe7dde692e7414606e5ea8e99bd349a62f8bad6c1cd4e935b4db5d59e76058bf59942faa897da77998d02f8632595bb4b22c2fee7bf
-  data.tar.gz: 0afbac423e7ae3418d0fca3ee3196ed303a00e0429c2255c72820c5908684f2982395f38386fff8ac9327afef6394c8d403c96c77f1a8c2395df7dd2bff951e5
+  metadata.gz: 20aa2f15424acfc3d0e665f94deffe31e35923c98fc097f5175de5e5160084de803fd5000a020142adfc1284d2f50caeb3f855ec59bb895ca3e40b39e371b92f
+  data.tar.gz: 150a794948999e0f56b59485c85f56e3f1a5a42c82eb1d20c3ce61c2e0e3c7bb0b05265261433820574925f7285e485ed4d4e6eff5cc4cedf42d1dabdd360cde

data/lib/bundler-common_gemfile.rb

@@ -6,22 +6,28 @@ module Bundler
       while true
         number_of_evaled = evaled.size
         sources = context.instance_variable_get('@sources').all_sources
-
         sources.select { |s| s.is_a?(Bundler::Source::Git) || s.is_a?(Bundler::Source::Path) }.each do |source|
+
           source.instance_variable_set('@allow_cached', true)
-          gemfile_common_path = if source.respond_to?('install_path')
-                                  source.install_path
-                                else
-                                  source.path
-                                end.join('Gemfile-common.rb')
-          gem_path = File.dirname(gemfile_common_path)
-          source.specs if !File.exist?(gem_path) && source.is_a?(Bundler::Source::Git)
+          gem_path = if source.respond_to?('install_path')
+                       source.install_path
+                     else
+                       source.expanded_original_path
+                     end
 
+          gemfile_common_path = gem_path.join('Gemfile-common.rb')
+
+          if !File.exist?(gem_path) && source.is_a?(Bundler::Source::Git)
+            STDERR.puts "  fetching \e[1m\e[92m#{source.name}\e[0m is search of common-gemfile"
+            source.specs
+          end
           if !evaled.include?(gemfile_common_path) && File.exist?(gemfile_common_path)
             evaled << gemfile_common_path
-            puts "Evaling \e[1m\e[92m#{gemfile_common_path}\e[0m"
-            eval(File.read(gemfile_common_path), context.send(:binding))
-            puts "Evaling \e[1m\e[92m#{'done'}\e[0m"
+            STDERR.puts "Evaling \e[1m\e[92m#{gemfile_common_path}\e[0m"
+            content = File.read(gemfile_common_path)
+            STDERR.puts content if ENV['DEBUG_GEMFILE_COMMOM']
+            context.send(:eval, content)
+            STDERR.puts "Evaling \e[1m\e[92m#{'done'}\e[0m"
           end
         end
 
@@ -29,4 +35,4 @@ module Bundler
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-common_gemfile
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrzej Bisewski
@@ -36,7 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: common gemfile