command_lion 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: beaa5906f988698d781674ec71e8502ff7760253
-  data.tar.gz: a0fef1faff79cc5b0f42cb14d8ad3e4045831baa
+SHA256:
+  metadata.gz: 7831b7dfa26eb6ba19e07b982ec5fa0b32f1340935148718820fa2ba07e719be
+  data.tar.gz: 965035c76c95b12680ca63b9ff36c58a7e46d23869246ef02d97c2770d7f865b
 SHA512:
-  metadata.gz: c6821dad4514df831728f9601613a01c5df02a4b6d54b1d7a5cd90347afa1aeed5b667e7f0eb1a4223db1fcf71485724afa99d4bdb035ae35b07fdac4a684073
-  data.tar.gz: d64ee8e37b1c47c709e49e8f2ff099d776b6607633cc0aa48f2759eb7d9e53895c1f8c8cf37a5531c684698940eb578daa04af416e2941f3f0ab0e61e129cee0
+  metadata.gz: 1bdd309f3238c084d791969dedc0248792835ed84ec247bdb7c166b26ec1a07d59245f864edc1404f1300e65c059affd8034c6efb12e95f2e88cbcfb2c517e13
+  data.tar.gz: 4942b2bea29cf5663ea59330ada573370cea73dbcbc2d113087726c0df82a1a68f47982e9402c7e4d0c02a6161f569d3c52b139cef4ccef6428b592d041f48c8

data/examples/ctrl_c.rb

@@ -0,0 +1,18 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'command_lion'
+require 'pry'
+
+CommandLion::App.run do
+  name "Example"
+   
+  ctrl_c do
+    puts "Exiting!"
+    exit 0
+  end
+
+  command :example do
+    action do
+      loop { puts "CTL+C to exit!"; sleep 1 }
+    end
+  end
+end

data/examples/debug.rb

@@ -2,4 +2,35 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'command_lion'
 require 'pry'
 
+
+cmd = CommandLion.command.new do
+  description "This is an example command for debugging!"
+  flags do
+    short "-e"
+    long  "--example"
+  end
+
+  before do
+    puts "Before"
+  end
+
+  action do
+    puts "Action"
+  end
+
+  after do
+    puts "After"
+  end
+
+  option :rainbow do
+    flags do
+      short "-r"
+      long  "--rainbow"
+    end
+    action do
+      require 'lolize/auto'
+    end
+  end
+end
+
 binding.pry

data/examples/error.rb

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'command_lion'
+require 'pry'
+
+CommandLion::App.run do
+  name "Hello World"
+
+  command :hello_world do
+    flag "--hello-world"
+    action do
+      puts "Hello World!"
+    end
+    option :example do
+      flag "--example"
+      action do
+        puts "Example worked!"
+      end
+    end
+  end
+end

data/examples/example.rb

@@ -6,6 +6,7 @@ CommandLion::App.run do
 
   name "Rainbow Hello"
   version "1.0.0"
+  description "Need to test this!"
 
   command :hello do
     description "A simple option to say hello!"

data/examples/pcapr.rb

@@ -9,6 +9,11 @@ CommandLion::App.run do
   version "1.0.0"
   description "Pcaprub command-line application to capture network traffic."
 
+  ctrl_c do
+    puts "Exiting!"
+    exit 0
+  end
+
   command :capture do
     description "Capture from a given network interface ( default: #{Pcap.lookupdev} )."
     type :string
@@ -18,7 +23,7 @@ CommandLion::App.run do
       capture = Pcap.open_live(argument, options[:snaplen].argument, options[:promisc].argument, options[:buffer].argument)
       loop do
         if packet = capture.next
-          puts packet
+          puts packet.size
         end
       end
     end

data/examples/readme.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'command_lion'
 require 'pry'
 
+
 CommandLion::App.run do
 
   name "Rainbow Hello"
@@ -10,26 +11,28 @@ CommandLion::App.run do
 
   command :hello do
     description "A simple command to say hello!"
-    
+
     type :string
-    flag "hello"
-    
+
+    flags do
+      short "-h"
+      long  "--hello" 
+    end
+
     default "world"
 
     action do
       puts "Hello #{argument}!"
     end
-    
+
     option :rainbow do
