clamp 1.3.2 → 1.3.3

data/spec/clamp/command_group_spec.rb

@@ -29,17 +29,27 @@ describe Clamp::Command do
 
     end
 
-    it "delegates to sub-commands" do
+    describe "flip command" do
+      before do
+        command.run(["flip"])
+      end
 
-      command.run(["flip"])
-      expect(stdout).to match(/FLIPPED/)
+      it "delegates to sub-commands" do
+        expect(stdout).to match(/FLIPPED/)
+      end
+    end
 
-      command.run(["flop"])
-      expect(stdout).to match(/FLOPPED/)
+    describe "flop command" do
+      before do
+        command.run(["flop"])
+      end
 
+      it "delegates to sub-commands" do
+        expect(stdout).to match(/FLOPPED/)
+      end
     end
 
-    context "executed with no subcommand" do
+    context "when executed with no subcommand" do
 
       it "triggers help" do
         expect do
@@ -56,10 +66,7 @@ describe Clamp::Command do
       end
 
       it "lists subcommands" do
-        help = command.help
-        expect(help).to match(/Subcommands:/)
-        expect(help).to match(/flip +flip it/)
-        expect(help).to match(/flop +flop it/)
+        expect(command.help).to match(/Subcommands:\n +flip +flip it\n +flop +flop it/)
       end
 
       it "handles new lines in subcommand descriptions" do
@@ -95,13 +102,27 @@ describe Clamp::Command do
 
     end
 
-    it "responds to both aliases" do
+    describe "the first alias" do
+
+      before do
+        command.run(["say", "boo"])
+      end
+
+      it "responds to it" do
+        expect(stdout).to match(/boo/)
+      end
+
+    end
+
+    describe "the second alias" do
 
-      command.run(["say", "boo"])
-      expect(stdout).to match(/boo/)
+      before do
+        command.run(["talk", "jive"])
+      end
 
-      command.run(["talk", "jive"])
-      expect(stdout).to match(/jive/)
+      it "responds to it" do
+        expect(stdout).to match(/jive/)
+      end
 
     end
 
@@ -167,7 +188,7 @@ describe Clamp::Command do
 
     end
 
-    context "executed with no subcommand" do
+    context "when executed with no subcommand" do
 
       it "invokes the default subcommand" do
         command.run([])
@@ -192,7 +213,7 @@ describe Clamp::Command do
 
     end
 
-    context "executed with no subcommand" do
+    context "when executed with no subcommand" do
 
       it "invokes the default subcommand" do
         command.run([])
@@ -203,24 +224,26 @@ describe Clamp::Command do
 
   end
 
-  context "declaring a default subcommand after subcommands" do
+  context "when declaring a default subcommand after subcommands" do
 
-    it "is not supported" do
+    let(:command) do
+      Class.new(Clamp::Command) do
 
-      expect do
-        Class.new(Clamp::Command) do
+        subcommand "status", "Show status" do
 
-          subcommand "status", "Show status" do
+          def execute
+            puts "All good!"
+          end
 
-            def execute
-              puts "All good!"
-            end
+        end
 
-          end
+      end
+    end
 
-          self.default_subcommand = "status"
+    it "is not supported" do
 
-        end
+      expect do
+        command.default_subcommand = "status"
       end.to raise_error(/default_subcommand must be defined before subcommands/)
 
     end
@@ -251,20 +274,18 @@ describe Clamp::Command do
 
     it "allows the parameter to be specified first" do
       command.run(["dummy", "spit"])
-      expect(stdout.strip).to eql "spat the dummy"
+      expect(stdout.strip).to eq "spat the dummy"
     end
 
     it "passes the parameter down the stack" do
       command.run(["money", "say", "loud"])
-      expect(stdout.strip).to eql "MONEY"
+      expect(stdout.strip).to eq "MONEY"
     end
 
     it "shows parameter in usage help" do
-      begin
-        command.run(["stuff", "say", "loud", "--help"])
-      rescue Clamp::HelpWanted => e
-        expect(e.command.invocation_path).to eql("with THING say loud")
-      end
+      command.run(["stuff", "say", "loud", "--help"])
+    rescue Clamp::HelpWanted => e
+      expect(e.command.invocation_path).to eq "with THING say loud"
     end
 
   end
@@ -275,6 +296,7 @@ describe Clamp::Command do
 
       speed_options = Module.new do
         extend Clamp::Option::Declaration
+
         option "--speed", "SPEED", "how fast", default: "slowly"
       end
 
@@ -338,7 +360,7 @@ describe Clamp::Command do
 
     it "only parses options once" do
       command.run(["--json", '{"a":"b"}', "woohoohoo"])
-      expect(stdout).to eql "parsing!"
+      expect(stdout).to eq "parsing!"
     end
 
   end
@@ -378,19 +400,16 @@ describe Clamp::Command do
       command_class.new("foo")
     end
 
-    it "should signal no such subcommand usage error" do
-      expect { command.run(["foo"]) }.to raise_error(Clamp::UsageError) do |exception|
-        expect(exception.message).to eq "No such sub-command 'foo'"
-      end
+    it "signals no such subcommand usage error" do
+      expect { command.run(["foo"]) }.to raise_error(Clamp::UsageError, "No such sub-command 'foo'")
     end
 
-    it "should execute the subcommand missing method" do
+    it "executes the subcommand missing method" do
       command.extend subcommand_missing
-      expect { command.run(["foo"]) }.to raise_error(SystemExit)
-      expect(stderr).to match(/there is no such thing/)
+      expect { command.run(["foo"]) }.to raise_error(SystemExit, /there is no such thing/)
     end
 
-    it "should use the subcommand class returned from subcommand_missing" do
+    it "uses the subcommand class returned from subcommand_missing" do
       command.extend subcommand_missing_with_return
       command.run(["foo"])
       expect(stdout).to match(/known subcommand/)
@@ -411,7 +430,7 @@ describe Clamp::Command do
 
     it "allows options after the subcommand" do
       command.run(%w[hop --direction south])
-      expect(stdout).to eql "Hopping south\n"
+      expect(stdout).to eq "Hopping south\n"
     end
 
   end

data/spec/clamp/{option_module_spec.rb → command_option_module_spec.rb}

@@ -12,6 +12,7 @@ describe Clamp::Command do
 
       shared_options = Module.new do
         extend Clamp::Option::Declaration
+
         option "--size", "SIZE", default: 4
       end
 
@@ -31,7 +32,7 @@ describe Clamp::Command do
 
     it "accepts options from included module" do
       command.run(["--size", "42"])
-      expect(stdout).to eql "size = 42\n"
+      expect(stdout).to eq "size = 42\n"
     end
 
   end

data/spec/clamp/{option_reordering_spec.rb → command_option_reordering_spec.rb}

@@ -40,17 +40,17 @@ describe Clamp::Command do
 
     it "still works" do
       command.run(%w[say foo])
-      expect(stdout).to eql("foo\n")
+      expect(stdout).to eq "foo\n"
     end
 
     it "honours options after positional arguments" do
       command.run(%w[say blah --verbose])
-      expect(stdout).to eql("blahblahblah\n")
+      expect(stdout).to eq "blahblahblah\n"
     end
 
     it "honours options declared on subcommands" do
       command.run(%w[say --loud blah])
-      expect(stdout).to eql("BLAH\n")
+      expect(stdout).to eq "BLAH\n"
     end
 
   end