furnish 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59696ae50785a0a803ebe6797e627c43230c6cfd
-  data.tar.gz: 3847e7e726cb5bd4a5791d5fb17e5fd00eae52ea
+  metadata.gz: 5757619fff0af93f2441893e9e204dc74d7573bc
+  data.tar.gz: e260a91321a8388b4519075209d382ce916678a3
 SHA512:
-  metadata.gz: 231a68d0bb0550efd3c87d337a8f1cf0419bf9af577cfc649a3e6ace96dcb17a3a1fbcd08a578b7577d605f72c5c559a3a4c8c8e6b1bc6f8b3750e321222dc59
-  data.tar.gz: cfba9a6a29dbdbae88f561812309739cd8738c45f71618fbff262fefd7f0bb40ac682fddc6d9d46d1f5b03f9aaf32583490130623bc7ead743f6de8289b77389
+  metadata.gz: 76d06e7b7374aca71abeeda91bc4d393b8cc6b7bb7bf7f9a85cd283602b355331acfa91bb668a93643e5886ea55749c9bcae01bdeec36cd2dc731e96d555181f
+  data.tar.gz: f39d5dcf9b1cf280a141b431681ba71ed7b9abb5f580bff6d53c108bb4593c94d6951b6a3530541c0b0bffc6f8d0cccb0777c8ce9d26bd9e84e40661c0947c5f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.3 (07/06/2013)
+  * Furnish::Provisioner::VM is a new subclass of API (and therefore should be
+    subclassed), specifically geared to add new functionality for machine
+    provisioners.
+  * Furnish::TestCase is now Furnish::Test and is Minitest 5 based.
 # 0.1.2 (04/27/2013)
   * Logger changes:
     * Fixed: Certain situations with if_debug and the IO proxy would result in

data/furnish.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'palsy', '~> 0.0.4'
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'minitest', '~> 4.7'
+  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'minitest', '~> 5.0'
   gem.add_development_dependency 'guard-minitest'
   gem.add_development_dependency 'guard-rake', '~> 0.0.8'
   gem.add_development_dependency 'rdoc', '~> 4'

data/lib/furnish.rb

@@ -17,6 +17,14 @@ module Furnish
   #
   def self.init(database_file)
     Palsy.change_db(database_file)
+    @initialized = true
+  end
+
+  #
+  # Has furnish been initialized?
+  #
+  def self.initialized?
+    @initialized
   end
 
   #
@@ -44,6 +52,7 @@ module Furnish
   # have a bad day.
   #
   def self.shutdown
+    @initialized = false
     Palsy.instance.close
   end
 end

data/lib/furnish/protocol.rb

@@ -195,7 +195,7 @@ module Furnish # :nodoc:
         return self[:accepts_from_any]
       end
 
-      return (yp.keys & ap.keys).all? { |k| ap[k][:type].ancestors.include?(yp[k][:type]) }
+      return ap.keys.any? { |k| yp.has_key?(k) && ap[k][:type].ancestors.include?(yp[k][:type]) }
     end
 
     VALIDATOR_NAMES.each do |vname|

data/lib/furnish/provisioner_group.rb

@@ -67,6 +67,7 @@ module Furnish
       @dependencies = dependencies.kind_of?(Set) ? dependencies : Set[*dependencies]
 
       assert_provisioner_protocol(provisioners)
+      run_add_hook(provisioners)
 
       super(provisioners)
     end
@@ -154,7 +155,7 @@ module Furnish
         end
 
         unless args.kind_of?(Hash) or force
-          set_recovery(this_prov, i, startup_args)
+          set_recovery(this_prov, i, shutdown_args)
           raise ArgumentError,
             "#{this_prov.class} does not return data that can be consumed by the next provisioner"
         end
@@ -246,12 +247,27 @@ module Furnish
       return result # scheduler will take it from here
     end
 
+    #
+    # Get a list of vms from provisioners that provide VMs via the ..
+    # Furnish::Provisioner::VM interface.
+    #
+    def vms
+      h = { }
+
+      each do |prov|
+        if prov.respond_to?(:list_vms)
+          h[prov] = prov.list_vms
+        end
+      end
+
+      return h
+    end
+
     protected
 
     #
     # Similar to #clean_state, a helper for recovery tracking
     #
