girdle 0.0.8 → 0.0.9

data/Guardfile

@@ -3,9 +3,9 @@
 
 guard 'minitest' do
   # with Minitest::Unit
-  watch(%r|^test/test_(.*)\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
+  # watch(%r|^test/test_(.*)\.rb|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  # watch(%r|^test/test_helper\.rb|)    { "test" }
 
   # with Minitest::Spec
   watch(%r|^spec/(.*)_spec\.rb|)

data/README.markdown

@@ -16,19 +16,21 @@ Create a job specification:
 
     spec = Girdle::Specification.new(name: 'example_spec', 
                                      notification_email: 'admin@example.com',
-                                     depends_on: [456,789])
+                                     depends_on: [another_spec])
     
 Add a task:
 
-    spec.tasks << Girdle::Task.new(name: 'hello', command: '/usr/bin/say', 
+    a_task = Girdle::Task.new(name: 'hello', command: '/usr/bin/say', 
                                    arguments: ['hello'])
+    spec.tasks << a_task
     
 Add another, this one dependent on the first:
 
-    spec.tasks << Girdle::Task.new(name: 'world', command: '/usr/bin/say', 
+    another_task = Girdle::Task.new(name: 'world', command: '/usr/bin/say', 
                                    arguments: ['$PLACE_NAME'], 
-                                   depends_on: ['hello'], 
+                                   depends_on: [ a_task ], 
                                    environment: {'PLACE_NAME' => 'world'})
+    spec.tasks << another_task
     
 Submit the specification and return an id:
 

data/lib/girdle/specification.rb

@@ -8,7 +8,8 @@ module Girdle
       @name = options[:name]
       @notification_email = options[:notification_email]
       @tasks = options[:tasks] || []
-      @depends_on = options[:depends_on] || []
+      @depends_on = (options[:depends_on] || []).
+        map {|d| d.respond_to?(:name) ? d.name : d}
     end
     
     def to_plist
@@ -69,6 +70,13 @@ module Girdle
       end.to_xml
     end
     
+    private
+    
+      def parse_dependencies(dependencies)
+        dependencies ||= []
+        dependencies.select {|d| d.respond_to? :name}.map(&:name)
+      end
+    
   end
   
 end

data/lib/girdle/task.rb

@@ -7,11 +7,12 @@ module Girdle
     def initialize(options = {})
       @name         = options[:name]
       @command      = options[:command]
-      @arguments    = options[:arguments]
-      @depends_on   = options[:depends_on] || []
+      @arguments    = (options[:arguments] || []).
+        map {|a| a.respond_to?(:name) ? a.name : a }
+      @depends_on   = (options[:depends_on] || []).
+        map {|d| d.respond_to?(:name) ? d.name : d }
       @environment  = options[:environment] || {}
     end
-
   end
   
 end

data/lib/girdle/version.rb

@@ -1,3 +1,3 @@
 module Girdle
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/{girdle/controller_spec.rb → controller_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Controller do
   

data/spec/girdle_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 def plist
   <<-EOS

data/spec/{girdle/grid_spec.rb → grid_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Grid do
   

data/spec/{girdle/helpers_spec.rb → helpers_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Helpers do 
   

data/spec/{girdle/job_spec.rb → job_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Job do
   

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'minitest/autorun'
 
 require 'bundler'
-Bundler.require(:development)
-
-require 'girdle'
+Bundler.require(:default, :development)

data/spec/{girdle/specification_spec.rb → specification_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Specification do
   

data/spec/{girdle/task_spec.rb → task_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe Girdle::Task do
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girdle
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70361514984380 !ruby/object:Gem::Requirement
+  requirement: &70264948488160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514984380
+  version_requirements: *70264948488160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70361514983960 !ruby/object:Gem::Requirement
+  requirement: &70264948487720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514983960
+  version_requirements: *70264948487720
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70361514967920 !ruby/object:Gem::Requirement
+  requirement: &70264948486880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514967920
+  version_requirements: *70264948486880
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70361514967380 !ruby/object:Gem::Requirement
+  requirement: &70264948486240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514967380
+  version_requirements: *70264948486240
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70361514966840 !ruby/object:Gem::Requirement
+  requirement: &70264948485600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514966840
+  version_requirements: *70264948485600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70361514966320 !ruby/object:Gem::Requirement
+  requirement: &70264948485160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361514966320
+  version_requirements: *70264948485160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70361514965900 !ruby/object:Gem::Requirement
+  requirement: &70264948484720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361514965900
+  version_requirements: *70264948484720
 - !ruby/object:Gem::Dependency
   name: nokogiri-plist
-  requirement: &70361514965360 !ruby/object:Gem::Requirement
+  requirement: &70264948484240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361514965360
+  version_requirements: *70264948484240
 description: An Xgrid client
 email:
 - jamiehodge@me.com
@@ -120,14 +120,14 @@ files:
 - lib/girdle/specification.rb
 - lib/girdle/task.rb
 - lib/girdle/version.rb
-- spec/girdle/controller_spec.rb
-- spec/girdle/grid_spec.rb
-- spec/girdle/helpers_spec.rb
-- spec/girdle/job_spec.rb
-- spec/girdle/specification_spec.rb
-- spec/girdle/task_spec.rb
+- spec/controller_spec.rb
 - spec/girdle_spec.rb
+- spec/grid_spec.rb
+- spec/helpers_spec.rb
+- spec/job_spec.rb
 - spec/spec_helper.rb
+- spec/specification_spec.rb
+- spec/task_spec.rb
 homepage: http://github.com/jamiehodge/girdle
 licenses: []
 post_install_message: 
@@ -148,16 +148,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A client for submitting and managing Xgrid jobs
 test_files:
-- spec/girdle/controller_spec.rb
-- spec/girdle/grid_spec.rb
-- spec/girdle/helpers_spec.rb
-- spec/girdle/job_spec.rb
-- spec/girdle/specification_spec.rb
-- spec/girdle/task_spec.rb
+- spec/controller_spec.rb
 - spec/girdle_spec.rb
+- spec/grid_spec.rb
+- spec/helpers_spec.rb
+- spec/job_spec.rb
 - spec/spec_helper.rb
+- spec/specification_spec.rb
+- spec/task_spec.rb