watchmaker 0.2.0 → 0.2.1

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 1.9.2
 script: "bundle exec rake spec"
 gemfile:
-  - gemfiles/rails-3.0.9.gemfile
+  - gemfiles/rails-3.0.10.gemfile
   - gemfiles/rails-3.1.0.gemfile
   - gemfiles/rails-master.gemfile

data/Appraisals

@@ -8,6 +8,6 @@ appraise "rails-3.1.0" do
   gem "rails", "3.1.0"
 end
 
-appraise "rails-3.0.9" do
-  gem "rails", "3.0.9"
+appraise "rails-3.0.10" do
+  gem "rails", "3.0.10"
 end

data/README.rdoc

@@ -14,17 +14,13 @@ place; for example:
 
 === Define profiles
 
-==== Implicit profiles
-
-Specify a dependency hash of profile name to objects.  The watchmaker
-will either yield another watchmaker or a factory when resolving those
-dependencies.
+Specify car, garage and boat as a dependency for lots of things.  Watchmaker 
+will either use a watchmaker by that name to fulfill that dependency, or fall 
+back to the factory if it doesn't exist.
 
   Watchmaker.define :lots_of_things => [:car, :garage, :boat] 
 
-==== Lambda-based profiles
-
-When called, will call the lambda.
+Specify a block with things to do do:
 
     Watchmaker.define :two_garages do
       2.times do 
@@ -32,32 +28,31 @@ When called, will call the lambda.
       end
     end
 
-==== Factory-based profiles
-
-Create a garage using the garage factory.
+Specify a factory as a dependency:
 
     Watchmaker.define :garage, :factories => [:garage] do
       # Some other post-factory creation setup here.
     end
 
-==== Watchmaker-based profiles
+Specify multiple factories as dependencies: 
 
-Create a garage using the garage factory.
+    Watchmaker.define :garages, :factories => [:garage, :garage] do
+      # Some other post-factory creation setup here.
+    end
 
-    Watchmaker.define :garage, :factories => [:garage]
+Pass those objects in to the block:
 
-Create a car using the car factory, and a garage using the garage
-watchmaker.
+    Watchmaker.define :car_and_driver, :factories => [:garage, :car] do |garage, car|
+      garage.cars << car
+    end
 
-    Watchmaker.define :car, :factories => [:car], :watchmakers => [:garage]
+Sepcify another watchmaker as a dependency:
 
-==== Inject created objects into the lambda
+    Watchmaker.define :car, :watchmakers => [:garage]
 
-Inject the factory-created garage and car into the block.
+Specify a factory and a watchmaker as a dependency:
 
-    Watchmaker.define :car_in_garage, :factories => [:garage, :car] do |garage, car| 
-      garage.cars << car
-    end
+    Watchmaker.define :car, :factories => [:car], :watchmakers => [:garage]
 
 === Manufacture objects
 

data/gemfiles/{rails-3.0.9.gemfile → rails-3.0.10.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.9"
+gem "rails", "3.0.10"
 
 gemspec :path=>"../"

data/gemfiles/{rails-3.0.9.gemfile.lock → rails-3.0.10.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
   remote: /home/cmeiklejohn/Repositories/watchmaker
   specs:
-    watchmaker (0.1.1)
+    watchmaker (0.2.0)
       factory_girl
       factory_girl_rails
       rails (~> 3.0)
@@ -9,14 +9,13 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.0)
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -24,19 +23,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
     appraisal (0.3.8)
       bundler
       rake
@@ -44,54 +43,56 @@ GEM
     builder (2.1.2)
     diesel (0.1.5)
       railties
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (2.0.3)
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.0.0)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
-    guard (0.5.1)
+    guard (0.7.0)
       thor (~> 0.14.6)
-    guard-rspec (0.4.1)
+    guard-rspec (0.4.5)
       guard (>= 0.4.0)
     horo (1.0.3)
       rdoc (>= 2.5)
     i18n (0.5.0)
     libnotify (0.5.7)
-      ffi (= 1.0.9)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.16)
-    mocha (0.9.12)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.3)
     polyglot (0.3.2)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
     rb-inotify (0.8.6)
       ffi (>= 0.5.0)
-    rdoc (3.9.2)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -105,9 +106,10 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.4)
     thor (0.14.6)
     treetop (1.4.10)
@@ -119,7 +121,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
   appraisal (~> 0.3.5)
   bundler (~> 1.0.15)
   diesel
@@ -128,7 +129,7 @@ DEPENDENCIES
   horo
   libnotify
   mocha
-  rails (= 3.0.9)
+  rails (= 3.0.10)
   rb-inotify
   rspec
   rspec-rails

