the-maestro 0.4.1 → 0.4.2

data/README.rdoc

@@ -25,7 +25,7 @@ JRuby (1.5.2)
 
 Add the following gem dependency to your Rails project's <code>Gemfile</code>:
 
-    gem 'the-maestro', '0.4.0', :require => 'maestro'
+    gem 'the-maestro', '0.4.2', :require => 'maestro'
 
 Then run the following to install the Maestro gem:
 
@@ -44,7 +44,7 @@ Add the following gem dependency to your Rails project's <code>config/environmen
 
     Rails::Initializer.run do |config|
 
-      config.gem "the-maestro", :lib => "maestro", :version => "0.4.0", :source => "http://gemcutter.org"
+      config.gem "the-maestro", :lib => "maestro", :version => "0.4.2", :source => "http://gemcutter.org"
 
     end
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/maestro/cloud.rb

@@ -200,8 +200,20 @@ module Maestro
               channel.request_pty {|ch, success| abort "could not obtain pty" if !success}
               channel.exec(cmd) do |ch, success|
                 @logger.progress "."
-                ch.on_data {|ch, data| the_node.logger.info data}
-                ch.on_extended_data {|ch, data| the_node.logger.error }
+                ch.on_data do |ch2, data2|
+                  begin
+                    the_node.logger.info data2
+                  rescue StandardError => err
+                    the_node.logger.error "Unexpected error logging: #{err.to_s}"
+                  end
+                end
+                ch.on_extended_data do |ch2, data2|
+                  begin
+                    the_node.logger.error data2
+                  rescue StandardError => err
+                    the_node.logger.error "Unexpected error logging: #{err.to_s}"
+                  end
+                end
               end
             end
           end
@@ -274,8 +286,20 @@ module Maestro
             else
               node_cmd = cmd + " -j '#{node_json_url(the_node)}'"
               channel.exec(node_cmd) do |ch, success|
-                ch.on_data {|ch2, data2| the_node.logger.info data2}
-                ch.on_extended_data {|ch2, data2| the_node.logger.error data2}
+                ch.on_data do |ch2, data2|
+                  begin
+                    the_node.logger.info data2
+                  rescue StandardError => err
+                    the_node.logger.error "Unexpected error logging: #{err.to_s}"
+                  end
+                end
+                ch.on_extended_data do |ch2, data2|
+                  begin
+                    the_node.logger.error data2
+                  rescue StandardError => err
+                    the_node.logger.error "Unexpected error logging: #{err.to_s}"
+                  end
+                end
               end
             end
           end

data/the-maestro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{the-maestro}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Ploetz"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-17}
   s.description = %q{Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -81,7 +81,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bploetz/maestro}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Maestro: Conduct your clouds.}
   s.test_files = [
     "test/integration/base_aws.rb",
@@ -117,7 +117,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, ["= 2.10.2"])
       s.add_runtime_dependency(%q<net-ssh>, ["= 2.0.15"])
       s.add_runtime_dependency(%q<net-scp>, ["= 1.0.2"])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: the-maestro
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Brian Ploetz
@@ -9,99 +14,144 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -04:00
+date: 2010-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-scp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: log4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
-    version: 
+  type: :runtime
+  version_requirements: *id009
 description: Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.
 email: 
 executables: []
@@ -183,21 +233,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Maestro: Conduct your clouds."