eac_tools 0.50.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4beb83e6ea4860f6c6b5a5e9cc4d06bc5fb2dbea75a75d431a9c37bae9070e9
-  data.tar.gz: c982c7cd5fd95f92ac4d656df233600745a0a6f58cc1d662456804eda7a3a9e7
+  metadata.gz: 2dbc38a08966af86a3d17c50ad0788770045d7dcbd7c336fbbc31c9883b6a0aa
+  data.tar.gz: '0979accd22c7b7651e8ee52d4798efad58550b74e21def1a2df600f4a557386f'
 SHA512:
-  metadata.gz: 10951929bb08a90e4d521c8f04baede258a04b8a4832a7770b765395616d5e7ec57dd88b5c6631d96a7aaeb5bb10f87cb99206e33ea86e3db635bee1b72a8d69
-  data.tar.gz: a2134fad70db674197dade76b08aa2acfd16e4c8e6af35d5eb12b9a7447145055941e22af96e3280b8de0c1770ec6ac40486fde50fa4ba6c3e7c95f883a9db16
+  metadata.gz: f3c593fb8b4e163a02e42b7540022bc5180abc1883f1ee2a9b8608035243fe99b43cb484894e0fcc7b40a33b3b63d0b00651885ae4685ba59b7acc40259ff25e
+  data.tar.gz: 65b5f4c7a7713ebe7e49892df82e18965fc32d47304b4afc2ca35af8c0a82a0a85df6b238e79645cd7c99002ef09f3a407357ef3089aa77e61e0defa3d24fdec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.50.0)
-      avm (~> 0.59)
+    eac_tools (0.51.0)
+      avm (~> 0.60)
       avm-eac_asciidoctor_base0 (~> 0.13)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
@@ -13,7 +13,7 @@ PATH
       avm-eac_rails_base1 (~> 0.8)
       avm-eac_redmine_base0 (~> 0.18)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
+      avm-eac_ruby_base1 (~> 0.28)
       avm-eac_webapp_base0 (~> 0.13)
       avm-eac_wordpress_base0 (~> 0.3)
       avm-tools (~> 0.143)
@@ -118,10 +118,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.27.3)
-      avm (~> 0.57)
+    avm-eac_ruby_base1 (0.28.0)
+      avm (~> 0.60)
       avm-eac_generic_base0 (~> 0.8)
-      eac_ruby_utils (~> 0.109)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -191,7 +191,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.59.0)
+    avm (0.60.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.30)
       eac_config (~> 0.12)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.50.0'
+  VERSION = '0.51.0'
 end

data/sub/avm/lib/avm/file_formats/base.rb

@@ -8,6 +8,7 @@ module Avm
   module FileFormats
     class Base
       enable_abstract_methods
+      compare_by :class
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
@@ -15,6 +16,12 @@ module Avm
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 
+      # @param path [Pathname]
+      # @return [Avm::FileFormats::FileWith]
+      def file_resource_name(path)
+        path.to_pathname.to_path
+      end
+
       def name
         self.class.name.demodulize
       end

data/sub/avm/lib/avm/file_formats/search_formatter.rb

@@ -50,19 +50,9 @@ module Avm
         @result = []
       end
 
+      # @return [Avm::FileFormats::Base, nil]
       def find_format(file)
-        formats.each do |c|
-          return c if c.match?(file)
-        end
-        nil
-      end
-
-      def formats_uncached
-        formats_from_registry
-      end
-
-      def formats_from_registry
-        ::Avm::Registry.file_formats.available.reverse.map(&:new)
+        ::Avm::Registry.file_formats.detect_optional(file)
       end
 
       def search_files

data/sub/avm/lib/avm/registry/file_formats.rb

@@ -5,6 +5,10 @@ require 'avm/registry/from_gems'
 module Avm
   module Registry
     class FileFormats < ::Avm::Registry::FromGems
+      # @return [Avm::FileFormats::Base]
+      def class_detect(klass, detect_args)
+        klass.new if klass.new.match?(detect_args.first)
+      end
     end
   end
 end

data/sub/avm/lib/avm/rspec/setup.rb

@@ -7,8 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
-                    in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/sub/avm/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
+  describe '#file_resource_name' do
+    input_expected.each do |path, expected_resource_name|
+      context "when path is \"#{path}\"" do
+        let(:instance) { described_class.new }
+
+        it { expect(instance.file_resource_name(path)).to eq(expected_resource_name) }
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/scms/auto_commit/file_resource_name.rb

@@ -7,13 +7,14 @@ module Avm
     module AutoCommit
       class FileResourceName
         require_sub __FILE__, include_modules: true
+        enable_simple_cache
         common_constructor :source_root, :path do
           self.source_root = source_root.to_pathname
           self.path = path.to_pathname
         end
 
         def class_name
-          ruby_class_name || relative_path.to_path
+          file_format.file_resource_name(path)
         end
 
         def commit_message
@@ -25,6 +26,13 @@ module Avm
         def relative_path
           path.expand_path.relative_path_from(source_root.expand_path)
         end
