clamp 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDFlNTQ5ZTA5ODJmZjI4NjU3OTE0YzEwYzJjMzcwNTAzNzlhMGJjMA==
+  data.tar.gz: !binary |-
+    MjhlMDdmNGYzY2E2ZDVmYTQxMzA2OTcwYmY1NDBmZjM1ZGJlMTczNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YjNlMjQ0OTdiMzZlYzYzOGJiNGI3YmI0NGIwODA4NmRhYTVlMWMxMTE0NzVl
+    NDRiYjIxN2JhNjMzMDliZDdjODgxMmJmOTU0MWY5NTUwYTg2YjY3MzBkZTU0
+    MGExZmI3NzRkMWM1NWEyY2ZlODIxOTFkZDYyMGMxYjFhYTJkN2E=
+  data.tar.gz: !binary |-
+    ZDc0NzQ1YTYyNzIzZTY2ODZlYzk4ZjVmYmE1OGU5OGYxODI2MzMzMDk5YzEx
+    ZTBkMzM3ZjNhZGNkYTNlODhjZWFhMjI1ZTA4NmRlMGJhNmVkNmFjNGIxZDc4
+    ZmY4ZGJhYWZhMWJlNzlkZWM1YzBjMGUzZGI2YWUxNzk3MmQyMzk=

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -4,6 +4,6 @@ gemspec
 
 group :test do
   gem "rake"
-  gem "rspec", "~> 2.6.0"
-  gem "rr", "~> 1.0.4"
+  gem "rspec"
+  gem "rr"
 end

data/lib/clamp/parameter.rb

@@ -7,7 +7,8 @@ module Clamp
     def initialize(name, description, options = {})
       @name = name
       @description = description
-      infer_attribute_name_and_multiplicity
+      @multivalued = (@name =~ ELLIPSIS_SUFFIX)
+      @required = (@name !~ OPTIONAL)
       if options.has_key?(:attribute_name)
         @attribute_name = options[:attribute_name].to_s
       end
@@ -17,6 +18,7 @@ module Clamp
       if options.has_key?(:environment_variable)
         @environment_variable = options[:environment_variable]
       end
+      @attribute_name ||= infer_attribute_name
     end
 
     attr_reader :name, :attribute_name
@@ -48,26 +50,18 @@ module Clamp
 
     private
 
-    NAME_PATTERN = "([A-Za-z0-9_-]+)"
+    ELLIPSIS_SUFFIX = / \.\.\.$/
+    OPTIONAL = /^\[(.*)\]/
 
