furnish 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4d4afd9cd6de61bdd854e6d2f7a1a6872752f6f4
+  data.tar.gz: 170882525003c0f981bd530c237eb6ff49833ce6
+SHA512:
+  metadata.gz: 654feec56dab6dcdad88a5b5778188fa53930482000a88d0c67d98ed91b7cb6118ec30b6064ffb647e7a2a9a8b0e8c0ee6e91f7fc98d876188cf3fb8c8974445
+  data.tar.gz: 5e3047a0556417cb61853a560cd7efa9c4cb75def76c9aa2a6585063a25092b3b90e00c60be2a5e61d22019f59642645575cde00b251d8029897cec2c11bcc26

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-* 0.1.0 (04/09/2013)
+# 0.1.1 (04/16/2013)
+  * #wait_for would spin forever if something got flagged as needing recovery
+    (threaded scheduler only). Now raises the first item's exception if
+    provided, or a generic one if it just flagged a failure.
+  * #wait_for would also throw rather cryptic exceptions if the scheduler was
+    threaded and was not running. Now raises something communicative.
+  * aliases for commonly used scheduler methods:
+    * #wait_for is aliased to #w
+    * #teardown_group is aliased to #d and #down
+  * New API: Furnish::Scheduler#groups can be used to more easily get at
+    provisioner groups the scheduler knows about.
+# 0.1.0 (04/09/2013)
   * Furnish requires 1.9.3 or greater -- always has been the case, now rubygems enforces that for us.
   * Runtime performance increased significantly. No hard numbers, but test
     suite assertion count doubled and total test runtime actually dropped
@@ -34,16 +45,16 @@
     * `<<` is now an alias for `schedule_provisioner_group`
     * `s` and `sched` are now aliases for `schedule_provision`
   * Probably some other shit I don't remember now.
-* 0.0.4 (03/25/2013)
+# 0.0.4 (03/25/2013)
   * Support for FURNISH_DEBUG environment variable for test suites.
   * Ruby 2.0.0-p0 Compatibility Fixes
   * Documentation is RDoc 4.0 compatible.
 
-* 0.0.3 (03/21/2013)
+# 0.0.3 (03/21/2013)
   * Fix an issue where state wasn't tracked for provisioners themselves after the provisioning process had started.
 
-* 0.0.2 (03/20/2013)
+# 0.0.2 (03/20/2013)
   * Extract Furnish::TestCase into gem for consumption by other gems that need to test against furnish.
 
-* 0.0.1 (02/23/2013)
+# 0.0.1 (02/23/2013)
   * Initial release as extracted from chef-workflow.

data/lib/furnish/provisioner_group.rb

@@ -140,7 +140,7 @@ module Furnish
 
         begin
           args = perform_deprovision(this_prov, shutdown_args)
-        rescue Exception => e
+        rescue => e
           if_debug do
             puts "Deprovision of #{this_prov} had errors:"
             puts "#{e.message}"

data/lib/furnish/scheduler.rb

@@ -97,6 +97,17 @@ module Furnish
       vm.need_recovery
     end
 
+    #
+    # Get the Furnish::ProvisionerGroup by name as it currently exists in the
+    # scheduler.  Useful for querying properties of a given provisioner after
+    # they've been set.
+    #
+    def group(name)
+      vm.groups[name]
+    end
+
+    alias g group
+
     #
     # Schedule a group of VMs for provision. This takes a group name, which is a
     # string, an array of provisioner objects, and a list of string dependencies.
@@ -138,22 +149,43 @@ module Furnish
     alias << schedule_provisioner_group
 
     #
-    # Sleep until this list of dependencies are resolved. In parallel mode, will
-    # raise if an exception occurred while waiting for these resources. In
-    # serial mode, wait_for just returns nil.
+    # Sleep until this list of dependencies are resolved. In parallel mode,
+    # will raise if an exception occurred while waiting for these groups, or
+    # the groups entered recovery state, or the scheduler is not currently
+    # running.  In serial mode, wait_for just returns nil.
     #
     def wait_for(*dependencies)
       return nil if @serial
       return nil if dependencies.empty?
 
+      unless running?
+        raise "The scheduler doesn't appear to be running or started. Can't wait_for anything!"
+      end
+
       dep_set = Set[*dependencies]
 
       until dep_set & vm.solved == dep_set
         sleep 0.1
         @solver_thread.join unless @solver_thread.alive?
