bowler 0.0.2 → 0.0.3

data/lib/bowler/dependency_tree.rb

@@ -13,18 +13,19 @@ module Bowler
       @definition = definition
     end
 
-    def dependencies_for(processes)
-      processes.inject([]) do |array, p|
-        array += [ (@definition.tree[p] || []), p ].flatten
-      end.uniq
+    def dependencies_for(processes, visited = [])
+      return [] unless processes
+      (processes - visited).map { |p|
+        [dependencies_for(@definition.tree[p], visited + [p]), p]
+      }.flatten.compact.uniq
     end
 
     def process_list_for(processes)
       on = dependencies_for(processes)
-      off = @definition.processes.reject {|i| on.include? i }
+      off = @definition.processes - on
 
       [ on.map {|x| "#{x}=1" }, off.map {|x| "#{x}=0" } ].flatten.sort.join(',')
     end
 
   end
-end
+end

data/lib/bowler/version.rb

@@ -1,3 +1,3 @@
 module Bowler
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/dependency_tree_spec.rb

@@ -15,6 +15,18 @@ module Bowler
         tree.dependencies_for([:foo]).should =~ [:bar, :foo, :required]
         tree.dependencies_for([:nyan]).should =~ [:bar, :foo, :nyan, :required]
       end
+
+      it "should find the dependencies of dependencies" do
+        tree = DependencyTree.load File.join( File.dirname(__FILE__), 'fixtures', 'dependency_tree_pinfile' )
+
+        tree.dependencies_for([:cat]).should =~ [:cat, :nyan, :bar, :foo, :required]
+      end
+
+      it "should correctly handle recursive dependencies" do
+        tree = DependencyTree.load File.join( File.dirname(__FILE__), 'fixtures', 'dependency_tree_pinfile' )
+
+        tree.dependencies_for([:loop1]).should =~ [:loop1, :loop2, :required]
+      end
     end
 
     context "given an array of one process" do

data/spec/dsl_spec.rb

@@ -1,4 +1,5 @@
 require 'bowler'
+require_relative 'helpers/definition_helper'
 
 module Bowler
 

data/spec/fixtures/dependency_tree_pinfile

@@ -2,4 +2,7 @@ dependency :required
 
 process :foo => :bar
 process :nyan => [:foo, :bar]
-process :rick
+process :cat => :nyan
+process :loop1 => :loop2
+process :loop2 => :loop1
+process :rick

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bowler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70109390703300 !ruby/object:Gem::Requirement
+  requirement: &70208968322280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70109390703300
+  version_requirements: *70208968322280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109390702060 !ruby/object:Gem::Requirement
+  requirement: &70208968321020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70109390702060
+  version_requirements: *70208968321020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109390694280 !ruby/object:Gem::Requirement
+  requirement: &70208968319640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70109390694280
+  version_requirements: *70208968319640
 description: 
 email:
 - jordan@jordanh.net
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3332018436335453637
+      hash: -4084858017591319005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3332018436335453637
+      hash: -4084858017591319005
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12