slushy 0.1.1 → 0.1.2

data/README.md

@@ -8,12 +8,15 @@ Assumes Fog's API for connecting to and creating instances.
 Provision and converge an instance:
 
 ```ruby
-connection = Fog::Compute.new :provider => 'AWS', :aws_access_key => 'KEY',
-  :aws_secret_access_key => 'SECRET'
+connection = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => 'KEY', :aws_secret_access_key => 'SECRET')
+
 # Second arg is a hash passed to Fog::Compute::AWS::Servers.create
-instance = Slushy::Instance.launch connection, :flavor_id => 'm1.large', :more => :keys
+instance = Slushy::Instance.launch(connection, :flavor_id => 'm1.large', :more => :keys)
+
+# Install ruby and Chef
 instance.bootstrap
-# Point at directory containing Chef cookbooks
+
+# Converge using your Chef cookbooks
 instance.converge Rails.root.join('provision')
 ```
 

data/lib/slushy/command_failed_error.rb

@@ -0,0 +1,2 @@
+class Slushy::CommandFailedError < Slushy::Error
+end

data/lib/slushy/error.rb

@@ -0,0 +1,2 @@
+class Slushy::Error < StandardError
+end

data/lib/slushy/instance.rb

@@ -1,13 +1,11 @@
 require 'timeout'
 
 class Slushy::Instance
-  class AptInstallError < StandardError; end
-
   attr_reader :connection, :instance_id
 
   def self.launch(connection, config)
     server = connection.servers.create(config)
-    server.wait_for { ready? }
+    server.wait_for { ready? } or raise Slushy::TimeoutError.new("Timeout launching server #{server.id}")
     new(connection, server.id)
   end
 
@@ -36,23 +34,23 @@ class Slushy::Instance
     response = connection.create_image(instance_id, name, description)
     image_id = response.body["imageId"]
     image = connection.images.get(image_id)
-    image.wait_for { state == "available" }
+    image.wait_for(3600) { ready? } or raise Slushy::TimeoutError.new("Timeout creating snapshot #{image_id}")
     image_id
   end
 
   def terminate
     server.destroy
-    server.wait_for { state == "terminated" }
+    server.wait_for { state == "terminated" } or raise Slushy::TimeoutError.new("Timeout terminating server #{server.id}")
   end
 
   def stop
     server.stop
-    server.wait_for { state == "stopped" }
+    server.wait_for { state == "stopped" } or raise Slushy::TimeoutError.new("Timeout stopping server #{server.id}")
   end
 
   def wait_for_connectivity
     puts "Waiting for ssh connectivity..."
-    retry_block(5, [Errno::ECONNREFUSED, Timeout::Error], "Connecting to Amazon refused") do
+    retry_block(5, [Errno::ECONNREFUSED, Timeout::Error], Slushy::TimeoutError.new("Timeout connecting to server #{server.id}")) do
       sleep 10
       Timeout.timeout(60) { ssh('ls') }
     end
@@ -65,21 +63,17 @@ class Slushy::Instance
   end
 
   def run_command!(command)
-    exit 1 unless run_command(command)
-  end
-
-  def run_apt_command!(command)
-    raise AptInstallError unless run_command(command)
+    raise Slushy::CommandFailedError.new("Failed running '#{command}'") unless run_command(command)
   end
 
   def apt_installs
-    retry_block(5, [AptInstallError], "Command 'apt-get' failed") do
+    retry_block(5, [Slushy::CommandFailedError], Slushy::CommandFailedError.new("Command 'apt-get' failed")) do
       puts "Updating apt cache..."
-      run_apt_command!('sudo apt-get update')
+      run_command!('sudo apt-get update')
       puts "Installing ruby..."
-      run_apt_command!('sudo apt-get -y install ruby')
+      run_command!('sudo apt-get -y install ruby')
       puts "Installing rubygems..."
-      run_apt_command!('sudo apt-get -y install rubygems1.8')
+      run_command!('sudo apt-get -y install rubygems1.8')
     end
   end
 
@@ -95,12 +89,14 @@ class Slushy::Instance
     cookbooks_path = "#{cookbooks_path}/" unless cookbooks_path.to_s.end_with?('/')
     scp(cookbooks_path, '/tmp/chef-solo', :recursive => true)
     puts "Converging server, this may take a while (10-20 minutes)"
-    run_command!('cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json')
+    path_part = 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH'
+    cmd = "cd /tmp/chef-solo && #{path_part} sudo chef-solo -c solo.rb -j dna.json"
+    run_command!(cmd)
   end
 
   protected
 
-  def retry_block(times, errors, failure)
+  def retry_block(times, retryable_exceptions, retries_failed_exception)
     succeeded = false
     attempts = 0
     last_error = nil
@@ -108,13 +104,13 @@ class Slushy::Instance
       begin
         retval = yield
         succeeded = true
-      rescue *errors => e
+      rescue *retryable_exceptions => e
         attempts +=1
-        puts "#{failure}. Attempting retry #{attempts}..."
+        puts "#{retries_failed_exception.message}. Attempting retry #{attempts}..."
         last_error = e
       end
     end
-    exit 1 if !succeeded
+    raise retries_failed_exception unless succeeded
     retval
   end
 

data/lib/slushy/timeout_error.rb

@@ -0,0 +1,2 @@
+class Slushy::TimeoutError < Slushy::Error
+end

data/lib/slushy/version.rb

@@ -1,3 +1,3 @@
 module Slushy
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/slushy.rb

