avm-tools 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea5ddc3be43fde36ddae9da599013e75bb0eeeab41960f449bc98665479df692
-  data.tar.gz: d7521c7d54d213a99a8786672c2c5252ed9ab0055f2704111b9c9995ebadbc7f
+  metadata.gz: 7ebefeec62ed2a18b49480f8da27d9582ab7c4bf6f71e19d0c2c2a82a7ec87ec
+  data.tar.gz: 1616f697714aecc0ea58b6695a8d7672b79e384c352a9e0ec1ece91daf88667c
 SHA512:
-  metadata.gz: 8446d752260be60ebffdda5226ec06fc0c01c4bdd07f5696188cbf0a062b00632544e26283e73cd499d37a3f6e9f701fe687dfe2a07fad674cb07fdd12f19f50
-  data.tar.gz: 5264f44597c53a062537a84ebf5ee740ec5eb62aeabc1c3171601f513bc8494055ad9ac62780b6dec5c7b50006bee64039455fd308a07d882b114ade74d25d7a
+  metadata.gz: 17fbb28c4bdaf19ca33c1db1cb3f0d9678dd476f5804f972c19fff2e0ab0aae151568b2e82ce46a6da6b524682de4df11b0d231606d61ce0a1fe67c089490262
+  data.tar.gz: 8fda39f66fb0d7e2108245b33e76d7f7053223572b0571534f57cdc5f1632ddd595b1f0a510bfc453a61286f2fee2b5fc3e8d786ce9f587bd16a6334e1f84833

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/eac_launcher_git_base'
+require 'eac_launcher/git/base'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/options_consumer'
 require 'eac_ruby_utils/require_sub'

data/lib/avm/git/revision_test.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm/fs_cache'
-require 'avm/ruby'
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/ruby'
 
 module Avm
   module Git
@@ -57,7 +57,7 @@ module Avm
       def run_test
         infom "Running test command \"#{::Shellwords.join(test_command_args)}\"" \
           " on \"#{git_absolute_path}\"..."
-        result = ::Avm::Ruby.on_clean_environment { test_command.execute }
+        result = ::EacRubyUtils::Ruby.on_clean_environment { test_command.execute }
         infom 'Test done'
         write_result_cache(result)
       end

data/lib/avm/rails.rb

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

data/lib/avm/rails/runners.rb

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

data/lib/avm/rails/runners/bundle.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module Rails
+    module Runners
+      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+        enable_console_speaker
+
+        DOC = <<~DOCOPT
+          Runs "bundle ...".
+
+          Usage:
+            __PROGRAM__ [<bundle-args>...]
+            __PROGRAM__ -h | --help
+
+          Options:
+            -h --help                 Show this screen.
+        DOCOPT
+
+        def run
+          infov 'Bundle arguments', ::Shellwords.join(bundle_args)
+          context(:instance).bundle(*bundle_args).system!
+        end
+
+        def bundle_args
+          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby.rb

@@ -5,25 +5,5 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Ruby
     require_sub __FILE__
-
-    class << self
-      def on_clean_environment
-        on_clean_envvars('BUNDLE', 'RUBY') { yield }
-      end
-
-      private
-
-      def on_clean_envvars(*start_with_vars)
-        old_values = envvars_starting_with(start_with_vars)
-        old_values.keys.each { |k| ENV.delete(k) } # rubocop:disable Style/HashEachMethods
-        yield
-      ensure
-        old_values&.each { |k, v| ENV[k] = v }
-      end
-
-      def envvars_starting_with(start_with_vars)
-        ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
-      end
-    end
   end
 end

data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/ruby'
 require 'avm/stereotypes/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
 
 module Avm
   module Stereotypes
@@ -11,7 +11,7 @@ module Avm
 
         def run_installer
           infom 'Running installer'
-          ::Avm::Ruby.on_clean_environment do
+          ::EacRubyUtils::Ruby.on_clean_environment do
             installer_command.system!
           end
         end

data/lib/avm/tools/runner/eac_rails_base0/bundle.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/rails/runners/bundle'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Bundle < ::Avm::Rails::Runners::Bundle
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb

