bundler-common_gemfile 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d49cc6da30860d848873298312f693b5d586da408a68344d1b0e38e0fd9654
-  data.tar.gz: 59cbe91c9da86860a7760dedf3c36ebcd60b8a43988dc539e194f9a3401b9e9f
+  metadata.gz: da9127d45f4269078997bf3934b503b9924165983f913dfd31d410b4e434b883
+  data.tar.gz: 7045c803323145d458db7018abdf7110123555e37856ce745b55a80f81fa6b1a
 SHA512:
-  metadata.gz: fc15f4d8d89c18588ce059e48e2b8d9010ed46279d372bd03a11c7c3db7154d744fc9c56ff8cc63c43e1452c46f0ae63acb1a99f718bf3fa1e06cd0edbf6db0c
-  data.tar.gz: c180e1e5edee0d7b8b9a4f436055605d811d761d0bdc4269d7e29a42a3841cd28a4bc31bfd8dad787c9429c84834c5dab74b7399d03b907792c138e3c76fd48b
+  metadata.gz: 5199f218cab3611e33518868719c6d739654b178bb9e4d209af49e3e08c9d19040be363a6803962abf8e7d347b785d1f1b108f19c40a511be4c2d8fe31430002
+  data.tar.gz: 78754b62ceb63064f8b7ce9cd903a1595fa5b46cee3bd44629980410dd9eb820343464d5b4ce8b6683a977ae79e8640deb11aa6d41a69e872f88defb478b59a4

data/lib/bundler-common_gemfile.rb

@@ -1,42 +1,68 @@
+module ColoredStrings
+  refine String do
+    def black;          "\e[30m#{self}\e[0m" end
+    def red;            "\e[31m#{self}\e[0m" end
+    def green;          "\e[32m#{self}\e[0m" end
+    def brown;          "\e[33m#{self}\e[0m" end
+    def blue;           "\e[34m#{self}\e[0m" end
+    def magenta;        "\e[35m#{self}\e[0m" end
+    def cyan;           "\e[36m#{self}\e[0m" end
+    def gray;           "\e[37m#{self}\e[0m" end
+    def yellow;         "\e[93m#{self}\e[0m" end
+
+    def bg_black;       "\e[40m#{self}\e[0m" end
+    def bg_red;         "\e[41m#{self}\e[0m" end
+    def bg_green;       "\e[42m#{self}\e[0m" end
+    def bg_brown;       "\e[43m#{self}\e[0m" end
+    def bg_blue;        "\e[44m#{self}\e[0m" end
+    def bg_magenta;     "\e[45m#{self}\e[0m" end
+    def bg_cyan;        "\e[46m#{self}\e[0m" end
+    def bg_gray;        "\e[47m#{self}\e[0m" end
+
+    def bold;           "\e[1m#{self}\e[22m" end
+    def italic;         "\e[3m#{self}\e[23m" end
+    def underline;      "\e[4m#{self}\e[24m" end
+    def blink;          "\e[5m#{self}\e[25m" end
+    def reverse_color;  "\e[7m#{self}\e[27m" end
+  end
+end
+
 module Bundler
   class CommonGemfile
+    using ColoredStrings
+
     def self.load_other(context)
       evaled = []
 
       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)
+        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) # allow git commands
           gem_path = if source.respond_to?('install_path')
-                       source.install_path
+                       source.install_path # remote gem
                      else
-                       source.expanded_original_path
+                       source.expanded_original_path # local gem
                      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"
+            puts "  fetching #{source.name.to_s.green.bold} in search of common-gemfile"
             source.specs
           end
+
+          gemfile_common_path = gem_path.join('Gemfile-common.rb')
           if !evaled.include?(gemfile_common_path) && File.exist?(gemfile_common_path)
             evaled << gemfile_common_path
-            STDERR.puts "Evaling \e[1m\e[92m#{gemfile_common_path}\e[0m"
+            STDERR.puts "Loading #{gemfile_common_path.to_s.green.bold}"
             content = File.read(gemfile_common_path)
-            STDERR.puts content if ENV['DEBUG_GEMFILE_COMMON']
+            $stderr.puts content if ENV['DEBUG_GEMFILE_COMMON']
             context.send(:eval, content)
-            STDERR.puts "Evaling \e[1m\e[92m#{'done'}\e[0m"
+            $stderr.puts 'ok'.green.bold
           end
         end
 
-        if evaled.size == number_of_evaled
-          # root = context.send(:gemfile_root)
-          # FileUtils.mkdir_p(root.join('.bundle'))
-          # File.open(root.join('.bundle/Gemfile-common-gems'), 'w') { |f| f.write(evaled.sort.join(' '))}
-          break
-        end
+        break if evaled.size == number_of_evaled
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-common_gemfile
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 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.1.6
 signing_key:
 specification_version: 4
 summary: common gemfile