-    	description "STDOUT is much prettier with rainbows!"
-      
-			flag "--rainbow"
-      
-			action do
+      description "STDOUT is much prettier with rainbows!"
+      flag "--rainbow"
+
+      action do
         require 'lolize/auto'
       end
     end
   end
 
 end
-

data/lib/command_lion/app.rb

@@ -1,86 +1,5 @@
 module CommandLion
 
-  # The App class provides what can be considered the "main" function for the a Command Lion application.
-  # 
-  # The App class is primarily used in one of two ways:
-  #
-  # == Building Block
-  # To build an application using the DSL, but not run it right away, the build method block is available.
-  #   app = CommandLion::App.build do
-  #     # ...
-  #   end
-  #
-  #   app.run!
-  #
-  # == Run Block
-  # To build, parse, and run everything in one concise block, the run method block is available.
-  #   CommandLion::App.run do
-  #     # ...
-  #   end
-  #
-  # == DSL Keywords:
-  # name::
-  #   The name of your application. This is how your application would be referenced in conversation.
-  #   It's also going to be used as the defualt banner for the application which will appear at the 
-  #   top of the help menu.
-  #   
-  #   == Example
-  #     app = CommandLion::App.build do
-  #       name "Example"
-  #     end
-  #     
-  #     app.name?
-  #     # => true
-  #
-  #     app.name = "Changed Name"
-  #     # => "Changed Name"
-  #
-  #     app.name
-  #     # => Changed Name
-  # usage::
-  #   Your usage string can be used to help show the basic information for how to use your application.
-  #   You can make this as simple or as complex as you like. One will be generated for you by default
-  #   when your application runs, but won't be pre-built for you inside the build block for now.
-  #
-  #   == Example
-  #     app = CommandLion::App.build do
-  #       usage "example [commands] [options...]"
-  #     end
-  #     
-  #     app.usage?
-  #     # => true
-  #
-  #     app.usage = <<USAGE
-  #         /|
-  #     ~~~/ |~
-  #     tsharky [command] [switches] [--] [arguments]
-  #     USAGE
-  #     # => "    /|\n" + "~~~/ |~\n" + "tsharky [command] [switches] [--] [arguments]\n"
-  #
-  #     app.usage
-  #     # => "    /|\n" + "~~~/ |~\n" + "tsharky [command] [switches] [--] [arguments]\n"
-  #
-  #     puts app.usage
-  #     #     /|
-  #     # ~~~/ |~
-  #     # tsharky [command] [switches] [--] [arguments]
-  # description::
-  #   To provide further context for your application's existence, it's fairly nice to have a description.
-  #   Like, the usage statement, this can be as complex or as simple as you would like. It isn't required either.
-  #   
-  #   == Example
-  #     app = CommandLion::App.build do
-  #       description "Example"
-  #     end
-  #     
-  #     app.description?
-  #     # => true
-  #
-  #     app.description = "Changed"
-  #     # => "Changed"
-  #
-  #     app.description
-  #     # => Changed
   class App < Base
 
     def self.default_help(app)
@@ -100,11 +19,11 @@ module CommandLion
       max_flag = flagz.map(&:length).max + 2
       max_desc = app.commands.values.map(&:description).select{|d| d unless d.nil? }.map(&:length).max
       puts app.name
-      puts
       if app.version?
+        puts
         puts "VERSION"
         puts app.version
-        puts
+        puts unless app.description?
       end
       if app.description?
         puts 
@@ -118,6 +37,7 @@ module CommandLion
         puts usage
         puts
       end
+      puts unless app.version? || app.description? || app.usage?
       puts "COMMANDS"
       app.commands.values.select { |cmd| cmd unless cmd.is_a? CommandLion::Option }.each do |command|
         if command.flags?
@@ -142,12 +62,9 @@ module CommandLion
       end
     end
 
-    # This run method is a pretty important method when using command lion typically.
-    #
-    # Under the hood, an application object is initialized. The block of code passed to
-    # this method is then used as the code that is ran in the context of a application 
-    # object. So all of those methods will be available.
-    #
+
+    # The run method will run a given block of code using the
+    # Commmand Lion DSL.
     def self.run(&block)
       # Initialize an instance of an App object.
       app = new
@@ -162,30 +79,25 @@ module CommandLion
           cmd.before.call if cmd.before?
           cmd.action.call if cmd.action?
           cmd.after.call  if cmd.after?