-
     def set_recovery(prov, index, args=nil)
       @group_state['provisioner'] = prov
       @group_state['index'] = index
@@ -300,6 +316,15 @@ module Furnish
       return result
     end
 
+    #
+    # Runs the Furnish::Provisioner::API#added_to_group hook for each provisioner
+    #
+    def run_add_hook(provisioners)
+      provisioners.each do |prov|
+        prov.added_to_group if prov.respond_to?(:added_to_group)
+      end
+    end
+
     #
     # Asserts that all the provisioners can communicate with each other.
     #
@@ -322,7 +347,7 @@ module Furnish
       yielders = [iterator.shift.class]
 
       while accepting = iterator.shift
-        accepting = accepting.class # meh
+        accepting = accepting.class
 
         unless yielders.all? { |y| y.respond_to?(protocol_method) }
           raise ArgumentError, "yielding classes do not implement protocol #{protocol_method} -- cannot continue"

data/lib/furnish/provisioners/api.rb

@@ -296,6 +296,17 @@ module Furnish # :nodoc:
         end
       end
 
+      #
+      # This is run when the provisioner is added to a
+      # Furnish::ProvisionerGroup. This is for doing things that would require
+      # the name of the group (such as allocating Palsy objects), but can't be
+      # done in #initialize because the group name isn't known yet.
+      #
+      # Note that #furnish_group_name will be set by the time this hook is run.
+      #
+      def added_to_group
+      end
+
       #
       # Called by Furnish::ProvisionerGroup#startup which is itself called by
       # Furnish::Scheduler#startup. Indicates the resource this provisioner
@@ -427,7 +438,7 @@ module Furnish # :nodoc:
               y
           end +
           [self.class]
-        )
+        ).bytes.inject(0) { |x,y| x += y.ord }
       end
     end
   end

data/lib/furnish/provisioners/dummy.rb

@@ -1,3 +1,6 @@
+require 'furnish/provisioners/dummy_include'
+require 'furnish/provisioners/api'
+
 module Furnish
   module Provisioner
     #
@@ -8,97 +11,7 @@ module Furnish
     # code.
     #
     class Dummy < API
-      #--
-      # Some dancing around the marshal issues with this provisioner. Note that
-      # after restoration, any delegates you set will no longer exist, so
-      # relying on scheduler persistence is a really bad idea.
-      #++
-
-      # basic Palsy::Object store for stuffing random stuff
-      attr_reader   :store
-
-      # order tracking via Palsy::List, delegation makes a breadcrumb here
-      # that's ordered between all provisioners.
-      attr_reader   :order
-
-      # arbitrary identifier for Dummy#call_order
-      attr_accessor :id
-
-      #
-      # Construct a Dummy.
-      #
-      def initialize
-        @store = Palsy::Object.new('dummy')
-        @order = Palsy::List.new('dummy_order', 'shared')
-      end
-
-      #
-      # used in state transitions to capture run information
-      #
-      def run_state
-        @run_state ||= Palsy::Map.new('dummy_run_state', [self.class.name, respond_to?(:furnish_group_name) ? furnish_group_name : name].join("-"))
-      end
-
-      #
-      # call order is ordering on a per-provisioner group basis, and is used to
-      # validate that groups do indeed execute in the proper order.
-      #
-      def call_order
-        # respond_to? here is to assist with deprecation tests
-        @call_order ||= Palsy::List.new('dummy_order', respond_to?(:furnish_group_name) ? furnish_group_name : name)
-      end
-
-      #
-      # report shim
-      #
-      def report
-        do_delegate(__method__) do
-          [furnish_group_name, @persist]
-        end
-      end
-
-      #
-      # startup shim
-      #
-      def startup(args={ })
-        @persist = "floop"
-        do_delegate(__method__) do
-          run_state[__method__] = args
-        end
-      end
-
-      #
-      # shutdown shim
-      #
-      def shutdown(args={ })
-        do_delegate(__method__) do
-          run_state[__method__] = args
-        end
-      end
-
-      #
-      # Helper to trace calls to this provisioner. Pretty much everything we
-      # care about goes through here.
-      #
-      def do_delegate(meth_name)
-        meth_name = meth_name.to_s
-
-        # indicate we actually did something
-        @store[ [furnish_group_name, meth_name].join("-") ] = Time.now.to_i
-        @order.push(furnish_group_name)
-        call_order.push(id || "unknown")
-
-        yield
-      end
-
-      #
-      # Test the mixin functionality
-      #
-      def make_log
-        if_debug do
-          puts "hello from Dummy"
-        end
-      end
+      include Furnish::Provisioner::DummyInclude
     end
   end
 end

