cl 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459af9c55e8066873b1a97420815bbc9cae92e3c
-  data.tar.gz: b987cc5e208df1187ec06ed7a61533b8b259b153
+  metadata.gz: 9a4e37103d294db33627a373c3d1d19b2113b0a6
+  data.tar.gz: 7733d1f9d8f3ca199fcea0a697e679829e758597
 SHA512:
-  metadata.gz: a1f965ab46d4feea6ce314874bea451b408492fdd44ae235d27104b436221591bb0504c2c9e7e4c3ac2efa78a8e5536f107278c656dd018359f2748c31cd5cd5
-  data.tar.gz: 2f24437e9ff8e604815edc4e091c996096811618f03ebfffd7b401ee77cbb58c8d821dffd4efdcf284eb6424c08701143ff47b1392039b6f35d7307674245f59
+  metadata.gz: bd906f7c16c3ea0fed71806baf8c12b0e78f62ebaa8f61ea398223d51383b22075bbbfa5afa87a95e549469fad46af93e231551cc01d12207379fda5ff4d55d8
+  data.tar.gz: 26459916c941da8486acc6f92e87c89f91f03b37115b83149fb231843738c4eb03968c0c4b27737b8a9b525e0e7f51df6bfe21f989385622bb9bc3e3d8be002b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl (0.1.9)
+    cl (0.1.11)
       regstry (~> 1.0.3)
 
 GEM

data/lib/cl/runner/default.rb

@@ -31,18 +31,21 @@ class Cl
 
       private
 
+        # stopping at any arg that starts with a dash, find the command
+        # with the key matching the most args when joined with ":", and
+        # remove these used args from the array
         def lookup(args)
-          keys = expand(args)
-          keys = keys & Cmd.registry.keys.map(&:to_s)
-          cmd  = Cmd[keys.last] || abort("Unknown command: #{args.join(' ')}")
-          args = args[keys.last.split(':').size..-1]
-          [cmd, args]
-        end
+          keys = args.take_while { |key| !key.start_with?('-') }
 
-        def expand(args)
-          keys = args.take_while { |str| !str.start_with?('-') }
-          args = args[keys.size..-1]
-          keys.inject([]) { |strs, str| strs << [strs.last, str].compact.join(':') }
+          keys = keys.inject([[], []]) do |keys, key|
+            keys[1] << key
+            keys[0] << [Cmd[keys[1].join(':')], keys[1].dup] if Cmd.registered?(keys[1].join(':'))
+            keys
+          end
+
+          cmd, keys = keys[0].last
+          keys.each { |key| args.delete_at(args.index(key)) }
+          [cmd, args]
         end
     end
   end

data/lib/cl/version.rb

@@ -1,3 +1,3 @@
 class Cl
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regstry