ironfan 4.8.6 → 4.8.7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.8.7
+* ec2/machine: fixing stop and start to wait for all valid end-states
+
 # v4.8.6
 * Gemfile: removing stale grit dependency (breaks Cygwin build due to stale posix-thread incompatibility)
 

data/VERSION

@@ -1 +1 @@
-4.8.6
+4.8.7

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.8.6"
+  s.version = "4.8.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-03-01"
+  s.date = "2013-03-05"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/provider/ec2/machine.rb

@@ -52,21 +52,29 @@ module Ironfan
         def created?
           not ['terminated', 'shutting-down'].include? state
         end
+        def pending?
+          state == "pending"
+        end
         def running?
           state == "running"
         end
+        def stopping?
+          state == "stopping"
+        end
         def stopped?
           state == "stopped"
         end
 
         def start
+          machine = self
           adaptee.start
-          adaptee.wait_for{ state == 'pending' }
+          adaptee.wait_for{ machine.pending? or machine.running? }
         end
 
         def stop
+          machine = self
           adaptee.stop
-          adaptee.wait_for{ state == 'stopping' }
+          adaptee.wait_for{ machine.stopping? or machine.stopped? }
         end
 
         def to_display(style,values={})

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.8.6
+  version: 4.8.7
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-01 00:00:00 Z
+date: 2013-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2170733179421176623
+      hash: -3865228418823474445
       segments: 
       - 0
       version: "0"