data/lib/furnish/provisioners/dummy_include.rb

@@ -0,0 +1,97 @@
+module Furnish # :nodoc:
+  module Provisioner # :nodoc:
+    module DummyInclude # :nodoc:
+      #--
+      # Some dancing around the marshal issues with this provisioner. Note that
+      # after restoration, any delegates you set will no longer exist, so
+      # relying on scheduler persistence is a really bad idea.
+      #++
+
+      # basic Palsy::Object store for stuffing random stuff
+      attr_reader   :store
+
+      # order tracking via Palsy::List, delegation makes a breadcrumb here
+      # that's ordered between all provisioners.
+      attr_reader   :order
+
+      # arbitrary identifier for Dummy#call_order
+      attr_accessor :id
+
+      #
+      # Construct a Dummy.
+      #
+      def initialize
+        @store = Palsy::Object.new('dummy')
+        @order = Palsy::List.new('dummy_order', 'shared')
+      end
+
+      #
+      # used in state transitions to capture run information
+      #
+      def run_state
+        @run_state ||= Palsy::Map.new('dummy_run_state', [self.class.name, respond_to?(:furnish_group_name) ? furnish_group_name : name].join("-"))
+      end
+
+      #
+      # call order is ordering on a per-provisioner group basis, and is used to
+      # validate that groups do indeed execute in the proper order.
+      #
+      def call_order
+        # respond_to? here is to assist with deprecation tests
+        @call_order ||= Palsy::List.new('dummy_order', respond_to?(:furnish_group_name) ? furnish_group_name : name)
+      end
+
+      #
+      # report shim
+      #
+      def report
+        do_delegate(__method__) do
+          [furnish_group_name, @persist]
+        end
+      end
+
+      #
+      # startup shim
+      #
+      def startup(args={ })
+        @persist = "floop"
+        do_delegate(__method__) do
+          run_state[__method__] = args
+        end
+      end
+
+      #
+      # shutdown shim
+      #
+      def shutdown(args={ })
+        do_delegate(__method__) do
+          run_state[__method__] = args
+        end
+      end
+
+      #
+      # Helper to trace calls to this provisioner. Pretty much everything we
+      # care about goes through here.
+      #
+      def do_delegate(meth_name)
+        meth_name = meth_name.to_s
+
+        # indicate we actually did something
+        @store[ [furnish_group_name, meth_name].join("-") ] = Time.now.to_i
+        @order.push(furnish_group_name)
+        call_order.push(id || "unknown")
+
+        yield
+      end
+
+      #
+      # Test the mixin functionality
+      #
+      def make_log
+        if_debug do
+          puts "hello from Dummy"
+        end
+      end
+    end
+  end
+end

data/lib/furnish/provisioners/dummy_vm.rb

@@ -0,0 +1,17 @@
+require 'furnish/provisioners/dummy_include'
+require 'furnish/provisioners/vm'
+
+module Furnish # :nodoc:
+  module Provisioner # :nodoc:
+    #
+    # Primarily for testing, this is a provisioner that has a basic storage
+    # model.
+    #
+    # In short, unless you're writing tests you should probably never use this
+    # code.
+    #
+    class DummyVM < VM
+      include Furnish::Provisioner::DummyInclude
+    end
+  end
+end

data/lib/furnish/provisioners/vm.rb

