avm-tools 0.99.0 → 0.99.1

data/lib/avm/tools/runner/launcher/projects.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/context'
+require 'avm/launcher/context'
 require 'avm/launcher/instances/runner_helper'
 
 module Avm
@@ -15,8 +15,8 @@ module Avm
           end
 
           def run
-            ::EacLauncher::Context.current.recache = parsed.recache?
-            ::EacLauncher::Context.current.projects.each do |p|
+            ::Avm::Launcher::Context.current.recache = parsed.recache?
+            ::Avm::Launcher::Context.current.projects.each do |p|
               show_project(p)
             end
           end

data/lib/avm/tools/runner/launcher/publish.rb

@@ -20,7 +20,7 @@ module Avm
           end
 
           def run
-            ::EacLauncher::Context.current.recache = parsed.recache?
+            ::Avm::Launcher::Context.current.recache = parsed.recache?
             build_publish_options
             instances.each do |i|
               next unless i.options.publishable?
@@ -40,7 +40,7 @@ module Avm
           end
 
           def build_publish_options
-            ::EacLauncher::Context.current.publish_options = publish_options
+            ::Avm::Launcher::Context.current.publish_options = publish_options
           end
 
           def publish_options

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.99.0'
+    VERSION = '0.99.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 0.99.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -491,16 +491,46 @@ files:
 - lib/avm/instances/entry.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/instances/runner.rb
+- lib/avm/launcher/context.rb
+- lib/avm/launcher/context/instance_discovery.rb
 - lib/avm/launcher/context/instance_manager.rb
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
 - lib/avm/launcher/context/instance_manager/cached_instances.rb
+- lib/avm/launcher/context/settings.rb
 - lib/avm/launcher/errors/base.rb
 - lib/avm/launcher/errors/non_project.rb
+- lib/avm/launcher/git.rb
+- lib/avm/launcher/git/base.rb
+- lib/avm/launcher/git/base/class_methods.rb
+- lib/avm/launcher/git/base/dirty_files.rb
+- lib/avm/launcher/git/base/remotes.rb
+- lib/avm/launcher/git/base/subrepo.rb
+- lib/avm/launcher/git/base/underlying.rb
+- lib/avm/launcher/git/error.rb
+- lib/avm/launcher/git/mirror_update.rb
+- lib/avm/launcher/git/publish_base.rb
+- lib/avm/launcher/git/remote.rb
+- lib/avm/launcher/git/sub_warp_base.rb
+- lib/avm/launcher/git/warp_base.rb
+- lib/avm/launcher/instances.rb
 - lib/avm/launcher/instances/base.rb
 - lib/avm/launcher/instances/base/cache.rb
 - lib/avm/launcher/instances/error.rb
 - lib/avm/launcher/instances/runner_helper.rb
 - lib/avm/launcher/instances/settings.rb
+- lib/avm/launcher/paths.rb
+- lib/avm/launcher/paths/logical.rb
+- lib/avm/launcher/paths/real.rb
+- lib/avm/launcher/project.rb
+- lib/avm/launcher/publish.rb
+- lib/avm/launcher/publish/base.rb
+- lib/avm/launcher/publish/check_result.rb
+- lib/avm/launcher/ruby.rb
+- lib/avm/launcher/ruby/gem.rb
+- lib/avm/launcher/ruby/gem/build.rb
+- lib/avm/launcher/ruby/gem/specification.rb
+- lib/avm/launcher/vendor.rb
+- lib/avm/launcher/vendor/github.rb
 - lib/avm/patches.rb
 - lib/avm/patches/class.rb
 - lib/avm/patches/class/i18n.rb
@@ -620,38 +650,6 @@ files:
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/version.rb
 - lib/avm/version.rb
