fuelcell 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmY4YWExNmViMzhhMjBkM2Y4MWQ4YzgyYWE3OTBkNzIxMDhiNzU5Yg==
+    OWMyNzZhNWVlZThhNWNhZjI4ZGY2ODNiZTMwMWIwNGJmYzZkYmI3Zg==
   data.tar.gz: !binary |-
-    ZTk4ZDFkYTJiMzc4MmUxNTU4NjQxODQ4ZjcwNTA4MDkxNTc3ZjU3MA==
+    NzZmMjRmYmJhMWM0NmJmNmRmYjA1MGEyYTA3YzRhMzY0NmUyZGRlNg==
 SHA512:
   metadata.gz: !binary |-
-    YWQ0ZWI5MDE5OWQ1YjgxMTI4MDlkZjJiODI3MGZiZDQ4ZjlmM2ZjZmNmMTk2
-    ZDJjNmE2NDdmMzRhM2I1MWYzODZjZDY5MjdhNjBmMWRkODI2NDRhM2I3YTM5
-    ODI0YjBjZGExNzlkMDhhYjdkNGY4M2FlNWM2MDllNmVkYjMwNTg=
+    Y2JkMjBkMGMyOWU3YWE0MTU3NzI2Njk4YjJjNzQ1MGVjODk3ZTc4Y2YwZDI4
+    ZDc2ZjNkNDU5ZDcwZTgyOTQ4NDc0NTc2ZjFiN2M0YjFlNzM5ZDM1YjBhNGEz
+    YWMwYzBhOTA4ZTA5MDM5MzRmZDY3OTEzZjY4ZmU2YjdlMmQ3OGM=
   data.tar.gz: !binary |-
-    YWMyY2EzMmYwYTM0ZjFhM2QxMjE5MDBmOGJmZDRkOTc0MmFiNTNkMTJmNjY0
-    NzRiNGU4Y2JhZTdjMWYwZDI4MWFmYzk2MDNlMzRkNmI3MmM0MDg0NTg3Zjhh
-    YTExODA0MzMxNzYzMDI1ZTNhYjUxZjFjMGJkMDQ0M2Y1ZjAzODU=
+    ODU1MmU2MDg1NTU1ZDMwNGE3NjdkMGMxYWMxY2Q3ZDhhZmNmZjg3NzVhNDNk
+    NGUzMDI1NzAzOTNhNWU2YmQ4NDYwZDc1NGU1M2RkZjFmZDFlMmJjOTdhZTQ3
+    YWIzNDQ2ZTQ1MTdhMmVkNWRlZTBjZTFjYjlhNzBmZjIwMTEzODk=

data/bin/test

@@ -13,8 +13,8 @@ Fuelcell.start(ARGV.dup, backtrace: true)  do
     shell.puts "testing #{args.foo}"
   }
   command 'fiz' do
-    run ->(opts, args, shell) {
-      shell.puts 'called by options'
-    }
+    opt 'blah'
+    desc 'the fiz command'
+
   end
 end

data/bin/world.rb

@@ -1,6 +1,6 @@
 Fuelcell.define 'hello world' do
   desc 'the world is saying hello'
-  run ->(opts, args, shell) {
-    shell.puts 'world hello example'
-  }
+  #run ->(opts, args, shell) {
+  #  shell.puts 'world hello example'
+  #}
 end

data/lib/fuelcell/cli.rb

@@ -40,7 +40,7 @@ module Fuelcell
       cmd      = root.locate(cmd_args, raw_args)
       root.add_global_options(cmd)
       begin
-        parser.call(cmd, raw_args)
+        parser.call(cmd, cmd_args, raw_args)
       rescue Exception => e
         shell.error e.message
         shell.failure_exit
@@ -56,10 +56,14 @@ module Fuelcell
       cmd       = context[:cmd]
       opts      = context[:opts] || {}
       args      = context[:args] || []
+      cmd_args  = context[:cmd_args]
       cli_shell = context[:shell] || shell
 
-      cmd = handle_callable_option(root, cmd)
+      unless cmd.callable?
+        return root['help'].call(opts, cmd_args, shell)
+      end
 
+      cmd = handle_callable_option(root, cmd)
       cmd.call(opts, args, cli_shell)
 
     end

data/lib/fuelcell/help/builder.rb

@@ -3,7 +3,8 @@ module Fuelcell
     class Builder
 
       def call(root, args, help = {})
-        cmd  = args.empty? ? root : root.locate(args.raw)
+        args = args.is_a?(Array) ? args : args.raw
+        cmd  = args.empty? ? root : root.locate(args)
         path = args.join(' ').strip
         build_usage(root.name, path, cmd, help)
         build_options(cmd.opts, help)

data/lib/fuelcell/parser/parsing_strategy.rb

@@ -41,7 +41,7 @@ module Fuelcell
       # @param raw_args [Array] raw args from ARGV
       # @param opts [Hash] stores processed options
       # @return [Array] the process options and processed args
-      def call(cmd, raw_args, opts = Fuelcell::Action::OptResults.new)
+      def call(cmd, cmd_args, raw_args, opts = Fuelcell::Action::OptResults.new)
         ignores = ignore_handler.call(raw_args)
         args = run_option_handlers(cmd, raw_args, opts)
         args = arg_handler.call(cmd, args)
@@ -51,7 +51,7 @@ module Fuelcell
           end
         end
 
-        format_return(cmd, opts, args, ignores)
+        format_return(cmd, opts, cmd_args, args, ignores)
       end
 
       private
@@ -67,8 +67,9 @@ module Fuelcell
         args
       end
 
-      def format_return(cmd, opts, args, ignores)
+      def format_return(cmd, opts, cmd_args, args, ignores)
         {
+          cmd_args: cmd_args,
           cmd: cmd,
           opts: opts,
           args: args,

data/lib/fuelcell/version.rb

@@ -1,3 +1,3 @@
 module Fuelcell
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelcell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Scott-Buccleuch