eac_ruby_gems_utils 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba6901f2b81816e02333d51f9c1e4eb8d5a705a500f8d5485b20897925d1e0a2
-  data.tar.gz: b84a7c9aa771b08b204860e6c1961c259d847c044ab26d00b1db16e7fe2fbfc9
+  metadata.gz: f10dcfe737d3c84df10c25a0fa82bcb7b49828b0470e83781863dbcd51ea07b2
+  data.tar.gz: '01930655004cdc2b58fe3691a9f781d40ef3261cbbfce8569eb58962c8e4a5e6'
 SHA512:
-  metadata.gz: 3dc046a756ad593ab46288d1882488ecd1e2c10116698036923f24d694b4c60daf025f798a7184b0b26705154588529a6ade87ea5261d64e81b7b3e2a79222d6
-  data.tar.gz: e70343b18f054bc8c402336b0150aed0c33a9638e815c40e9c75a13ff49835ea46498b1d686f91065edd401f834de1302e1d5ff3bd51ca80c2d25192e4441f28
+  metadata.gz: aea3df2c2992bcaf24684910e043eda8ce4fefd6b25ee3f9111ab7d7388df010c2dc1c0923a9f4e79ff699472e76f09737d7327108c53924c8d201844a1d865d
+  data.tar.gz: d04bb3e97d4a7c9d66a513fce6c63573f61f0b896f2edfcfc50a7bff3231a861bc34d5c86e9f502db1637a8244c433922fbd748e54c2f1c6550681f0408c3187

data/lib/eac_ruby_gems_utils/gem.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs'
+require 'rubygems'
 
 module EacRubyGemsUtils
   class Gem
@@ -10,8 +11,9 @@ module EacRubyGemsUtils
 
     GEMSPEC_EXTNAME = '.gemspec'
 
-    common_constructor :root do
+    common_constructor :root, :host_env, default: [nil] do
       @root = ::Pathname.new(root).expand_path
+      self.host_env ||= ::EacRubyUtils::Envs.local
     end
 
     def to_s
@@ -22,6 +24,11 @@ module EacRubyGemsUtils
       ::EacRubyGemsUtils::Gem::Command.new(self, %w[bundle] + args).envvar_gemfile
     end
 
+    # @return A [Pathname] array with relative paths from root listed in gemspec's .file directive.
+    def files
+      gemspec.files.map(&:to_pathname)
+    end
+
     def gemfile_lock_gem_version(gem_name)
       gemfile_lock_content.specs.find { |gem| gem.name == gem_name }.if_present(&:version)
     end
@@ -67,6 +74,10 @@ module EacRubyGemsUtils
       gemfile_path.basename_sub { |b| "#{b}.lock" }
     end
 
+    def gemspec_uncached
+      ::Gem::Specification.load(gemspec_path.to_path)
+    end
+
     def gemspec_path_uncached
       ::Pathname.glob("#{root.to_path}/*#{GEMSPEC_EXTNAME}").first
     end

data/lib/eac_ruby_gems_utils/gem/command.rb

@@ -11,7 +11,7 @@ module EacRubyGemsUtils
 
       def initialize(gem, command_args, extra_options = {})
         @gem = gem
-        super(command_args, extra_options)
+        super(command_args, extra_options.merge(host_env: gem.host_env))
       end
 
       # Changes current directory to the gem's directory.

data/lib/eac_ruby_gems_utils/gem/version_file.rb

@@ -10,11 +10,7 @@ module EacRubyGemsUtils
       VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
 
       def value
-        path.read.each_line do |line|
-          VERSION_LINE_PATTERN.if_match(line.rstrip, false) do |m|
-            ::Gem::Version.new(m[2])
-          end
-        end
+        path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
       end
 
       def value=(new_value)
@@ -23,6 +19,11 @@ module EacRubyGemsUtils
 
       private
 