-          # maybe exit?
+          exit 0
         else
           # Use the default help menu for the application unless that's been
           # explictly removed by the author for whatever reason.
           default_help(app) unless app.default_help_menu_removed?
         end
       else
-        threadz = false
         app.commands.each do |_, cmd|
           next unless cmd.given?
-          if cmd.threaded?
-            threadz = [] unless threadz
-            threadz << Thread.new do 
-              cmd.before.call if cmd.before?
-              cmd.action.call if cmd.action?
-              cmd.after.call  if cmd.after?
-            end
-          else
-            cmd.before.call if cmd.before?
-            cmd.action.call if cmd.action?
-            cmd.after.call  if cmd.after?
-          end
+          cmd.options.each do |_, opt|
+            next unless opt.given?
+            opt.before.call if opt.before?
+            opt.action.call if opt.action?
+            opt.after.call  if opt.after?
+          end if cmd.options?
+          cmd.before.call if cmd.before?
+          cmd.action.call if cmd.action?
+          cmd.after.call  if cmd.after?
         end
-        threadz.map(&:join) if threadz
       end
     end
 
@@ -205,19 +117,6 @@ module CommandLion
       @remove_default_help_menu || false
     end
 
-    # A tiny bit of rainbow magic is included. You can simple include
-    # this option within your application and, if you have the `lolize` gem
-    # installed, then rainbows will automagically be hooked to STDOUT to make your
-    # application much prettier.
-    #
-    # It'd be funny if this was turned on by default and you had to opt-out of the 
-    # rainbows. Good thing I didn't do that, right?
-    def rainbows
-      require 'lolize/auto'
-    rescue
-      raise "The 'lolize' gem is not installed. Install it for rainbow magic!"
-    end
-
     # Simple attributes for the application. Mostly just metadata to help
     # provide some context to the application.
     #
@@ -278,11 +177,14 @@ module CommandLion
       cmd
     end
 
+    def ctrl_c(&block)
+      trap("SIGINT") { block.call }
+    end
+
     def help(&block)
       command :help, &block
     end
 
-
     # Plugin a command that's probably been built outside of the application's run or build block.
     # This is helpful for sharing or reusing commands in applications.
     # @param command [Command] 
@@ -297,7 +199,7 @@ module CommandLion
 
     # Direct access to the various commands an application has. Helpful for debugging.
     def commands
-      @commands
+      @commands.reject { |_, v| v.is_a? CommandLion::Option }
     end
 
     # Parse arguments off of ARGV.
@@ -326,7 +228,7 @@ module CommandLion
       end
     end
 
-    # Parse a given command with its 
+    # Parse a given command with its given flags. 
     # @TODO Re-visit this.
     def parse_cmd(cmd, flags)
       if cmd.flags?
@@ -337,7 +239,9 @@ module CommandLion
       else
         args = Raw.arguments_to(cmd.index.to_s, flags)
       end
-      return nil if args.nil?
+      unless cmd.type.to_s =~ /stdin/
+        return nil if args.nil?
+      end
       case cmd.type
       when :stdin
         args = STDIN.gets.strip
@@ -374,9 +278,6 @@ module CommandLion
         if cmd.delimiter?
           if args.count > 1
             args = args.first.split(cmd.delimiter)
-            #args = args.first.join.split(cmd.delimiter).flatten.select { |arg| arg unless arg.empty? }
-            #args = args.select { |arg| arg if arg.include?(cmd.delimiter) }
-            #args = args.map { |arg| arg.split(cmd.delimiter) }.flatten
           else
             args = args.map { |arg| arg.split(cmd.delimiter) }.flatten
           end
@@ -412,10 +313,18 @@ module CommandLion
       nil
     end
 
-    # @TODO Re-visit this.
     def run!
       parse do |cmd|
-        cmd.action.call
+        next unless cmd.given?
+        cmd.options.each do |_, opt|
+          next unless opt.given?
+          opt.before.call if opt.before?
+          opt.action.call if opt.action?
+          opt.after.call  if opt.after?
+        end if cmd.options?
+        cmd.before.call if cmd.before?
+        cmd.action.call if cmd.action?
+        cmd.after.call  if cmd.after?
       end 
     end
 

data/lib/command_lion/base.rb

@@ -107,8 +107,8 @@ module CommandLion
         end
       end
 
+
     end
 
   end
-
 end

