tango 0.0.4 → 0.0.5

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 .DS_Store
+.rvmrc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tango (0.0.4)
+    tango (0.0.5)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -15,17 +15,17 @@ Example
 
     class Homebrew < Tango::Namespace
       def installed?(formula)
-        `brew info #{formula}` !~ /Not installed/
+        shell("brew", "info", formula, :echo => false).output !~ /Not installed/
       end
 
       step "bootstrap" do
-        met? { system "brew info" }
-        meet { system %{ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"} }
+        met? { shell("brew info").succeeded? }
+        meet { shell(%{ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"}) }
       end
 
       step "install" do |formula|
         met? { installed?(formula) }
-        meet { system "brew install #{formula}" }
+        meet { shell("brew, "install", formula) }
       end
     end
 
@@ -39,7 +39,7 @@ Example
 
       step "install mtr" do
         met? { Homebrew.installed?("mtr") }
-        meet { system "brew install --no-gtk mtr" }
+        meet { shell("brew install --no-gtk mtr") }
       end
     end
 

data/lib/tango/logger.rb

@@ -10,17 +10,21 @@ module Tango
     end
 
     def enter(step_name)
-      @io.puts "#{indent}#{step_name} {\n"
+      log "#{step_name} {"
       @depth += 1
     end
 
+    def leave(step_name)
+      @depth -= 1
+      log "} √ #{step_name}"
+    end
+
     def log(message)
-      @io.puts "#{indent}#{message}\n"
+      @io.puts "#{indent}#{message}"
     end
 
-    def leave(step_name)
-      @depth -= 1
-      @io.puts "#{indent}} √ #{step_name}\n"
+    def log_raw(message)
+      @io.write message
     end
 
   private
@@ -31,3 +35,4 @@ module Tango
 
   end
 end
+

data/lib/tango/namespace.rb

@@ -1,10 +1,12 @@
 require 'tango/as_user'
 require 'tango/met_and_meet'
+require 'tango/shell'
 
 module Tango
   class Namespace
     include AsUser
     include MetAndMeet
+    include Shell
     
     def self.step(step_name, &block)
       define_method(step_name, &block)
@@ -27,6 +29,10 @@ module Tango
       self.class.logger.log(message)
     end
 
+    def log_raw(message)
+      self.class.logger.log_raw(message)
+    end
+
     def self.method_missing(method, *args)
       new.send(method, *args)
     end

data/lib/tango/shell.rb

@@ -0,0 +1,57 @@
+require 'ostruct'
+
+module Tango
+  module Shell
+
+    def shell(command, *args)
+      options = { :echo => true }
+      options.merge!(args.pop) if args.last.is_a?(Hash)
+
+      log "% #{command} #{args.join(' ')}\n\n" if options[:echo]
+
+      pid, pipe = fork_and_exec(command, *args)
+      output    = collect_output(pipe, options[:echo])
+      Process.waitpid(pid)
+      pipe.close
+
+      OpenStruct.new(
+        :output     => output,
+        :status     => $?.exitstatus,
+        :succeeded? => $?.success?,
+        :failed?    => !$?.success?
+      )
+    end
+
+  private
+
+    def fork_and_exec(command, *args)
+      read_end, write_end = IO.pipe
+      pid = fork do
+        read_end.close
+        STDOUT.reopen(write_end)
+        STDERR.reopen(write_end)
+        exec(command, *args)
+      end
+      write_end.close
+
+      return pid, read_end
+    end
+
+    def collect_output(pipe, echo = true)
+      output = ""
+
+      begin
+        loop do
+          partial = pipe.readpartial(4096)
+          log_raw(partial) if echo
+          output << partial
+        end
+      rescue EOFError
+      end
+
+      output
+    end
+
+  end
+end
+

data/lib/tango/version.rb

@@ -1,3 +1,3 @@
 module Tango
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/shell_spec.rb

@@ -0,0 +1,51 @@
+require 'tango'
+
+module Tango
+  describe Shell do
+
+    before do
+      @stub_class = Class.new do
+        include Tango::Shell
+        def log(message); end
+        def log_raw(message); end
+      end
+    end
+
+    it "should return the right info for a successful command" do
+      result = @stub_class.new.shell("echo", "Hello, world!")
+      result.output.should == "Hello, world!\n"
+      result.status.should == 0
+      result.succeeded?.should be_true
+      result.failed?.should be_false
+    end
+
+    it "should return the right info for a failing command" do
+      result = @stub_class.new.shell("test", "a", "=", "b")
+      result.status.should == 1
+      result.succeeded?.should be_false
+      result.failed?.should be_true 
+    end
+
+    it "should accept commands as a single argument" do
+      result = @stub_class.new.shell("echo Hello, world!")
+      result.output.should == "Hello, world!\n"
+    end
+
+    it "should echo the command and its output" do
+      @stub = @stub_class.new
+      @stub.should_receive(:log).with("% echo Hello, world!\n\n")
+      @stub.should_receive(:log_raw).with("Hello, world!\n")
+
+      @stub.shell("echo", "Hello, world!")
+    end
+
+    it "should allow echo to be turned off" do
+      @stub = @stub_class.new
+      @stub.should_not_receive(:log)
+      @stub.should_not_receive(:log_raw)
+
+      @stub.shell("echo", "Hello, world!", :echo => false).output.should == "Hello, world!\n"
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tango
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +11:00
+date: 2011-04-01 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,12 @@ files:
 - lib/tango/logger.rb
 - lib/tango/met_and_meet.rb
 - lib/tango/namespace.rb
+- lib/tango/shell.rb
 - lib/tango/version.rb
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
 - spec/namespace_spec.rb
+- spec/shell_spec.rb
 - tango.gemspec
 has_rdoc: true
 homepage: ""
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tango
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Experiment in deployment tools.
@@ -97,3 +99,4 @@ test_files:
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
 - spec/namespace_spec.rb
+- spec/shell_spec.rb