eco-helpers 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c5373e513f2c43cd593684e28011ce9b0646a4457e19c31a5590f5cac0d743
-  data.tar.gz: d1985d695d0a8c390593a76f6cc65dbf8ebcbb584f6b1e6fd0032706be6c4299
+  metadata.gz: e4f70377026306ed8ee7e6bb8629bb765b92ea310b41a75dddb586cc398d5f5b
+  data.tar.gz: 2a25b0c4114c3b68943308e7475989a93cf8055ac59f9ff0e00173b02f2b3386
 SHA512:
-  metadata.gz: 4101d84e2d20cdc95459277316177570af81d1fd9ef38aadba6f41d7df424a093d12619efaf4a811cc2374cb812235f86a3602ebf18b26ef8d33cfe469d5c89b
-  data.tar.gz: 25b6df7e98d964fb7b53685fa98f31eb0983138b8a3754404d5dd5704669adf69fee0bbe91162eca35234b0fcf5b6af09b3d053c995e9470371b2d880758d2f9
+  metadata.gz: 62c5f462a9121215a5a7d45a084084b088c314544cba21dabeb0e15a4c386288b6b136a3c7bc7436f9974d84a5c3418df93803409d6637f17dde0bac8024ae27
+  data.tar.gz: 3e16c7ed28eeb72da9783cbbda1c4e44c3452aee7ee0eeb1c41855189f0d53f1d96dcf3caf68fc3e9eeefbd42ee9c5c63c84ee51e8b0c8e9e6c50d9d9bdcc8cb

data/lib/eco/api/session.rb

@@ -141,7 +141,9 @@ module Eco
       end
 
       def entries(*args)
-        @entry_factory.entries(*args)
+        @entry_factory.entries(*args).tap do |collection|
+          logger.info("Loaded #{collection.length} input entries.")
+        end
       end
 
       def export(*args)

data/lib/eco/api/usecases/default_cases/change_email_case.rb

@@ -10,7 +10,7 @@ module Eco
               change = session.job_group("main").new("change email", type: :update, sets: :core)
               add_account = session.job_group("post").new("add account", type: :update, sets: :account)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/create_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("create", type: :sync) do |entries, people, session, options|
               creation = session.job_group("main").new("create", type: :create, sets: [:core, :details, :account])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs = session.policy_groups
 
               entries.each.with_index do |entry, i|
@@ -25,7 +25,7 @@ module Eco
                     ini_tags   = person.account&.filter_tags || []
                     entry.set_account(person)
 
-                    person.account.send_invites = false if options.key?(:send_invites) && !options(:send_invites)
+                    person.account&.send_invites = options[:send_invites] if options.key?(:send_invites)
 
                     person.account.policy_group_ids   = pgs.user_pg_ids(
                       initial:         ini_pg_ids,

data/lib/eco/api/usecases/default_cases/create_details_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("create-details", type: :sync) do |entries, people, session, options|
               creation = session.job_group("main").new("create", type: :create, sets: [:core, :details])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/create_details_with_supervisor_case.rb

@@ -10,7 +10,7 @@ module Eco
               creation = session.job_group("main").new("create", type: :create, sets: [:core, :details])
               supers   = session.job_group("post").new("supers", type: :update, sets: :core)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/hris_case.rb

@@ -24,7 +24,7 @@ module Eco
               #  end
               #end
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/new_email_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("new-email", type: :sync) do |entries, people, session, options|
               job = session.job_group("main").new("update", type: :update, sets: :core)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/new_id_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("new-id", type: :sync) do |entries, people, session, options|
               job = session.job_group("main").new("update", type: :update, sets: :core)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/recover_db_case.rb

@@ -14,7 +14,7 @@ module Eco
               update   = session.job_group("main").new("update", type: :update, sets: [:core, :details, :account])
               remove   = session.job_group("main").new("remove", type: :delete, sets: [:core, :details, :account])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs = session.policy_groups
 
               if options.dig(:include, :delete)

data/lib/eco/api/usecases/default_cases/remove_account_case.rb

@@ -17,7 +17,7 @@ module Eco
             @cases.define("remove-account", type: :sync) do |entries, people, session, options|
               update = session.job_group("main").new("update", type: :update, sets: [:core, :account])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/set_supervisor_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("set-supervisor", type: :sync) do |entries, people, session, options|
               job = session.job_group("main").new("update", type: :update, sets: :core)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/update_case.rb

@@ -18,7 +18,7 @@ module Eco
             @cases.define("update", type: :sync) do |entries, people, session, options|
               update   = session.job_group("main").new("update", type: :update, sets: [:core, :details, :account])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs = session.policy_groups
 
               entries.each.with_index do |entry, i|

data/lib/eco/api/usecases/default_cases/update_details_case.rb

@@ -8,7 +8,7 @@ module Eco
             @cases.define("update-details", type: :sync) do |entries, people, session, options|
               job = session.job_group("main").new("update", type: :update, sets: [:core, :details])
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)

