clamp 0.6.3 → 0.6.4

data/spec/clamp/option/definition_spec.rb

@@ -2,33 +2,33 @@ require 'spec_helper'
 
 describe Clamp::Option::Definition do
 
-  describe "with String argument" do
+  context "with String argument" do
 
     let(:option) do
       described_class.new("--key-file", "FILE", "SSH identity")
     end
 
     it "has a long_switch" do
-      option.long_switch.should == "--key-file"
+      expect(option.long_switch).to eql "--key-file"
     end
 
     it "has a type" do
-      option.type.should == "FILE"
+      expect(option.type).to eql "FILE"
     end
 
     it "has a description" do
-      option.description.should == "SSH identity"
+      expect(option.description).to eql "SSH identity"
     end
 
     describe "#attribute_name" do
 
       it "is derived from the (long) switch" do
-        option.attribute_name.should == "key_file"
+        expect(option.attribute_name).to eql "key_file"
       end
 
       it "can be overridden" do
         option = described_class.new("--key-file", "FILE", "SSH identity", :attribute_name => "ssh_identity")
-        option.attribute_name.should == "ssh_identity"
+        expect(option.attribute_name).to eql "ssh_identity"
       end
 
     end
@@ -36,7 +36,7 @@ describe Clamp::Option::Definition do
     describe "#write_method" do
 
       it "is derived from the attribute_name" do
-        option.write_method.should == "key_file="
+        expect(option.write_method).to eql "key_file="
       end
 
     end
@@ -45,12 +45,12 @@ describe Clamp::Option::Definition do
 
       it "defaults to nil" do
         option = described_class.new("-n", "N", "iterations")
-        option.default_value.should == nil
+        expect(option.default_value).to eql nil
       end
 
       it "can be overridden" do
         option = described_class.new("-n", "N", "iterations", :default => 1)
-        option.default_value.should == 1
+        expect(option.default_value).to eql 1
       end
 
     end
@@ -58,14 +58,14 @@ describe Clamp::Option::Definition do
     describe "#help" do
 
       it "combines switch, type and description" do
-        option.help.should == ["--key-file FILE", "SSH identity"]
+        expect(option.help).to eql ["--key-file FILE", "SSH identity"]
       end
 
     end
 
   end
 
-  describe "flag" do
+  context "flag" do
 
     let(:option) do
       described_class.new("--verbose", :flag, "Blah blah blah")
@@ -74,13 +74,13 @@ describe Clamp::Option::Definition do
     describe "#default_conversion_block" do
 
       it "converts truthy values to true" do
-        option.default_conversion_block.call("true").should == true
-        option.default_conversion_block.call("yes").should == true
+        expect(option.default_conversion_block.call("true")).to eql true
+        expect(option.default_conversion_block.call("yes")).to eql true
       end
 
       it "converts falsey values to false" do
-        option.default_conversion_block.call("false").should == false
-        option.default_conversion_block.call("no").should == false
+        expect(option.default_conversion_block.call("false")).to eql false
+        expect(option.default_conversion_block.call("no")).to eql false
       end
 
     end
@@ -88,29 +88,29 @@ describe Clamp::Option::Definition do
     describe "#help" do
 
       it "excludes option argument" do
-        option.help.should == ["--verbose", "Blah blah blah"]
+        expect(option.help).to eql ["--verbose", "Blah blah blah"]
       end
 
     end
 
   end
 
-  describe "negatable flag" do
+  context "negatable flag" do
 
     let(:option) do
       described_class.new("--[no-]force", :flag, "Force installation")
     end
 
     it "handles both positive and negative forms" do
-      option.handles?("--force").should be_true
-      option.handles?("--no-force").should be_true
+      expect(option.handles?("--force")).to be true
+      expect(option.handles?("--no-force")).to be true
     end
 
     describe "#flag_value" do
 
       it "returns true for the positive variant" do