+
+        dependencies_in_recovery = needs_recovery.keys.to_set & dep_set
+
+        if needs_recovery? and !dependencies_in_recovery.empty?
+          # we really can't get them all, but we can at least raise the first one.
+          group_name = dependencies_in_recovery.first
+
+          group_exception = needs_recovery[group_name]
+          if group_exception
+            raise group_exception
+          else
+            raise "group #{group_name} is in recovery during wait_for"
+          end
+        end
       end
     end
 
+    alias w wait_for
+
     #
     # Start the scheduler. In serial mode this call will block until the whole
     # dependency graph is satisfied, or one of the provisions fails, at which
@@ -301,9 +333,11 @@ module Furnish
 
         deprovision_group(group_name)
       end
-
     end
 
+    alias down teardown_group
+    alias d teardown_group
+
     #
     # Instruct all provisioners except ones in the exception list to tear down.
     # Calls #stop as its first action.

data/lib/furnish/version.rb

@@ -1,4 +1,4 @@
 module Furnish
   # The current version of Furnish.
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/mt_cases.rb

@@ -28,13 +28,16 @@ module Furnish
 
         sched.s(test1, Dummy.new)
         sched.s(test2, prov.new)
-        sched.run rescue nil # FIXME oof. maybe move this to indepedent tests for serial mode?
+        sched.run rescue nil # start.
         assert(sched.serial || sched.running?)
         unless sched.serial
           sleep 0.1 while !sched.needs_recovery.has_key?(test2)
         end
         assert(sched.needs_recovery?)
         assert_includes(sched.needs_recovery.keys, test2)
+        unless sched.serial
+          assert_raises(RuntimeError) { sched.wait_for(test2) }
+        end
         refute_solved(test2)
         sched.s(test3, Dummy.new, [test2])
         refute_solved(test3)
@@ -72,6 +75,11 @@ module Furnish
           sleep 0.1 while !sched.needs_recovery.has_key?(test4)
         end
         assert(sched.needs_recovery?)
+        unless sched.serial
+          assert_raises(RuntimeError) { sched.wait_for(test2) }
+          assert_raises(RuntimeError) { sched.wait_for(test4) }
+          assert_raises(RuntimeError) { sched.wait_for(test1, test2, test3, test4, test5) }
+        end
         refute_solved(test2)
         refute_solved(test3)
         refute_solved(test4)
@@ -131,6 +139,48 @@ module Furnish
       assert_equal("floop", sched.vm.groups['test2'].first.report.last, "provision failed but state is still stored for the provisions that succeeded")
     end
 
+    def test_scheduler_groups
+      group = Furnish::ProvisionerGroup.new([Dummy.new], 'test2')
+      sched.s('test1', Dummy.new)
+      sched << group
+      sched.run rescue nil
+      sched.w('test1', 'test2')
+
+      %w[test1 test2].each do |group_name|
+        assert_kind_of(Furnish::ProvisionerGroup, sched.group(group_name))
+        assert_kind_of(Dummy, sched.group(group_name).first)
+      end
+    end
+
+    def test_aliases
+      group = Furnish::ProvisionerGroup.new([Dummy.new], 'test2')
+      sched.s('test1', Dummy.new)
+      sched << group
+      sched.run rescue nil
+      sched.w('test1', 'test2')
+      assert_solved('test1')
+      assert_solved('test2')
+      assert_kind_of(Furnish::ProvisionerGroup, sched.g('test1'))
+      assert_kind_of(Furnish::ProvisionerGroup, sched.g('test2'))
+      sched.d('test1')
+      sched.d('test2')
+      refute_solved('test1')
+      refute_solved('test2')
+    end
+
+    def test_wait_for_no_run
+      unless sched.serial
+        sched.s('test1', Dummy.new)
+        assert_raises(RuntimeError) { sched.wait_for('test1') }
+        sched.run
+        sched.wait_for('test1')
+        assert_solved('test1')
+        sched.teardown
+        refute_solved('test1')
+        assert_raises(RuntimeError) { sched.wait_for('test1') }
+      end
+    end
+
     def test_provision_cycle
       machine_names = %w[blarg blarg2 blarg3]
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: furnish
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palsy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,33 +97,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A novel way to do virtual machine provisioning
@@ -179,30 +162,26 @@ files:
 - test/test_vm.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4039116121410524587
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A novel way to do virtual machine provisioning
 test_files:
 - test/dummy_classes.rb