@@ -1,34 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_redmine_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/rails/runners/bundle'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Bundle < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
-
-          DOC = <<~DOCOPT
-            Runs "bundle ...".
-
-            Usage:
-              __PROGRAM__ [<bundle-args>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                 Show this screen.
-          DOCOPT
-
-          def run
-            infov 'Bundle arguments', ::Shellwords.join(bundle_args)
-            context(:instance).bundle(*bundle_args).system!
-          end
-
-          def bundle_args
-            options.fetch('<bundle-args>').reject { |arg| arg == '--' }
-          end
+        class Bundle < ::Avm::Rails::Runners::Bundle
         end
       end
     end

data/lib/avm/tools/runner/files/format.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/files/formatter'
-require 'avm/patches/eac_launcher_git_base'
+require 'eac_launcher/git/base'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 

data/lib/avm/tools/runner/git.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/require_sub'
-require 'avm/patches/eac_launcher_git_base'
+require 'eac_launcher/git/base'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.47.0'
+    VERSION = '0.48.0'
   end
 end

data/lib/eac_launcher/git/base.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs'
 require 'eac_launcher/paths/real'
-require 'eac_launcher/git/base/underlying'
-require 'eac_launcher/git/base/subrepo'
 require 'eac_launcher/git/error'
 
 module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
-      include ::EacRubyUtils::SimpleCache
+      require_sub __FILE__
+      enable_simple_cache
+      extend ::EacLauncher::Git::Base::ClassMethods
+      include ::EacLauncher::Git::Base::DirtyFiles
+      include ::EacLauncher::Git::Base::Remotes
       include ::EacLauncher::Git::Base::Subrepo
       include ::EacLauncher::Git::Base::Underlying
-      require_relative ::File.join(__dir__, 'base', '_remotes')
 
       def init_bare
         FileUtils.mkdir_p(self)
@@ -30,6 +31,11 @@ module EacLauncher
         raise "Reference \"#{ref}\" not found"
       end
 
+      # @return [Pathname]
+      def root_path
+        @root_path ||= self.class.find_root(to_s)
+      end
+
       def descendant?(descendant, ancestor)
         base = merge_base(descendant, ancestor)
         return false if base.blank?

data/lib/eac_launcher/git/base/class_methods.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module EacLauncher
+  module Git
+    class Base < ::EacLauncher::Paths::Real
+      module ClassMethods
+        # @return [EacLauncher::Git::Base]
+        def by_root(search_base_path)
+          new(find_root(search_base_path).to_path)
+        end
+
+        # Searches the root path for the Git repository which includes +search_base_path+.
+        # @return [Pathname]
+        def find_root(search_base_path)
+          path = search_base_path.to_pathname.expand_path
+          loop do
+            return path if path.join('.git').exist?
+            raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
+
+            path = path.parent
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/base/dirty_files.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object'
+
+module EacLauncher
+  module Git
+    class Base < ::EacLauncher::Paths::Real
+      module DirtyFiles
+        def dirty?
+          dirty_files.any?
+        end
+
+        def dirty_files
+          execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
+            parse_status_line(line.gsub(/\n\z/, ''))
+          end
+        end
+
+        private
+
+        def parse_status_line(line)
+          m = /\A(.)(.)\s(.+)\z/.match(line)
+          ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
+          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
+                           absolute_path: ::File.expand_path(m[3], self))
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/base/remotes.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_launcher/git/remote'
+
+module EacLauncher
+  module Git
+    class Base < ::EacLauncher::Paths::Real
+      module Remotes
+        # @return [EacLauncher::Git::Remote]
+        def remote(name)
+          ::EacLauncher::Git::Remote.new(self, name)
+        end
+
+        def remote_hashs(remote_name)
+          remote(remote_name).ls
+        end
+
+        def remote_exist?(remote_name)
+          remote(remote_name).exist?
+        end
+
+        def assert_remote_url(remote_name, url)
+          r = git.remote(remote_name)
+          if !r.url || r.url != url
+            r.remove if r.url
+            git.add_remote(remote_name, url)
+          end
+          r
+        end
+
+        def remote_branch_sha(remote_name, branch_name)
+          remote_hashs(remote_name)["refs/heads/#{branch_name}"]
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/base/underlying.rb