@@ -0,0 +1,64 @@
+require 'furnish/provisioners/api'
+
+module Furnish # :nodoc:
+  module Provisioner # :nodoc:
+    #
+    # The VM provisioner API (which inherits from Furnish::Provisioner::API)
+    # just adds a few convenience functions and a tracking database for VM
+    # work. This makes it easy to get the data back you need and an easy,
+    # consistent way to stuff it away when you have data to store.
+    #
+    # See the methods themselves for more information.
+    #
+    class VM < API
+      #
+      # Our database, which won't be available until the provisioner is added
+      # to a ProvisionerGroup.
+      #
+      attr_reader :vm
+
+      #
+      # Hook required by Furnish::ProvisionerGroup#run_add_hook. See
+      # Furnish::Provisioner::API#added_to_group for more information.
+      #
+      def added_to_group
+        @vm = Palsy::Map.new(self.class.name.gsub(/::/, '_').downcase + "_vms", furnish_group_name)
+      end
+
+      #
+      # Add a vm. Takes a name (String) and metadata (Hash).
+      #
+      def add_vm(name, metadata)
+        unless vm
+          raise "Cannot add machine '#{name}' to ungrouped provisioner"
+        end
+
+        unless metadata.kind_of?(Hash)
+          raise ArgumentError, "Metadata must be a kind of Hash!"
+        end
+
+        vm[name] = metadata
+      end
+
+      #
+      # Delete a VM. Takes a name (String).
+      #
+      def remove_vm(name)
+        unless vm
+          raise "Cannot delete machine '#{name}' from ungrouped provisioner"
+        end
+
+        vm.delete(name)
+      end
+
+      #
+      # List the VMs. If the provisioner is not named (a part of a
+      # Furnish::ProvisionerGroup), will return an empty array.
+      #
+      def list_vms
+        return [] unless vm
+        return vm.keys
+      end
+    end
+  end
+end

data/lib/furnish/scheduler.rb

@@ -46,6 +46,9 @@ module Furnish
     # Instantiate the Scheduler.
     #
     def initialize
+
+      raise "Cannot start; Furnish has not been initialized" unless Furnish.initialized?
+
       @force_deprovision  = false
       @solved_mutex       = Mutex.new
       @serial             = false
@@ -310,7 +313,11 @@ module Furnish
     # halt the deprovisioning process.
     #
     def teardown_group(group_name, wait=true)
-      wait_for(group_name) if wait
+      begin
+        wait_for(group_name) if wait
+      rescue => e
+        raise e unless force_deprovision
+      end
 
       dependent_items = vm.dependencies.partition { |k,v| v.include?(group_name) }.first.map(&:first)
 

data/lib/furnish/test.rb

@@ -1,8 +1,10 @@
-require 'minitest/unit'
+require 'minitest'
+require 'minitest/test'
 require 'tempfile'
 require 'furnish'
 
 module Furnish
+
   #
   # Furnish::TestCase is a test harness for testing things with furnish, like
   # provisioner libraries. It is intended to be consumed by other libraries.
@@ -18,20 +20,21 @@ module Furnish
   # log will be presented to the standard error. Otherwise, it is sent a log
   # file.
   #
-  class TestCase < MiniTest::Unit::TestCase
+  class Test < Minitest::Test
     def setup # :nodoc:
-      @tempfiles ||= []
-      file = Tempfile.new('furnish_db')
-      @tempfiles.push(file)
-      if ENV["FURNISH_DEBUG"]
-        Furnish.logger = Furnish::Logger.new($stderr, 3)
-      else
-        logfile = Tempfile.new('furnish_log')
-        @tempfiles.push(logfile)
-        Furnish.logger = Furnish::Logger.new(logfile, 3)
+      unless Furnish.initialized? or (Minitest.respond_to?(:keep_scheduler) and Minitest.keep_scheduler rescue nil)
+        @tempfiles ||= []
+        file = Tempfile.new('furnish_db')
+        @tempfiles.push(file)
+        if ENV["FURNISH_DEBUG"]
+          Furnish.logger = Furnish::Logger.new($stderr, 3)
+        else
+          logfile = Tempfile.new('furnish_log')
+          @tempfiles.push(logfile)
+          Furnish.logger = Furnish::Logger.new(logfile, 3)
+        end
+        Furnish.init(file.path)
       end
