buildem 0.0.5 → 1.0.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage

data/Gemfile

@@ -8,4 +8,6 @@ group :test do
 	gem "autotest"
 	gem "autotest-growl"
 	gem "autotest-fsevent"
+	gem "flexmock"
+	gem "rcov"
 end

data/README.md

@@ -2,7 +2,6 @@ Build'em quick, Build'em right
 ==============================
 
 Build'em is a small little script parser that is intended for large build systems.
-Build'em is still very young :) so be careful using it.  Input is always welcome and if there is a feature that you just half to have i'd probably do it.
 
 
 Features:
@@ -44,11 +43,35 @@ Example:
 	
 This will give you 5 nano-bots for your unordered tasks
 
-
 optional run and queued_run options
 --------------------------
 * :retry\_amount    (Integer that specifies that you want to retry the execution of the provided command. Default is 1 execution.)
 * :retry\_condition (Integer, regular expression, or string that specifies what a good execution is. Default is 0 if not specified.)
 * :quit\_on\_error  (Boolean that specifies if build'em should quit when an exception happens executing the provided command. Default is true)
 
+**Notice** If the retry\_condition is not met within the retry\_amount interval an error will be throw unless :quit\_on\_error is set to false
+
+Logging
+-------
+If you wish to log all of the output to a specific file you can do so with an output\_to block
+
+Example:
+
+	output_to "my_nifty_output_file.txt" do
+		run "./task.sh"
+		run "./another.sh"
+		unordered do
+			queued_run "./some_task.sh"
+			queued_run "./some_task1.sh"
+			queued_run "./some_task2.sh"
+		end
+	end
+	
+* output\_to parameters
 
+filename: The filename that you wish to output to (optional, default is output.log)
+IO capture: possible values :stdout, :stderr etc (optional, default is :stdout)
+	
+	output_to do ... will save all stdout output to output.log
+	output_to "another_file.txt" do ... same as above but would be saved to another_file.txt
+	output_to "err.txt", :stderr do ... will output all stderr to err

data/Rakefile

@@ -6,14 +6,22 @@ namespace :spec do
   
   desc "Run all of the system specs. [spec=system/foo.rb]"
   RSpec::Core::RakeTask.new(:system) do |spec|
-    spec.pattern = 'spec/system/*_spec.rb'
-    spec.rspec_opts = ['--color']
+    spec.pattern    = 'spec/system/*_spec.rb'
+    spec.rspec_opts = %w{--color'}
   end
   
   desc "Run all of the unit specs. [spec=unit/foo.rb]"
   RSpec::Core::RakeTask.new(:test) do |spec|
-    spec.pattern = 'spec/unit/*_spec.rb'
-    spec.rspec_opts = ['--color']
+    spec.pattern    = 'spec/unit/*_spec.rb'
+    spec.rspec_opts = %w{--color -f d}
   end
   
-end
+  RSpec::Core::RakeTask.new('test:rcov') do |spec|
+    rm_f "coverage"
+    spec.pattern    = 'spec/unit/*_spec.rb'
+    spec.rcov       = true
+    spec.rspec_opts = %w{--color}
+    spec.rcov_opts  = %w{--exclude spec,gems\/}
+  end
+  
+end

data/bin/buildem

@@ -3,4 +3,4 @@
 
 require 'rubygems'
 require 'buildem/runner'
-BuildEm::Runner.start
+BuildEm::Runner.new.start

data/lib/buildem/base.rb

@@ -13,11 +13,6 @@ module Kernel
   end
 end
 
-def windows?
-  return java.lang.System.get_property("os.name")[/windows/i] if RUBY_PLATFORM == "java"
-  return RUBY_PLATFORM[/mswin/]
-end
-
 def inside path
   cd path do
     yield

data/lib/buildem/executor.rb

@@ -17,7 +17,7 @@ class BuildEm::Executor
   
   def run
     optz = argz[1]
-    quit_on_error = (optz[:quit_on_error].nil?  ? true : optz[:quit_on_error])
+    quit_on_error = (optz[:quit_on_error].nil?   ? true : optz[:quit_on_error])
     retry_amount  = (optz[:retry_amount].nil?    ? 1 : optz[:retry_amount])
     condition     = (optz[:retry_condition].nil? ? 0 : optz[:retry_condition])
     executions    = 0
@@ -32,18 +32,10 @@ class BuildEm::Executor
     rescue Exception => e
       if quit_on_error
         raise e
-      else
-        #put to output log or specified log
       end
     end while executions < retry_amount
+    fail "Failed to execute [#{argz[0]}]. Tried #{retry_amount} time(s), expected match was [#{condition}] got [#{@command_exitstatus}]." if quit_on_error
     @command_exitstatus
   end
-  
-  private
-  
-  def redirect_standard_error_and_out
-    ""
-  end
-  
-  
+    
 end

data/lib/buildem/logger.rb

@@ -0,0 +1,22 @@
+require 'stringio'
+module Kernel
+  
+  def output_to(filename="output.log", stream=:stdout)
+    if block_given?
+      begin
+        stream = stream.to_s
+        eval "$#{stream} = StringIO.new"
+        yield
+        result = eval("$#{stream}").string
+      ensure
+        eval("$#{stream} = #{stream.upcase}")
+      end
+    else
+      fail "output_to must be used in block format with a 'do' and 'end'."
+    end
+    
+    File.open(filename, "w+") {|f| f.puts result }
+    
+  end
+  
+end

data/lib/buildem/runner.rb

@@ -3,6 +3,7 @@ require 'buildem/base'
 require 'buildem/configuration'
 require 'buildem/executor'
 require 'process_pool'
+require 'buildem/logger'
 
 module Kernel
   def unordered
@@ -28,8 +29,28 @@ module Kernel
 end
 
 class BuildEm::Runner
+  
   $jobs = []
-  def self.start
+  
+  def initialize(kernel = Kernel, argv = ARGV)
+    @kernel = kernel
+    @argv   = argv
+  end
+  
+  def process_standard_in
+    if @argv.empty?
+      output = []
+      while input = @kernel.gets and not input == "start\n"
+        output << input
+      end 
+      unless output.empty?
+        output = output.join("\n")
+        @kernel.eval(output)
+      end
+    end
+  end
+  
+  def start
     if ARGV.size == 1
       begin
         puts "running #{ARGV[0]}"
@@ -45,7 +66,7 @@ class BuildEm::Runner
   
   private
   
-    def self.usage
+    def usage
 <<-USAGE
 
 -----------------------------------------------------------------

data/lib/buildem/version.rb

@@ -1,3 +1,3 @@
 class BuildEm
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
 end

data/spec/helper.rb

@@ -1,12 +1,14 @@
+require "bundler/setup"
 require 'fileutils'
 include FileUtils
 require 'buildem'
+
 require 'rspec'
+require 'test/unit'
+require 'flexmock/test_unit'
 
 $SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
 
-require "bundler/setup"
-
 def require_files filename
   filename.each do |file|
     require "#{$SPEC_ROOT}/../lib/buildem/#{file}"
@@ -22,6 +24,8 @@ end
 
 RSpec.configure do |config|
   
+  config.mock_with :flexmock
+  
   def expecting_exception(clazz)
     begin
       yield

data/spec/unit/base_spec.rb

@@ -27,4 +27,22 @@ describe "base" do
     end
   end
   
+end
+
+describe Kernel, "exitstatus" do
+  
+  it "can get the exit status of the last ran application" do
+    capture(:stdout) { `pwd` }
+    Kernel.exitstatus.should == 0
+  end
+  
+end
+
+describe Kernel, "run_command" do
+  
+  it "can run a command" do
+    flexmock(Kernel) {|k| k.should_receive("`").with("awesome command").and_return("foo man shoe").once}
+    Kernel.run_command("awesome command").should == "foo man shoe"
+  end
+  
 end

data/spec/unit/executor_spec.rb

@@ -1,66 +1,84 @@
 require File.expand_path(File.dirname(__FILE__)+"/../helper.rb")
 require_files "executor"
 
+describe BuildEm::Executor, "name" do
+  it "has the correct name" do
+    BuildEm::Executor.new(["command",{}]).name.should == BuildEm::Executor
+  end
+end
+
 describe BuildEm::Executor, "run" do
   
   before :each do
-    @mock_kernel = mock(Kernel)
-    @matcher = mock(BuildEm::ConditionMatcher)
+    @mock_kernel = flexmock(Kernel)
+    @matcher     = flexmock(BuildEm::ConditionMatcher.new)
   end
 
-  describe "runs with default options" do
+  describe "with default options" do
     
     it "executes the provided command and quits if no retries supplied" do
       command  = "pinky and the brain"
-      executor = BuildEm::Executor.new([command,{}], @mock_kernel)
-      run_and_exitstatus_with(command, "FAILURE", 8675308)
-      executor.run.should == 8675308
+      run_and_exitstatus_with(command, "FAILURE")
+      capture(:stdout) { BuildEm::Executor.new([command,{}], @mock_kernel, @matcher).run.should == 0 }
     end
     
     it "raises an exception when something bad goes on" do
       command  = "foo bar"
-      executor = BuildEm::Executor.new([command, {}], @mock_kernel)
       @mock_kernel.should_receive("run_command").with(command).and_raise("KA BOOM")
-      expecting_exception("KA BOOM") { executor.run }
+      capture(:stdout) { expecting_exception("KA BOOM") { BuildEm::Executor.new([command, {}], @mock_kernel, @matcher).run } }
     end
     
   end
   
-  describe "runs command with options" do
+  describe "command retry interactions" do
+    
+    it "executes the provided command 50 times and raises an error when condition is not met" do
+      command = "urr"
+      50.times { run_and_exitstatus_with(command, "FAILURE", -1) }
+      capture(:stdout) { expecting_exception("Failed to execute [urr]. Tried 50 time(s), expected match was [0] got [-1].") { BuildEm::Executor.new([command, {:retry_amount => 50, :quit_on_error => true}], @mock_kernel, @matcher).run.should == -1 } }
+    end
     
     it "executes the provided command 10 times when condition is not met" do
       command = "some really cool command"
-      executor = BuildEm::Executor.new([command, {:retry_amount => 10}], @mock_kernel)
-      10.times do
-        run_and_exitstatus_with(command, "FAILURE", -1)
-      end
-      executor.run.should == -1
+      10.times { run_and_exitstatus_with(command, "FAILURE", -1) }
+      capture(:stdout) { BuildEm::Executor.new([command, {:retry_amount => 10, :quit_on_error => false}], @mock_kernel, @matcher).run.should == -1 }
     end
     
     it "executes the provided command 3 times out of 10 when condition is met after 3 tries" do
       command = "command_to_run"
-      executor = BuildEm::Executor.new([command, {:retry_amount => 10}], @mock_kernel)
-      2.times do
-        run_and_exitstatus_with(command, "FAILURE", -1)
-      end
+      2.times { run_and_exitstatus_with(command, "FAILURE", -1) }
       run_and_exitstatus_with(command, "WINNER", 0)
-      executor.run.should == 0
+      capture(:stdout) { BuildEm::Executor.new([command, {:retry_amount => 10}], @mock_kernel, @matcher).run.should == 0 }
     end
     
     it "does not raise an exception when something bad goes on if :quit_on_error is false" do
-      argz = ["command_to_run", {:quit_on_error => false}]
-      executor = BuildEm::Executor.new(argz, @mock_kernel)
       @mock_kernel.should_receive("run_command").with("command_to_run").and_raise("KA BOOM")
-      executor.run.should == nil
+      capture(:stdout) { BuildEm::Executor.new(["command_to_run", {:quit_on_error => false}], @mock_kernel, @matcher).run.should == nil }
     end
     
   end
   
-  private
-  def run_and_exitstatus_with(command, output, exitstatus)
-    @mock_kernel.should_receive("run_command").with(command).and_return(output)
-    @mock_kernel.should_receive(:exitstatus).and_return(exitstatus)
+  describe "command can handle conditions" do
+    
+    it "is successful when condition is met" do
+      command = "er powel"
+      run_and_exitstatus_with(command, "WINNER", 55, 55)
+      capture(:stdout) { BuildEm::Executor.new([command, {:retry_condition => 55}], @mock_kernel, @matcher).run.should == 55 }
+    end
+    
+    it "executes the provided command raises an error when condition is not met" do
+      command = "fooz"
+      run_and_exitstatus_with(command, "FAILURE", -1) 
+      capture(:stdout) { expecting_exception("Failed to execute [fooz]. Tried 1 time(s), expected match was [0] got [-1].") { BuildEm::Executor.new([command, {}], @mock_kernel, @matcher).run.should == -1 } }
+    end
+    
   end
   
+  private
+  def run_and_exitstatus_with(command, output, exitstatus=0, condition = 0)
+    @mock_kernel.should_receive(:run_command).with(command).and_return(output).once.ordered
+    @mock_kernel.should_receive(:exitstatus).and_return(exitstatus).once.ordered
+    @matcher.should_receive(:match).with(exitstatus, output, condition).and_return(exitstatus == condition).once.ordered
+  end
   
 end

data/spec/unit/logger_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.dirname(__FILE__)+"/../helper.rb")
+require_files "logger"
+require 'tempfile'
+
+describe Kernel, "output_to" do
+  
+  after :each do
+    rm_rf "output.log" if File.exist? "output.log"
+  end
+  
+  it "captures multiple lines" do
+    output_to { 
+      puts "hi"
+      puts "bye"
+      puts "wooh wooooooh"
+    }
+    File.open("output.log", "r") {|f| f.readlines.size.should == 3}
+  end
+  
+  it "captures standard out" do
+    output_to("output.log", :stdout) {
+     puts `pwd`
+    }
+    File.open("output.log", "r") {|f| f.readline.should =~ /buildem/ }
+  end
+  
+  it "captures standard error" do
+    output_to("output.log", :stderr) { 
+      $stderr.puts "err"
+    }
+    File.open("output.log", "r") {|f| f.readlines.should == ["err\n"] }
+  end
+  
+  it "captures standard out by default" do
+    output_to { puts "hi" }
+    File.open("output.log", "r") {|f| f.readlines.should == ["hi\n"] }
+  end
+  
+  it "writes output to default filename of output.log" do
+    output_to { puts "hi" }
+    File.exist?("output.log").should == true
+  end
+  
+  it "writes to a provided filename" do
+    output_to ("woowoo.txt") { puts "heee-che-bon" }
+    File.open("woowoo.txt", "r") {|f| f.readlines.should == ["heee-che-bon\n"] }
+    rm_rf "woowoo.txt"
+  end
+  
+  it "throws an exception if a block is not given" do
+    expecting_exception("output_to must be used in block format with a 'do' and 'end'.") { Kernel.output_to }
+  end
+  
+end

data/spec/unit/runner_spec.rb

@@ -1,29 +1,65 @@
 require File.expand_path(File.dirname(__FILE__)+"/../helper.rb")
 require_files "runner"
 
+describe BuildEm::Runner, "process_standard_in" do
+  
+  before :each do
+    @mock_kernel = flexmock(:kernel, Kernel)
+    @mock_argv   = flexmock(:argv, ARGV)
+  end
+  
+  it "can handle user arguments" do
+    @mock_argv.should_receive("empty?").and_return(false).once
+    BuildEm::Runner.new(@mock_kernel, @mock_argv).process_standard_in
+  end
+  
+  it "can handle standard in with no value" do
+    @mock_argv.should_receive("empty?").and_return(true).once
+    @mock_kernel.should_receive(:gets).once
+    BuildEm::Runner.new(@mock_kernel, @mock_argv).process_standard_in
+  end
+  
+  it "stops when the command 'start' is issued" do
+    @mock_argv.should_receive("empty?").and_return(true).once
+    @mock_kernel.should_receive(:gets).once
+    BuildEm::Runner.new(@mock_kernel, @mock_argv).process_standard_in
+  end
+    
+end
+
+describe Kernel, "queued_run" do
+  
+  it "has the correct number of jobs" do
+    30.times { @mock_kernel.queued_run("foo",{}) }
+    $jobs.size.should == 30
+    $jobs = []
+  end
+  
+  it "can add a job" do
+    101.times { |t|
+      @mock_kernel.queued_run("foo",{}) 
+      $jobs.size.should == t+1
+    }
+    $jobs = []
+  end
+  
+end
+
 describe BuildEm::Runner, "start" do
   
   it "runs the program" do
     ARGV.replace ["#{here}/helper/examples/blank_file.buildem"]
-    capture(:stdout) {BuildEm::Runner.start}.strip.should == "running #{here}/helper/examples/blank_file.buildem\nfinished #{here}/helper/examples/blank_file.buildem"
+    capture(:stdout) {BuildEm::Runner.new.start}.strip.should == "running #{here}/helper/examples/blank_file.buildem\nfinished #{here}/helper/examples/blank_file.buildem"
   end
   
   it "runs the program" do
     ARGV.replace ["#{here}/helper/examples/not_there.buildem"]
-    lambda { capture(:stdout) {BuildEm::Runner.start} }.should raise_error(LoadError)
+    lambda { capture(:stdout) {BuildEm::Runner.new.start} }.should raise_error(LoadError)
   end
   
   it "spits out usage when the user doesn't supply a filename" do
     ARGV.replace []
-    capture(:stdout) {BuildEm::Runner.start}.should == usage_banner
-  end
-  
-  describe "execution flow" do
-    
-    before do
-      
-    end
-    
+    capture(:stdout) {BuildEm::Runner.new.start}.should == usage_banner
   end
   
   private

data/spec/unit/version_spec.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.dirname(__FILE__)+"/../helper.rb")
-require_files "version"
 
 describe BuildEm, "VERSION" do
   it "has the proper version number" do
