caliph 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a677cfc00224f91e1cddbfd66ecf9310071deb
-  data.tar.gz: ba9069ed6aff7c72b2e1c5b9b40c00c694970a37
+  metadata.gz: 8bc37eb0ffecf0d003a9144cf99d8f9a1c939615
+  data.tar.gz: a01552b706ec5dd873175abe5d299716312bdcbc
 SHA512:
-  metadata.gz: 995b6ad0b4898b4f51ac2ce098a7fe92558773a63747ccb28db6d8324305ca3c43dcaaddafddc0b60843e0cb22f95c7cb154d4a8c54c10906a8291990f7e64d6
-  data.tar.gz: 125d12f8318ff484e2e74a67794dbf12569d66d5612fa62a8c9ccf3a800552d52ec0bf25be165fe5ff420258974789ebd7a8e19cfcb2bdf47675901bd632a667
+  metadata.gz: 69b432bb2de573c7694ec6191afbf3ec103bf3cfa027e9022cec0c2e9a201774081819e5a1c5d6bf1e774ce88fe08b364bce6418f4dc01a95466071f21e6a6fe
+  data.tar.gz: 72c5668ae540aee64b20db9eb55fcc7c19ed98ae9e96bb0938e83ae60f40bb390b8c307405058de795964a4a64e7543cd40084387c3127931441b53c290f4155

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

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

data/lib/caliph/command-line.rb

@@ -9,10 +9,9 @@ module Caliph
       attr_accessor :output_stream
     end
 
-    def initialize(executable = nil, *options)
+    def initialize(*args)
       @output_stream = self.class.output_stream || $stderr
-      @executable = executable.to_s unless executable.nil?
-      @options = options
+      from(*args)
       @redirections = []
       @env = {}
       @verbose = false
@@ -25,6 +24,11 @@ module Caliph
 
     alias_method :command_environment, :env
 
+    def from(executable = nil, *options)
+      @executable = executable.to_s unless executable.nil?
+      @options = options
+    end
+
     def valid?
       !@executable.nil?
     end

data/lib/caliph/describer.rb

@@ -0,0 +1,19 @@
+module Caliph
+  class Describer
+    attr_accessor :apex
+
+    def initialize(apex)
+      @apex = apex
+    end
+
+    def describe(&block)
+      apex.definition_watcher = self
+      yield apex
+      return apex
+    end
+
+    def inspect
+      "Watcher@#{"%#0x" % apex.object_id}"
+    end
+  end
+end

data/lib/caliph/shell.rb

@@ -1,3 +1,5 @@
+require 'caliph/describer'
+
 module Caliph
   class Error < StandardError; end
   class IncompleteCommand < Error; end
@@ -49,7 +51,9 @@ module Caliph
       else
         command_line = args.first
       end
-      yield command_line if block_given?
+      if block_given?
+        command_line = Describer.new(command_line).describe(&block)
+      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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caliph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Evan Dorn
@@ -53,6 +53,7 @@ files:
 - lib/caliph/command-line.rb
 - lib/caliph/command-run-result.rb
 - lib/caliph/define-op.rb
+- lib/caliph/describer.rb
 - lib/caliph/shell-escaped.rb
 - lib/caliph/testing/mock-command-line.rb
 - lib/caliph/testing/record-commands.rb
@@ -101,7 +102,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- caliph-0.2.0 Documentation
+- caliph-0.3.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement