avm-tools 0.95.0 → 0.99.1

data/lib/avm/launcher/ruby/gem/specification.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object'
+
+module Avm
+  module Launcher
+    module Ruby
+      module Gem
+        class Specification
+          class << self
+            def parse_version_file(file)
+              s = ::File.read(file)
+              m = /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.match(s)
+              m ? m[1] : nil
+            end
+          end
+
+          attr_reader :gemspec_file
+
+          def initialize(gemspec_file)
+            @gemspec_file = gemspec_file
+          end
+
+          def version
+            v = self.class.parse_version_file(version_file)
+            return v if v.present?
+
+            raise "Version not found on file \"#{version_file}\""
+          end
+
+          def name
+            ::File.basename(gemspec_file).gsub(/\.gemspec\z/, '')
+          end
+
+          def full_name
+            "#{name}-#{version}"
+          end
+
+          def to_s
+            full_name
+          end
+
+          private
+
+          def gem_root
+            ::File.dirname(gemspec_file)
+          end
+
+          def version_file
+            f = ::File.join(gem_root, 'lib', *namespace_parts, 'version.rb')
+            return f if ::File.exist?(f)
+
+            raise "Version file \"#{f}\" does not exist"
+          end
+
+          def namespace_parts
+            name.split('-')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/vendor.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/vendor/github'