+      # @return Version found in line, nil otherwise.
+      def line_value(line)
+        VERSION_LINE_PATTERN.if_match(line.rstrip, false) { |m| ::Gem::Version.new(m[2]) }
+      end
+
       def new_value_content(new_value)
         path.read.each_line
             .map { |line| new_value_line(line, new_value) }

data/lib/eac_ruby_gems_utils/tests/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/logs'
 require 'eac_ruby_utils/fs_cache'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/on_clean_ruby_environment'
@@ -27,20 +28,16 @@ module EacRubyGemsUtils
         self.class.name.demodulize.gsub(/Test\z/, '')
       end
 
-      def stdout_cache
-        root_cache.child('stdout')
-      end
-
-      def stderr_cache
-        root_cache.child('stderr')
-      end
-
       def to_s
         "#{gem}[#{name}]"
       end
 
       private
 
+      def logs_uncached
+        ::EacRubyUtils::Fs::Logs.new.add(:stdout).add(:stderr)
+      end
+
       def result_uncached
         return RESULT_NONEXISTENT unless elegible?
 
@@ -53,8 +50,8 @@ module EacRubyGemsUtils
 
       def exec_run_with_log
         r = exec_run
-        stdout_cache.write(r[:stdout])
-        stderr_cache.write(r[:stderr])
+        logs[:stdout].write(r[:stdout])
+        logs[:stderr].write(r[:stderr])
         r[:exit_code].zero?
       end
 

data/lib/eac_ruby_gems_utils/tests/multiple.rb

@@ -7,6 +7,7 @@ require 'eac_ruby_utils/core_ext'
 module EacRubyGemsUtils
   module Tests
     class Multiple
+      require_sub __FILE__
       enable_console_speaker
       enable_simple_cache
       common_constructor :gems, :options, default: [{}]
@@ -26,16 +27,17 @@ module EacRubyGemsUtils
         decorated_gems.flat_map(&:tests)
       end
 
-      def bundle_all_gems
-        infom 'Bundling all gems...'
-        decorated_gems.each do |gem|
-          next unless gem.gemfile_path.exist?
-
-          infov 'Bundle install', gem
-          gem.bundle.execute!
+      def clear_logs
+        all_tests.each do |test|
+          test.logs.remove_all
         end
       end
 
+      def prepare_all_gems
+        infom 'Preparing all gems...'
+        decorated_gems.each(&:prepare)
+      end
+
       def decorated_gems_uncached
         r = gems
         r = r.select { |gem| only.include?(gem.name) } if only.present?
@@ -51,8 +53,7 @@ module EacRubyGemsUtils
           warn 'Some test did not pass:'
           failed_tests.each do |test|
             infov '  * Test', test
-            infov '    * STDOUT', test.stdout_cache.content_path
-            infov '    * STDERR', test.stderr_cache.content_path
+            info test.logs.truncate_all
           end
         else
           success 'All tests passed'
@@ -61,9 +62,11 @@ module EacRubyGemsUtils
 
       def run
         start_banner
-        bundle_all_gems
+        prepare_all_gems
         test_all_gems
         final_results_banner
+      ensure
+        clear_logs
       end
 
       def start_banner
@@ -76,31 +79,6 @@ module EacRubyGemsUtils
           infov test, Result.new(test.result).tag
         end
       end
-
-      class DecoratedGem < ::SimpleDelegator
-        def tests
-          [::EacRubyGemsUtils::Tests::Minitest.new(__getobj__),
-           ::EacRubyGemsUtils::Tests::Rspec.new(__getobj__)]
-        end
-      end
-
-      class Result
-        common_constructor :result
-
-        COLORS = {
-          ::EacRubyGemsUtils::Tests::Base::RESULT_FAILED => :red,
-          ::EacRubyGemsUtils::Tests::Base::RESULT_NONEXISTENT => :white,
-          ::EacRubyGemsUtils::Tests::Base::RESULT_SUCCESSFUL => :green
-        }.freeze
-
-        def tag
-          result.to_s.send(color)
-        end
-
-        def color
-          COLORS.fetch(result)
-        end
-      end
     end
   end
 end

