eco-helpers 0.8.3 → 0.8.4

data/lib/eco/cli/scripting/argument.rb

@@ -0,0 +1,31 @@
+module Eco
+  class CLI
+    class Scripting
+      class Argument
+
+        attr_reader :key
+
+        def initialize(key, with_param: false)
+          @key        = key
+          @with_param = !!with_param
+        end
+
+        def args_slice(*args)
+          #pp "known arg '#{key}' => included? #{args.include?(key)}"
+          return args unless args.include?(key)
+          i = args.index(key)
+          j = with_param?? i+1 : i
+          args - args.slice(i..j)
+        end
+
+        def with_param!
+          @with_param = true
+        end
+
+        def with_param?
+          @with_param
+        end
+      end
+    end
+  end
+end

data/lib/eco/cli/scripting/arguments.rb

@@ -0,0 +1,70 @@
+module Eco
+  class CLI
+    class Scripting
+      class Arguments
+        include Enumerable
+
+        attr_reader :args
+
+        def initialize(args = ARGV)
+          @args  = args
+          @known = {}
+        end
+
+        def each(params: {}, &block)
+          return to_enum(:each) unless block
+          @known.values.each(&block)
+        end
+
+        def add(key, with_param: false)
+          self << Argument.new(key, with_param: with_param)
+        end
+
+        def <<(arg)
+          raise "Expected Argument. Given #{arg.class}" unless arg.is_a?(Argument)
+          if karg = @known[arg.key]
+            #puts "Found already existent option #{arg.key} (with_param: arg.with_param?)"
+            karg.with_param! if arg.with_param?
+          else
+            #puts "Adding unexistent option #{arg.key}"
+            @known[arg.key] = arg
+          end
+          self
+        end
+
+        def known?(value)
+          @known.key?(to_key(value))
+        end
+
+        def keys
+          @known.keys
+        end
+
+        def unknown(exclude: [])
+          reduce(args.dup - exclude) do |not_known, arg|
+            arg.args_slice(*not_known)
+          end
+        end
+
+        def any_unkown?(exclude: [])
+          unknown(exclude: exclude).length > 0
+        end
+
+        private
+
+        def to_key(value)
+          case value
+          when String
+            value
+          when Argument
+            value.key
+          else
+            "Missuse: only able to transform to key a String or an Argument. Given #{value.class}"
+          end
+        end
+
+
+      end
+    end
+  end
+end

data/lib/eco/common.rb

@@ -3,6 +3,4 @@ module Eco
   end
 end
 
-require_relative 'common/meta_thor'
-require_relative 'common/base_cli'
-require_relative 'common/language'
+#require_relative 'common/'

data/lib/eco/data/crypto/encryption.rb

@@ -3,12 +3,12 @@ require 'json'
 require 'base64'
 require 'pp'
 
-require_relative '../../scripting'
+require_relative '../../cli/scripting'
 
 # see some ramblings here: http://distributed-frostbite.blogspot.com/2010/06/file-encryption-in-ruby-with-openssl.html
 
 def run! # this will run only if called from command line (not when require'd nor load'd)
-  include Eco::Scripting
+  include Eco::CLI::Scripting
   include Eco::Data::Crypto
   # script arguments
   keygen = get_arg("-keygen")

data/lib/eco/language/models/collection.rb

@@ -37,7 +37,7 @@ module Eco
 
         #attr_reader :items
 
-        def initialize(data = [], klass:, factory: nil, handy: Eco::Common::Language.new)
+        def initialize(data = [], klass:, factory: nil, handy: Eco::Assets::Language.new)
           raise "Raise klass required, given: #{klass}" if !klass
           @klass   = klass
           @factory = factory

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Oscar Segura
@@ -118,46 +118,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +259,7 @@ files:
 - lib/eco/api/common/session/mailer.rb
 - lib/eco/api/common/session/s3_uploader.rb
 - lib/eco/api/common/version_patches.rb
+- lib/eco/api/common/version_patches/base_model.rb
 - lib/eco/api/common/version_patches/external_person.rb
 - lib/eco/api/common/version_patches/internal_person.rb
 - lib/eco/api/eco_faker.rb
