avm-tools 0.129.1 → 0.130.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5d19e88ae6cbf388d46a45edc8e119da03cf22830eb9ce545e5231b9a3386b
-  data.tar.gz: e2e7507a7d8ea822d034d8a39a91450393858f49d0f5c62edd0519b3baa24d41
+  metadata.gz: '0698967568303e0d5288e864b9173c0916ac2a81b9a770a5f8e53a9e81f94616'
+  data.tar.gz: 6e6d462145da7deeba4b7f65a785eb9842595fdf0ec2513b1e0a7fda4342b318
 SHA512:
-  metadata.gz: c9d1004d678667bd5df8fe9ec275f62bcebc21fd308b6640a504c15ac8093cfe603f907bb6cd7e47a654acbfcb01fbca25d103b168d6cf13b92dd32814d77a61
-  data.tar.gz: 46ef40a420bd173412be7736a14d0294de7e570db8d00a9a2d24e75d43a83f524c732a76b110518ae13048366284464cc94a45e14d92b802f304714a4b8428ad
+  metadata.gz: edc70de430e385b918b3e58a22482a94298ab11ac4c1e5f32d460f22795ee75d5abe45ab23f02c4bec272cfb2cee7b2087e3a6f09ac4c2c58fd13ad7ca8ead09
+  data.tar.gz: c76af0a8732429866926f23c60c9f71fc563140cd4b5fc2b9903a35d98d8f62a6d5062ec52051b75220c0fcf29fe919fb51b93ca59fa73c07a23a53f920355d4

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

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/sources/runner'
 require 'avm/tools/app_src'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class AppSrc < ::Avm::Sources::Runner
         require_sub __FILE__
-        runner_with :help, :subcommands do
-          desc 'Utilities for local projects.'
-          arg_opt '-C', '--path', 'Path to local project instance.'
-          subcommands
-        end
 
         def instance_banner
           infov 'Instance', instance
@@ -20,19 +16,13 @@ module Avm
         end
 
         def subject
-          instance.avm_instance
+          source
         end
 
-        delegate :extra_available_subcommands, to: :subject
-
         private
 
         def instance_uncached
-          ::Avm::Tools::AppSrc.new(instance_path)
-        end
-
-        def instance_path_uncached
-          (parsed.path || '.').to_pathname.expand_path
+          ::Avm::Tools::AppSrc.new(source_path)
         end
       end
     end

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

@@ -1,44 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/runners/base'
-require 'eac_cli/core_ext'
+require 'avm/source_generators/runner'
 
 module Avm
   module Tools
     class Runner
-      class SourceGenerate
-        runner_with :help do
-          pos_arg :stereotype_name
-          pos_arg :target_path
-        end
-
-        def run
-          start_banner
-          generate
-        end
-
-        def generate
-          infom 'Generating...'
-          generator.perform
-          success "Source generated in \"#{generator.target_path}\""
-        end
-
-        def start_banner
-          infov 'Stereotype', stereotype_name
-          infov 'Target path', target_path
-          infov 'Generator', generator.class
-        end
-
-        def generator_uncached
-          ::Avm::Registry.source_generators.detect_optional(stereotype_name, target_path) ||
-            fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
-        end
-
-        delegate :stereotype_name, to: :parsed
-
-        def target_path
-          parsed.target_path.to_pathname
-        end
+      class SourceGenerate < ::Avm::SourceGenerators::Runner
       end
     end
   end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.129.1'
+    VERSION = '0.130.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.129.1
+  version: 0.130.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -324,11 +324,6 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem.rb
 - lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
-- lib/avm/rails.rb
-- lib/avm/ruby.rb
-- lib/avm/ruby/bundler.rb
-- lib/avm/ruby/gems.rb
-- lib/avm/ruby/gems/generator.rb
 - lib/avm/stereotypes.rb
 - lib/avm/tools.rb
 - lib/avm/tools/app_src.rb
@@ -378,8 +373,6 @@ files:
 - lib/avm/tools/runner/launcher/projects.rb
 - lib/avm/tools/runner/launcher/publish.rb
 - lib/avm/tools/runner/ruby.rb
-- lib/avm/tools/runner/ruby/gems.rb
-- lib/avm/tools/runner/ruby/gems/generate.rb
 - lib/avm/tools/runner/ruby/rubocop.rb
 - lib/avm/tools/runner/self.rb
 - lib/avm/tools/runner/self/docker.rb
@@ -398,12 +391,6 @@ files:
 - template/avm/eac_writings_base0/commons/source_code/java.tex
 - template/avm/eac_writings_base0/commons/utils.tex
 - template/avm/eac_writings_base0/deploy/index.html.template
-- template/avm/ruby/gems/generator/gemspec.template
-- template/avm/ruby/gems/generator/root_lib.template
-- template/avm/ruby/gems/generator/static/Gemfile
-- template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb
-- template/avm/ruby/gems/generator/static/spec/spec_helper.rb
-- template/avm/ruby/gems/generator/version.template
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
 homepage: 

data/lib/avm/rails.rb

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

data/lib/avm/ruby/bundler.rb

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

data/lib/avm/ruby/gems/generator.rb