data/lib/command_lion/command.rb

@@ -1,290 +1,16 @@
 module CommandLion
 
-  # Every command or option for Command Lion is built on the Command class.
-  #
-  # A Command is typically built using the DSL provided within a build method block:
-  # == ⚙️  Build Block
-  #   cmd = CommandLion::Command.build do
-  #     # ...
-  #   end
-  # This is used under the hood within an Application's DSL run or block:
-  # == ⚙️  Application Build Block
-  #   app = CommandLion::App.build do
-  #     command :example_index do
-  #       # ...
-  #     end
-  #   end
-  #
-  # The DSL keywords are simple methods provided for any Command object and can be accessed
-  # or modified outside of the DSL building block itself to, for example, query if it exists.
-  #
-  # == 🗣  DSL 
-  # Command Lion's DSL is meant to be as flexible as possible without being too compelx.
-  # 
-  # ==⚡️  Example
-  #   cmd = CommandLion::Command.build do
-  #     index :example
-  #     flags do
-  #       short "-e"
-  #       long  "--example"
-  #     end
-  #     type :strings
-  #     default ["Jim", "Pam", "Dwight", "Michael"]
-  #     before do
-  #       unless arguments.count > 2
-  #         abort "Must provide more than two arguments!"
-  #       end
-  #     end
-  #     action do
-  #       arguments.each do |argument|
-  #         puts "Hello #{argument}!"
-  #       end
-  #     end
-  #     after do
-  #       exit 0
-  #     end
-  #   end
-  #
-  # == Keywords 
-  # 🔑  description::
-  #   To provide further context for your command's existence, it's fairly nice 
-  #   to have a description.
-  #   
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       description "Example"
-  #     end
-  #     
-  #     cmd.description?
-  #     # => true
-  #
-  #     cmd.description = "Changed"
-  #     # => "Changed"
-  #
-  #     cmd.description
-  #     # => Changed
-  # 🔑  type::
-  #   A command may require a specific argument from the command-line. The type
-  #   of argument(s) that the command utilizies can be specified with this keyword.
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       type :string
-  #     end
-  #     
-  #     cmd.type?
-  #     # => true
-  #
-  #     cmd.type = :strings
-  #     # => :strings
-  #
-  #     cmd.type
-  #     # => :strings
-  # 🔑  default::
-  #   To specify a command's default arguments, the default keyword can be used.
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       default "example"
-  #     end
-  #     
-  #     cmd.default?
-  #     # => true
-  #
-  #     cmd.default = "EXAMPLE"
-  #     # => "EXAMPLE"
-  #
-  #     cmd.default
-  #     # => "EXAMPLE"
-  #
-  #     cmd.argument
-  #     # => "EXAMPLE"
-  # 🔑  delimiter::
-  #   In the case of multiple command-line arguments, a custom delimter can be used
-  #   to help split up the arguments. Command Lion uses the space betwen arguments as the
-  #   default delimter.
-  #
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       delimter ","
-  #     end
-  #     
-  #     cmd.delimter?
-  #     # => true
-  #
-  #     cmd.delimter = ":"
-  #     # => ":"
-  #
-  #     cmd.delimter
-  #     # => : 
-  # 🔑  flag::
-  #   If you'd like for one specfic flag to be used for the command, then this keyword is for you!
-  #   
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       flag "example"
-  #     end
-  #     
-  #     cmd.flag?
-  #     # => true
-  #
-  #     cmd.flag = "EXAMPLE"
-  #     # => "EXAMPLE"
-  #
-  #     cmd.flag 
-  #     # => "EXAMPLE"
-  # 🔑  flags::
-  #   The flags keywords can be used two specify the short and long flags option for a command.
-  #
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       flags do
-  #         short "-e"
-  #         long  "--example
-  #       end
-  #     end
-  #     
-  #     cmd.flags?
-  #     # => true
-  #
-  #     cmd.flags.short? 
-  #     # => true
-  #
-  #     cmd.flags.long? 
-  #     # => true
-  #
-  #     cmd.flags.short = "-E" 
-  #     # => "-E"
-  #
-  #     cmd.flags.long = "--EXAMPLE" 
-  #     # => "--EXAMPLE"
-  # 
-  #     cmd.flags.long
-  #     # => "--EXAMPLE"
-  #
-  #     cmd.flags.short
-  #     # => "-E"
-  # 🔑  threaded::
-  #   To have your command spawn a thread and have the action block
-  #   for your command run in its own background thread. 
-  #
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       description "Example"
-  #     end
-  #     
-  #     cmd.description?
-  #     # => true
-  #
-  #     cmd.description = "Changed"
-  #     # => "Changed"
-  #
-  #     cmd.description
-  #     # => Changed
-  # 🔑  action::
-  #   What do you want a command to do when it is used? The action keyword can be used
-  #   to capture the block you'd like to run when the command is used.
-  #
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       action do
-  #         puts "Hello World!"
-  #       end
-  #     end
-  #     
-  #     cmd.action?
-  #     # => true
-  #
-  #     cmd.action
-  #     # => #<Proc:...>
-  #
-  #     cmd.action.call
-  #     # => Hello World! .. to STDOUT
-  # 🔑  before::
-  #   Before the action block is called, you can specify anouther block to be used beforehand
-  #   which can be used to help setup or do some custom error checking.
-  #
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       before do
-  #         abort "Not on Mondays!" Time.now.monday?
-  #       end
-  #       action do
-  #         puts "Hello World!"
-  #       end
-  #     end
-  #     
-  #     cmd.before?
-  #     # => true
-  #
-  #     cmd.before
-  #     # => #<Proc:...>
-  #
-  #     cmd.before.call
-  #     # aborts application if it's Monday
-  # 🔑  after::
-  #   After the action block has been called and completed, anouther optional block
-  #   can be used within the block given in the after keyword. This can be used for all sorts
-  #   of nifty things: from stopping the application from moving on, to logging, to whatever else.
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       action do
-  #         puts "Hello World!"
-  #       end
-  #       after do
-  #         exit 0 
-  #       end
-  #     end
-  #     
-  #     cmd.after?
-  #     # => true
-  #
-  #     cmd.after
-  #     # => #<Proc:...>
-  #
-  #     cmd.after.call
-  #     # exits application with successful status code
-  # 🔑  index::
-  #   A command's index should be unique. It is used to used to accesses the command amongst other 
-  #   commands when used within an application. However, this keyword usually isn't used unless being utilized
-  #   when using Command Lion's plugin system. 
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       index :example
-  #     end
-  #     
-  #     cmd.index?
-  #     # => :example
-  #
-  #     cmd.index
-  #     # => :example
-  # 🔑  option::
-  #   a command may have mutiple sub commands or options associated with it. these effectively
-  #   work exactly like any other command, but are just started as a leaf under the paren't command's options.
-  #   == Example
-  #     cmd = CommandLion::Command.build do
-  #       # ...
-  #       option :example do
-  #         action do
-  #           puts "hello world!"
-  #         end
-  #       end
-  #     end
-  #     
-  #     cmd.options?
-  #     # => true
-  #
-  #     cmd.options[:example]
-  #     # => #<proc:...>
-  #
-  #     cmd.after.call
-  #     # exits the application with successful status code
-  #
   class Command < Base
