nickstenning-outback 0.0.2 → 0.0.3

data/lib/outback/manager.rb

@@ -13,18 +13,32 @@ module Outback
   
     def initialize
       @tasks = []
+      @names = {}
       @position = 0
     end
     
     def add_tasks( *tasks )
       [*tasks].each do |task|
         task.workdir = @workdir unless task.workdir
+        
+        if task.name
+          if @names.has_key?(task.name)
+            raise DuplicateNamedTaskError, "Cannot add a named task more than once!"
+          else
+            @names[task.name] = @tasks.length
+          end
+        end
+        
+        @tasks << task
       end
-      @tasks += [*tasks]
     end
     
     alias_method :add_task, :add_tasks
     
+    def find_task( name )
+      @tasks[@names[name]]
+    end
+    
     def rollout!
       @direction = ROLLOUT
       run

data/lib/outback/shelltask.rb

@@ -5,7 +5,7 @@ module Outback
   
   class ShellTask
   
-    attr_accessor :rollout, :rollback, :workdir
+    attr_accessor :rollout, :rollback, :workdir, :name
     attr_reader :result, :errors, :exit_code
     
     def initialize(out, back)

data/lib/outback/yaml.rb

@@ -6,18 +6,15 @@ module Outback
       manager = Manager.new
       tasks = ::YAML.load(yaml_string)
       tasks.each do |task|
+        task = [task['out'], task['back']]
         manager.tasks << Outback::ShellTask.new(*task)
       end
       return manager
     end
     
     def self.load_file( yaml_file )
-      manager = Manager.new
-      tasks = ::YAML.load_file(yaml_file)
-      tasks.each do |task|
-        manager.tasks << Outback::ShellTask.new(*task)
-      end
-      return manager
+      yaml = File.read( yaml_file )
+      load( yaml )
     end
               
   end

data/lib/outback.rb

@@ -6,5 +6,6 @@ module Outback
   
   class Error < RuntimeError; end
   class TransactionError < Error; end
+  class DuplicateNamedTaskError < Error; end
   
 end

data/outback.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{outback}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
  
   s.specification_version = 2 if s.respond_to? :specification_version=
  

data/spec/outback/manager_spec.rb

@@ -5,10 +5,9 @@ describe Outback::Manager do
   
   before do
     @obm = Outback::Manager.new
-    @task1 = mock("task1", :workdir => "/tmp")
-    @task2 = mock("task2", :workdir => nil)
-    @task1.stub!(:workdir=)
-    @task2.stub!(:workdir=)
+    @task1 = mock("task1", :workdir => "/tmp", :name => "task1", :null_object => true)
+    @task2 = mock("task2", :workdir => nil, :name => nil, :null_object => true)
+    @task3 = mock("task3", :workdir => nil, :name => "task3", :null_object => true)
   end
 
   it "should have a list of tasks" do
@@ -24,13 +23,29 @@ describe Outback::Manager do
   end
   
   it "should add multiple tasks to its list, in order, with #add_tasks" do
-    @obm.add_tasks(@task1, @task2, @task1)
+    @obm.add_tasks(@task1, @task2, @task3)
     @obm.should have(3).tasks
     @obm.tasks[0].should == @task1
     @obm.tasks[1].should == @task2
-    @obm.tasks[2].should == @task1
+    @obm.tasks[2].should == @task3
   end
-
+  
+  it "should not allow more than one task with the same name" do
+    lambda { @obm.add_tasks(@task1, @task1) }.should raise_error(Outback::DuplicateNamedTaskError)
+    lambda { @obm.add_tasks(@task1, @task2, @task1) }.should raise_error(Outback::DuplicateNamedTaskError)
+    lambda { @obm.add_tasks(@task1, @task3, @task3) }.should raise_error(Outback::DuplicateNamedTaskError)
+  end
+  
+  it "should allow the same task twice if unnamed" do
+    lambda { @obm.add_tasks(@task1, @task2, @task2) }.should_not raise_error
+  end
+  
+  it "should return the named task with #find_task(name)" do
+    @obm.add_tasks(@task1, @task2, @task3)
+    @obm.find_task('task1').should == @task1
+    @obm.find_task('task3').should == @task3
+  end
+  
   describe "(with a few tasks)" do
     
     before do

data/spec/outback/shelltask_spec.rb

@@ -6,6 +6,12 @@ describe Outback::ShellTask do
     @task = Outback::ShellTask.new("out", "back")
   end
   
+  it "should have an attr_accessor for @name" do
+    @task.name.should be_nil
+    @task.name = "Henry"
+    @task.name.should == "Henry"
+  end
+  
   it "should use the first parameter to the rollout command" do
     @task.rollout.should == "out"
   end

data/spec/outback/yaml_spec.rb

@@ -6,11 +6,11 @@ describe Outback::YAML do
   before do
     @yaml =<<-EOM.gsub(/^\s{4}/, '')
     -
-      - touch y
-      - rm y
+      out: touch y
+      back: rm y
     -
-      - touch x
-      - rm x
+      out: touch x
+      back: rm x
     EOM
     @file = '/tmp/outback_yaml_spec_tmp'
     File.open(@file, 'w') { |f| f.puts @yaml }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nickstenning-outback
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nick Stenning