-      Furnish.init(file.path)
-      return file
     end
 
     def teardown # :nodoc:
@@ -39,9 +42,11 @@ module Furnish
         Furnish.logger.close
       end
 
-      Furnish.shutdown
-      @tempfiles.each do |file|
-        file.unlink
+      if Furnish.initialized? and !(Minitest.respond_to?(:keep_scheduler) and Minitest.keep_scheduler rescue nil)
+        Furnish.shutdown
+        @tempfiles.each do |file|
+          file.unlink
+        end
       end
     end
   end
@@ -56,14 +61,17 @@ module Furnish
   #
   # RunningSchedulerTestCase deals with managing a running scheduler for you.
   #
-  class SchedulerTestCase < TestCase
+  class SchedulerTest < Test
     ##
     # Furnish::Scheduler object.
     attr_reader :sched
 
     def setup # :nodoc:
       super
-      @sched = Furnish::Scheduler.new
+      if $sched
+        @sched = $sched
+      end
+      @sched ||= Furnish::Scheduler.new
       @monitor = Thread.new { loop { @sched.running?; sleep 1 } }
       @monitor.abort_on_exception = true
     end
@@ -95,7 +103,7 @@ module Furnish
   # Inherits from SchedulerTestCase and manages a running scheduler in
   # conjunction with all the other features.
   #
-  class RunningSchedulerTestCase < SchedulerTestCase
+  class RunningSchedulerTest < SchedulerTest
     def setup # :nodoc:
       super
       @sched.run

data/lib/furnish/test/scheduler_runner.rb

@@ -0,0 +1,53 @@
+#
+# Monkey Patches for Minitest for Furnish::Test
+#
+module Minitest
+  class << self
+    #
+    # If this is set, the scheduler will be kept running between test methods,
+    # so that it can be re-used. This can be used to save some time in
+    # situaitons where a long-running provision will be used in all methods in
+    # a suite.
+    #
+    attr_accessor :keep_scheduler
+
+    remove_method :__run
+
+    def __run(reporter, options) # :nodoc:
+      at_exit do
+        if Furnish.initialized?
+          $sched.force_deprovision = true
+          #$sched.teardown
+          #Furnish.shutdown
+          FileUtils.rm_f('test.db')
+        end
+      end
+
+      Minitest::Runnable.runnables.each do |suite|
+        begin
+          if keep_scheduler
+            require 'fileutils'
+            Furnish.init('test.db') unless Furnish.initialized?
+
+            if ENV["FURNISH_DEBUG"]
+              Furnish.logger = Furnish::Logger.new($stderr, 3)
+            end
+
+            $sched ||= Furnish::Scheduler.new
+            $sched.run
+          end
+
+          if suite.respond_to?(:before_suite)
+            suite.before_suite
+          end
+
+          suite.run(reporter, options)
+        ensure
+          if suite.respond_to?(:after_suite)
+            suite.after_suite
+          end
+        end
+      end
+    end
+  end
+end

data/lib/furnish/version.rb

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

data/test/helper.rb

@@ -7,9 +7,8 @@ if ENV["COVERAGE"]
   end
 end
 
-require 'minitest/unit'
 require 'tempfile'
 require 'furnish'
-require 'mt_cases'
+require 'furnish/test'
 
 require 'minitest/autorun'

data/test/mt_cases.rb

@@ -3,7 +3,7 @@ require 'furnish/test'
 
 module Furnish
   # These tests are run for both threaded and serial cases.
-  class RestartingSchedulerTestCase < SchedulerTestCase
+  class RestartingSchedulerTest < SchedulerTest
     def teardown
       sched.stop
       super
@@ -361,6 +361,27 @@ module Furnish
       sched.force_deprovision = true
       sched.teardown
       refute_includes(sched.vm.solved, "blarg")