data/gemfiles/rails-3.1.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/cmeiklejohn/Repositories/watchmaker
   specs:
-    watchmaker (0.1.1)
+    watchmaker (0.2.0)
       factory_girl
       factory_girl_rails
       rails (~> 3.0)
@@ -9,7 +9,6 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
     actionmailer (3.1.0)
       actionpack (= 3.1.0)
       mail (~> 2.3.0)
@@ -49,9 +48,9 @@ GEM
       railties
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.0.5)
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.0.0)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
     guard (0.6.3)
@@ -131,7 +130,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
   appraisal (~> 0.3.5)
   bundler (~> 1.0.15)
   diesel

data/gemfiles/rails-master.gemfile.lock

@@ -51,7 +51,7 @@ GIT
 PATH
   remote: /home/cmeiklejohn/Repositories/watchmaker
   specs:
-    watchmaker (0.1.1)
+    watchmaker (0.2.0)
       factory_girl
       factory_girl_rails
       rails (~> 3.0)
@@ -59,7 +59,6 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.0)
     appraisal (0.3.8)
       bundler
       rake
@@ -138,7 +137,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
   appraisal (~> 0.3.5)
   bundler (~> 1.0.15)
   diesel

data/lib/watchmaker/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Watchmaker # :nodoc:
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmaker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20782820 !ruby/object:Gem::Requirement
+  requirement: &18414680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20782820
+  version_requirements: *18414680
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &20781980 !ruby/object:Gem::Requirement
+  requirement: &18414060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20781980
+  version_requirements: *18414060
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &20781180 !ruby/object:Gem::Requirement
+  requirement: &18413040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20781180
+  version_requirements: *18413040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20780160 !ruby/object:Gem::Requirement
+  requirement: &18411200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *20780160
+  version_requirements: *18411200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20769240 !ruby/object:Gem::Requirement
+  requirement: &18409500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20769240
+  version_requirements: *18409500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20767800 !ruby/object:Gem::Requirement
+  requirement: &18406180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20767800
+  version_requirements: *18406180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20766440 !ruby/object:Gem::Requirement
+  requirement: &18403880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20766440
+  version_requirements: *18403880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &20765820 !ruby/object:Gem::Requirement
+  requirement: &18400160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20765820
+  version_requirements: *18400160
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &20765000 !ruby/object:Gem::Requirement
+  requirement: &18397500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *20765000
+  version_requirements: *18397500
 - !ruby/object:Gem::Dependency
   name: horo
-  requirement: &20764480 !ruby/object:Gem::Requirement
+  requirement: &18339200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20764480
+  version_requirements: *18339200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20763900 !ruby/object:Gem::Requirement
+  requirement: &18334660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20763900
+  version_requirements: *18334660
 - !ruby/object:Gem::Dependency
   name: diesel
-  requirement: &20763300 !ruby/object:Gem::Requirement
+  requirement: &18306220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20763300
+  version_requirements: *18306220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &20762780 !ruby/object:Gem::Requirement
+  requirement: &18300500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20762780
+  version_requirements: *18300500
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &20762200 !ruby/object:Gem::Requirement
+  requirement: &18270800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20762200
+  version_requirements: *18270800
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &20738200 !ruby/object:Gem::Requirement
+  requirement: &18267500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20738200
+  version_requirements: *18267500
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &20737680 !ruby/object:Gem::Requirement
+  requirement: &18265920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20737680
+  version_requirements: *18265920
 description: Build complex objects easily for use in integration tests.
 email:
 - christopher.meiklejohn@gmail.com
@@ -206,8 +205,8 @@ files:
 - README.rdoc
 - Rakefile
 - db/schema.rb
-- gemfiles/rails-3.0.9.gemfile
-- gemfiles/rails-3.0.9.gemfile.lock
+- gemfiles/rails-3.0.10.gemfile
+- gemfiles/rails-3.0.10.gemfile.lock
 - gemfiles/rails-3.1.0.gemfile
 - gemfiles/rails-3.1.0.gemfile.lock
 - gemfiles/rails-master.gemfile
@@ -227,7 +226,6 @@ files:
 - spec/support/models.rb
 - spec/support/watchmakers.rb
 - watchmaker.gemspec
-has_rdoc: true
 homepage: https://github.com/cmeiklejohn/watchmaker
 licenses: []
 post_install_message: 
@@ -242,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3091043332297961962
+      hash: 1606083286535417542
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,10 +249,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3091043332297961962
+      hash: 1606083286535417542
 requirements: []
 rubyforge_project: watchmaker
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Build complex objects easily for use in integration tests.