avm-tools 0.94.1 → 0.97.0

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

@@ -0,0 +1,19 @@
+# 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 InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /In Gemfile:/
+                        .to_parser { |_m| new }
+
+          common_constructor
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/line_factory'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineBuffer
+          class << self
+            def from_file(path)
+              new(::File.read(path.to_s))
+            end
+          end
+
+          attr_reader :gems_in_conflict
+
+          def initialize(content)
+            self.gems_in_conflict = []
+            self.parsing_required = false
+            content.each_line { |string_line| add_line(LineFactory.new(string_line)) }
+          end
+
+          private
+
+          attr_accessor :parsing_required
+          attr_writer :gems_in_conflict
+
+          def add_line(line)
+            return if line.blank?
+
+            return if LineFactory::TYPES.any? do |type|
+              next false unless line.result.is_a?(type)
+
+              send("on_#{type.name.demodulize.underscore.variableize}_line", line.result)
+              true
+            end
+
+            return unless parsing_required
+
+            raise(::ArgumentError, "Unparsed line: \"#{line.content}\"")
+          end
+
+          def on_gem_conflict_line(result)
+            self.parsing_required = true
+            gems_in_conflict << result
+          end
+
+          def on_in_gemfile_line(result)
+            # Do nothing
+          end
+
+          def on_depends_on_line(result)
+            current_gem_conflict.add_depends_on(result)
+          end
+
+          def on_version_requirement_line(result)
+            current_gem_conflict.add_version_requirement(result)
+          end
+
+          def current_gem_conflict
+            raise 'No gems in conflict' if gems_in_conflict.none?
+            raise 'Last gem is blank' if gems_in_conflict.last.blank?
+
+            gems_in_conflict.last
+          end
+        end
+      end
+    end
+  end
+end

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,7 +8,7 @@ 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
@@ -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/_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/{local_project → app_src}/eac_asciidoctor_base0.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class EacAsciidoctorBase0
           require_sub __FILE__
 

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

@@ -7,7 +7,7 @@ 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

@@ -7,7 +7,7 @@ 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

@@ -7,7 +7,7 @@ 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

@@ -7,7 +7,7 @@ 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/{local_project → app_src}/info.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Info < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Ruby
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+          class Bundler
             require_sub __FILE__
-            include ::EacCli::DefaultRunner
-
-            runner_definition do
+            runner_with :help, :subcommands do
               desc 'Ruby\'s bundler utitilies for local projects.'
               subcommands
             end

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

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Ruby
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
-            class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
-              include ::EacCli::DefaultRunner
-
-              runner_definition do
+          class Bundler
+            class GemfileLock
+              runner_with :help do
                 desc 'Manipulage a "Gemfile.lock" file.'
                 bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
                 bool_opt '-i', '--install', 'Run "bundle install".'
@@ -34,7 +31,7 @@ module Avm
               private
 
               def complete?
-                !option_or_all?('--recursive') || !conflict?
+                !option_or_all?(:recursive) || !conflict?
               end
 
               def rebasing?
@@ -51,21 +48,21 @@ module Avm
               end
 
               def bundle_install
-                return unless check_capability(__method__, :ruby_gem, '--install')
+                return unless check_capability(__method__, :ruby_gem, :install)
 
                 infom '"bundle install"...'
                 bundle_run('install')
               end
 
               def bundle_update
-                return unless check_capability(__method__, :ruby_gem, '--update')
+                return unless check_capability(__method__, :ruby_gem, :update)
 
                 infom '"bundle update"...'
                 bundle_run('update')
               end
 
               def git_continue
-                return unless check_capability(__method__, :git_repo, '--continue')
+                return unless check_capability(__method__, :git_repo, :continue)
 
                 infom "Adding \"#{gemfile_lock}\"..."
                 instance.git_repo.command('add', gemfile_lock).execute!
@@ -115,11 +112,11 @@ module Avm
               end
 
               def option_or_all?(option)
-                options.fetch(option) || options.fetch('--all')
+                parsed[option] || parsed.all?
               end
 
               def instance
-                context(:instance)
+                runner_context.call(:instance)
               end
 
               def check_capability(caller, capability, option)