eac_cli 0.5.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f2b4fa3a0e5441a2407d37035549bc8fa73746c2676835f47aeb059d459fda
-  data.tar.gz: 024bdf40c653d7a1a6619641fe25f4df7f9f68ee8d6c87c43c4d24e45298c324
+  metadata.gz: 7d373480947d50978fb88bb6e55a1296d644fcae95eb3b39a7a4127250cf14e2
+  data.tar.gz: 350598588e6cb04bf5fca9cc626f8a1d662167dc5dee9fbc60bd231e2279aa0b
 SHA512:
-  metadata.gz: 0e9eb7198e7d6f9aa2f54d3345ff33102c5cc8e6346da98d0ac957dfc14ea96c3bb3c08d121b94266ddacbc22c2fce28532a485b3867116b5e08f1e1c6ed8f78
-  data.tar.gz: e04c6359213c1596c8b9dc2b1acc64d8f7db6a70a2c19a3e4039034dddeb847e3d11a023997846e6df5d9c18be7dbf9457d4ed2e23b578c7987d00d540c64245
+  metadata.gz: 074cf7d6fe38050884bb0578d1dcd6a7b02bb384d0634bfec15d8d53b03945dc789bf7654aba4a491145e4c9bb8a7366e1a2a799ce00709e0af2940ca97004ba
+  data.tar.gz: 4da66cb205f1e58cb0c4fffb491d0d4e7aa38f7a6eeb7d7d67caa7c0f0e2177e2e98366639de29f9e588fc329c21051334d6696515e1c82711d1b2b8ec6e95b7

data/lib/eac_cli/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/patches'

data/lib/eac_cli/default_runner.rb

@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'eac_cli/runner'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_cli/runner_with/help'
+require 'eac_ruby_utils/core_ext'
 
 module EacCli
   module DefaultRunner
-    extend ::ActiveSupport::Concern
-
-    included do
-      include ::EacCli::Runner
-      include ::EacRubyUtils::Console::Speaker
-      include ::EacRubyUtils::SimpleCache
-      runner_definition.alt do
-        options_arg false
-        bool_opt '-h', '--help', 'Show help.', usage: true
-      end
+    common_concern do
+      include ::EacCli::RunnerWith::Help
+      enable_console_speaker
+      enable_simple_cache
     end
   end
 end

data/lib/eac_cli/docopt/runner_extension.rb

@@ -9,7 +9,6 @@ module EacCli
       extend ::ActiveSupport::Concern
 
       included do
-        singleton_class.prepend ClassMethods
         prepend InstanceMethods
       end
 
@@ -17,15 +16,10 @@ module EacCli
         def check(klass)
           return unless klass < ::EacRubyUtils::Console::DocoptRunner
 
-          klass.include(self)
-        end
-      end
+          ::EacCli::Runner.alias_runner_class_methods(klass, '', 'eac_cli')
+          ::EacCli::Runner.alias_runner_class_methods(klass, 'original', '')
 
-      module ClassMethods
-        def create(*context_args)
-          r = new(*context_args)
-          r.runner_context = ::EacCli::Runner::Context.new(*context_args)
-          r
+          klass.include(self)
         end
       end
 

data/lib/eac_cli/patches.rb

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

data/lib/eac_cli/patches/object.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+  require path
+end

data/lib/eac_cli/patches/object/runner_with.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner'
+require 'eac_cli/runner_with'
+
+class Object
+  def runner_with(*runners)
+    include ::EacCli::Runner
+    enable_simple_cache
+    enable_console_speaker
+    runners.each do |runner|
+      include runner_with_to_module(runner)
+    end
+  end
+
+  private
+
+  def runner_with_to_module(runner)
+    return runner if runner.is_a?(::Module)
+
+    "EacCli::RunnerWith::#{runner.to_s.camelize}".constantize
+  end
+end

data/lib/eac_cli/runner.rb

@@ -10,24 +10,61 @@ module EacCli
     require_sub __FILE__
     extend ::ActiveSupport::Concern
 