-    
-    simple_attrs :index, :description, :threaded,
-                 :type, :delimiter, :flags, :arguments, 
-                 :given, :default, :action, 
-                 :options, :before, :after
-  
+
+    simple_attrs :index, :description, :type, 
+      :delimiter, :flags, :arguments, 
+      :given, :default, :action, 
+      :options, :before, :after
+
+    def initialize(&block)
+      self.instance_eval(&block) if block_given?
+    end
+
     # @private
     def option(index, &block)
       option = Option.new
@@ -310,7 +36,7 @@ module CommandLion
         short string.to_s
       end
     end
-    
+
     # @private 
     def argument
       if arguments.respond_to?(:each)
@@ -341,6 +67,12 @@ module CommandLion
           arguments.each do |argument|
             yield argument
           end
+        elsif @arguments.respond_to?(:readline)
+          until arguments.eof?
+            yield arguments.readline
+          end
+        elsif @arguments.nil? and !@default
+          return
         else
           yield @arguments || @default
         end
@@ -360,17 +92,13 @@ module CommandLion
       return @before unless block_given?
       @before = block
     end
-    
+
     # @private
     def after(&block)
       return @after unless block_given?
       @after = block
     end
 
-    # @private
-    def threaded
-      @threaded = true
-    end
   end
 
 end

data/lib/command_lion/flags.rb