-- lib/eac_launcher.rb
-- lib/eac_launcher/context.rb
-- lib/eac_launcher/context/instance_discovery.rb
-- lib/eac_launcher/context/settings.rb
-- lib/eac_launcher/git.rb
-- lib/eac_launcher/git/base.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
-- lib/eac_launcher/git/mirror_update.rb
-- lib/eac_launcher/git/publish_base.rb
-- lib/eac_launcher/git/remote.rb
-- lib/eac_launcher/git/sub_warp_base.rb
-- lib/eac_launcher/git/warp_base.rb
-- lib/eac_launcher/instances.rb
-- lib/eac_launcher/paths.rb
-- lib/eac_launcher/paths/logical.rb
-- lib/eac_launcher/paths/real.rb
-- lib/eac_launcher/project.rb
-- lib/eac_launcher/publish.rb
-- lib/eac_launcher/publish/base.rb
-- lib/eac_launcher/publish/check_result.rb
-- lib/eac_launcher/ruby.rb
-- lib/eac_launcher/ruby/gem.rb
-- lib/eac_launcher/ruby/gem/build.rb
-- lib/eac_launcher/ruby/gem/specification.rb
-- lib/eac_launcher/vendor.rb
-- lib/eac_launcher/vendor/github.rb
-- lib/eac_launcher/version.rb
 - template/avm/eac_rails_base0/apache_path/extra_content.conf
 - template/avm/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template

data/lib/eac_launcher.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  require 'eac_launcher/context'
-  require 'eac_launcher/paths'
-  require 'eac_launcher/project'
-  require 'avm/projects/stereotype'
-  require 'eac_launcher/git'
-  require 'eac_launcher/instances'
-  require 'eac_launcher/publish'
-  require 'eac_launcher/ruby'
-  require 'eac_launcher/vendor'
-end

data/lib/eac_launcher/context.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/hash/indifferent_access'
-require 'avm/launcher/context/instance_manager'
-require 'eac_ruby_utils/simple_cache'
-require 'eac_cli/speaker'
-require 'eac_launcher/context/instance_discovery'
-require 'eac_launcher/context/settings'
-require 'eac_launcher/paths/logical'
-require 'eac_launcher/project'
-
-module EacLauncher
-  class Context
-    include ::EacRubyUtils::SimpleCache
-    include ::EacCli::Speaker
-
-    DEFAULT_PROJECTS_ROOT = '.'
-    DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
-    DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
-
-    class << self
-      attr_writer :current
-
-      def current
-        @current ||= default
-      end
-
-      def default
-        @default ||= Context.new
-      end
-    end
-
-    attr_reader :root, :settings, :cache_root
-    attr_accessor :publish_options, :recache, :instance_manager
-
-    def initialize(options = {})
-      @options = options.with_indifferent_access
-      @root = ::EacLauncher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
-      @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
-      @cache_root = build_option(:cache_root)
-      @publish_options = { new: false, confirm: false, stereotype: nil }
-      @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
-      @recache = false
-    end
-
-    def instance(name)
-      instances.find { |i| i.name == name }
-    end
-
-    def instances
-      @instance_manager.instances
-    end
-
-    def pending_instances
-      @instance_manager.pending_instances
-    end
-
-    private
-
-    def build_option(key)
-      @options[key] || env_option(key) || default_option(key)
-    end
-
-    def env_option(key)
-      ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
-    end
-
-    def default_option(key)
-      self.class.const_get("DEFAULT_#{key}".underscore.upcase)
-    end
-
-    def projects_uncached
-      r = {}
-      instances.each do |i|
-        r[i.project_name] ||= []
-        r[i.project_name] << i
-      end
-      r.map { |name, instances| ::EacLauncher::Project.new(name, instances) }
-    end
-  end
-end

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'ruby-progressbar'
-require 'avm/launcher/instances/base'
-
-module EacLauncher
-  class Context
-    class InstanceDiscovery
-      attr_reader :instances
-
-      def initialize(context)
-        @context = context
-        @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
-        @instances = path_instances(@context.root, nil)
-      ensure
-        @progress&.finish
-      end
-
-      private
-
-      def path_instances(path, parent_instance)
-        update_progress_format(path)
-        on_rescued_path_instances(path) do |r|
-          if path.project?
-            parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
-            r << path
-          end
-          children = path.children
-          update_progress_count(children)
-          r.concat(children.flat_map { |c| path_instances(c, parent_instance) })
-        end
-      end
-
-      def on_rescued_path_instances(path)
-        r = []
-        begin
-          yield(r) if path.included?
-        rescue StandardError => e
-          warn("#{path}: #{e}")
-        end
-        r
-      end
-
-      def update_progress_format(path)
-        @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
-      end
-
-      def update_progress_count(children)
-        @progress.total += children.count
-        @progress.increment
-      end
-    end
-  end
-end

