eac_ruby_gems_utils 0.7.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e22689b28c655a76ab05c049502d3723179ab7478a3ed29ddca72d2d025a428
-  data.tar.gz: b729e4e446f6f6d8da520625d5d3451287180ebe703930518733310a508d0995
+  metadata.gz: c099ecc1a35c258668400a2ae537a1b4d68e8bc015ec5412a13e41c48cd9e068
+  data.tar.gz: 3fc444bbde8b308c16f4e9e7d8f4cac37a249fe7a72e7f1c983a7e6cf110f67d
 SHA512:
-  metadata.gz: 56718b85ff502646e0b548103d5d6c9d423e15641c033ddc62cab5534ae0b52c0591b600fb79107c99126fb6e5a5e84c59816fa7e188961881bb811ac8d41873
-  data.tar.gz: 2e8eecf1678a665fa9cd2dd248eced1561130cb85f3dfd8d01e4ac445f68d0f21f7309b1a0ab2cf05bf34f7e5cea7e69cfc3bd00b137af7942e0d9f9c560935e
+  metadata.gz: 719f2c29fc18afe5c9fb00e53c2624cb78aad1d04b0e64f2cbd0b2449da2af67246c3ca8b64a4ec36a497bfe7837de51db00a1c2c033290bd4b11aee3f0dea5a
+  data.tar.gz: f6e66ff586dacf7d43a2daf6a7181cb3b57764f5b92f7425531d838d08640e71b6cb6a01cc92718ca1234917f9381fa5f4f23f62f297adf515ea67c584954a71

data/eac_ruby_gems_utils.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_utils', '~> 0.29'
 
   # Tests
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/lib/eac_ruby_gems_utils/gem.rb

@@ -11,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

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

@@ -27,6 +27,12 @@ module EacRubyGemsUtils
         decorated_gems.flat_map(&:tests)
       end
 
+      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)
@@ -47,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'
@@ -60,6 +65,8 @@ module EacRubyGemsUtils
         prepare_all_gems
         test_all_gems
         final_results_banner
+      ensure
+        clear_logs
       end
 
       def start_banner

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

@@ -12,14 +12,12 @@ module EacRubyGemsUtils
           log('running "bundle install"...')
           return if bundle('install').execute.fetch(:exit_code).zero?
 
-          if can_remove_gemfile_lock?
-            log('"bundle install" failed, removing Gemfile.lock and trying again...')
-            gemfile_lock_path.unlink if gemfile_lock_path.exist?
-            bundle('install').execute!
-          else
+          unless can_remove_gemfile_lock?
             raise '"bundle install" failed and the Gemfile.lock is part of gem' \
-              '(Should be changed by developer)'
+                '(Should be changed by developer)'
           end
+
+          prepare_with_removable_gemfile_lock
         end
 
         def tests
@@ -33,6 +31,12 @@ module EacRubyGemsUtils
           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

data/lib/eac_ruby_gems_utils/version.rb

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

data/spec/code/rubocop_check_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyGemSupport::Rspec.default.describe_rubocop

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

data/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_gems_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: 
 email: 
 executables: []
@@ -64,8 +64,10 @@ files:
 - 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
@@ -95,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

data/spec/rubocop_check_spec.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop do
-  include_examples 'rubocop_check', ::File.expand_path('../..', __dir__)
-end