data/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module EacRubyGemsUtils
+  module Tests
+    class Multiple
+      class DecoratedGem < ::SimpleDelegator
+        enable_console_speaker
+
+        def prepare
+          return unless gemfile_path.exist?
+
+          log('running "bundle install"...')
+          return if bundle('install').execute.fetch(:exit_code).zero?
+
+          unless can_remove_gemfile_lock?
+            raise '"bundle install" failed and the Gemfile.lock is part of gem' \
+                '(Should be changed by developer)'
+          end
+
+          prepare_with_removable_gemfile_lock
+        end
+
+        def tests
+          [::EacRubyGemsUtils::Tests::Minitest.new(__getobj__),
+           ::EacRubyGemsUtils::Tests::Rspec.new(__getobj__)]
+        end
+
+        private
+
+        def log(message)
+          infov self, message
+        end
+
+        def prepare_with_removable_gemfile_lock
+          log('"bundle install" failed, removing Gemfile.lock and trying again...')
+          gemfile_lock_path.unlink if gemfile_lock_path.exist?
+          bundle('install').execute!
+        end
+
+        def can_remove_gemfile_lock?
+          !files.include?(gemfile_lock_path.relative_path_from(root))
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_gems_utils/tests/multiple/result.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module EacRubyGemsUtils
+  module Tests
+    class Multiple
+      class Result
+        common_constructor :result
+
+        COLORS = {
+          ::EacRubyGemsUtils::Tests::Base::RESULT_FAILED => :red,
+          ::EacRubyGemsUtils::Tests::Base::RESULT_NONEXISTENT => :white,
+          ::EacRubyGemsUtils::Tests::Base::RESULT_SUCCESSFUL => :green
+        }.freeze
+
+        def tag
+          result.to_s.send(color)
+        end
+
+        def color
+          COLORS.fetch(result)
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

data/spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gems_utils/gem'
+
+::RSpec.describe ::EacRubyGemsUtils::Gem::VersionFile do
+  let(:stubs_dir) { ::Pathname.new(__dir__).join('version_file_spec_files') }
+  let(:stub_file) { stubs_dir.join('a_version_file.rb') }
+  let(:instance) { described_class.new(stub_file) }
+  let(:target_version) { ::Gem::Version.new('0.69.1') }
+
+  describe '#value' do
+    it { expect(instance.value).to eq(target_version) }
+  end
+end

data/spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module Tools
+    VERSION = '0.69.1'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_gems_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -60,10 +60,14 @@ files:
 - lib/eac_ruby_gems_utils/tests/base.rb
 - lib/eac_ruby_gems_utils/tests/minitest.rb
 - lib/eac_ruby_gems_utils/tests/multiple.rb
+- lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb
+- lib/eac_ruby_gems_utils/tests/multiple/result.rb
 - lib/eac_ruby_gems_utils/tests/rspec.rb
 - lib/eac_ruby_gems_utils/version.rb
+- spec/code/rubocop_check_spec.rb
+- spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb
+- spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb
 - spec/lib/eac_ruby_gems_utils/gem_spec.rb
-- spec/rubocop_check_spec.rb
 - spec/spec_helper.rb
 - spec/support/mygem/Gemfile
 - spec/support/mygem/Gemfile.lock
@@ -93,13 +97,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Utilities for Ruby gems development.
 test_files:
+- spec/code/rubocop_check_spec.rb
+- spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb
+- spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb
 - spec/lib/eac_ruby_gems_utils/gem_spec.rb
-- spec/rubocop_check_spec.rb
 - spec/spec_helper.rb
 - spec/support/mygem/Gemfile
 - spec/support/mygem/Gemfile.lock