-        option.flag_value("--force").should be_true
-        option.flag_value("--no-force").should be_false
+        expect(option.flag_value("--force")).to be true
+        expect(option.flag_value("--no-force")).to be false
       end
 
     end
@@ -118,35 +118,35 @@ describe Clamp::Option::Definition do
     describe "#attribute_name" do
 
       it "is derived from the (long) switch" do
-        option.attribute_name.should == "force"
+        expect(option.attribute_name).to eql "force"
       end
 
     end
 
   end
 
-  describe "with both short and long switches" do
+  context "with both short and long switches" do
 
     let(:option) do
       described_class.new(["-k", "--key-file"], "FILE", "SSH identity")
     end
 
     it "handles both switches" do
-      option.handles?("--key-file").should be_true
-      option.handles?("-k").should be_true
+      expect(option.handles?("--key-file")).to be true
+      expect(option.handles?("-k")).to be true
     end
 
     describe "#help" do
 
       it "includes both switches" do
-        option.help.should == ["-k, --key-file FILE", "SSH identity"]
+        expect(option.help).to eql ["-k, --key-file FILE", "SSH identity"]
       end
 
     end
 
   end
 
-  describe "with an associated environment variable" do
+  context "with an associated environment variable" do
 
     let(:option) do
       described_class.new("-x", "X", "mystery option", :environment_variable => "APP_X")
@@ -155,12 +155,12 @@ describe Clamp::Option::Definition do
     describe "#help" do
 
       it "describes environment variable" do
-        option.help.should == ["-x X", "mystery option (default: $APP_X)"]
+        expect(option.help).to eql ["-x X", "mystery option (default: $APP_X)"]
       end
 
     end
 
-    describe "and a default value" do
+    context "and a default value" do
 
       let(:option) do
         described_class.new("-x", "X", "mystery option", :environment_variable => "APP_X", :default => "xyz")
@@ -169,7 +169,7 @@ describe Clamp::Option::Definition do
       describe "#help" do
 
         it "describes both environment variable and default" do
-          option.help.should == ["-x X", %{mystery option (default: $APP_X, or "xyz")}]
+          expect(option.help).to eql ["-x X", %{mystery option (default: $APP_X, or "xyz")}]
         end
 
       end
@@ -178,25 +178,25 @@ describe Clamp::Option::Definition do
 
   end
 
-  describe "multivalued" do
+  context "multivalued" do
 
     let(:option) do
       described_class.new(["-H", "--header"], "HEADER", "extra header", :multivalued => true)
     end
 
     it "is multivalued" do
-      option.should be_multivalued
+      expect(option).to be_multivalued
     end
 
     describe "#default_value" do
 
       it "defaults to an empty Array" do
-        option.default_value.should == []
+        expect(option.default_value).to eql []
       end
 
       it "can be overridden" do
         option = described_class.new("-H", "HEADER", "extra header", :multivalued => true, :default => [1,2,3])
-        option.default_value.should == [1,2,3]
+        expect(option.default_value).to eql [1,2,3]
       end
 
     end
@@ -204,7 +204,7 @@ describe Clamp::Option::Definition do
     describe "#attribute_name" do
 
       it "gets a _list suffix" do
-        option.attribute_name.should == "header_list"
+        expect(option.attribute_name).to eql "header_list"
       end
 
     end
@@ -212,7 +212,7 @@ describe Clamp::Option::Definition do
     describe "#append_method" do
 
       it "is derived from the attribute_name" do
-        option.append_method.should == "append_to_header_list"
+        expect(option.append_method).to eql "append_to_header_list"
       end
 
     end
@@ -236,7 +236,7 @@ describe Clamp::Option::Definition do
       it "includes help for each option exactly once" do
         subcommand = command_class.send(:find_subcommand, 'foo')
         subcommand_help = subcommand.subcommand_class.help("")