@@ -1,4 +1,7 @@
 module Slushy; end
 
 require 'slushy/version'
+require 'slushy/error'
+require 'slushy/command_failed_error'
+require 'slushy/timeout_error'
 require 'slushy/instance'

data/spec/lib/instance_spec.rb

@@ -20,6 +20,13 @@ describe Slushy::Instance do
       lambda { described_class.launch(connection, config) }.should change { connection.servers.size }.by(1)
     end
 
+    it "raises if wait_for fails" do
+      servers = stub(:create => server)
+      connection.stub(:servers).and_return(servers)
+      server.stub(:wait_for).and_return(false)
+      lambda { described_class.launch(connection, config) }.should raise_error(Slushy::TimeoutError)
+    end
+
     it "returns the instance object" do
       described_class.launch(connection, config).should be_a Slushy::Instance
     end
@@ -57,21 +64,56 @@ describe Slushy::Instance do
     it "does NOT return until image creation is complete" do
       connection.stub(:create_image).and_return(response)
       images.should_receive(:get).with(:some_ami_id).and_return(image)
-      image.should_receive(:wait_for)
+      image.should_receive(:ready?).ordered.and_return(false)
+      image.should_receive(:ready?).ordered.and_return(true)
       instance.snapshot(:some_name, :some_description)
     end
+
+    it "raises if wait_for fails" do
+      connection.stub(:create_image).and_return(response)
+      images.should_receive(:get).with(:some_ami_id).and_return(image)
+      image.stub(:wait_for).and_return(false)
+      lambda { instance.snapshot(:some_name, :some_description) }.should raise_error(Slushy::TimeoutError)
+    end
   end
 
   describe "#terminate" do
     it "terminates the given instance" do
       instance.stub(:server).and_return(server)
       server.should_receive(:destroy)
-      server.should_receive(:wait_for)
+      server.should_receive(:state).ordered.and_return("running")
+      server.should_receive(:state).ordered.and_return("terminated")
       instance.terminate
     end
+
+    it "raises if wait_for fails" do
+      instance.stub(:server).and_return(server)
+      server.stub(:destroy)
+      server.stub(:wait_for).and_return(false)
+      lambda { instance.terminate }.should raise_error(Slushy::TimeoutError)
+    end
+  end
+
+  describe "#stop" do
+    it "stops the given instance" do
+      instance.stub(:server).and_return(server)
+      server.should_receive(:stop)
+      server.should_receive(:state).ordered.and_return("running")
+      server.should_receive(:state).ordered.and_return("stopped")
+      instance.stop
+    end
+
+    it "raises if wait_for fails" do
+      instance.stub(:server).and_return(server)
+      server.stub(:stop)
+      server.stub(:wait_for).and_return(false)
+      lambda { instance.stop }.should raise_error(Slushy::TimeoutError)
+    end
   end
 
   describe '#wait_for_connectivity' do
+    before { instance.stub(:server).and_return(server) }
+
     it 'retries if the first attempt fails' do
       instance.should_receive(:ssh).ordered.and_raise(Errno::ECONNREFUSED)
       instance.should_receive(:ssh).ordered.and_return([mock_job])
@@ -91,12 +133,12 @@ describe Slushy::Instance do
       stdout.should include 'Attempting retry 3...'
     end
 
-    it 'retries up to five times, then aborts' do
+    it 'retries up to five times, then fails' do
       instance.should_receive(:ssh).exactly(5).times.and_raise(Errno::ECONNREFUSED)
       instance.stub(:sleep).and_return(10)
       expect do
         capture_stdout { instance.wait_for_connectivity }
-      end.to raise_error SystemExit
+      end.to raise_error Slushy::TimeoutError
     end
   end
 
@@ -107,7 +149,7 @@ describe Slushy::Instance do
       capture_stdout do
         expect do
           instance.run_command!("ls")
-        end.to raise_error SystemExit
+        end.to raise_error Slushy::CommandFailedError
       end.should =~ /STDERR: FAIL WHALE/
     end
   end
@@ -124,11 +166,11 @@ describe Slushy::Instance do
       end.to_not raise_error
     end
 
-    it 'retries up to five times, then aborts' do
+    it 'retries up to five times, then fails' do
       instance.should_receive(:ssh).exactly(5).times.with('sudo apt-get update').and_return([mock_job(:status => 1)])
       expect do
         capture_stdout { instance.apt_installs }
-      end.to raise_error SystemExit
+      end.to raise_error Slushy::CommandFailedError
     end
   end
 

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'slushy'
 Dir[File.expand_path("support/*.rb", File.dirname(__FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include OutputStreams
   config.filter_run :focused => true
   config.filter_run_excluding :disabled => true
   config.run_all_when_everything_filtered = true

data/spec/support/output_streams.rb

@@ -10,3 +10,7 @@ module OutputStreams
     fake.string
   end
 end
+
+RSpec.configure do |config|
+  config.include OutputStreams
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slushy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -92,7 +92,10 @@ files:
 - README.md
 - Rakefile
 - lib/slushy.rb
+- lib/slushy/command_failed_error.rb
+- lib/slushy/error.rb
 - lib/slushy/instance.rb
+- lib/slushy/timeout_error.rb
 - lib/slushy/version.rb
 - slushy.gemspec
 - spec/lib/instance_spec.rb
@@ -112,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 663044203149620506
+      hash: -3387664004883499874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 663044203149620506
+      hash: -3387664004883499874
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An Aussie kitchen hand helping out Chef