+    class << self
+      def alias_runner_class_methods(klass, from_suffix, to_suffix)
+        %i[create run].each do |method|
+          alias_class_method(klass, build_method_name(method, from_suffix),
+                             build_method_name(method, to_suffix))
+        end
+      end
+
+      private
+
+      def alias_class_method(klass, from, to)
+        sklass = klass.singleton_class
+        return unless sklass.method_defined?(from)
+
+        sklass.alias_method to, from
+      end
+
+      def build_method_name(name, suffix)
+        ss = suffix.if_present('') { |s| "#{s}_" }
+        "#{ss}#{name}"
+      end
+    end
+
+    the_module = self
     included do
-      extend ClassMethods
+      the_module.alias_runner_class_methods(self, '', 'original')
+
+      extend AfterClassMethods
       include InstanceMethods
       ::EacCli::Docopt::RunnerExtension.check(self)
     end
 
-    module ClassMethods
+    module AfterClassMethods
       def create(*runner_context_args)
         r = new
-        r.runner_context = ::EacCli::Runner::Context.new(*runner_context_args)
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
+        r
+      end
+
+      def run(*runner_context_args)
+        r = create(*runner_context_args)
+        r.parsed
+        r.run
         r
       end
 
       def runner_definition(&block)
-        @runner_definition ||= ::EacCli::Definition.new
+        @runner_definition ||= super_runner_definition
         @runner_definition.instance_eval(&block) if block
         @runner_definition
       end
+
+      def super_runner_definition
+        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
+      end
     end
 
     module InstanceMethods

data/lib/eac_cli/runner/context.rb

@@ -5,13 +5,30 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module Runner
     class Context
-      attr_reader :argv, :parent, :program_name
+      attr_reader :argv, :parent, :program_name, :runner
 
-      def initialize(*context_args)
+      def initialize(runner, *context_args)
         options = context_args.extract_options!
-        @argv = (context_args[0] || options.delete(:argv)).freeze
+        @argv = (context_args[0] || options.delete(:argv) || ARGV).dup.freeze
         @parent = context_args[1] || options.delete(:parent)
         @program_name = options.delete(:program_name)
+        @runner = runner
+      end
+
+      # Call a method in the runner or in one of it ancestors.
+      def call(method_name, *args)
+        return runner.send(method_name, *args) if runner.respond_to?(method_name)
+        return parent_call(method_name, *args) if parent.present?
+
+        raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+      end
+
+      protected
+
+      def parent_call(method_name, *args)
+        return parent.context(method_name, *args) if parent.respond_to?(:context)
+
+        parent.runner_context.call(method_name, *args)
       end
     end
   end

data/lib/eac_cli/runner_with.rb

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

data/lib/eac_cli/runner_with/help.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      common_concern do
+        include ::EacCli::Runner
+
+        runner_definition.alt do
+          options_arg false
+          bool_opt '-h', '--help', 'Show help.', usage: true
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/output_file.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module OutputFile
+      common_concern do
+        include ::EacCli::Runner
+
+        runner_definition do
+          arg_opt '-o', '--output-file', 'Output to file.'
+        end
+      end
+
+      def run_output
+        if parsed.output_file.present?
+          ::File.write(parsed.output_file, output_content)
+        else
+          out output_content
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.5.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -52,6 +52,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - lib/eac_cli.rb
+- lib/eac_cli/core_ext.rb
 - lib/eac_cli/default_runner.rb
 - lib/eac_cli/definition.rb
 - lib/eac_cli/definition/argument_option.rb
@@ -66,8 +67,14 @@ files:
 - lib/eac_cli/parser/options_collection.rb
 - lib/eac_cli/parser/parse_result.rb
 - lib/eac_cli/parser/positional_collection.rb
+- lib/eac_cli/patches.rb
+- lib/eac_cli/patches/object.rb
+- lib/eac_cli/patches/object/runner_with.rb
 - lib/eac_cli/runner.rb
 - lib/eac_cli/runner/context.rb
+- lib/eac_cli/runner_with.rb
+- lib/eac_cli/runner_with/help.rb
+- lib/eac_cli/runner_with/output_file.rb
 - lib/eac_cli/version.rb
 homepage: 
 licenses: []