eac_ruby_gems_utils 0.6.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f75298747a013afc0a9885aa971bf93245ca3b94b6967b21c80a2644a19ec68
-  data.tar.gz: 5b8c611448808035da09b60baf19e97cd1e86f631fb889c18dc53c638a096ce9
+  metadata.gz: c26b2235fcb990e88ce893a82c90d84300c6a11e2d236a3259cba110f56e8c45
+  data.tar.gz: 250ecc8711c9419c044344257e059a1045b26d73a5f4fa17e43254e424e760a1
 SHA512:
-  metadata.gz: c075d0b148870a9981c6457cccdfc3a7a41b8f79b8a9d4fa6aecbf8adb11bc483049d3359d8d034d30225d5a27b5f667a8cc4dbc58b8e91f70c19272149192aa
-  data.tar.gz: 50a6af80b9f47c4673669c1c6da5a041700700de23d15ecc05150b608b85d16019f894d437efb2c5b3fafe04519055fcd4229528d89dceff0e863f36b1117ec2
+  metadata.gz: 04523c761475b7acdb4558f80e17312fad58929918c3ff610e9cf690a065837a7c27403cdadca9af732907f30a3323c145016f977cf0f88eeb09e5ce0b101e58
+  data.tar.gz: 690a80843b3a9afbd736c153d9e38037dcf5d14f96ada89e6eb2114bbd51d3b8578d6750a4415406c9d7653c80c4037bcbde28ecc7bd4b13df6ae350036d7c06

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
@@ -22,6 +23,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
@@ -54,7 +60,7 @@ module EacRubyGemsUtils
     end
 
     def version
-      /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.if_match(version_file.read) { |m| m[1] }
+      version_file.value
     end
 
     private
@@ -64,7 +70,11 @@ module EacRubyGemsUtils
     end
 
     def gemfile_lock_path_uncached
-      root.join('Gemfile.lock')
+      gemfile_path.basename_sub { |b| "#{b}.lock" }
+    end
+
+    def gemspec_uncached
+      ::Gem::Specification.load(gemspec_path.to_path)
     end
 
     def gemspec_path_uncached
@@ -76,6 +86,10 @@ module EacRubyGemsUtils
     end
 
     def version_file_uncached
+      ::EacRubyGemsUtils::Gem::VersionFile.new(version_file_path)
+    end
+
+    def version_file_path_uncached
       root.join('lib', *namespace_parts, 'version.rb')
     end
   end

data/lib/eac_ruby_gems_utils/gem/version_file.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyGemsUtils
+  class Gem
+    class VersionFile
+      common_constructor :path
+
+      VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
+
+      def value
+        path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
+      end
+
+      def value=(new_value)
+        path.write(new_value_content(new_value))
+      end
+
+      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) }
+            .join
+      end
+
+      def new_value_line(line, new_value)
+        m = VERSION_LINE_PATTERN.match(line)
+        return line unless m
+
+        "#{m[1]}VERSION = '#{new_value}'#{m[3]}"
+      end
+    end
+  end
+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,14 +27,9 @@ 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!
-        end
+      def prepare_all_gems
+        infom 'Preparing all gems...'
+        decorated_gems.each(&:prepare)
       end
 
       def decorated_gems_uncached
@@ -61,7 +57,7 @@ module EacRubyGemsUtils
 
       def run
         start_banner
-        bundle_all_gems
+        prepare_all_gems
         test_all_gems
         final_results_banner
       end
@@ -76,31 +72,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.6.1'
+  VERSION = '0.7.3'
 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.6.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -55,14 +55,19 @@ files:
 - lib/eac_ruby_gems_utils.rb
 - lib/eac_ruby_gems_utils/gem.rb
 - lib/eac_ruby_gems_utils/gem/command.rb
+- lib/eac_ruby_gems_utils/gem/version_file.rb
 - lib/eac_ruby_gems_utils/tests.rb
 - 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
@@ -92,13 +97,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 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