eac_cli 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22db6b0edb02623b574dc9545e67dc42ac19d35ec6da4010b0c463c886aacfe3
-  data.tar.gz: 8164b097784d2d63d805de366c830a0313bdd244a4656326ace4c01faa17ac52
+  metadata.gz: 2b936a1bc75006a7969bd549ed89750bf7b09ccebf5d77e35a7b2443ad7175b5
+  data.tar.gz: 812fb927a263d8d6aa74600631db16eb07e626217ec1e81614bdf5f1031d7ef7
 SHA512:
-  metadata.gz: d013970f6550f09e9ff0411326ee6b014b4685c33b7f96ff1c3db2321521114b33746e87bac97fa4f96c779b4efff8f1d420c88b93319998a08c7c10d288342f
-  data.tar.gz: 1d3c695a9c107e69a54062e5e2fa4cd6ebaa9b9e935a6902e185078eb2ff0fbdffb7c6d83e252d892702ec2b6a8c305a55269f1e05d67af0daeadabe9e8fa2bb
+  metadata.gz: 4b2331aa69dd79cf797ab64305f3b088ee012cfe53e71ef0d0f00ec1f84ed2f5bc849e70a9745e17e43d591fc7e02ae9b061870b4d2b27cb93c51385c12780f8
+  data.tar.gz: a62b07e41f454aa85015be5b39a3e427ab41b2afffdacfbf998ce1a261a49bf82c0711e95f7bb42b449fb3b41178dee666124a76eeaeee993c9fe6fdc7a6baf5

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.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,40 +10,77 @@ 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
-      def create(*context_args)
+    module AfterClassMethods
+      def create(*runner_context_args)
         r = new
-        r.context = ::EacCli::Runner::Context.new(*context_args)
+        r.runner_context = ::EacCli::Runner::Context.new(*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
-      def context
-        return @context if @context
+      def runner_context
+        return @runner_context if @runner_context
 
         raise 'Context was required, but was not set yet'
       end
 
-      def context=(new_context)
-        @context = new_context
+      def runner_context=(new_runner_context)
+        @runner_context = new_runner_context
         @parsed = nil
       end
 
       def parsed
-        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition).parse(context.argv)
+        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition).parse(runner_context.argv)
       end
     end
   end

data/lib/eac_cli/runner/context.rb

@@ -9,7 +9,7 @@ module EacCli
 
       def initialize(*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)
       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.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-09-27 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: []