-        subcommand_help.lines.grep(/--bar BAR/).count.should == 1
+        expect(subcommand_help.lines.grep(/--bar BAR/).count).to eql 1
       end
 
     end

data/spec/clamp/option_module_spec.rb

@@ -4,7 +4,7 @@ describe Clamp::Command do
 
   include OutputCapture
 
-  describe "with included module" do
+  context "with included module" do
 
     let(:command) do
 
@@ -29,7 +29,7 @@ describe Clamp::Command do
 
     it "accepts options from included module" do
       command.run(["--size", "42"])
-      stdout.should == "size = 42\n"
+      expect(stdout).to eql "size = 42\n"
     end
 
   end

data/spec/clamp/parameter/definition_spec.rb

@@ -2,33 +2,33 @@ require 'spec_helper'
 
 describe Clamp::Parameter::Definition do
 
-  describe "normal" do
+  context "normal" do
 
     let(:parameter) do
       described_class.new("COLOR", "hue of choice")
     end
 
     it "has a name" do
-      parameter.name.should == "COLOR"
+      expect(parameter.name).to eql "COLOR"
     end
 
     it "has a description" do
-      parameter.description.should == "hue of choice"
+      expect(parameter.description).to eql "hue of choice"
     end
 
     it "is single-valued" do
-      parameter.should_not be_multivalued
+      expect(parameter).to_not be_multivalued
     end
 
     describe "#attribute_name" do
 
       it "is derived from the name" do
-        parameter.attribute_name.should == "color"
+        expect(parameter.attribute_name).to eql "color"
       end
 
       it "can be overridden" do
         parameter = described_class.new("COLOR", "hue of choice", :attribute_name => "hue")
-        parameter.attribute_name.should == "hue"
+        expect(parameter.attribute_name).to eql "hue"
       end
 
     end
@@ -37,17 +37,17 @@ describe Clamp::Parameter::Definition do
 
       it "consumes one argument" do
         arguments = %w(a b c)
-        parameter.consume(arguments).should == ["a"]
-        arguments.should == %w(b c)
+        expect(parameter.consume(arguments)).to eql ["a"]
+        expect(arguments).to eql %w(b c)
       end
 
       describe "with no arguments" do
 
         it "raises an Argument error" do
           arguments = []
-          lambda do
+          expect do
             parameter.consume(arguments)
-          end.should raise_error(ArgumentError)
+          end.to raise_error(ArgumentError)
         end
 
       end
@@ -56,20 +56,20 @@ describe Clamp::Parameter::Definition do
 
   end
 
-  describe "optional (name in square brackets)" do
+  context "optional (name in square brackets)" do
 
     let(:parameter) do
       described_class.new("[COLOR]", "hue of choice")
     end
 
     it "is single-valued" do
-      parameter.should_not be_multivalued
+      expect(parameter).to_not be_multivalued
     end
 
     describe "#attribute_name" do
 
       it "omits the brackets" do
-        parameter.attribute_name.should == "color"
+        expect(parameter.attribute_name).to eql "color"
       end
 
     end
@@ -78,15 +78,15 @@ describe Clamp::Parameter::Definition do
 
       it "consumes one argument" do
         arguments = %w(a b c)
-        parameter.consume(arguments).should == ["a"]
-        arguments.should == %w(b c)
+        expect(parameter.consume(arguments)).to eql ["a"]
+        expect(arguments).to eql %w(b c)
       end
 
       describe "with no arguments" do
 
         it "consumes nothing" do
           arguments = []
-          parameter.consume(arguments).should == []
+          expect(parameter.consume(arguments)).to eql []
         end
 
       end
@@ -95,20 +95,20 @@ describe Clamp::Parameter::Definition do
 
   end
 
-  describe "list (name followed by ellipsis)" do
+  context "list (name followed by ellipsis)" do
 
     let(:parameter) do
       described_class.new("FILE ...", "files to process")
     end
 
     it "is multi-valued" do
