avm-tools 0.94.3 → 0.99.0

data/lib/avm/ruby/bundler/incompatible_parser/line_factory.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/depends_on'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/in_gemfile'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineFactory
+          TYPES = [GemConflict, InGemfile, DependsOn, VersionRequirement].freeze
+
+          enable_simple_cache
+          common_constructor :content do
+            self.content = content.strip
+          end
+
+          delegate :blank?, to: :content
+
+          private
+
+          def result_uncached
+            TYPES.lazy.map { |type| type.parse(content) }.find(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/line_parser_base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineParserBase
+          class << self
+            def parse(line_content)
+              const_get('LINE_PARSER').parse(line_content)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/version_requirement.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class VersionRequirement < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\A([a-z][a-z_0-9]*)(?: \((.+)\))?\z/
+                        .to_parser { |m| new(m[1], m[2]) }
+
+          enable_simple_cache
+          attr_accessor :stack
+
+          common_constructor :gem_name, :requirements_source
+
+          def data
+            { requirements_source: requirements_source, stack: stack.map(&:data) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,10 +8,10 @@ module Avm
     module Gems
       class Generator
         IDENT = '  '
-        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock rspec].freeze
+        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
         common_constructor :root_directory, :options, default: [{}] do
           self.root_directory = root_directory.to_pathname
@@ -61,11 +61,11 @@ module Avm
         protected
 
         def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacRubyUtils::Templates::Directory)
+          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?(::EacRubyUtils::Templates::File)
+          elsif template.is_a?(::EacTemplates::File)
             template.apply_to_file(template_variables, root_directory.join(subpath))
           else
             raise "Unknown template object: #{template}"
@@ -92,10 +92,6 @@ module Avm
           template_apply('root_lib', "lib/#{lib_path}.rb")
         end
 
-        def generate_rspec
-          self_gem.bundle('exec', 'rspec').chdir_root.execute!
-        end
-
         def generate_static
           template.child('static').apply(self, root_directory)
         end

data/lib/avm/ruby/rubocop.rb

@@ -7,7 +7,7 @@ module Avm
   module Ruby
     class Rubocop
       require_sub __FILE__
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :base_path, :rubocop_args
       set_callback :initialize, :after do

data/lib/avm/ruby/rubocop/_configured.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/configuration'
+require 'avm/apps/sources/configuration'
 
 module Avm
   module Ruby
@@ -22,7 +22,7 @@ module Avm
       private
 
       def configuration_uncached
-        ::Avm::Instances::Configuration.find_by_path(base_path)
+        ::Avm::Apps::Sources::Configuration.find_by_path(base_path)
       end
     end
   end

data/lib/avm/tools/runner/{local_project.rb → app_src.rb}

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/local_projects/instance'
+require 'avm/app_src'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         require_sub __FILE__
         runner_with :help, :subcommands do
           desc 'Utilities for local projects.'
@@ -22,7 +22,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::LocalProjects::Instance.new(instance_path)
+          ::Avm::AppSrc.new(instance_path)
         end
 
         def instance_path_uncached

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/sources/runner'
+
+module Avm
+  module Tools
+    class Runner
+      class AppSrc
+        class EacAsciidoctorBase0 < ::Avm::EacAsciidoctorBase0::Sources::Runner
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/{local_project → app_src}/eac_asciidoctor_base0/build.rb

@@ -1,37 +1,49 @@
 # frozen_string_literal: true
 
-require 'avm/eac_asciidoctor_base0/build'
-require 'avm/eac_asciidoctor_base0/project'
-require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/core_ext'
+require 'avm/eac_asciidoctor_base0/sources/build'
+require 'os'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacAsciidoctorBase0
           class Build
             runner_with :help do
               desc 'Build the project'
               arg_opt '-d', '--target-dir', 'Directory to build'
+              bool_opt '--open', 'Show the result.'
             end
 
             def run
               start_banner
               build.run
+              open
             end
 
             private
 
             def build_uncached
-              ::Avm::EacAsciidoctorBase0::Build.new(runner_context.call(:project),
-                                                    target_directory: parsed.target_dir)
+              ::Avm::EacAsciidoctorBase0::Sources::Build.new(runner_context.call(:project),
+                                                             target_directory: parsed.target_dir)
             end
 
             def default_target_directory
               runner_context.call(:project).root.join('build')
             end
 