@@ -8,6 +8,16 @@ module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
       module Underlying
+        def command(*args)
+          args, _options = build_args(args)
+          ::EacRubyUtils::Envs.local.command(*args)
+        end
+
+        def execute(*args)
+          args, options = build_args(args)
+          ::EacRubyUtils::Envs.local.command(*args).execute(options)
+        end
+
         def execute!(*args)
           args, options = build_args(args)
           ::EacRubyUtils::Envs.local.command(*args).execute!(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -303,9 +303,11 @@ files:
 - lib/avm/instances/entries/entry_reader.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/patches.rb
-- lib/avm/patches/eac_launcher_git_base.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
+- lib/avm/rails.rb
+- lib/avm/rails/runners.rb
+- lib/avm/rails/runners/bundle.rb
 - lib/avm/result.rb
 - lib/avm/ruby.rb
 - lib/avm/ruby/rubocop.rb
@@ -352,6 +354,7 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_host.rb
+- lib/avm/tools/runner/eac_rails_base0/bundle.rb
 - lib/avm/tools/runner/eac_rails_base0/data.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
@@ -388,7 +391,9 @@ files:
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
-- lib/eac_launcher/git/base/_remotes.rb
+- lib/eac_launcher/git/base/class_methods.rb
+- lib/eac_launcher/git/base/dirty_files.rb
+- lib/eac_launcher/git/base/remotes.rb
 - lib/eac_launcher/git/base/subrepo.rb
 - lib/eac_launcher/git/base/underlying.rb
 - lib/eac_launcher/git/error.rb

data/lib/avm/patches/eac_launcher_git_base.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_launcher/git/base'
-require 'eac_launcher/git/error'
-require 'eac_ruby_utils/patch'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Patches
-    module EacLauncherGitBase
-      extend ::ActiveSupport::Concern
-
-      included do
-        extend ClassMethods
-        include InstanceMethods
-      end
-
-      module ClassMethods
-        # @return [EacLauncher::Git::Base]
-        def by_root(search_base_path)
-          new(find_root(search_base_path).to_path)
-        end
-
-        # Searches the root path for the Git repository which includes +search_base_path+.
-        # @return [Pathname]
-        def find_root(search_base_path)
-          path = search_base_path.to_pathname.expand_path
-          loop do
-            return path if path.join('.git').exist?
-            raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
-
-            path = path.parent
-          end
-        end
-      end
-
-      module InstanceMethods
-        def execute(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).execute(options)
-        end
-
-        def command(*args)
-          args, _options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args)
-        end
-
-        def dirty?
-          dirty_files.any?
-        end
-
-        def dirty_files
-          execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
-            parse_status_line(line.gsub(/\n\z/, ''))
-          end
-        end
-
-        # @return [Pathname]
-        def root_path
-          @root_path ||= self.class.find_root(to_s)
-        end
-
-        private
-
-        def parse_status_line(line)
-          m = /\A(.)(.)\s(.+)\z/.match(line)
-          ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
-          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
-                           absolute_path: ::File.expand_path(m[3], self))
-        end
-      end
-    end
-  end
-end
-
-::EacRubyUtils.patch(::EacLauncher::Git::Base, ::Avm::Patches::EacLauncherGitBase)

data/lib/eac_launcher/git/base/_remotes.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_launcher/git/remote'
-
-module EacLauncher
-  module Git
-    class Base < ::EacLauncher::Paths::Real
-      # @return [EacLauncher::Git::Remote]
-      def remote(name)
-        ::EacLauncher::Git::Remote.new(self, name)
-      end
-
-      def remote_hashs(remote_name)
-        remote(remote_name).ls
-      end
-
-      def remote_exist?(remote_name)
-        remote(remote_name).exist?
-      end
-
-      def assert_remote_url(remote_name, url)
-        r = git.remote(remote_name)
-        if !r.url || r.url != url
-          r.remove if r.url
-          git.add_remote(remote_name, url)
-        end
-        r
-      end
-
-      def remote_branch_sha(remote_name, branch_name)
-        remote_hashs(remote_name)["refs/heads/#{branch_name}"]
-      end
-    end
-  end
-end