dotanuki 0.0.2 → 0.0.3

data/Gemfile

@@ -2,7 +2,3 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in dotanuki.gemspec
 gemspec
-
-group :test do
-	gem "rspec"
-end

data/dotanuki.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "popen4"
 
-  #s.add_test_dependency "rspec"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "metric_fu"
 
 end

data/lib/dotanuki.rb

@@ -40,10 +40,17 @@ module Dotanuki
 
     def <<(result)
       raise ArgumentError unless result.is_a?(ExecResult)
+      # TODO merge correctly
       add(result.stdout, result.stderr, result.status)
     end
   end
 
+  def initialize(options={})
+    @defaults = {}
+    @defaults[:on_error] = :exception
+    @defaults.merge!(options)
+  end
+
   # Execute commands in a block and return an array of ExecResult
   #
   # @example
@@ -54,12 +61,15 @@ module Dotanuki
   #
   # TODO this is not thread safe
   def guard(options={}, &block)
+    opts = @defaults.merge(options)
+    validate_options(opts)
     @guard = ExecResult.new
     yield
     clear_guard
   rescue ExecError => e
-    puts "guard on duty"
-    clear_guard
+    result = clear_guard
+    raise e if opts[:on_error] == :exception
+    result
   end
 
   # commands can be a string or an array of strings
@@ -102,7 +112,7 @@ module Dotanuki
 
   def validate_options(options)
     options.each do |option, value|
-      if option == :on_error && value != :exception
+      if option == :on_error && ! [:exception, :silent].include?(value)
         raise ArgumentError, "illegal value for option #{option}: #{value}"
       end
       raise ArgumentError, "illegal option: #{option}" if option != :on_error

data/lib/dotanuki/version.rb

@@ -1,3 +1,3 @@
 module Dotanuki
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dotanuki_spec.rb

@@ -19,12 +19,24 @@ describe Dotanuki do
     end
 
     it "should stop when one item fails" do
-      guard do
+      guard(:on_error => :silent) do
         execute("id")
         execute("ls /asd")
         execute("uname -n")
       end.failed_index.should == 1
     end
+
+    it "should raise an exception by default on error" do
+      lambda { guard do
+        execute("ls /asd")
+      end }.should raise_error
+    end
+
+    it "should not raise an exception by default on error" do
+      lambda { guard(:on_error => :silent) do
+        execute("ls /asd")
+      end }.should_not raise_error
+    end
   end
 
   describe "execute" do

metadata

@@ -1,39 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dotanuki
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Martin Englund
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -07:00
+date: 2011-06-02 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: popen4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157101940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A command executioner which doesn't blindly stumble on when a command fails'
-email: 
+  prerelease: false
+  version_requirements: *2157101940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157101500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157101500
+- !ruby/object:Gem::Dependency
+  name: metric_fu
+  requirement: &2157100960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157100960
+description: A command executioner which doesn't blindly stumble on when a command
+  fails'
+email:
 - martin@englund.nu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
@@ -49,31 +68,28 @@ files:
 has_rdoc: true
 homepage: https://github.com/pmenglund/dotanuki
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dotanuki
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Command executioner
-test_files: 
+test_files:
 - spec/dotanuki_spec.rb
 - spec/spec_helper.rb