+            def open
+              return unless parsed.open?
+
+              infom "Opening \"#{open_path}\"..."
+              ::EacRubyUtils::Envs.local.command(OS.open_file_command, open_path).system!
+            end
+
+            def open_path
+              build.source_files.first.target_path
+            end
+
             def start_banner
               runner_context.call(:project_banner)
               infov 'Target directory', build.target_directory

data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0.rb

@@ -2,12 +2,11 @@
 
 require 'avm/eac_writings_base0/project'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacWritingsBase0
           require_sub __FILE__
           enable_simple_cache

data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/build_chapters.rb

@@ -2,12 +2,11 @@
 
 require 'avm/eac_writings_base0/project_build'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacWritingsBase0
           class BuildChapters
             runner_with :help do

data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/build_single.rb

@@ -2,12 +2,11 @@
 
 require 'avm/eac_writings_base0/project_build'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacWritingsBase0
           class BuildSingle
             runner_with :help do

data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/info.rb

@@ -2,12 +2,11 @@
 
 require 'avm/eac_writings_base0/project_build'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacWritingsBase0
           class Info
             runner_with :help do

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class AppSrc
+        class Info
+          runner_with :help do
+            desc 'Show information about local project instance.'
+          end
+
+          def run
+            infov 'Path', runner_context.call(:instance).path
+            infov 'Stereotypes', runner_context.call(:instance).stereotypes.map(&:label).join(', ')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/{local_project → app_src}/ruby.rb

@@ -6,7 +6,7 @@ require 'eac_cli/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Ruby
           require_sub __FILE__
           runner_with :help, :subcommands do

data/lib/avm/tools/runner/{local_project → app_src}/ruby/bundler.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_base0/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Ruby
           class Bundler
             require_sub __FILE__

data/lib/avm/tools/runner/{local_project → app_src}/ruby/bundler/gemfile_lock.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_base0/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Ruby
           class Bundler
             class GemfileLock

data/lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'avm/fs_cache'
+require 'avm/ruby/bundler/incompatible_parser'
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class AppSrc
+        class Ruby
+          class Bundler
+            class Incompatible
+              runner_with :help do
+                desc 'Identify incompatible gems in a "Gemfile.lock" file.'
+                bool_opt '-l', '--last', 'Process the last \"bundle update\" result.'
+              end
+
+              def run
+                infov 'Cache path', fs_cache.content_path
+                infov 'Cached?', fs_cache.cached?
+                parser.gems_in_conflict.each do |gem_in_conflict|
+                  print_gem_in_conflict(gem_in_conflict)
+                end
+              end
+
+              private
+
+              def bundle_update
+                infom 'Running "bundle update"...'
+                instance.ruby_gem.bundle('update').execute[:stdout]
+              end
+
+              def content_path
+                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.content_path
+              end
+
+              def fs_cache_uncached
+                ::Avm.fs_cache.child(self.class.name.variableize)
+                     .child(instance.path.to_s.variableize)
+              end
+
+              def gem_title(gem_in_conflict)
+                gem_in_conflict.gem_name
+              end
+
+              def instance
+                runner_context.call(:instance)
+              end
+
+              def parser_uncached
+                ::Avm::Ruby::Bundler::IncompatibleParser.new(content_path)
+              end
+
+              def print_gem_in_conflict(gem_in_conflict)
+                infov 'Gem', gem_title(gem_in_conflict)
+                gem_in_conflict.versions_requirements.each do |requirement|
+                  print_requirement(requirement)
+                end
+              end
+
+              def print_requirement(req)
+                infov '  ' + requirement_title(req), requirement_value(req)
+              end
+
+              def requirement_stack(req)
+                req.stack.map { |d| "#{d.gem_name} (#{d.version})" }.join(' > '.green)
+              end
+
+              def requirement_title(req)
+                req.requirements_source.if_present('*')
+              end
+
+              def requirement_value(req)
+                requirement_stack(req)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/{local_project → app_src}/test.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
-        class Test < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+      class AppSrc
+        class Test
+          runner_with :help do
             desc 'Test local project.'
           end
 
           def run
-            context(:instance_banner)
+            runner_context.call(:instance_banner)
             infov 'Test command', test_command
             if test_command.present?
               test_command.system!
@@ -25,7 +22,7 @@ module Avm
           end
 
           def test_command
-            context(:instance).configuration.if_present(&:any_test_command)
+            runner_context.call(:instance).configuration.if_present(&:any_test_command)
           end
         end
       end