@@ -361,24 +322,15 @@ files:
 - lib/eco/api/usecases/use_case_io.rb
 - lib/eco/api/usecases/use_group.rb
 - lib/eco/assets.rb
+- lib/eco/assets/language.rb
 - lib/eco/cli.rb
-- lib/eco/cli/api.rb
-- lib/eco/cli/root.rb
-- lib/eco/cli/session.rb
-- lib/eco/cli/session/batch.rb
+- lib/eco/cli/config.rb
+- lib/eco/cli/config/options.rb
+- lib/eco/cli/scripting.rb
+- lib/eco/cli/scripting/args_helpers.rb
+- lib/eco/cli/scripting/argument.rb
+- lib/eco/cli/scripting/arguments.rb
 - lib/eco/common.rb
-- lib/eco/common/base_cli.rb
-- lib/eco/common/base_cli_backup.rb
-- lib/eco/common/language.rb
-- lib/eco/common/meta_thor.rb
-- lib/eco/common/meta_thor/command_group.rb
-- lib/eco/common/meta_thor/command_unit.rb
-- lib/eco/common/meta_thor/input_backup.rb
-- lib/eco/common/meta_thor/input_multi_backup.rb
-- lib/eco/common/meta_thor/pipe.rb
-- lib/eco/common/meta_thor/thor.rb
-- lib/eco/common/meta_thor/thor/command.rb
-- lib/eco/common/meta_thor/value.rb
 - lib/eco/data.rb
 - lib/eco/data/crypto.rb
 - lib/eco/data/crypto/encryption.rb
@@ -403,11 +355,6 @@ files:
 - lib/eco/language/models/parser_serializer.rb
 - lib/eco/language/models/wrap.rb
 - lib/eco/language/values_at.rb
-- lib/eco/scripting.rb
-- lib/eco/scripting/README.md
-- lib/eco/scripting/args_helpers.rb
-- lib/eco/scripting/argument.rb
-- lib/eco/scripting/arguments.rb
 - lib/eco/tester.rb
 - lib/eco/version.rb
 homepage: https://www.ecoportal.com

data/lib/eco/cli/api.rb

@@ -1,14 +0,0 @@
-module Eco
-  module CLI
-    class API < Eco::Common::BaseCLI
-      class_option :csv_in, :type  => :string, :banner => "FILE", :desc => "CSV input file"
-      class_option :csv_out, :type => :string, :banner => "FILE", :desc => "CSV output file"
-      class_option :json_in, :type  => :string, :banner => "FILE", :desc => "CSV input file"
-      class_option :json_out, :type  => :string, :banner => "FILE", :desc => "CSV input file"
-      
-      class_option :config_file, :aliases => "o", :type => :string,
-        :banner => "FILE", :desc => "specifes the session configuration file"
-      #class_option :csv_in, :alisaes =>
-    end
-  end
-end

data/lib/eco/cli/root.rb

@@ -1,9 +0,0 @@
-module Eco
-  module CLI
-    class Root < Eco::Common::BaseCLI
-      class_option :config_file, :aliases => "o", :type => :string,
-        :banner => "FILE", :desc => "specifes the session configuration file"
-      #class_option :csv_in, :alisaes =>
-    end
-  end
-end

data/lib/eco/cli/session.rb

@@ -1,9 +0,0 @@
-module Eco
-  module CLI
-    class Session < Eco::Common::BaseCLI
-
-    end
-  end
-end
-
-require_relative 'session/batch'

data/lib/eco/cli/session/batch.rb

@@ -1,9 +0,0 @@
-module Eco
-  module CLI
-    class Session
-      class Batch < Eco::Common::BaseCLI
-
-      end
-    end
-  end
-end

data/lib/eco/common/base_cli.rb

@@ -1,23 +0,0 @@
-module Eco
-  module Common
-    class BaseCLI < MetaThor
-      CUSTOM_HELP_MAPPINGS = ["?", "help"]
-      ALL_HELP_MAPPINGS = Thor::HELP_MAPPINGS + CUSTOM_HELP_MAPPINGS
-
-      class_option :simulate, type: :boolean, aliases: :s, desc: "do not launch updates or rewrite files"
-      #class_option :verbosity, type: :numeric, default: 0, desc: "defines the level of verbosity to show feedback"
-
-      class << self
-        def start(given_args = ARGV, config = {})
-          super(given_args, config)
-        end
-      end
-      
-      protected
-
-      no_commands do
-      end
-
-    end
-  end
-end