+
+      dummy = StartFailDummy.new
+      assert(sched.schedule_provision('blarg', StartFailDummy.new))
+
+      assert_raises(RuntimeError) do
+        sched.run
+
+        unless sched.serial
+          sched.wait_for('blarg')
+        end
+      end
+
+      sched.force_deprovision = false
+      refute_includes(sched.vm.solved, "blarg")
+      unless sched.serial
+        assert_raises(RuntimeError) do
+          sched.down("blarg")
+        end
+      end
+      sched.force_deprovision = true
+      sched.down("blarg")
     end
   end
 end

data/test/test_api.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestAPI < Furnish::TestCase
+class TestAPI < Furnish::Test
   def setup
     super
     # NOTE this class is defined in test/dummy_classes.rb

data/test/test_dummy.rb

@@ -11,7 +11,7 @@
 
 require 'helper'
 
-class TestDummy < Furnish::TestCase
+class TestDummy < Furnish::Test
   def test_defaults
     dummy = Dummy.new
     dummy.furnish_group_name = 'dummy_test'

data/test/test_logger.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'tempfile'
 require 'stringio'
 
-class TestLogger < Furnish::TestCase
+class TestLogger < Furnish::Test
   def setup
     super
     @logger_file = Tempfile.new('furnish_log')

data/test/test_protocol.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestProtocol < Furnish::TestCase
+class TestProtocol < Furnish::Test
   #--
   # see the Furnish::Protocol docs for truth tables and whatnot
   #++
@@ -209,5 +209,13 @@ class TestProtocol < Furnish::TestCase
     proto2.accepts(:bar, "bar", Integer)
 
     refute(proto2.accepts_from(proto1), "nothing accepted is yielded")
+
+    proto1 = Furnish::Protocol.new
+    proto2 = Furnish::Protocol.new
+    proto1.yields(:foo, "foo", String)
+    proto1.accepts(:bar, "bar", String)
+    proto1.accepts(:foo, "foo", String)
+
+    assert(proto2.accepts_from(proto1), "only one of the types is matched")
   end
 end

data/test/test_provisioner_group.rb

@@ -1,7 +1,9 @@
 require 'helper'
+require 'dummy_classes'
+require 'furnish/provisioners/dummy_vm'
 
 # NOTE the dummy classes in this file are defined in test/dummy_classes.rb
-class TestProvisionerGroup < Furnish::TestCase
+class TestProvisionerGroup < Furnish::Test
   def test_constructor
     dummy = Dummy.new
     pg = Furnish::ProvisionerGroup.new(dummy, 'blarg')
@@ -206,4 +208,28 @@ class TestProvisionerGroup < Furnish::TestCase
       assert(pg.last.run_state[:shutdown])
     end
   end
+
+  def test_vms
+    vm1 = Furnish::Provisioner::DummyVM.new
+    vm2 = Furnish::Provisioner::DummyVM.new
+
+    pg1 = Furnish::ProvisionerGroup.new([vm1], 'test1')
+    pg2 = Furnish::ProvisionerGroup.new([vm2], 'test2')
+
+    pg1.first.add_vm('test', {})
+    pg2.first.add_vm('test2', {})
+
+    assert_equal({ pg1.first => ['test'] }, pg1.vms)
+    assert_equal({ pg2.first => ['test2'] }, pg2.vms)
+
+    vm1 = Furnish::Provisioner::DummyVM.new
+    dummy = Dummy.new
+    vm2 = Furnish::Provisioner::DummyVM.new
+
+    pg1 = Furnish::ProvisionerGroup.new([vm1, dummy, vm2], 'test1')
+    pg1.first.add_vm('test', { })
+    pg1.last.add_vm('test2', { })
+
+    assert_equal({ pg1.first => ['test', 'test2'], pg1.last => ['test', 'test2'] }, pg1.vms)
+  end
 end

data/test/test_provisioner_vm.rb