data/lib/eac_launcher/context/settings.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/instances/settings'
-require 'eac_ruby_utils/simple_cache'
-require 'yaml'
-
-module EacLauncher
-  class Context
-    class Settings
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(file)
-        unless ::File.exist?(file)
-          ::FileUtils.mkdir_p(::File.dirname(file))
-          ::File.write(file, {}.to_yaml)
-        end
-        @data = YAML.load_file(file)
-      end
-
-      def instance_settings(instance)
-        ::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
-      end
-
-      private
-
-      def excluded_projects_uncached
-        enum_value(%w[Projects Exclude])
-      end
-
-      def excluded_paths_uncached
-        enum_value(%w[Paths Exclude])
-      end
-
-      def enum_value(path)
-        r = value(path)
-        r.is_a?(Enumerable) ? r : []
-      end
-
-      def value(path)
-        node_value(@data, path)
-      end
-
-      def node_value(data, path)
-        return data if path.empty?
-        return nil unless data.is_a?(Hash)
-
-        node_value(data[path.first], path.drop(1))
-      end
-    end
-  end
-end

data/lib/eac_launcher/git.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_launcher/git/base'
-require 'eac_launcher/git/error'
-require 'eac_launcher/git/mirror_update'
-require 'eac_launcher/git/publish_base'
-require 'eac_launcher/git/warp_base'

data/lib/eac_launcher/git/base.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_git/local'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/envs'
-require 'eac_launcher/paths/real'
-require 'eac_launcher/git/error'
-
-module EacLauncher
-  module Git
-    class Base < ::EacLauncher::Paths::Real
-      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
-
-      attr_reader :eac_git
-      delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
-
-      def initialize(path)
-        super(path)
-
-        @eac_git = ::EacGit::Local.new(path)
-      end
-
-      def init_bare
-        FileUtils.mkdir_p(self)
-        ::EacRubyUtils::Envs.local.command('git', 'init', '--bare', self).execute! unless
-        File.exist?(subpath('.git'))
-      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?
-
-        revparse = execute!('rev-parse', '--verify', ancestor).strip
-        base == revparse
-      end
-
-      def subtree_split(prefix)
-        execute!('subtree', '-q', 'split', '-P', prefix).strip
-      end
-
-      def push(remote_name, refspecs, options = {})
-        refspecs = [refspecs] unless refspecs.is_a?(Array)
-        args = ['push']
-        args << '--dry-run' if options[:dryrun]
-        args << '--force' if options[:force]
-        system!(args + [remote_name] + refspecs)
-      end
-
-      def push_all(remote_name)
-        system!('push', '--all', remote_name)
-        system!('push', '--tags', remote_name)
-      end
-
-      def fetch(remote_name, options = {})
-        args = ['fetch', '-p', remote_name]
-        args += %w[--tags --prune-tags --force] if options[:tags]
-        execute!(*args)
-      end
-
-      def current_branch
-        execute!(%w[symbolic-ref -q HEAD]).gsub(%r{\Arefs/heads/}, '').strip
-      end
-
-      def reset_hard(ref)
-        execute!('reset', '--hard', ref)
-      end
-
-      def raise(message)
-        ::Kernel.raise EacLauncher::Git::Error.new(self, message)
-      end
-    end
-  end
-end