data/lib/eco/common/base_cli_backup.rb

@@ -1,120 +0,0 @@
-require 'thor'
-
-module Eco
-  module Common
-    class BaseCLI < MethaThor
-      PIPE = "!"
-      CUSTOM_HELP_MAPPINGS = ["?", "help"]
-      ALL_HELP_MAPPINGS = Thor::HELP_MAPPINGS + CUSTOM_HELP_MAPPINGS
-
-      class_option :simulate, type: :boolean, aliases: :s, desc: "do not launch updates or rewrite files"
-      class_option :verbosity, type: :numeric, default: 0, desc: "defines the level of verbosity to show feedback"
-
-      class_option :input, type: :hash, default: {json: nil}, required: false, desc: "--input=json:STRING"
-      class_option :pipe, type: :boolean, default: false, required: false, desc: "--pipe subcommand"
-
-      def self.start(given_args = ARGV, config = {})
-        #given_args = splat_namespaces(given_args)
-        given_args = BaseCLI.parse_help(given_args)
-        super(given_args, config)
-      end
-
-      # incompatible with options / arguments of Hash type
-      # see: parse_hash here: https://github.com/erikhuda/thor/blob/master/lib/thor/parser/arguments.rb
-      def self.splat_namespaces(args)
-        args.reduce([]) do |done, arg|
-          done.concat(arg.split(":"))
-        end
-      end
-
-      def self.parse_help(args)
-        # Help enhancement. Adapted from: https://stackoverflow.com/a/49044225/4352306
-        last = args.last
-        if args.length > 1 && help?(last)
-          # switch last and second last position
-          last = "help" if custom_help?(last)
-          args.insert(args.length - 2, last).pop
-          puts "> #{args.join(" ")}"
-        end
-        args
-      end
-
-      def self.help?(value)
-        case value
-        when String
-          ALL_HELP_MAPPINGS.include?(value)
-        when Symbol
-          help?(value.to_s)
-        when Array
-          value.any? { |v| help?(v) }
-        when Hash
-          value.keys.any { |k| help?(v) }
-        end
-      end
-
-      def self.custom_help?(value)
-        CUSTOM_HELP_MAPPINGS.include?(value)
-      end
-
-      protected
-
-      no_commands do
-        def input?(options)
-          if options
-            options.key?("input") || options.key?(:input) ||
-            options.key?("json") ||  options.key?(:json)
-          end
-        end
-
-        def input_object(input)
-          Eco::CLI::Input.new(input)
-        end
-
-        def input(value)
-          case
-          when value.is_a?(Eco::CLI::Input)
-            value.value
-          when value.is_a?(Eco::CLI::MultiInput)
-            value.to_h
-          when value.is_a?(String)
-            input(JSON.parse(value))
-          when value&.key?("input")
-            input(value["input"])
-          when value&.key?(:input)
-            input(value[:input])
-          when value&.key?("json")
-            JSON.parse(value["json"])
-          when value&.key?(:json)
-            JSON.parse(value[:json])
-          end
-        end
-
-        def pipe(input, args)
-          command, args, piped = parse_pipe(args)
-          invoke command, args, {input: input_object(input)} if piped
-          piped
-        end
-
-        def parse_pipe(args)
-          args.shift if piped = (args.first == PIPE)
-          subcommand = ""
-          if piped
-            raise "Error: bad usage of pipe ('#{PIPE}'). Expected: '#{PIPE} command' " unless subcommand = args.slice!(0)
-            if help?(subcommand)
-              # Idea adapted from: https://stackoverflow.com/a/46167300/4352306
-              self.class.command_help(Thor::Base.shell.new, args.first)
-              exit
-            end
-          end
-          [subcommand, args, piped]
-        end
-
-        def help?(value)
-          BaseCLI.help?(value)
-        end
-
-      end
-
-    end
-  end
-end