caliph 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc37eb0ffecf0d003a9144cf99d8f9a1c939615
-  data.tar.gz: a01552b706ec5dd873175abe5d299716312bdcbc
+  metadata.gz: dc5ce22c06862354326d17dd565011e0a1400c2b
+  data.tar.gz: e807f8ba5aee6acbff65f4914e07a45cfe041e77
 SHA512:
-  metadata.gz: 69b432bb2de573c7694ec6191afbf3ec103bf3cfa027e9022cec0c2e9a201774081819e5a1c5d6bf1e774ce88fe08b364bce6418f4dc01a95466071f21e6a6fe
-  data.tar.gz: 72c5668ae540aee64b20db9eb55fcc7c19ed98ae9e96bb0938e83ae60f40bb390b8c307405058de795964a4a64e7543cd40084387c3127931441b53c290f4155
+  metadata.gz: 633740377edb77bc21209b85ef40fc0e12951e31deef6889311c34ba1e3175a355dc35105ee2bbe85f96681c3d5bbaea28bbd534f5eb76c297e2d7fc00119453
+  data.tar.gz: 36bf32376cd2e8bc619d133b0cae4e727bd64a8d7aff2ae78d5b7d8402f941d528272d861e51a00f97386842eb8b3c5a7d66bce27a2de90cce3bf8387ee9f36c

data/lib/caliph/command-line-dsl.rb

@@ -10,7 +10,13 @@ module Caliph
     end
 
     def escaped_command(*args, &block)
-      ShellEscaped.new(CommandLine.new(*args, &block))
+      command = nil
+      if args.length == 1 and args.first.is_a? CommandLine
+        command = args.first
+      else
+        command = cmd(*args, &block)
+      end
+      ShellEscaped.new(command)
     end
   end
 end

data/lib/caliph/command-run-result.rb

@@ -56,6 +56,7 @@ module Caliph
     rescue
       return false
     end
+    alias succeeds? succeeded?
 
     # Nicely formatted output of stdout and stderr - won't be intermixed, which
     # may be different than what you'd see live in the shell
@@ -70,7 +71,7 @@ module Caliph
       when 0
         return exit_code
       else
-        fail "Command #{@command.inspect} failed with exit status #{exit_code}: \n#{format_streams}"
+        fail "Command '#{@command.string_format}' failed with exit status #{exit_code}: \n#{format_streams}"
       end
     end
 

data/lib/caliph/shell-escaped.rb

@@ -21,5 +21,9 @@ module Caliph
     def to_s
       command
     end
+
+    def valid?
+      @escaped.valid?
+    end
   end
 end

data/lib/caliph/shell.rb

@@ -56,7 +56,7 @@ module Caliph
       end
       #raise InvalidCommand, "not a command line: #{command_line.inspect}"
       #unless command_line.is_a? CommandLine
-      raise IncompleteCommand, "cannot run #{command_line}" unless command_line.valid?
+      raise IncompleteCommand, "cannot run #{command_line.inspect}" unless command_line.valid?
       command_line
     end
     protected :normalize_command_line

data/lib/caliph/testing/mock-command-line.rb

@@ -24,44 +24,49 @@ module Caliph
     alias exit_status exit_code
   end
 
-  class CommandLine
-    def self.execute(*args)
-      fail "Command line executed in specs without 'expect_command' or 'expect_some_commands'"
+  class MockShell
+    def self.execute(command_line, *args)
+      execute_string(command_line.string_format)
+    end
+
+    def self.execute_string(string)
+      fail "Command line executed in specs without 'expect_command' or 'expect_some_commands' (string was: #{string})"
     end
   end
 
   module CommandLineExampleGroup
     include CommandLineDSL
     module MockingExecute
-      def execute
-        Caliph::CommandLine.execute(command)
+      def execute(command)
+        Caliph::MockShell.execute(command)
       end
     end
 
-
     def self.included(group)
       group.before :each do
-        @original_execute = Caliph::CommandLine.instance_method(:execute)
-        unless MockingExecute > Caliph::CommandLine
-          Caliph::CommandLine.send(:include, MockingExecute)
+        @original_execute = Caliph::Shell.instance_method(:execute)
+        @reporting_stream = StringIO.new
+        unless MockingExecute > Caliph::Shell
+          Caliph::Shell.send(:include, MockingExecute)
         end
-        Caliph::CommandLine.send(:remove_method, :execute)
+        Caliph::Shell.send(:remove_method, :execute)
+        Caliph::Shell.any_instance.stub(:output_stream => @reporting_stream)
       end
 
       group.after :each do
-        Caliph::CommandLine.send(:define_method, :execute, @original_execute)
+        Caliph::Shell.send(:define_method, :execute, @original_execute)
       end
     end
 
     #Registers indifference as to exactly what commands get called
     def expect_some_commands
-      Caliph::CommandLine.should_receive(:execute).any_number_of_times.and_return(MockCommandResult.create(0))
+      Caliph::MockShell.should_receive(:execute_string).any_number_of_times.and_return(MockCommandResult.create(0))
     end
 
     #Registers an expectation about a command being run - expectations are
     #ordered
     def expect_command(cmd, *result)
-      Caliph::CommandLine.should_receive(:execute, :expected_from => caller(1)[0]).with(cmd).ordered.and_return(MockCommandResult.create(*result))
+      Caliph::MockShell.should_receive(:execute_string, :expected_from => caller(1)[0]).with(cmd).ordered.and_return(MockCommandResult.create(*result))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caliph
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Evan Dorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
       TDD-suitable Ruby tool for generating command-line commands via an OOP interface.
@@ -102,7 +102,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- caliph-0.3.0 Documentation
+- caliph-0.3.1 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement