caliph 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5de06075953f9ad400bad3cc4332993b9bacd0
-  data.tar.gz: 06aa83e94ac0995663cfb620b6ebdfc1ae0ad52f
+  metadata.gz: d4a677cfc00224f91e1cddbfd66ecf9310071deb
+  data.tar.gz: ba9069ed6aff7c72b2e1c5b9b40c00c694970a37
 SHA512:
-  metadata.gz: 3d6102271b1792f2e61475a4d8fbfe90015a22285db7443c7c9fe0532bde556f514bcc4397b4e8c9c15c782171dbfdc470770e85e9282d24859c970a69395566
-  data.tar.gz: b10807d66cff7e0660da4cc896b9cf48eff868617b4f82479a3101f81459eba831b8ed5b73ed8cdf4fe0294b0e6a0077f9aa7b543184ac3070c357a1271e1a1a
+  metadata.gz: 995b6ad0b4898b4f51ac2ce098a7fe92558773a63747ccb28db6d8324305ca3c43dcaaddafddc0b60843e0cb22f95c7cb154d4a8c54c10906a8291990f7e64d6
+  data.tar.gz: 125d12f8318ff484e2e74a67794dbf12569d66d5612fa62a8c9ccf3a800552d52ec0bf25be165fe5ff420258974789ebd7a8e19cfcb2bdf47675901bd632a667

data/lib/caliph/command-chain.rb

@@ -30,6 +30,18 @@ module Caliph
       end
     end
 
+    def redirect_to(stream, path)
+      @commands.last.redirect_to(stream, path)
+    end
+
+    def redirect_from(path, stream)
+      @commands.last.redirect_from(path, stream)
+    end
+
+    def copy_stream_to(from, to)
+      @commands.last.copy_stream_to(from, to)
+    end
+
     def name
       @name || @commands.last.name
     end

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

@@ -1,7 +1,20 @@
 module Caliph
   module CommandLineDSL
+    class Watcher
+      attr_accessor :apex
+
+      def inspect
+        "Watcher@#{"%#0x" % apex.object_id}"
+      end
+    end
+
     def cmd(*args, &block)
-      CommandLine.new(*args, &block)
+      watcher = Watcher.new
+      cmd = CommandLine.new(*args)
+      cmd.definition_watcher = watcher
+      watcher.apex = cmd
+      yield cmd if block_given?
+      watcher.apex
     end
 
     def escaped_command(*args, &block)

data/lib/caliph/command-line.rb

@@ -20,6 +20,7 @@ module Caliph
     end
 
     attr_accessor :name, :executable, :options, :env, :output_stream, :verbose
+    attr_accessor :definition_watcher
     attr_reader :redirections
 
     alias_method :command_environment, :env
@@ -59,8 +60,6 @@ module Caliph
       self
     end
 
-    # Waits for the process to complete. If this takes longer that
-    # {consume_timeout},
     def redirect_from(path, stream)
       @redirections << "#{stream}<#{path}"
     end

data/lib/caliph/define-op.rb

@@ -15,6 +15,10 @@ module Caliph
             chain = self
           else
             chain = klass.new
+            chain.definition_watcher = definition_watcher
+            unless definition_watcher.nil?
+              definition_watcher.apex = chain
+            end
             chain.add(self)
           end
           chain.add(other)

data/spec/command-line-dsl.rb

@@ -3,6 +3,24 @@ require 'caliph/command-line-dsl'
 describe Caliph::CommandLineDSL do
   include described_class
 
+  describe "complex commands in a block" do
+    let :command do
+      cmd("cd", "/tmp/trash") do |cmd|
+        cmd.redirect_stderr "file1"
+        cmd &= %w{rm -rf *}
+        cmd.redirect_stderr "file2"
+      end #=> returns whole chain
+    end
+
+    it "should define commands" do
+      expect(command).to be_a(Caliph::CommandChain)
+      expect(command.commands.size).to eq(2)
+      expect(command.commands[0]).to be_an_instance_of(Caliph::CommandLine)
+      expect(command.commands[1]).to be_an_instance_of(Caliph::CommandLine)
+      expect(command.command).to eq("cd /tmp/trash 2>file1 && rm -rf * 2>file2")
+    end
+  end
+
   describe "using the - operator" do
     let :command do
       cmd("sudo") - ["gem", "install", "bundler"]
@@ -33,7 +51,6 @@ describe Caliph::CommandLineDSL do
 
   describe "using the & operator" do
     let :command do
-      p method(:cmd).source_location
       cmd("cd", "/tmp/trash") & %w{rm -rf *}
     end
 

metadata

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