kerplutz 0.1.0 → 0.1.1

data/History.txt

@@ -0,0 +1,5 @@
+== (0.1.1)
+* Favor commands when parsing ambiguous flag arguments (Mike Sassak)
+
+== (0.1.0)
+* Initial release (Mike Sassak)

data/README.md

@@ -11,8 +11,14 @@ generally a pretty slick library, even if its interface is a bit wonky.
 It seemed like a shame to let it go to waste, when getting from it what
 I needed requires only a small amount of code.
 
+## Usage
+
+Real documentation will be forthcoming, but for now see
+`features/kerplutz.feature`.
+
 ## Todo
 
+* README docs for builder and option types
 * Read defaults from a config file
 * Argument type-casts
 * List arguments

data/Rakefile

@@ -8,3 +8,7 @@ end
 task :spec do
   sh "rspec spec"
 end
+
+task :focus do
+  sh "rspec -t focus spec"
+end

data/kerplutz.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'kerplutz'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.authors     = ["Mike Sassak"]
   s.description = "Command-line option parser with subcommands that won't leave you feeling Kerplutz"
   s.summary     = "kerplutz #{s.version}"

data/lib/kerplutz/command_map.rb

@@ -18,6 +18,10 @@ module Kerplutz
       commands[display_name]
     end
 
+    def has_command?(display_name)
+      self.===(display_name)
+    end
+
     def ===(display_name)
       commands.has_key?(display_name)
     end

data/lib/kerplutz/executable.rb

@@ -23,26 +23,32 @@ module Kerplutz
       top.add_option(option, false)
     end
 
+    # TODO: Extract this method into separate class that gives all 
+    # the involved parties the chance to parse all of the args
     def parse(args)
-      first, *rest = args
-      remainder = []
-
-      case first
-
-      when help
-        puts (rest.empty? ? banner : commands[rest.first].help)
-
-      when option
-        remainder = top.parse(args)
-
-      when commands
-        remainder = commands[first].parse(rest)
-
+      if args[0] =~ /^(--help|help)$/
+        first, *rest = args
+        if rest.empty?
+          puts banner
+        else
+          puts commands[rest.first].help
+        end
+      elsif cmd = args.find { |el| commands.has_command?(el) }
+        cmd_idx = args.index(cmd)
+        top_args, cmd_args = args.partition.with_index do |_arg, idx|
+          idx < cmd_idx
+        end
+        top.parse(top_args)
+        remainder = commands[cmd].parse(cmd_args[1..-1])
       else
-        puts banner
+        if args.empty?
+          puts banner
+        else
+          remainder = top.parse(args)
+        end
       end
 
-      [arguments, remainder]
+      [arguments, remainder || []]
     end
 
     def banner
@@ -51,15 +57,5 @@ module Kerplutz
       help << " Commands:\n" << commands.summary << "\n"
       help << "Type '#{name} help COMMAND' for help with a specific command.\n"
     end
-
-    private
-
-    def help
-      /^(--help|help)$/
-    end
-
-    def option
-      /^(--|-)[\w-]+$/
-    end
   end
 end

data/spec/kerplutz/executable_spec.rb

@@ -2,12 +2,39 @@ require 'spec_helper'
 
 module Kerplutz
   describe Executable do
-    subject { Executable.new("test") }
+    let(:option) { Flag.new(:foo, '', :bar) }
+    let(:command) { Command.new(:foo, '') }
+
+    subject do
+      exec = Executable.new("test")
+      exec.add_option(option)
+      exec.add_command(command)
+      exec
+    end
 
     describe "#parse" do
       it "extracts the options from the arguments" do
-        subject.add_option(Switch.new(:foo, ''))
         subject.parse(["--foo"]).should == [{ :foo => true }, []]
+        subject.parse(["--foo", "bar"]).should == [{ :foo => "bar" }, []]
+      end
+
+      it "parses an unambiguous flag argument" do
+        subject.top.should_receive(:parse).with(["--foo", "bar"])
+        subject.parse(["--foo", "bar"])
+      end
+
+      it "parses an ambiguous flag argument" do
+        subject.top.should_receive(:parse).with(["--foo"])
+        command.should_receive(:parse).with([])
+        subject.parse(["--foo", "foo"])
+
+        subject.top.should_receive(:parse).with(["--foo"])
+        command.should_receive(:parse).with(["-x"])
+        subject.parse(["--foo", "foo", "-x"])
+
+        subject.top.should_receive(:parse).with(["--foo"])
+        command.should_receive(:parse).with(["foo", "-x"])
+        subject.parse(["--foo", "foo", "foo", "-x"])
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mike Sassak
@@ -71,6 +71,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- History.txt
 - LICENSE
 - README.md
 - Rakefile
@@ -120,7 +121,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: kerplutz 0.1.0
+summary: kerplutz 0.1.1
 test_files: 
 - features/kerplutz.feature
 - features/step_definitions/kerplutz_steps.rb