+
+        private
+
+        # @return [Avm::FileFormats::Base]
+        def file_format_uncached
+          ::Avm::Registry.file_formats.detect(path)
+        end
       end
     end
   end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.59.0'
+  VERSION = '0.60.0'
 end

data/sub/avm/spec/lib/avm/file_formats/base_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+
+::RSpec.describe ::Avm::FileFormats::Base do
+  include_examples 'avm_file_format_file_resource_name', {
+    'app/models/mynamespace/the_class.rb' => 'app/models/mynamespace/the_class.rb',
+    'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' =>
+      'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb'
+  }
+end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm', '~> 0.60'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_ruby_base1/rubocop'
+
+module Avm
+  module EacRubyBase1
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileResourceName
+          enable_method_class
+          common_constructor :file_format, :path do
+            self.path = path.to_pathname
+          end
+
+          LIBRARY_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
+                              %r{app/[^/]+/(.+)\.rb\z}].freeze
+          SPEC_PATTERNS = [%r{spec/[^/]+/(.+)_spec\.rb\z}].freeze
+
+          # @param path [Pathname]
+          # @return [Avm::FileFormats::FileWith]
+          def result
+            result_from_spec || result_from_library || result_from_superclass
+          end
+
+          private
+
+          def result_from_library
+            result_from_patterns(LIBRARY_PATTERNS) { |m| m[1].camelize }
+          end
+
+          def result_from_patterns(patterns)
+            patterns.lazy.map { |pattern| pattern.to_parser.parse(path.to_path) }
+              .find(&:present?).if_present { |v| yield(v) }
+          end
+
+          def result_from_spec
+            result_from_patterns(SPEC_PATTERNS) { |m| "RSpec.describe('#{m[1].camelize}')" }
+          end
+
+          def result_from_superclass
+            file_format.class.superclass.instance_method(:file_resource_name)
+              .bind_call(file_format, path)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb

@@ -7,6 +7,8 @@ module Avm
   module EacRubyBase1
     module FileFormats
       class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        require_sub __FILE__
+
         VALID_BASENAMES = %w[*.gemspec *.rake *.rb Gemfile Rakefile].freeze
         VALID_TYPES = ['x-ruby'].freeze
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.27.3'
+    VERSION = '0.28.0'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec.rb

@@ -4,4 +4,12 @@ require 'avm/eac_ruby_base1/file_formats/base'
 
 ::RSpec.describe ::Avm::EacRubyBase1::FileFormats::Base do
   include_examples 'avm_file_formats_with_fixtures', __FILE__
+  include_examples 'avm_file_format_file_resource_name', {
+    'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
+    'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity',
+    'a_non_library_file.rb' => 'a_non_library_file.rb',
+    'spec/lib/my_lib_spec.rb' => 'RSpec.describe(\'MyLib\')',
+    'spec/lib/sub/my_lib_spec.rb' => 'RSpec.describe(\'Sub::MyLib\')',
+    'spec/spec_helper.rb' => 'spec/spec_helper.rb'
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Put here the authors
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.60'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.60'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -188,20 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.3
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.3
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -623,6 +617,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem/build.rb
@@ -1131,6 +1126,7 @@ files:
 - sub/avm/lib/avm/rspec/setup.rb
 - sub/avm/lib/avm/rspec/setup/launcher.rb
 - sub/avm/lib/avm/rspec/setup/source_generator.rb
+- sub/avm/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb
 - sub/avm/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
 - sub/avm/lib/avm/rspec/shared_examples/avm_source_generated.rb
 - sub/avm/lib/avm/rspec/shared_examples/entries_values.rb
@@ -1140,7 +1136,6 @@ files:
 - sub/avm/lib/avm/scms.rb
 - sub/avm/lib/avm/scms/auto_commit.rb
 - sub/avm/lib/avm/scms/auto_commit/file_resource_name.rb
-- sub/avm/lib/avm/scms/auto_commit/file_resource_name/ruby.rb
 - sub/avm/lib/avm/scms/auto_commit/for_file.rb
 - sub/avm/lib/avm/scms/auto_commit/rules.rb
 - sub/avm/lib/avm/scms/auto_commit/rules/base.rb
@@ -1192,6 +1187,7 @@ files:
 - sub/avm/lib/avm/with/extra_subcommands.rb
 - sub/avm/spec/lib/avm/applications/base_spec.rb
 - sub/avm/spec/lib/avm/applications/base_spec_fixture.yml
+- sub/avm/spec/lib/avm/file_formats/base_spec.rb
 - sub/avm/spec/lib/avm/instances/base_spec.rb
 - sub/avm/spec/lib/avm/instances/base_spec_files/config.yml
 - sub/avm/spec/lib/avm/launcher/instances/base_spec.rb

data/sub/avm/lib/avm/scms/auto_commit/file_resource_name/ruby.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Scms
-    module AutoCommit
-      class FileResourceName
-        module Ruby
-          RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
-                                      %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-          def ruby_class_name
-            RUBY_CLASS_NAME_PATTERNS.each do |pattern|
-              pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-            end
-            nil
-          end
-        end
-      end
-    end
-  end
-end