-      parameter.should be_multivalued
+      expect(parameter).to be_multivalued
     end
 
     describe "#attribute_name" do
 
       it "gets a _list suffix" do
-        parameter.attribute_name.should == "file_list"
+        expect(parameter.attribute_name).to eql "file_list"
       end
 
     end
@@ -116,7 +116,7 @@ describe Clamp::Parameter::Definition do
     describe "#append_method" do
 
       it "is derived from the attribute_name" do
-        parameter.append_method.should == "append_to_file_list"
+        expect(parameter.append_method).to eql "append_to_file_list"
       end
 
     end
@@ -125,17 +125,17 @@ describe Clamp::Parameter::Definition do
 
       it "consumes all the remaining arguments" do
         arguments = %w(a b c)
-        parameter.consume(arguments).should == %w(a b c)
-        arguments.should == []
+        expect(parameter.consume(arguments)).to eql %w(a b c)
+        expect(arguments).to eql []
       end
 
       describe "with no arguments" do
 
         it "raises an Argument error" do
           arguments = []
-          lambda do
+          expect do
             parameter.consume(arguments)
-          end.should raise_error(ArgumentError)
+          end.to raise_error(ArgumentError)
         end
 
       end
@@ -151,7 +151,7 @@ describe Clamp::Parameter::Definition do
       describe "#attribute_name" do
 
         it "is the specified one" do
-          parameter.attribute_name.should == "config_settings"
+          expect(parameter.attribute_name).to eql "config_settings"
         end
 
       end
@@ -160,20 +160,20 @@ describe Clamp::Parameter::Definition do
 
   end
 
-  describe "optional list" do
+  context "optional list" do
 
     let(:parameter) do
       described_class.new("[FILES] ...", "files to process")
     end
 
     it "is multi-valued" do
-      parameter.should be_multivalued
+      expect(parameter).to be_multivalued
     end
 
     describe "#attribute_name" do
 
       it "gets a _list suffix" do
-        parameter.attribute_name.should == "files_list"
+        expect(parameter.attribute_name).to eql "files_list"
       end
 
     end
@@ -181,7 +181,7 @@ describe Clamp::Parameter::Definition do
     describe "#default_value" do
 
       it "is an empty list" do
-        parameter.default_value.should == []
+        expect(parameter.default_value).to eql []
       end
 
     end
@@ -189,12 +189,12 @@ describe Clamp::Parameter::Definition do
     describe "#help" do
 
       it "does not include default" do
-        parameter.help_rhs.should_not include("default:")
+        expect(parameter.help_rhs).to_not include("default:")
       end
 
     end
 
-    describe "with specified default value" do
+    context "with specified default value" do
 
       let(:parameter) do
         described_class.new("[FILES] ...", "files to process", :default => %w(a b c))
@@ -203,7 +203,7 @@ describe Clamp::Parameter::Definition do
       describe "#default_value" do
 
         it "is that specified" do
-          parameter.default_value.should == %w(a b c)
+          expect(parameter.default_value).to eql %w(a b c)
         end
 
       end
@@ -211,7 +211,7 @@ describe Clamp::Parameter::Definition do
       describe "#help" do
 
         it "includes the default value" do
-          parameter.help_rhs.should include("default:")
+          expect(parameter.help_rhs).to include("default:")
         end
 
       end
@@ -220,15 +220,15 @@ describe Clamp::Parameter::Definition do
 
         it "consumes all the remaining arguments" do
           arguments = %w(a b c)
-          parameter.consume(arguments).should == %w(a b c)
-          arguments.should == []
+          expect(parameter.consume(arguments)).to eql %w(a b c)
+          expect(arguments).to eql []
         end
 
-        describe "with no arguments" do
+        context "with no arguments" do
 
           it "don't override defaults" do
             arguments = []
-            parameter.consume(arguments).should == []
+            expect(parameter.consume(arguments)).to eql []
           end
 
         end