@@ -0,0 +1,33 @@
+require 'helper'
+require 'furnish/provisioners/dummy_vm'
+
+DummyVM = Furnish::Provisioner::DummyVM
+
+class TestProvisionerVM < Furnish::Test
+  def test_definition
+    assert_kind_of(Furnish::Provisioner::API, DummyVM.new)
+    assert_kind_of(Furnish::Provisioner::VM, DummyVM.new)
+    assert_respond_to(DummyVM.new, :vm)
+    assert_equal([], DummyVM.new.list_vms)
+    assert_raises(RuntimeError) { DummyVM.new.add_vm("foo", 1) }
+    assert_raises(RuntimeError) { DummyVM.new.remove_vm("foo") }
+  end
+
+  def test_group
+    dummy = DummyVM.new
+    assert_nil(dummy.vm)
+    group = Furnish::ProvisionerGroup.new([dummy], 'test1')
+
+    assert_kind_of(Palsy::Map, group.first.vm)
+    group
+  end
+
+  def test_api
+    group = test_group
+    group.first.add_vm("foo", "one" => "two", "three" => "four")
+    assert_raises(ArgumentError) { group.first.add_vm("foo", 1) }
+    assert_includes(group.first.list_vms, "foo")
+    group.first.remove_vm("foo")
+    refute_includes(group.first.list_vms, "foo")
+  end
+end

data/test/test_scheduler_basic.rb

@@ -1,6 +1,13 @@
 require 'helper'
+require 'dummy_classes'
+
+class TestSchedulerBasic < Furnish::SchedulerTest
+  def test_initialized
+    Furnish::Scheduler.new # should not raise
+    Furnish.instance_variable_set(:@initialized, false)
+    assert_raises(RuntimeError) { Furnish::Scheduler.new }
+  end
 
-class TestSchedulerBasic < Furnish::SchedulerTestCase
   def test_schedule_provision
     assert(sched.schedule_provision('blarg', [Dummy.new]), 'we can schedule')
     assert_includes(sched.vm.waiters.keys, 'blarg', 'exists in the waiters')

data/test/test_scheduler_serial.rb

@@ -1,6 +1,7 @@
 require 'helper'
+require 'mt_cases'
 
-class TestSchedulerSerial < Furnish::RestartingSchedulerTestCase
+class TestSchedulerSerial < Furnish::RestartingSchedulerTest
   def setup
     super
     sched.serial = true

data/test/test_scheduler_threaded.rb

@@ -1,7 +1,8 @@
 require 'helper'
+require 'mt_cases'
 
 # NOTE the dummy classes in this file are defined in test/dummy_classes.rb
-class TestSchedulerThreaded < Furnish::RestartingSchedulerTestCase
+class TestSchedulerThreaded < Furnish::RestartingSchedulerTest
   def setup
     super
     sched.serial = false

data/test/test_vm.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestVM < Furnish::TestCase
+class TestVM < Furnish::Test
   def test_initialize
     vm = Furnish::VM.new
     kinds = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furnish
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palsy
@@ -28,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -144,8 +144,12 @@ files:
 - lib/furnish/provisioner_group.rb
 - lib/furnish/provisioners/api.rb
 - lib/furnish/provisioners/dummy.rb
+- lib/furnish/provisioners/dummy_include.rb
+- lib/furnish/provisioners/dummy_vm.rb
+- lib/furnish/provisioners/vm.rb
 - lib/furnish/scheduler.rb
 - lib/furnish/test.rb
+- lib/furnish/test/scheduler_runner.rb
 - lib/furnish/version.rb
 - lib/furnish/vm.rb
 - test/dummy_classes.rb
@@ -156,6 +160,7 @@ files:
 - test/test_logger.rb
 - test/test_protocol.rb
 - test/test_provisioner_group.rb
+- test/test_provisioner_vm.rb
 - test/test_scheduler_basic.rb
 - test/test_scheduler_serial.rb
 - test/test_scheduler_threaded.rb
@@ -192,6 +197,7 @@ test_files:
 - test/test_logger.rb
 - test/test_protocol.rb
 - test/test_provisioner_group.rb
+- test/test_provisioner_vm.rb
 - test/test_scheduler_basic.rb
 - test/test_scheduler_serial.rb
 - test/test_scheduler_threaded.rb