avm-git 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b90e458de2c4249f60e964c1d95564bd46dbe0f4fd754ce591f475ba13313f
-  data.tar.gz: 03bc99cf2b5863dc919a8d06f92711959c8f3fd8b4ae360500528a5b82f74a9a
+  metadata.gz: 5b8398e0b296b1b152268e3e75893239fdbf76ea35198a090b5a32c0b50c29ce
+  data.tar.gz: 1a3d77ec717bededa720a46b50d44dbe8cf098dc829adfce891e66880669024c
 SHA512:
-  metadata.gz: afb7e4062254feab12e955691537fabe63c5a31318aa4965a31b807c40636ade3835dd90649bff89b830eb79d666d73680e0b74501910b1d7f58f9c5eed009c7
-  data.tar.gz: aba1de78c58adcfee8009bf3a02f2ac7e87ff97a0313643745dd393416d76559ba02197ebab4e345244758d6e8de80f2f726957360f58b3edab5608c8a4b7129
+  metadata.gz: f6b6a7480886329c0d8d430ad2d3617e94a3775beee1812bf9d5a95bf5e56c0dad34dc9d4cfa437dfe0b3c9d73657960eefc149e7595d10b9f45fd3bc58d8cdc
+  data.tar.gz: a37e788e6f4c18b11c556c0bab148968e448915a34aa36e09810578c11f2b8ee9313882762a5ecc500b88d874407cd9f0cb09dbb945a9974ab59364317c0ccac

data/lib/avm/git/application_scms/base/assert_main_at.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avm/application_scms/base'
+require 'eac_git/local'
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module ApplicationScms
+      class Base < ::Avm::ApplicationScms::Base
+        class AssertMainAt
+          MAIN_REFERENCE = 'HEAD'
+
+          acts_as_instance_method
+          enable_simple_cache
+          common_constructor :base, :path
+
+          # @return [Pathname]
+          def result
+            local_repos.remote(base.git_https_url).fetch
+            local_repos.command('checkout', remote_head_commit_id).execute!
+            path
+          end
+
+          private
+
+          # @return [String]
+          def remote_head_commit_id
+            remote_repos.ls.fetch(MAIN_REFERENCE)
+          end
+
+          # @return [EacGit::Local]
+          def local_repos_uncached
+            path.mkpath
+            r = ::EacGit::Local.new(path)
+            r.command('init').execute! unless r.root_path.join('.git').exist?
+            r
+          end
+
+          # @return [EacGit::Remote]
+          def remote_repos_uncached
+            ::EacGit::Remote.new(base.git_https_url)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/application_scms/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/application_scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module ApplicationScms
+      class Base < ::Avm::ApplicationScms::Base
+        acts_as_abstract
+
+        # @return [Addressable::URI]
+        def git_https_url
+          raise_abstract_method __method__
+        end
+
+        require_sub __FILE__, require_mode: :kernel
+      end
+    end
+  end
+end

data/lib/avm/git/application_scms.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module ApplicationScms
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/git/issue/complete/commits.rb

@@ -32,8 +32,8 @@ module Avm
           end
 
           def commit_parents(commit)
-            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
-                        .select(&:present?)
+            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split.map(&:strip)
+              .select(&:present?)
           end
         end
       end

data/lib/avm/git/issue/complete/push.rb

@@ -25,11 +25,11 @@ module Avm
           end
 
           def pushs_uncached
-            [master_push, remove_branch_push, tag_push].reject(&:nil?)
+            [master_push, remove_branch_push, tag_push].compact
           end
 
           def master_push
-            remote_master_hash != branch_hash ? "#{branch_hash}:refs/heads/master" : nil
+            remote_master_hash == branch_hash ? nil : "#{branch_hash}:refs/heads/master"
           end
 
           def remove_branch_push

data/lib/avm/git/issue.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Git

data/lib/avm/git/launcher/base/dirty_files.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/object'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
@@ -9,11 +9,11 @@ module Avm
         module DirtyFiles
           delegate :dirty?, to: :eac_git
 
+          # @return [Array<Struct>]
           def dirty_files
             eac_git.dirty_files.map do |df|
-              ::OpenStruct.new(
-                df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
-              )
+              df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
+                .to_struct
             end
           end
         end

data/lib/avm/git/launcher/base/subrepo.rb

@@ -30,7 +30,7 @@ module Avm
           def subrepo_status_parse_output(output)
             r = {}.with_indifferent_access
             output.each_line do |l|
-              m = /\A([^\:]+)\:(.*)\z/.match(l.strip)
+              m = /\A([^\:]+):(.*)\z/.match(l.strip)
               next unless m && m[2].present?
 
               r[m[1].strip] = m[2].strip

data/lib/avm/git/launcher/base.rb

@@ -19,6 +19,7 @@ module Avm
         include ::Avm::Git::Launcher::Base::Underlying
 
         attr_reader :eac_git
+
         delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
 
         def initialize(path)

data/lib/avm/git/launcher/publish_base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
@@ -111,7 +110,7 @@ module Avm
         def remote_sha_uncached
           remote_fetch
           b = sgit.git.branches["#{remote_name}/#{remote_ref}"]
