dotanuki 0.2.0 → 0.3.0

data/README.textile

@@ -2,41 +2,61 @@ h1. Dotanuki "!https://secure.travis-ci.org/pmenglund/dotanuki.png?branch=master
 
 Simple but effective executioner of commands, which will deal correctly with failed commands.
 
+There are two versions of the Dotanuki gem "dotanuki":http://rubygems.org/gems/dotanuki which uses "posix-spawn":http://rubygems.org/gems/posix-spawn and a pure ruby version "dotanuki-ruby":http://rubygems.org/gems/dotanuki-ruby which uses "open4":http://rubygems.org/gems/open4 instead.
+
+Note that if the pure ruby version can load "posix-spawn":http://rubygems.org/gems/posix-spawn it will use it.
+
 h1. Examples
 
 In the following example, if the <code>mkdir</code> fails, none of the other commands will be executed.
 
 <pre>
-	class Example
-		include Dotanuki
-
-		def test
-			commands = [
-				"mkdir /tmp/foo",
-				"cp /etc/hosts /tmp/foo",
-				"cp /etc/passwd /tmp/foo"
-			]
-
-			result = execute(commands)
-			if result.failed?
-				puts "execution failed: #{result.fail_message}"
-			end
-		end
-	end
+  require "dotanuki"
+
+  class Example
+    include Dotanuki
+
+    def test
+      commands = [
+        "mkdir /tmp/foo",
+        "cp /etc/hosts /tmp/foo",
+        "cp /etc/passwd /tmp/foo"
+      ]
+
+      result = execute(commands)
+      if result.failed?
+        puts "execution failed: #{result.fail_message}"
+      end
+    end
+  end
 </pre>
 
 It can also be used with a <code>guard</code> block, which will raise an <code>ExecError</code> if a command fails.
 
 <pre>
-	class Example
-		include Dotanuki
-
-		def test
-			guard do
-				execute "mkdir /tmp/foo"
-				execute "cp /etc/hosts /tmp/foo"
-				execute "cp /etc/passwd /tmp/foo"
-			end
-		end
-	end
+  require "dotanuki"
+
+  class Example
+    include Dotanuki
+
+    def test
+      guard do
+        execute "mkdir /tmp/foo"
+        execute "cp /etc/hosts /tmp/foo"
+        execute "cp /etc/passwd /tmp/foo"
+      end
+    end
+  end
+</pre>
+
+If you want to use dotanuki in a class method, you have to use the module method
+
+<pre>
+  require "dotanuki"
+
+  class Example
+    def self.test?
+      Dotanuki.execute("mkdir /tmp/foo").ok?
+    end
+  end
 </pre>

data/Rakefile

@@ -1,10 +1,26 @@
 require 'bundler'
 require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
-
 task :default => [:spec]
-RSpec::Core::RakeTask.new(:spec)
+
+desc "run rspec tests"
+task :spec => [:"native:spec", :"pure:spec"]
+
+desc "build gems"
+task :build => [:"native:build", :"pure:build"]
+
+desc "release gems"
+task :release => [:"native:release", :"pure:release"]
+
+namespace "native" do
+  Bundler::GemHelper.install_tasks :name => 'dotanuki'
+  RSpec::Core::RakeTask.new(:spec)
+end
+
+namespace "pure" do
+  Bundler::GemHelper.install_tasks :name => 'dotanuki-ruby'
+  RSpec::Core::RakeTask.new(:spec)
+end
 
 desc "run autotest"
 task :autotest do

data/dotanuki-ruby.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "dotanuki/version"
+
+Gem::Specification.new do |s|
+  s.name        = "dotanuki-ruby"
+  s.version     = Dotanuki::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Martin Englund"]
+  s.email       = ["martin@englund.nu"]
+  s.homepage    = "https://github.com/pmenglund/dotanuki"
+  s.summary     = %q{Command executioner}
+  s.description = %q{A pure ruby command executioner which doesn't blindly stumble on when a command fails'}
+
+  s.rubyforge_project = "dotanuki"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency "open4"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "rake"
+
+end

data/lib/dotanuki.rb

@@ -1,9 +1,15 @@
-require 'posix/spawn'
-
 # Module intented to be included into classes which execute system commands
 # @author Martin Englund
 module Dotanuki
 
+  begin
+    require 'posix/spawn'
+    POSIX_SPAWN = true
+  rescue LoadError
+    require 'open4'
+    POSIX_SPAWN = false
+  end
+
   # Error raised when an execution error occurs
   class ExecError < StandardError
     # Create a new ExecError
@@ -47,6 +53,11 @@ module Dotanuki
       status != 0
     end
 
+    # Returns true if a command has not failed
+    def ok?
+      status == 0
+    end
+
     # Returns stderr for the command that failed
     def fail_message
       stderr[@failed_index]
@@ -118,12 +129,20 @@ module Dotanuki
 
     [commands].flatten.each do |command|
       begin
-        child = POSIX::Spawn::Child.new(command)
-        stdout = child.out.strip
-        stderr = child.err.strip
-        result.add(stdout, stderr, child.status.exitstatus)
+        if POSIX_SPAWN
+          child = POSIX::Spawn::Child.new(command)
+          stdout = child.out.strip
+          stderr = child.err.strip
+          status = child.status
+        else
+          status = Open4::popen4(command) do |pid, stdin, out, err|
+            stdout = out.read.strip
+            stderr = err.read.strip
+          end
+        end
+        result.add(stdout, stderr, status.exitstatus)
 
-        if child.status.exitstatus != 0
+        if status.exitstatus != 0
           if options[:on_error] == :exception || @guard
             @guard << result if @guard
             raise ExecError, stderr

data/lib/dotanuki/version.rb

@@ -1,4 +1,4 @@
 module Dotanuki
   # gem version
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/dotanuki_spec.rb

@@ -122,6 +122,7 @@ describe Dotanuki do
 
     it "should supply correct info on a failing command" do
       r = execute(COMMAND_FAILED)
+      r.ok?.should be_false
       r.failed?.should be_true
       r.fail_message.should_not be_empty
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotanuki
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &70167238543040 !ruby/object:Gem::Requirement
+  requirement: &70268770922200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167238543040
+  version_requirements: *70268770922200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70167238542300 !ruby/object:Gem::Requirement
+  requirement: &70268770921340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167238542300
+  version_requirements: *70268770921340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70167238541620 !ruby/object:Gem::Requirement
+  requirement: &70268770920880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167238541620
+  version_requirements: *70268770920880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70167238540880 !ruby/object:Gem::Requirement
+  requirement: &70268770920460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167238540880
+  version_requirements: *70268770920460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70167238540160 !ruby/object:Gem::Requirement
+  requirement: &70268770919920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167238540160
+  version_requirements: *70268770919920
 description: A command executioner which doesn't blindly stumble on when a command
   fails'
 email:
@@ -83,6 +83,7 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
+- dotanuki-ruby.gemspec
 - dotanuki.gemspec
 - lib/dotanuki.rb
 - lib/dotanuki/version.rb