@@ -1,35 +1,11 @@
 module CommandLion
 
-  # The way a user is able to call or access a command or option for
-  # a command-line application is by passing their flags when the application
-  # is run at the command-line.
-  #
-  # == 🗣  DSL 
-  # The flags DSL works three different ways.
-  # 
-  # == Index as Flag
-  #   app = CommandLion::Command.build do
-  #     command :hello do
-  #       # just use the index as the flag
-  #     end
-  #   end
-  # == One Flag
-  #   app = CommandLion::Command.build do
-  #     command :hello do
-  #       flag "--hello"
-  #     end
-  #   end
-  # == Short & Long Flags
-  #   app = CommandLion::Command.build do
-  #     command :hello do
-  #       flags do
-  #         short "-e"
-  #         long  "--example"
-  #       end
-  #     end
-  #   end
   class Flags < Base
     simple_attrs :short, :long
-  end
+  
+		def all
+			[@short, @long].reject { |v| v.nil? }
+		end
+	end
 
 end

data/lib/command_lion/option.rb

@@ -1,21 +1,3 @@
 module CommandLion
-
-  # The Option class is a direct sub-class of the Command class. In pretty much
-  # every way it is just a command under the hood. However, instead of being indexed
-  # in an application's commands index, it will be available in whatever command's
-  # options index.
-  #
-  # == Example
-  #
-  #   app = CommandLion::App.build do
-  #     command :example_command do
-  #         # ...
-  #       option :example_option do
-  #         # ...
-  #       end
-  #     end
-  #   end
-  #
-  #   app.commands[:example_command].options[:example_option]
   class Option < Command; end
 end

data/lib/command_lion/raw.rb

@@ -1,29 +1,60 @@
 module CommandLion
 
+  # Raw command-line option API
   module Raw
 
-    def self.index_of(string)
-      ARGV.index(string)
+    @arguments = ARGV
+
+    def self.arguments
+      return @arguments unless block_given?
+      @arguments.each do |argument|
+        yield argument
+      end
+    end
+
+    def self.arguments=(args)
+      @arguments = args
+    end
+
+    def self.arguments?
+      arguments.size > 0 ? true : false
+    end
+
+    def self.index_of(flag)
+      arguments.index(flag)
+    end
+
+    def self.index_of?(flag)
+      index_of(flag) ? true : false
     end
 
     def self.arguments_to(string, flags)
-      return unless index_of(string)
-      args = []
-      ARGV.drop(index_of(string)+1).each do |argument|
-        next if argument == ","
-        break if flags.include?(argument)
-        args << argument
-        yield argument if block_given?
+      return if string.nil?
+      return if flags.nil?
+      return unless index = index_of(string)
+      if block_given?
+        arguments.drop(index+1).each do |argument|
+          # next if argument == ","
+          break if flags.include?(argument)
+          yield argument
+        end
+      else
+        args = []
+        arguments_to(string, flags) { |arg| args << arg }
+        return args
       end
-      args
     end
 
-    def self.arguments_to?(string)
-      ARGV[ARGV.index(string) + 1]
+    def self.arguments_to?(flag)
+      arguments[arguments.index(flag) + 1] ? true : false
     end
     
-    def self.argument_to(string)
-      ARGV[ARGV.index(string) + 1]
+    def self.possible_argument_to(string)
+      arguments[arguments.index(string) + 1]
+    end
+
+    def self.clear!
+      @arguments = []
     end
 
   end

data/lib/command_lion/version.rb

@@ -1,3 +1,3 @@
 module CommandLion
-  VERSION = "1.0.4"
+  VERSION = "2.0.0"
 end

data/lib/command_lion.rb

@@ -1,11 +1,21 @@
 require "command_lion/version"
 require "command_lion/raw"
 require "command_lion/base"
-require "command_lion/flags"
 require "command_lion/command"
 require "command_lion/option"
+require "command_lion/flags"
 require "command_lion/app"
 
 module CommandLion
-  # Your code goes here...
+  def self.raw
+    Raw
+  end
+
+  def self.command
+    Command
+  end
+
+  def self.application
+    Application
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_lion
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Kent 'picat' Gruber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,14 +71,11 @@ files:
 - bin/console
 - bin/setup
 - command_lion.gemspec
+- examples/ctrl_c.rb
 - examples/debug.rb