-    def infer_attribute_name_and_multiplicity
-      case @name
-      when /^\[#{NAME_PATTERN}\]$/
-        @attribute_name = $1
-      when /^\[#{NAME_PATTERN}\] ...$/
-        @attribute_name = "#{$1}_list"
-        @multivalued = true
-      when /^#{NAME_PATTERN} ...$/
-        @attribute_name = "#{$1}_list"
-        @multivalued = true
-        @required = true
-      when /^#{NAME_PATTERN}$/
-        @attribute_name = @name
-        @required = true
-      else
-        raise "invalid parameter name: '#{name}'"
+    VALID_ATTRIBUTE_NAME = /^[a-z0-9_]+$/
+
+    def infer_attribute_name
+      inferred_name = name.downcase.tr('-', '_').sub(ELLIPSIS_SUFFIX, '').sub(OPTIONAL) { $1 }
+      unless inferred_name =~ VALID_ATTRIBUTE_NAME
+        raise "cannot infer attribute_name from #{name.inspect}"
       end
-      @attribute_name = @attribute_name.downcase.tr('-', '_')
+      inferred_name += "_list" if multivalued?
+      inferred_name
     end
 
     def multivalued?

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/spec/clamp/command_group_spec.rb

@@ -29,10 +29,10 @@ describe Clamp::Command do
 
     it "delegates to sub-commands" do
 
-      @command.run(["flip"])
+      command.run(["flip"])
       stdout.should =~ /FLIPPED/
 
-      @command.run(["flop"])
+      command.run(["flop"])
       stdout.should =~ /FLOPPED/
 
     end
@@ -41,7 +41,7 @@ describe Clamp::Command do
 
       it "triggers help" do
         lambda do
-          @command.run([])
+          command.run([])
         end.should raise_error(Clamp::HelpWanted)
       end
 
@@ -50,18 +50,18 @@ describe Clamp::Command do
     describe "#help" do
 
       it "shows subcommand parameters in usage" do
-        @command.help.should include("flipflop [OPTIONS] SUBCOMMAND [ARGS] ...")
+        command.help.should include("flipflop [OPTIONS] SUBCOMMAND [ARGS] ...")
       end
 
       it "lists subcommands" do
-        @help = @command.help
-        @help.should =~ /Subcommands:/
-        @help.should =~ /flip +flip it/
-        @help.should =~ /flop +flop it/
+        help = command.help
+        help.should =~ /Subcommands:/
+        help.should =~ /flip +flip it/
+        help.should =~ /flop +flop it/
       end
 
       it "handles new lines in subcommand descriptions" do
-        @command.help.should =~ /flop +flop it\n +for extra flop/
+        command.help.should =~ /flop +flop it\n +for extra flop/
       end
 
     end
@@ -86,10 +86,10 @@ describe Clamp::Command do
 
     it "responds to both aliases" do
 
-      @command.run(["say", "boo"])
+      command.run(["say", "boo"])
       stdout.should =~ /boo/
 
-      @command.run(["talk", "jive"])
+      command.run(["talk", "jive"])
       stdout.should =~ /jive/
 
     end
@@ -97,8 +97,8 @@ describe Clamp::Command do
     describe "#help" do
 
       it "lists all aliases" do
-        @help = @command.help
-        @help.should =~ /say, talk .* Say something/
+        help = command.help
+        help.should =~ /say, talk .* Say something/
       end
 
     end
@@ -122,7 +122,7 @@ describe Clamp::Command do
     end
 
     it "delegates multiple levels" do
-      @command.run(["foo", "bar"])
+      command.run(["foo", "bar"])
       stdout.should =~ /FUBAR/
     end
 
@@ -147,7 +147,7 @@ describe Clamp::Command do
     context "executed with no subcommand" do
 
       it "invokes the default subcommand" do
-        @command.run([])
+        command.run([])
         stdout.should =~ /All good/
       end
 
@@ -172,7 +172,7 @@ describe Clamp::Command do
     context "executed with no subcommand" do
 
       it "invokes the default subcommand" do
-        @command.run([])
+        command.run([])
         stdout.should =~ /All good/
       end
 
@@ -182,14 +182,14 @@ describe Clamp::Command do
 
   describe "each subcommand" do
 
-    before do
+    let(:command_class) do
 
       speed_options = Module.new do
         extend Clamp::Option::Declaration
         option "--speed", "SPEED", "how fast", :default => "slowly"
       end
 
-      @command_class = Class.new(Clamp::Command) do
+      Class.new(Clamp::Command) do
 
         option "--direction", "DIR", "which way", :default => "home"
 
@@ -205,29 +205,30 @@ describe Clamp::Command do
         end
 
       end
+    end
 
-      @command = @command_class.new("go")
-
+    let(:command) do
+      command_class.new("go")
     end
 
     it "accepts options defined in superclass (specified after the subcommand)" do
-      @command.run(["move", "--direction", "north"])
+      command.run(["move", "--direction", "north"])
       stdout.should =~ /walking north/
     end
 
     it "accepts options defined in superclass (specified before the subcommand)" do
-      @command.run(["--direction", "north", "move"])
+      command.run(["--direction", "north", "move"])
       stdout.should =~ /walking north/
     end
 
     it "accepts options defined in included modules" do
-      @command.run(["move", "--speed", "very quickly"])
+      command.run(["move", "--speed", "very quickly"])
       stdout.should =~ /walking home very quickly/
     end
 
     it "has access to command context" do
-      @command = @command_class.new("go", :motion => "wandering")
-      @command.run(["move"])
+      command = command_class.new("go", :motion => "wandering")
+      command.run(["move"])
       stdout.should =~ /wandering home/
     end
 
@@ -248,7 +249,7 @@ describe Clamp::Command do
     end
 
     it "only parses options once" do
-      @command.run(['--json', '{"a":"b"}', 'woohoohoo'])
+      command.run(['--json', '{"a":"b"}', 'woohoohoo'])
       stdout.should == 'parsing!'
     end
 

data/spec/clamp/command_spec.rb

@@ -17,7 +17,7 @@ describe Clamp::Command do
   describe "#help" do
 
     it "describes usage" do
-      @command.help.should =~ /^Usage:\n    cmd.*\n/
+      command.help.should =~ /^Usage:\n    cmd.*\n/
     end
 
   end
@@ -25,7 +25,7 @@ describe Clamp::Command do
   describe "#run" do
 
     before do
-      @command.run([])
+      command.run([])
     end
 
     it "executes the #execute method" do
@@ -37,21 +37,21 @@ describe Clamp::Command do
   describe ".option" do
 
     it "declares option argument accessors" do
-      @command.class.option "--flavour", "FLAVOUR", "Flavour of the month"
-      @command.flavour.should == nil
-      @command.flavour = "chocolate"
-      @command.flavour.should == "chocolate"
+      command.class.option "--flavour", "FLAVOUR", "Flavour of the month"
+      command.flavour.should == nil
+      command.flavour = "chocolate"
+      command.flavour.should == "chocolate"
     end
 
     describe "with type :flag" do
 
       before do
-        @command.class.option "--verbose", :flag, "Be heartier"
+        command.class.option "--verbose", :flag, "Be heartier"
       end
 
       it "declares a predicate-style reader" do
-        @command.should respond_to(:verbose?)
-        @command.should_not respond_to(:verbose)
+        command.should respond_to(:verbose?)
+        command.should_not respond_to(:verbose)
       end
 
     end
@@ -59,17 +59,17 @@ describe Clamp::Command do
     describe "with explicit :attribute_name" do
 
       before do
-        @command.class.option "--foo", "FOO", "A foo", :attribute_name => :bar
+        command.class.option "--foo", "FOO", "A foo", :attribute_name => :bar
       end
 
       it "uses the specified attribute_name name to name accessors" do
-        @command.bar = "chocolate"
-        @command.bar.should == "chocolate"
+        command.bar = "chocolate"
+        command.bar.should == "chocolate"
       end
 
       it "does not attempt to create the default accessors" do
-        @command.should_not respond_to(:foo)
-        @command.should_not respond_to(:foo=)
+        command.should_not respond_to(:foo)
+        command.should_not respond_to(:foo=)
       end
 
     end
@@ -77,8 +77,8 @@ describe Clamp::Command do
     describe "with default method" do
 
       before do
-        @command.class.option "--port", "PORT", "port"
-        @command.class.class_eval do
+        command.class.option "--port", "PORT", "port"
+        command.class.class_eval do
           def default_port
             4321
           end
@@ -86,7 +86,7 @@ describe Clamp::Command do
       end
 
       it "sets the specified default value" do
-        @command.port.should == 4321
+        command.port.should == 4321
       end
 
     end
@@ -94,17 +94,17 @@ describe Clamp::Command do
     describe "with :default value" do
 
       before do
-        @command.class.option "--port", "PORT", "port to listen on", :default => 4321
+        command.class.option "--port", "PORT", "port to listen on", :default => 4321
       end
 
       it "declares default method" do
-        @command.default_port.should == 4321
+        command.default_port.should == 4321
       end
 
       describe "#help" do
 
         it "describes the default value" do
-          @command.help.should include("port to listen on (default: 4321)")
+          command.help.should include("port to listen on (default: 4321)")
         end
 
       end
@@ -114,33 +114,33 @@ describe Clamp::Command do
     describe "with :environment_variable value" do
 
       before do
-        @command.class.option "--port", "PORT", "port to listen on", :default => 4321, :environment_variable => "PORT" do |value|
+        command.class.option "--port", "PORT", "port to listen on", :default => 4321, :environment_variable => "PORT" do |value|
           value.to_i
         end
       end
 
       it "should use the default if neither flag nor env var are present" do
         ENV.delete("PORT")
-        @command.parse([])
-        @command.port.should == 4321
+        command.parse([])
+        command.port.should == 4321
       end
 
       it "should use the env value if present (instead of default)" do
         ENV["PORT"] = rand(10000).to_s
-        @command.parse([])
-        @command.port.should == ENV["PORT"].to_i
+        command.parse([])
+        command.port.should == ENV["PORT"].to_i
       end
 
       it "should use the the flag value if present (instead of env)" do
         ENV["PORT"] = "12345"
-        @command.parse(%w(--port 1500))
-        @command.port.should == 1500
+        command.parse(%w(--port 1500))
+        command.port.should == 1500
       end
 
       describe "#help" do
 
         it "describes the default value and env usage" do
-          @command.help.should include("port to listen on (default: $PORT, or 4321)")
+          command.help.should include("port to listen on (default: $PORT, or 4321)")
         end
 
       end
@@ -150,19 +150,19 @@ describe Clamp::Command do
     describe "with :environment_variable value on a :flag option" do
 
       before do
-        @command.class.option "--[no-]enable", :flag, "enable?", :default => false, :environment_variable => "ENABLE"
+        command.class.option "--[no-]enable", :flag, "enable?", :default => false, :environment_variable => "ENABLE"
       end
 
       it "should use the default if neither flag nor env var are present" do
-        @command.parse([])
-        @command.enable?.should == false
+        command.parse([])
+        command.enable?.should == false
       end
 
       Clamp::Option::Parsing::TRUTHY_ENVIRONMENT_VALUES.each do |value|
         it "should use environment value '#{value}' to mean true" do
           ENV["ENABLE"] = value
-          @command.parse([])
-          @command.enable?.should == true
+          command.parse([])
+          command.enable?.should == true
         end
       end
 
@@ -176,15 +176,15 @@ describe Clamp::Command do
       it "should use an env value other than truthy ones to mean false" do
         [nil, "0", "no", "whatever"].each do |val|
           ENV["ENABLE"] = val
-          @command.parse([])
-          @command.enable?.should == false
+          command.parse([])
+          command.enable?.should == false
         end
       end
 
       it "should use the the flag value if present (instead of env)" do
         ENV["ENABLE"] = "1"
-        @command.parse(%w(--no-enable))
-        @command.enable?.should == false
+        command.parse(%w(--no-enable))
+        command.enable?.should == false
       end
 
     end
@@ -192,15 +192,15 @@ describe Clamp::Command do
     describe "with :required value" do
 
       before do
-        @command.class.option "--port", "PORT", "port to listen on", :required => true
+        command.class.option "--port", "PORT", "port to listen on", :required => true
       end
 
       it "should fail if a required option is not provided" do
-        expect { @command.parse([]) }.to raise_error(Clamp::UsageError)
+        expect { command.parse([]) }.to raise_error(Clamp::UsageError)
       end
 
       it "should succeed if a required option is provided" do
-        @command.parse(["--port", "12345"])
+        command.parse(["--port", "12345"])
       end
 
     end
@@ -208,22 +208,22 @@ describe Clamp::Command do
     describe "with :required value with :env" do
 
       before do
-        @command.class.option "--port", "PORT", "port to listen on", :required => true, :environment_variable => "PORT"
+        command.class.option "--port", "PORT", "port to listen on", :required => true, :environment_variable => "PORT"
       end
 
       it "should fail if a required option is not provided" do
         ENV.delete("PORT")
-        expect { @command.parse([]) }.to raise_error(Clamp::UsageError)
+        expect { command.parse([]) }.to raise_error(Clamp::UsageError)
       end
 
       it "should succeed if a required option is provided via arguments" do
         ENV.delete("PORT")
-        @command.parse(["--port", "12345"])
+        command.parse(["--port", "12345"])
       end
 
       it "should succeed if a required option is provided via env" do
         ENV["PORT"] = "12345"
-        @command.parse([])
+        command.parse([])
       end
 
     end
@@ -232,17 +232,17 @@ describe Clamp::Command do
     describe "with a block" do
 
       before do
-        @command.class.option "--port", "PORT", "Port to listen on" do |port|
+        command.class.option "--port", "PORT", "Port to listen on" do |port|
           Integer(port)
         end
       end
 
       it "uses the block to validate and convert the option argument" do
         lambda do
-          @command.port = "blah"
+          command.port = "blah"
         end.should raise_error(ArgumentError)
-        @command.port = "1234"
-        @command.port.should == 1234
+        command.port = "1234"
+        command.port.should == 1234
       end
 
     end
@@ -252,10 +252,10 @@ describe Clamp::Command do
   describe "with options declared" do
 
     before do
-      @command.class.option ["-f", "--flavour"], "FLAVOUR", "Flavour of the month"
-      @command.class.option ["-c", "--color"], "COLOR", "Preferred hue"
-      @command.class.option ["-n", "--[no-]nuts"], :flag, "Nuts (or not)\nMay include nuts"
-      @command.class.parameter "[ARG] ...", "extra arguments", :attribute_name => :arguments
+      command.class.option ["-f", "--flavour"], "FLAVOUR", "Flavour of the month"
+      command.class.option ["-c", "--color"], "COLOR", "Preferred hue"
+      command.class.option ["-n", "--[no-]nuts"], :flag, "Nuts (or not)\nMay include nuts"
+      command.class.parameter "[ARG] ...", "extra arguments", :attribute_name => :arguments
     end
 
     describe "#parse" do
@@ -264,7 +264,7 @@ describe Clamp::Command do
 
         it "raises a UsageError" do
           lambda do
-            @command.parse(%w(--foo bar))
+            command.parse(%w(--foo bar))
           end.should raise_error(Clamp::UsageError)
         end
 
@@ -273,13 +273,13 @@ describe Clamp::Command do
       describe "with options" do
 
         before do
-          @command.parse(%w(--flavour strawberry --nuts --color blue))
+          command.parse(%w(--flavour strawberry --nuts --color blue))
         end
 
         it "maps the option values onto the command object" do
-          @command.flavour.should == "strawberry"
-          @command.color.should == "blue"
-          @command.nuts?.should == true
+          command.flavour.should == "strawberry"
+          command.color.should == "blue"
+          command.nuts?.should == true
         end
 
       end
@@ -287,12 +287,12 @@ describe Clamp::Command do
       describe "with short options" do
 
         before do
-          @command.parse(%w(-f strawberry -c blue))
+          command.parse(%w(-f strawberry -c blue))
         end
 
         it "recognises short options as aliases" do
-          @command.flavour.should == "strawberry"
-          @command.color.should == "blue"
+          command.flavour.should == "strawberry"
+          command.color.should == "blue"
         end
 
       end
@@ -300,11 +300,11 @@ describe Clamp::Command do
       describe "with a value appended to a short option" do
 
         before do
-          @command.parse(%w(-fstrawberry))
+          command.parse(%w(-fstrawberry))
         end
 
         it "works as though the value were separated" do
-          @command.flavour.should == "strawberry"
+          command.flavour.should == "strawberry"
         end
 
       end
@@ -312,12 +312,12 @@ describe Clamp::Command do
       describe "with combined short options" do
 
         before do
-          @command.parse(%w(-nf strawberry))
+          command.parse(%w(-nf strawberry))
         end
 
         it "works as though the options were separate" do
-          @command.flavour.should == "strawberry"
-          @command.nuts?.should == true
+          command.flavour.should == "strawberry"
+          command.nuts?.should == true
         end
 
       end
@@ -325,12 +325,12 @@ describe Clamp::Command do
       describe "with option arguments attached using equals sign" do
 
         before do
-          @command.parse(%w(--flavour=strawberry --color=blue))
+          command.parse(%w(--flavour=strawberry --color=blue))
         end
 
         it "works as though the option arguments were separate" do
-          @command.flavour.should == "strawberry"
-          @command.color.should == "blue"
+          command.flavour.should == "strawberry"
+          command.color.should == "blue"
         end
 
       end
@@ -338,8 +338,8 @@ describe Clamp::Command do
       describe "with option-like things beyond the arguments" do
 
         it "treats them as positional arguments" do
-          @command.parse(%w(a b c --flavour strawberry))
-          @command.arguments.should == %w(a b c --flavour strawberry)
+          command.parse(%w(a b c --flavour strawberry))
+          command.arguments.should == %w(a b c --flavour strawberry)
         end
 
       end
@@ -347,13 +347,13 @@ describe Clamp::Command do
       describe "with multi-line arguments that look like options" do
 
         before do
-          @command.parse(["foo\n--flavour=strawberry", "bar\n-cblue"])
+          command.parse(["foo\n--flavour=strawberry", "bar\n-cblue"])
         end
 
         it "treats them as positional arguments" do
-          @command.arguments.should == ["foo\n--flavour=strawberry", "bar\n-cblue"]
-          @command.flavour.should be_nil
-          @command.color.should be_nil
+          command.arguments.should == ["foo\n--flavour=strawberry", "bar\n-cblue"]
+          command.flavour.should be_nil
+          command.color.should be_nil
         end
 
       end
@@ -361,8 +361,8 @@ describe Clamp::Command do
       describe "with an option terminator" do
 
         it "considers everything after the terminator to be an argument" do
-          @command.parse(%w(--color blue -- --flavour strawberry))
-          @command.arguments.should == %w(--flavour strawberry)
+          command.parse(%w(--color blue -- --flavour strawberry))
+          command.arguments.should == %w(--flavour strawberry)
         end
 
       end
@@ -370,11 +370,11 @@ describe Clamp::Command do
       describe "with --flag" do
 
         before do
-          @command.parse(%w(--nuts))
+          command.parse(%w(--nuts))
         end
 
         it "sets the flag" do
-          @command.nuts?.should be_true
+          command.nuts?.should be_true
         end
 
       end
@@ -382,12 +382,12 @@ describe Clamp::Command do
       describe "with --no-flag" do
 
         before do
-          @command.nuts = true
-          @command.parse(%w(--no-nuts))
+          command.nuts = true
+          command.parse(%w(--no-nuts))
         end
 
         it "clears the flag" do
-          @command.nuts?.should be_false
+          command.nuts?.should be_false
         end
 
       end
@@ -396,7 +396,7 @@ describe Clamp::Command do
 
         it "requests help" do
           lambda do
-            @command.parse(%w(--help))
+            command.parse(%w(--help))
           end.should raise_error(Clamp::HelpWanted)
         end
 
@@ -406,7 +406,7 @@ describe Clamp::Command do
 
         it "requests help" do
           lambda do
-            @command.parse(%w(-h))
+            command.parse(%w(-h))
           end.should raise_error(Clamp::HelpWanted)
         end
 
@@ -415,7 +415,7 @@ describe Clamp::Command do
       describe "when option-writer raises an ArgumentError" do
 
         before do
-          @command.class.class_eval do
+          command.class.class_eval do
 
             def color=(c)
               unless c == "black"
@@ -428,7 +428,7 @@ describe Clamp::Command do
 
         it "re-raises it as a UsageError" do
           lambda do
-            @command.parse(%w(--color red))
+            command.parse(%w(--color red))
           end.should raise_error(Clamp::UsageError, /^option '--color': sorry, we're out of red/)
         end
 
@@ -439,16 +439,16 @@ describe Clamp::Command do
     describe "#help" do
 
       it "indicates that there are options" do
-        @command.help.should include("cmd [OPTIONS]")
+        command.help.should include("cmd [OPTIONS]")
       end
 
       it "includes option details" do
-        @command.help.should =~ %r(--flavour FLAVOUR +Flavour of the month)
-        @command.help.should =~ %r(--color COLOR +Preferred hue)
+        command.help.should =~ %r(--flavour FLAVOUR +Flavour of the month)
+        command.help.should =~ %r(--color COLOR +Preferred hue)
       end
 
       it "handles new lines in option descriptions" do
-        @command.help.should =~ %r(--\[no-\]nuts +Nuts \(or not\)\n +May include nuts)
+        command.help.should =~ %r(--\[no-\]nuts +Nuts \(or not\)\n +May include nuts)
       end
 
     end
@@ -458,19 +458,19 @@ describe Clamp::Command do
   describe "with an explicit --help option declared" do
 
     before do
-      @command.class.option ["--help"], :flag, "help wanted"
+      command.class.option ["--help"], :flag, "help wanted"
     end
 
     it "does not generate implicit help option" do
       lambda do
-        @command.parse(%w(--help))
+        command.parse(%w(--help))
       end.should_not raise_error
-      @command.help.should be_true
+      command.help.should be_true
     end
 
     it "does not recognise -h" do
       lambda do
-        @command.parse(%w(-h))
+        command.parse(%w(-h))
       end.should raise_error(Clamp::UsageError)
     end
 
@@ -479,18 +479,18 @@ describe Clamp::Command do
   describe "with an explicit -h option declared" do
 
     before do
-      @command.class.option ["-h", "--humidity"], "PERCENT", "relative humidity" do |n|
+      command.class.option ["-h", "--humidity"], "PERCENT", "relative humidity" do |n|
         Integer(n)
       end
     end
 
     it "does not map -h to help" do
-      @command.help.should_not =~ %r( -h[, ].*help)
+      command.help.should_not =~ %r( -h[, ].*help)
     end
 
     it "still recognises --help" do
       lambda do
-        @command.parse(%w(--help))
+        command.parse(%w(--help))
       end.should raise_error(Clamp::HelpWanted)
     end
 
@@ -499,21 +499,21 @@ describe Clamp::Command do
   describe ".parameter" do
 
     it "declares option argument accessors" do
-      @command.class.parameter "FLAVOUR", "flavour of the month"
-      @command.flavour.should == nil
-      @command.flavour = "chocolate"
-      @command.flavour.should == "chocolate"
+      command.class.parameter "FLAVOUR", "flavour of the month"
+      command.flavour.should == nil
+      command.flavour = "chocolate"
+      command.flavour.should == "chocolate"
     end
 
     describe "with explicit :attribute_name" do
 
       before do
-        @command.class.parameter "FOO", "a foo", :attribute_name => :bar
+        command.class.parameter "FOO", "a foo", :attribute_name => :bar
       end
 
       it "uses the specified attribute_name name to name accessors" do
-        @command.bar = "chocolate"
-        @command.bar.should == "chocolate"
+        command.bar = "chocolate"
+        command.bar.should == "chocolate"
       end
 
     end
@@ -521,17 +521,17 @@ describe Clamp::Command do
     describe "with :default value" do
 
       before do
-        @command.class.parameter "[ORIENTATION]", "direction", :default => "west"
+        command.class.parameter "[ORIENTATION]", "direction", :default => "west"
       end
 
       it "sets the specified default value" do
-        @command.orientation.should == "west"
+        command.orientation.should == "west"
       end
 
       describe "#help" do
 
         it "describes the default value" do
-          @command.help.should include("direction (default: \"west\")")
+          command.help.should include("direction (default: \"west\")")
         end
 
       end
@@ -541,17 +541,17 @@ describe Clamp::Command do
     describe "with a block" do
 
       before do
-        @command.class.parameter "PORT", "port to listen on" do |port|
+        command.class.parameter "PORT", "port to listen on" do |port|
           Integer(port)
         end
       end
 
       it "uses the block to validate and convert the argument" do
         lambda do
-          @command.port = "blah"
+          command.port = "blah"
         end.should raise_error(ArgumentError)
-        @command.port = "1234"
-        @command.port.should == 1234
+        command.port = "1234"
+        command.port.should == 1234
       end
 
     end
@@ -559,12 +559,12 @@ describe Clamp::Command do
     describe "with ellipsis" do
 
       before do
-        @command.class.parameter "FILE ...", "files"
+        command.class.parameter "FILE ...", "files"
       end
 
       it "accepts multiple arguments" do
-        @command.parse(%w(X Y Z))
-        @command.file_list.should == %w(X Y Z)
+        command.parse(%w(X Y Z))
+        command.file_list.should == %w(X Y Z)
       end
 
     end
@@ -572,13 +572,13 @@ describe Clamp::Command do
     describe "optional, with ellipsis" do
 
       before do
-        @command.class.parameter "[FILE] ...", "files"
+        command.class.parameter "[FILE] ...", "files"
       end
 
       it "default to an empty list" do
-        @command.parse([])
-        @command.default_file_list.should == []
-        @command.file_list.should == []
+        command.parse([])
+        command.default_file_list.should == []
+        command.file_list.should == []
       end
 
     end
@@ -586,31 +586,31 @@ describe Clamp::Command do
     describe "with :environment_variable value" do
 
       before do
-        @command.class.parameter "[FILE]", "a file", :environment_variable => "FILE",
+        command.class.parameter "[FILE]", "a file", :environment_variable => "FILE",
           :default => "/dev/null"
       end
 
       it "should use the default if neither flag nor env var are present" do
-        @command.parse([])
-        @command.file.should == "/dev/null"
+        command.parse([])
+        command.file.should == "/dev/null"
       end
 
       it "should use the env value if present (instead of default)" do
         ENV["FILE"] = "/etc/motd"
-        @command.parse([])
-        @command.file.should == ENV["FILE"]
+        command.parse([])
+        command.file.should == ENV["FILE"]
       end
 
       it "should use the the flag value if present (instead of env)" do
         ENV["FILE"] = "/etc/motd"
-        @command.parse(%w(/bin/sh))
-        @command.file.should == "/bin/sh"
+        command.parse(%w(/bin/sh))
+        command.file.should == "/bin/sh"
       end
 
       describe "#help" do
 
         it "describes the default value and env usage" do
-          @command.help.should include(%{ (default: $FILE, or "/dev/null")})
+          command.help.should include(%{ (default: $FILE, or "/dev/null")})
         end
 
       end
@@ -627,7 +627,7 @@ describe Clamp::Command do
 
         it "raises a UsageError" do
           lambda do
-            @command.parse(["crash"])
+            command.parse(["crash"])
           end.should raise_error(Clamp::UsageError, "too many arguments")
         end
 
@@ -640,9 +640,9 @@ describe Clamp::Command do
   describe "with parameters declared" do
 
     before do
-      @command.class.parameter "X", "x\nxx"
-      @command.class.parameter "Y", "y"
-      @command.class.parameter "[Z]", "z", :default => "ZZZ"
+      command.class.parameter "X", "x\nxx"
+      command.class.parameter "Y", "y"
+      command.class.parameter "[Z]", "z", :default => "ZZZ"
     end
 
     describe "#parse" do
@@ -650,13 +650,13 @@ describe Clamp::Command do
       describe "with arguments for all parameters" do
 
         before do
-          @command.parse(["crash", "bang", "wallop"])
+          command.parse(["crash", "bang", "wallop"])
         end
 
         it "maps arguments onto the command object" do
-          @command.x.should == "crash"
-          @command.y.should == "bang"
-          @command.z.should == "wallop"
+          command.x.should == "crash"
+          command.y.should == "bang"
+          command.z.should == "wallop"
         end
 
       end
@@ -665,7 +665,7 @@ describe Clamp::Command do
 
         it "raises a UsageError" do
           lambda do
-            @command.parse(["crash"])
+            command.parse(["crash"])
           end.should raise_error(Clamp::UsageError, "parameter 'Y': no value provided")
         end
 
@@ -674,10 +674,10 @@ describe Clamp::Command do
       describe "with optional argument omitted" do
 
         it "defaults the optional argument" do
-          @command.parse(["crash", "bang"])
-          @command.x.should == "crash"
-          @command.y.should == "bang"
-          @command.z.should == "ZZZ"
+          command.parse(["crash", "bang"])
+          command.x.should == "crash"
+          command.y.should == "bang"
+          command.z.should == "ZZZ"
         end
 
       end
@@ -685,10 +685,10 @@ describe Clamp::Command do
       describe "with multi-line arguments" do
 
         it "parses them correctly" do
-          @command.parse(["foo\nhi", "bar", "baz"])
-          @command.x.should == "foo\nhi"
-          @command.y.should == "bar"
-          @command.z.should == "baz"
+          command.parse(["foo\nhi", "bar", "baz"])
+          command.x.should == "foo\nhi"
+          command.y.should == "bar"
+          command.z.should == "baz"
         end
 
       end
@@ -697,7 +697,7 @@ describe Clamp::Command do
 
         it "raises a UsageError" do
           lambda do
-            @command.parse(["crash", "bang", "wallop", "kapow"])
+            command.parse(["crash", "bang", "wallop", "kapow"])
           end.should raise_error(Clamp::UsageError, "too many arguments")
         end
 
@@ -708,17 +708,17 @@ describe Clamp::Command do
     describe "#help" do
 
       it "indicates that there are parameters" do
-        @command.help.should include("cmd [OPTIONS] X Y [Z]")
+        command.help.should include("cmd [OPTIONS] X Y [Z]")
       end
 
       it "includes parameter details" do
-        @command.help.should =~ %r(X +x)
-        @command.help.should =~ %r(Y +y)
-        @command.help.should =~ %r(\[Z\] +z \(default: "ZZZ"\))
+        command.help.should =~ %r(X +x)
+        command.help.should =~ %r(Y +y)
+        command.help.should =~ %r(\[Z\] +z \(default: "ZZZ"\))
       end
 
       it "handles new lines in option descriptions" do
-        @command.help.should =~ %r(X +x\n +xx)
+        command.help.should =~ %r(X +x\n +xx)
       end
 
     end
@@ -737,7 +737,7 @@ describe Clamp::Command do
     describe "#help" do
 
       it "includes the explicit usage" do
-        @command.help.should include("blah FOO BAR ...\n")
+        command.help.should include("blah FOO BAR ...\n")
       end
 
     end
@@ -756,8 +756,8 @@ describe Clamp::Command do
     describe "#help" do
 
       it "includes both potential usages" do
-        @command.help.should include("put THIS HERE\n")
-        @command.help.should include("put THAT THERE\n")
+        command.help.should include("put THIS HERE\n")
+        command.help.should include("put THAT THERE\n")
       end
 
     end
@@ -780,8 +780,8 @@ describe Clamp::Command do
     describe "#help" do
 
       it "includes the description" do
-        @command.help.should =~ /^  Punt is an example command/
-        @command.help.should =~ /^  The prefix/
+        command.help.should =~ /^  Punt is an example command/
+        command.help.should =~ /^  The prefix/
       end
 
     end
@@ -791,26 +791,26 @@ describe Clamp::Command do
   describe ".run" do
 
     it "creates a new Command instance and runs it" do
-      @command.class.class_eval do
+      command.class.class_eval do
         parameter "WORD ...", "words"
         def execute
           print word_list.inspect
         end
       end
       @xyz = %w(x y z)
-      @command.class.run("cmd", @xyz)
+      command.class.run("cmd", @xyz)
       stdout.should == @xyz.inspect
     end
 
     describe "invoked with a context hash" do
 
       it "makes the context available within the command" do
-        @command.class.class_eval do
+        command.class.class_eval do
           def execute
             print context[:foo]
           end
         end
-        @command.class.run("xyz", [], :foo => "bar")
+        command.class.run("xyz", [], :foo => "bar")
         stdout.should == "bar"
       end
 
@@ -820,14 +820,14 @@ describe Clamp::Command do
 
       before do
 
-        @command.class.class_eval do
+        command.class.class_eval do
           def execute
             signal_usage_error "bad dog!"
           end
         end
 
         begin
-          @command.class.run("cmd", [])
+          command.class.run("cmd", [])
         rescue SystemExit => e
           @system_exit = e
         end
@@ -852,7 +852,7 @@ describe Clamp::Command do
     describe "when help is requested" do
 
       it "outputs help" do
-        @command.class.run("cmd", ["--help"])
+        command.class.run("cmd", ["--help"])
         stdout.should include "Usage:"
       end
 
@@ -862,19 +862,19 @@ describe Clamp::Command do
 
   describe "subclass" do
 
-    before do
-      @parent_command_class = Class.new(Clamp::Command) do
+    let(:command) do
+      parent_command_class = Class.new(Clamp::Command) do
         option "--verbose", :flag, "be louder"
       end
-      @derived_command_class = Class.new(@parent_command_class) do
+      derived_command_class = Class.new(parent_command_class) do
         option "--iterations", "N", "number of times to go around"
       end
-      @command = @derived_command_class.new("cmd")
+      derived_command_class.new("cmd")
     end
 
     it "inherits options from it's superclass" do
-      @command.parse(["--verbose"])
-      @command.should be_verbose
+      command.parse(["--verbose"])
+      command.should be_verbose
     end
 
   end