data/lib/eco/api/usecases/default_cases/upsert_case.rb

@@ -10,7 +10,7 @@ module Eco
               update   = session.job_group("main").new("update", type: :update, sets: [:core, :details, :account])
               supers   = session.job_group("post").new("supers", type: :update, sets: :core)
 
-              strict_search = session.config.people.strict_search? || options.dig(:search, :strict)
+              strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs = session.policy_groups
 
               entries.each.with_index do |entry, i|

data/lib/eco/scripting.rb

@@ -1,9 +1,11 @@
-require_relative './scripting/arguments'
+require_relative 'scripting/args_helpers'
+require_relative 'scripting/argument'
+require_relative 'scripting/arguments'
 
 module Eco
   #TODO integrate Thor to build the CLI from bottom to top on load
   class Scripting
-    include Scripting::Lib
+    include Scripting::ArgsHelpers
 
     def args_contain?(*values)
       match?(ARGV, patterns, [:any, :or, :insensitive, :pattern])

data/lib/eco/scripting/args_helpers.rb

@@ -0,0 +1,53 @@
+module Eco
+  class Scripting
+    module ArgsHelpers
+
+      def is_modifier?(value)
+       value&.start_with?("-")
+      end
+
+      def arguments
+        @arguments ||= Arguments.new
+      end
+
+      def stop_on_unknown!(exclude: [])
+        if arguments.any_unkown?(exclude: exclude)
+          raise "There are unkown options in your command line arguments: #{arguments.unknown(exclude: exclude)}"
+        end
+      end
+
+      def get_arg(key, with_param: false, valid: true)
+        # track what a known option looks like
+        arguments.add(key, with_param: with_param)
+        return nil if !ARGV.include?(key)
+        value = true
+        if with_param
+          next_i = ARGV.index(key) + 1
+          value = ARGV[next_i]
+          #puts "modifier argument: #{value}"
+          value = nil if valid && is_modifier?(value)
+        end
+        return value
+      end
+
+      def get_file(key, required: false, should_exist: true)
+        filename = get_arg(key, with_param: true)
+        if !filename
+            if required
+              puts "you need to specify a file '#{key} file'"
+              exit
+            end
+        elsif  !(File.exists?(filename) || File.exists?(File.expand_path(filename)))
+          if should_exist && required
+            puts "file doesn't exist #{filename}"
+            exit
+          end
+        end
+
+        filename = File.expand_path(filename) if filename && should_exist
+        filename
+      end
+
+    end
+  end
+end

data/lib/eco/scripting/argument.rb

@@ -0,0 +1,29 @@
+module Eco
+  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

data/lib/eco/scripting/arguments.rb

@@ -1,40 +1,68 @@
 module Eco
   class Scripting
-    module Lib
-      def is_modifier?(value)
-       value&.start_with?("-")
-      end
-
-      def get_arg(key, with_param: false, valid: true)
-       return nil if !ARGV.include?(key)
-       value = true
-       if with_param
-         next_i = ARGV.index(key) + 1
-         value = ARGV[next_i]
-         #puts "modifier argument: #{value}"
-         value = nil if valid && is_modifier?(value)
-       end
-       return value
-      end
-
-      def get_file(key, required: false, should_exist: true)
-        filename = get_arg(key, with_param: true)
-        if !filename
-            if required
-              puts "you need to specify a file '#{key} file'"
-              exit
-            end
-        elsif  !(File.exists?(filename) || File.exists?(File.expand_path(filename)))
-          if should_exist && required
-            puts "file doesn't exist #{filename}"
-            exit
-          end
+    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
 
-        filename = File.expand_path(filename) if filename && should_exist
-        filename
+      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

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Oscar Segura
@@ -405,6 +405,8 @@ files:
 - 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