+- examples/error.rb
 - examples/example.rb
 - examples/example2.rb
-- examples/example_rainbows.rb
-- examples/flipr.rb
-- examples/flipr2.rb
-- examples/flipr3.rb
-- examples/flipr4.rb
 - examples/hello_expanded.rb
 - examples/hello_multi.rb
 - examples/hello_world.rb
@@ -124,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Command-line application framework.

data/examples/example_rainbows.rb

@@ -1,21 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'command_lion'
-require 'pry'
-
-CommandLion::App.run do
-
-  name "Rainbow Hello"
-  version "1.0.0"
-  #rainbows
-
-  command "Say Hello" do
-    type :string
-    flag "hello"
-    default "world"
-
-    action do
-      puts "Hello #{argument}!"
-    end
-  end
-
-end

data/examples/flipr.rb

@@ -1,27 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'command_lion'
-require 'pry'
-
-
-CommandLion::App.run do
-
-  name "Flipr"
-  version "1.0.0"
-  description "Flipping tables in terminals made easy!"
-
-  command :flip do
-    description "Flip a table."
-    
-    flips = ["[ ╯ '□']╯︵┻━┻)", "[ ╯ಠ益ಠ]╯彡┻━┻)", "[ ╯´･ω･]╯︵┸━┸)"]
-    
-    flags do
-      short "-f"
-      long  "--flip"
-    end
-    
-    action do
-      puts flips.sample
-    end
-  end
-
-end

data/examples/flipr2.rb

@@ -1,48 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'command_lion'
-require 'pry'
-
-def random_sleep
-  sleep (0..5).to_a.sample
-end
-
-def synchronize(&block)
-  @semaphore ||= Mutex.new
-  @semaphore.synchronize do
-    block.call
-  end
-end
-
-CommandLion::App.run do
-
-  name "Flipr"
-  version "1.0.0"
-  description "Flipping tables in terminals made easy!"
-
-  command :flip do
-    threaded
-    description "Flip a table."
-    flag "--flip"
-    flips = ["[ ╯ '□']╯︵┻━┻)", "[ ╯ಠ益ಠ]╯彡┻━┻)", "[ ╯´･ω･]╯︵┸━┸)"]
-    action do
-      10.times do
-        random_sleep
-        synchronize { puts flips.sample }
-      end
-    end
-  end
-
-  command :put do
-    threaded
-    description "Put a table."
-    flag "--put"
-    puts = ["┬──┬ノ['-' ノ ]", "┬──┬ノ[･ω･ ノ ]", "┬──┬ノ['~' ノ ]"]
-    action do
-      10.times do
-        random_sleep
-        synchronize { puts puts.sample }
-      end
-    end
-  end
-
-end

data/examples/flipr3.rb

@@ -1,31 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'command_lion'
-require 'pry'
-
-CommandLion::App.run do
-
-  name "Flipr"
-  version "1.0.0"
-  description "Flipping tables in terminals made easy!"
-
-  command :flip do
-    description "Flip a table."
-    flag "--flip"
-
-    flips = ["[ ╯ '□']╯︵┻━┻)", "[ ╯ಠ益ಠ]╯彡┻━┻)", "[ ╯´･ω･]╯︵┸━┸)"]
-
-    action do
-      options[:count].argument.times do
-        puts flips.sample 
-      end
-    end
-
-    option :count do
-      default 3
-      description "Specify the number of flips ( default: #{default} )"
-      type :integer
-      flag "--count"
-    end
-  end
-
-end

data/examples/flipr4.rb

@@ -1,33 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'command_lion'
-require 'pry'
-
-CommandLion::App.run do
-
-  name "Flipr"
-  version "1.0.0"
-  description "Flipping tables in terminals made easy!"
-
-  command :flip do
-    description "Flip a table."
-    flag "--flip"
-
-    flips = ["[ ╯ '□']╯︵┻━┻)", "[ ╯ಠ益ಠ]╯彡┻━┻)", "[ ╯´･ω･]╯︵┸━┸)"]
-
-    action do
-      options[:count].arguments do |argument|
-        argument.times do
-          puts flips.sample 
-        end
-      end
-    end
-
-    option :count do
-      default 1
-      description "Specify the number of flips ( default: #{default} )"
-      type :stdin_integers
-      flag "--count"
-    end
-  end
-
-end