data/lib/avm/launcher/vendor/github.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Vendor
+      module Github
+        class << self
+          def to_ssh_url(url)
+            return nil if url.blank?
+
+            url_no_dot_git = url.gsub(/\.git\z/, '')
+
+            m = %r{\Ahttps://github.com/([^/]+)/([^/]+)\z}.match(url_no_dot_git.to_s)
+            m ? "git@github.com:#{m[1]}/#{m[2]}.git" : url
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/patches/class.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/eac_ruby_gems_utils.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/configuration'
+require 'avm/apps/sources/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,7 +13,7 @@ module Avm
         private
 
         def configuration_uncached
-          ::Avm::Instances::Configuration.find_in_path(root)
+          ::Avm::Apps::Sources::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/patches/object.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/object/fs_cache.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/self'
+require 'eac_ruby_utils/core_ext'
+
+class Object
+  class << self
+    def avm_fs_cache
+      ::Avm::Self.application.fs_cache.child(name.variableize)
+    end
+  end
+
+  def avm_fs_cache
+    self.class.avm_fs_cache.child(avm_fs_cache_object_id)
+  end
+end

data/lib/avm/patches/object/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/self/root'
-require 'eac_ruby_utils/patches/object/template'
+require 'eac_templates/patches/object/template'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths <<
+::EacTemplates::Searcher.default.included_paths <<
   ::Avm::Self.root.join('template').to_path

data/lib/avm/projects/stereotypes/git/publish.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/publish_base'
+require 'avm/launcher/git/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class Git
-        class Publish < ::EacLauncher::Git::PublishBase
+        class Publish < ::Avm::Launcher::Git::PublishBase
           PUBLISH_GIT_REMOTE_NAME = 'publish'
         end
       end

data/lib/avm/projects/stereotypes/git/update.rb

@@ -10,7 +10,7 @@ module Avm
         class Update
           require_sub __FILE__
           enable_simple_cache
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           delegate :git_repo, to: :instance

data/lib/avm/projects/stereotypes/git/update/subrepo.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'avm/git/commit'
 
 module Avm
@@ -13,7 +13,7 @@ module Avm
 
             require_sub __FILE__, include_modules: true
             enable_simple_cache
-            enable_console_speaker
+            enable_speaker
             common_constructor :parent_update, :subpath do
               self.subpath = subpath.to_pathname
             end
@@ -48,7 +48,7 @@ module Avm
               infom 'Pulling subrepo...'
               git_repo.command('subrepo', 'pull', '--force', subpath).execute!
               ::Avm::Git::Commit.new(
-                ::EacLauncher::Git::Base.new(git_repo.root_path.to_path),
+                ::Avm::Launcher::Git::Base.new(git_repo.root_path.to_path),
                 git_repo.rev_parse('HEAD')
               )
             end

data/lib/avm/projects/stereotypes/git/warp.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/warp_base'
+require 'avm/launcher/git/warp_base'
 
 module Avm
   module Projects
     module Stereotypes
       class Git
-        class Warp < ::EacLauncher::Git::WarpBase
+        class Warp < ::Avm::Launcher::Git::WarpBase
           private
 
           def current_ref

data/lib/avm/projects/stereotypes/git_subrepo.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/error'
+require 'avm/launcher/git/error'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotype'
 
@@ -25,7 +25,7 @@ module Avm
               m = /remote\s*=\s(.+)/.match(l)
               return m[1] if m
             end
-            raise ::EacLauncher::Git::Error.new(path, '"remote = ... " not found')
+            raise ::Avm::Launcher::Git::Error.new(path, '"remote = ... " not found')
           end
         end
       end

data/lib/avm/projects/stereotypes/git_subrepo/publish.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/publish_base'
+require 'avm/launcher/git/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubrepo
-        class Publish < ::EacLauncher::Git::PublishBase
+        class Publish < ::Avm::Launcher::Git::PublishBase
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/simple_cache'
-require 'eac_launcher/git/sub_warp_base'
+require 'avm/launcher/git/sub_warp_base'
 require 'avm/launcher/errors/base'
-require 'eac_launcher/paths/real'
-require 'eac_launcher/vendor/github'
+require 'avm/launcher/paths/real'
+require 'avm/launcher/vendor/github'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubrepo
-        class Warp < ::EacLauncher::Paths::Real
-          include ::EacLauncher::Git::SubWarpBase
+        class Warp < ::Avm::Launcher::Paths::Real
+          include ::Avm::Launcher::Git::SubWarpBase
           include ::EacRubyUtils::SimpleCache
 
           attr_reader :instance
@@ -46,11 +46,11 @@ module Avm
           end
 
           def init_aux
-            ::EacLauncher::Git::Base.new(aux_path).init_bare
+            ::Avm::Launcher::Git::Base.new(aux_path).init_bare
           end
 
           def parent_git_warped_uncached
-            ::EacLauncher::Git::Base.new(parent_instance.warped)
+            ::Avm::Launcher::Git::Base.new(parent_instance.warped)
           end
 
           def aux_path
@@ -58,7 +58,7 @@ module Avm
           end
 
           def warped_git_uncached
-            ::EacLauncher::Git::Base.new(instance.cache_path('git_repository'))
+            ::Avm::Launcher::Git::Base.new(instance.cache_path('git_repository'))
           end
 
           def push_to_aux
@@ -68,16 +68,16 @@ module Avm
           end
 
           def reset
-            ::EacLauncher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
+            ::Avm::Launcher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
           end
 
           def assert_target_remote
-            warped_git.assert_remote_url(::EacLauncher::Git::WarpBase::TARGET_REMOTE,
+            warped_git.assert_remote_url(::Avm::Launcher::Git::WarpBase::TARGET_REMOTE,
                                          target_remote_url)
           end
 
           def target_remote_url
-            ::EacLauncher::Vendor::Github.to_ssh_url(
+            ::Avm::Launcher::Vendor::Github.to_ssh_url(
               parent_git_warped.subrepo_remote_url(to_parent_git_path)
             )
           end

data/lib/avm/projects/stereotypes/git_subtree/publish.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/publish_base'
+require 'avm/launcher/git/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Publish < ::EacLauncher::Git::PublishBase
+        class Publish < ::Avm::Launcher::Git::PublishBase
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subtree/warp.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/warp_base'
-require 'eac_launcher/git/sub_warp_base'
+require 'avm/launcher/git/warp_base'
+require 'avm/launcher/git/sub_warp_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Warp < ::EacLauncher::Git::WarpBase
-          include ::EacLauncher::Git::SubWarpBase
+        class Warp < ::Avm::Launcher::Git::WarpBase
+          include ::Avm::Launcher::Git::SubWarpBase
 
           private
 

data/lib/avm/projects/stereotypes/ruby_gem.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/projects/stereotype'
-require 'eac_launcher/ruby/gem/specification'
+require 'avm/launcher/ruby/gem/specification'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -21,7 +21,7 @@ module Avm
           end
 
           def load_gemspec(gemspec_file)
-            ::EacLauncher::Ruby::Gem::Specification.new(gemspec_file)
+            ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
           end
         end
       end

data/lib/avm/projects/stereotypes/ruby_gem/publish.rb

@@ -4,18 +4,18 @@ require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_launcher/publish/base'
-require 'eac_launcher/publish/check_result'
-require 'eac_launcher/ruby/gem'
+require 'eac_cli/speaker'
+require 'avm/launcher/publish/base'
+require 'avm/launcher/publish/check_result'
+require 'avm/launcher/ruby/gem'
 
 module Avm
   module Projects
     module Stereotypes
       class RubyGem
-        class Publish < ::EacLauncher::Publish::Base
+        class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          include ::EacCli::Speaker
 
           protected
 
@@ -42,23 +42,23 @@ module Avm
           end
 
           def new_gem_disallowed_check_result
-            ::EacLauncher::Publish::CheckResult.blocked(
+            ::Avm::Launcher::Publish::CheckResult.blocked(
               "#{gem_spec.full_name} does not exist in RubyGems"
             )
           end
 
           def version_published_check_result
-            ::EacLauncher::Publish::CheckResult.updated("#{gem_spec.full_name} already pushed")
+            ::Avm::Launcher::Publish::CheckResult.updated("#{gem_spec.full_name} already pushed")
           end
 
           def outdated_version_check_result
-            ::EacLauncher::Publish::CheckResult.outdated(
+            ::Avm::Launcher::Publish::CheckResult.outdated(
               "#{gem_spec.full_name} is outdated (Max: #{gem_version_max})"
             )
           end
 
           def version_unpublished_check_result
-            ::EacLauncher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
+            ::Avm::Launcher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
                 'in RubyGems')
           end
 
@@ -71,7 +71,7 @@ module Avm
           end
 
           def gem_build_uncached
-            ::EacLauncher::Ruby::Gem::Build.new(source)
+            ::Avm::Launcher::Ruby::Gem::Build.new(source)
           end
 
           def publish
@@ -82,7 +82,7 @@ module Avm
           end
 
           def new_gem_allowed?
-            ::EacLauncher::Context.current.publish_options[:new]
+            ::Avm::Launcher::Context.current.publish_options[:new]
           end
 
           def gem_published?
@@ -112,7 +112,7 @@ module Avm
           def push_gem
             info("Pushing gem #{gem_spec}...")
             command = ['gem', 'push', gem_build.output_file]
-            unless ::EacLauncher::Context.current.publish_options[:confirm]
+            unless ::Avm::Launcher::Context.current.publish_options[:confirm]
               command = %w[echo] + command + %w[(Dry-run)]
             end
             EacRubyUtils::Envs.local.command(command).system