-    BuildEm::VERSION.should == "0.0.5"
+    BuildEm::VERSION.should == "1.0.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildem
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jeremy W. Rowe
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 -04:00
-default_executable: 
+date: 2011-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: process_pool
@@ -71,8 +70,8 @@ files:
 - lib/buildem/condition_matcher.rb
 - lib/buildem/configuration.rb
 - lib/buildem/executor.rb
+- lib/buildem/logger.rb
 - lib/buildem/runner.rb
-- lib/buildem/validator.rb
 - lib/buildem/version.rb
 - spec/helper.rb
 - spec/unit/base_spec.rb
@@ -86,9 +85,9 @@ files:
 - spec/unit/helper/examples/sequential.buildem
 - spec/unit/helper/examples/sequential_with_comments.buildem
 - spec/unit/helper/examples/sequential_with_config.buildem
+- spec/unit/logger_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/version_spec.rb
-has_rdoc: true
 homepage: http://github.com/jeremywrowe/buildem
 licenses: []
 
@@ -118,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: buildem
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A simple build script wrapper that allows for concurent tasks
@@ -135,5 +134,6 @@ test_files:
 - spec/unit/helper/examples/sequential.buildem
 - spec/unit/helper/examples/sequential_with_comments.buildem
 - spec/unit/helper/examples/sequential_with_config.buildem
+- spec/unit/logger_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/version_spec.rb

data/lib/buildem/validator.rb

@@ -1,4 +0,0 @@
-
-class BuildEm::Validator
-    
-end