-          b ? b.gcommit.sha : nil
+          b&.gcommit&.sha
         end
 
         def remote_fetch_uncached

data/lib/avm/git/launcher/remote.rb

@@ -13,10 +13,10 @@ module Avm
         end
 
         def ls
-          git.execute!(['ls-remote', name]).each_line.map do |line|
+          git.execute!(['ls-remote', name]).each_line.to_h do |line|
             x = line.strip.split(/\s+/)
             [x[1], x[0]]
-          end.to_h
+          end
         end
 
         # +git remote add ...+

data/lib/avm/git/launcher/warp_base.rb

@@ -33,8 +33,9 @@ module Avm
             return
           end
 
-          raise ::Avm::Launcher::Instances::Error, 'Refspec ' \
-            "\"#{source_instance.options.git_current_revision}\" not found in \"#{source_git}\""
+          raise ::Avm::Launcher::Instances::Error,
+                "Refspec \"#{source_instance.options.git_current_revision}\" " \
+                "not found in \"#{source_git}\""
         end
 
         def update

data/lib/avm/git/launcher_stereotypes/git_subrepo/warp.rb

@@ -33,8 +33,8 @@ module Avm
                       parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
 
             raise Avm::Launcher::Errors::Base,
-                  "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
-                  " not found in \"#{parent_git_warped}\""
+                  "Subrepo parent hash \"#{subrepo_parent_hash}\" " \
+                  "not found in \"#{parent_git_warped}\""
           end
 
           def subrepo_parent_hash

data/lib/avm/git/organize/repository.rb

@@ -42,7 +42,7 @@ module Avm
 
         def all_references
           ::Pathname.glob("#{refs_root}/**/*").select(&:file?)
-                    .map { |p| p.relative_path_from(refs_root).to_path }
+            .map { |p| p.relative_path_from(refs_root).to_path }
         end
 
         def reference_update_by_ref(reference)

data/lib/avm/git/revision_test.rb

@@ -57,8 +57,8 @@ module Avm
       end
 
       def run_test
-        infom "Running test command \"#{::Shellwords.join(test_command_args)}\"" \
-          " on \"#{git_absolute_path}\"..."
+        infom "Running test command \"#{::Shellwords.join(test_command_args)}\" " \
+              "on \"#{git_absolute_path}\"..."
         result = ::EacRubyUtils::Ruby.on_clean_environment { test_command.execute }
         infom 'Test done'
         write_result_cache(result)

data/lib/avm/git/scms/git/change_tracker.rb

@@ -9,6 +9,7 @@ module Avm
         class ChangeTracker
           common_constructor :git_scm, :commit_info
           attr_reader :starting_commit
+
           delegate :git_repo, to: :git_scm
 
           def start

data/lib/avm/git/scms/git/commit.rb

@@ -15,7 +15,7 @@ module Avm
           delegate :git_repo, to: :git_scm
           delegate :id, to: :git_commit
 
-          FIXUP_SUBJECT_PATTERN = /\Afixup\!/.freeze
+          FIXUP_SUBJECT_PATTERN = /\Afixup!/.freeze
 
           # @return [Array<Pathname>]
           def changed_files

data/lib/avm/git/scms/git/interval.rb

@@ -17,7 +17,7 @@ module Avm
           # @return [Array<Avm::Git::Scms::Git::Commit>]
           def commits
             scm.git_repo.command('log', '--pretty=format:%H', git_commit_interval).execute!
-               .each_line.map { |sha1| scm.commit(sha1.strip) }
+              .each_line.map { |sha1| scm.commit(sha1.strip) }
           end
 
           # @return [String]

data/lib/avm/git/scms/git_subtree.rb

@@ -15,7 +15,7 @@ module Avm
 
         def valid?
           return false unless ::Avm::Git::Scms::Provider
-                              .new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
+                                .new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
 
           (::Avm::Git::Scms::Provider.new.all - [self.class])
             .lazy.map { |scm_class| scm_class.new(path) }.none?(&:valid?)

data/lib/avm/git/subrepo_check/show_result.rb

@@ -24,7 +24,7 @@ module Avm
         end
 
         def out_attr(key, value)
-          out('|' + "#{key}=".white + value)
+          out("|#{"#{key}=".white}#{value}")
         end
       end
     end

data/lib/avm/git/subrepo_checks.rb

@@ -9,6 +9,7 @@ module Avm
       enable_speaker
       enable_simple_cache
       attr_accessor :check_remote, :fix_parent
+
       common_constructor :repository
 
       def add_all_subrepos

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.4'
+    VERSION = '0.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.82'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.82'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -98,40 +98,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
-- !ruby/object:Gem::Dependency
-  name: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.9'
 description: 
 email: 
 executables: []
@@ -139,6 +119,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/git.rb
+- lib/avm/git/application_scms.rb
+- lib/avm/git/application_scms/base.rb
+- lib/avm/git/application_scms/base/assert_main_at.rb
 - lib/avm/git/commit.rb
 - lib/avm/git/commit/class_methods.rb
 - lib/avm/git/commit/diff_tree_line.rb