@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_ruby_base1/sources/base'
-require 'eac_templates/core_ext'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Ruby
-    module Gems
-      class Generator
-        IDENT = '  '
-        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
-        TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
-
-        enable_speaker
-        enable_simple_cache
-        common_constructor :root_directory, :options, default: [{}] do
-          self.root_directory = root_directory.to_pathname
-          run
-        end
-
-        def eac_ruby_gem_support_version
-          dependency_version('eac_ruby_gem_support')
-        end
-
-        def eac_ruby_utils_version
-          dependency_version('eac_ruby_utils')
-        end
-
-        def name
-          root_directory.basename.to_s
-        end
-
-        def lib_path
-          name.split('-').join('/')
-        end
-
-        def root_module
-          lib_path.camelize
-        end
-
-        def root_module_close
-          root_module_components.count.times.map do |index|
-            (IDENT * index) + 'end'
-          end.reverse.join("\n")
-        end
-
-        def root_module_inner_identation
-          IDENT * root_module_components.count
-        end
-
-        def root_module_open
-          root_module_components.each_with_index.map do |component, index|
-            (IDENT * index) + 'module ' + component
-          end.join("\n")
-        end
-
-        def root_module_components
-          root_module.split('::')
-        end
-
-        protected
-
-        def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacTemplates::Directory)
-            template.children.each do |child|
-              apply_to_root_directory(child, subpath.join(child.basename))
-            end
-          elsif template.is_a?(::EacTemplates::File)
-            template.apply_to_file(template_variables, root_directory.join(subpath))
-          else
-            raise "Unknown template object: #{template}"
-          end
-        end
-
-        def dependency_version(gem_name)
-          VersionBuilder.new(gem_name, options).to_s
-        end
-
-        def generate_gemspec
-          template_apply('gemspec', "#{name}.gemspec")
-        end
-
-        def generate_gemfile_lock
-          self_gem.bundle('install').chdir_root.execute!
-        end
-
-        def generate_root_directory
-          root_directory.mkpath
-        end
-
-        def generate_root_lib
-          template_apply('root_lib', "lib/#{lib_path}.rb")
-        end
-
-        def generate_static
-          template.child('static').apply(self, root_directory)
-        end
-
-        def generate_version_lib
-          template_apply('version', "lib/#{lib_path}/version.rb")
-        end
-
-        def run
-          infov 'Root directory', root_directory
-          infov 'Gem name', name
-          JOBS.each do |job|
-            infom "Generating #{job.humanize}..."
-            send("generate_#{job}")
-          end
-        end
-
-        def self_gem_uncached
-          ::Avm::EacRubyBase1::Sources::Base.new(root_directory)
-        end
-
-        def template_apply(from, to)
-          target = root_directory.join(to)
-          target.dirname.mkpath
-          template.child("#{from}.template").apply_to_file(self, target.to_path)
-        end
-
-        class VersionBuilder
-          enable_simple_cache
-          common_constructor :gem_name, :options
-
-          def to_s
-            r = "'~> #{two_segments}'"
-            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
-            r
-          end
-
-          # @return [Gem::Version]
-          def version
-            (options_version || default_version)
-          end
-
-          def two_segments
-            segments.first(2).join('.')
-          end
-
-          def three_segments
-            segments.first(3).join('.')
-          end
-
-          private
-
-          def segments_uncached
-            version.release.to_s.split('.').map(&:to_i)
-          end
-
-          def default_version
-            ::Gem.loaded_specs[gem_name].version
-          end
-
-          def options_version
-            options["#{gem_name}_version".to_sym].if_present do |v|
-              ::Gem::Version.new(v)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/ruby/gems.rb

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

data/lib/avm/ruby.rb

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

data/lib/avm/tools/runner/ruby/gems/generate.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/ruby/gems/generator'
-require 'eac_cli/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Ruby
-        class Gems
-          class Generate
-            runner_with :help do
-              desc 'Create a gem.'
-              arg_opt '--eac-ruby-utils-version', 'Version for "eac_ruby_utils" gem.'
-              arg_opt '--eac-ruby-gem-support-version', 'Version for "eac_ruby_gem_support" gem.'
-              pos_arg :path
-            end
-
-            def run
-              success "Gem \"#{generator.name}\" created in \"#{generator.root_directory}\""
-            end
-
-            private
-
-            def generator_uncached
-              ::Avm::Ruby::Gems::Generator.new(parsed.path, generator_options)
-            end
-
-            def generator_options
-              %w[eac_ruby_utils eac_ruby_gem_support].map do |gem_name|
-                ["#{gem_name}_version".to_sym, parsed.fetch("#{gem_name.variableize}_version")]
-              end.to_h
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/ruby/gems.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Ruby
-        class Gems
-          require_sub __FILE__
-          runner_with :help, :subcommands do
-            desc 'Rubygems utilities for AVM.'
-            subcommands
-          end
-        end
-      end
-    end
-  end
-end

data/template/avm/ruby/gems/generator/gemspec.template

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require '%%LIB_PATH%%/version'
-
-Gem::Specification.new do |s|
-  s.name        = '%%NAME%%'
-  s.version     = %%ROOT_MODULE%%::VERSION
-  s.authors     = ['Put here the authors']
-  s.summary     = 'Put here de description.'
-
-  s.files = Dir['{lib}/**/*']
-
-  s.add_dependency 'eac_ruby_utils', %%EAC_RUBY_UTILS_VERSION%%
-
-  s.add_development_dependency 'eac_ruby_gem_support', %%EAC_RUBY_GEM_SUPPORT_VERSION%%
-end

data/template/avm/ruby/gems/generator/root_lib.template

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-%%ROOT_MODULE_OPEN%%
-%%ROOT_MODULE_INNER_IDENTATION%%require_sub __FILE__
-%%ROOT_MODULE_CLOSE%%

data/template/avm/ruby/gems/generator/static/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec

data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/template/avm/ruby/gems/generator/version.template

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-%%ROOT_MODULE_OPEN%%
-%%ROOT_MODULE_INNER_IDENTATION%%VERSION = '0.0.0'
-%%ROOT_MODULE_CLOSE%%