gosen 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/gosen.rb

@@ -4,7 +4,7 @@ require 'gosen/deployment'
 require 'gosen/error'
 
 module Gosen
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
   # Extracts the site part of a Grid'5000 node hostname, and returns a hash indexing the nodes by their site
   # Example:

data/lib/gosen/deployment.rb

@@ -23,11 +23,15 @@ module Gosen
       @api_options = {}
       @logger = options.delete(:logger) || NullLogger.new
 
+      @site.session.default_headers['User-Agent'] = "Gosen/#{Gosen::VERSION} Restfully/#{Restfully::VERSION}"
+
       @min_deployed_nodes = options.delete(:min_deployed_nodes) || 1
-      raise Gosen::Error if @min_deployed_nodes > @nodes.length || @min_deployed_nodes < 0
+      raise Gosen::Error.new("Invalid minimal number of deployed nodes, should be between 0 and #{@nodes.length}") if @min_deployed_nodes > @nodes.length || @min_deployed_nodes < 0
 
       @max_deploy_runs = options.delete(:max_deploy_runs) || 1
-      raise Gosen::Error if @max_deploy_runs < 1
+      raise Gosen::Error.new("Invalid maximal number of deployments, should be greater than or equal to 1") if @max_deploy_runs < 1
+
+      @continue_if_error = options.delete(:continue_if_error) || false
 
       if options[:ssh_public_key]
         @ssh_public_key = options[:ssh_public_key]
@@ -48,21 +52,31 @@ module Gosen
 
     def join
       @max_deploy_runs.times do |i|
-        @deployment_resource = Gosen::DeploymentRun.new(@site, @environment, @bad_nodes, @api_options)
+        @deployment_run = Gosen::DeploymentRun.new(@site, @environment, @bad_nodes, @api_options)
         @logger.info("Kadeploy run #{i + 1} with #{@bad_nodes.length} nodes (#{@good_nodes.length} already deployed, need #{@min_deployed_nodes - @good_nodes.length} more)")
-        @deployment_resource.wait_for_completion
-        @deployment_resource.update_nodes
-        @bad_nodes = @deployment_resource.bad_nodes
-        @good_nodes |= @deployment_resource.good_nodes
-        @logger.info("Nodes deployed: #{@deployment_resource.good_nodes.join(' ')}") unless @deployment_resource.good_nodes.empty?
-        @logger.info("Nodes which failed: #{@deployment_resource.bad_nodes.join(' ')}") unless @deployment_resource.bad_nodes.empty?
+        begin
+          @deployment_run.wait_for_completion
+        rescue Gosen::Error => e
+          if e.message =~ /^Deployment error/ && @continue_if_error
+            @logger.warn("Deployment error: #{@deployment_run.deployment_resource['output']}")
+            @logger.warn("Continuing because continue_if_error is set")
+            next
+          else
+            raise e
+          end
+        end
+        @deployment_run.update_nodes
+        @bad_nodes = @deployment_run.bad_nodes
+        @good_nodes |= @deployment_run.good_nodes
+        @logger.info("Nodes deployed: #{@deployment_run.good_nodes.join(' ')}") unless @deployment_run.good_nodes.empty?
+        @logger.info("Nodes which failed: #{@deployment_run.bad_nodes.join(' ')}") unless @deployment_run.bad_nodes.empty?
         if no_more_required?
           @all_runs_done = true
           @logger.info("Had to run #{i + 1} kadeploy runs, deployed #{@good_nodes.length} nodes")
           return
         end
       end
-      raise Gosen::Error.new('Not enough nodes')
+      raise Gosen::Error.new("Not enough nodes deployed after #{@max_deploy_runs} deployment(s): needed #{@min_deployed_nodes} nodes, got only #{@good_nodes.length}")
     end
 
     def no_more_required?

data/lib/gosen/deployment_run.rb

@@ -3,7 +3,7 @@ module Gosen
     # Time between two checks of the deployment run status
     POLLING_TIME = 10
 
-    attr_reader :environment, :nodes, :site, :ssh_public_key
+    attr_reader :deployment_resource, :environment, :nodes, :site, :ssh_public_key
 
     # Launch a new deployment run
     # @param [Restfully:Resource] site the deployment site, as a restfully resource
@@ -57,7 +57,7 @@ module Gosen
         Kernel.sleep(Gosen::DeploymentRun::POLLING_TIME)
         @deployment_resource.reload
       end
-      raise Gosen::Error if @deployment_resource['status'] == 'error'
+      raise Gosen::Error.new("Deployment error: #{@deployment_resource['output']}") if @deployment_resource['status'] == 'error'
     end
 
     def update_nodes

data/test/gosen/test_deployment.rb

@@ -4,6 +4,11 @@ class TestDeployment < Test::Unit::TestCase
   context 'A deployment instance' do
     setup do
       @site = mock()
+      @session = mock()
+      @default_headers = mock()
+      @default_headers.stubs(:[]=).with('User-Agent', "Gosen/#{Gosen::VERSION} Restfully/#{Restfully::VERSION}")
+      @session.stubs(:default_headers).returns(@default_headers)
+      @site.stubs(:session).returns(@session)
       @site_name = "Rennes"
       @site.stubs(:name).returns(@site_name)
       @environment = 'lenny-x64-base'
@@ -148,7 +153,12 @@ class TestDeployment < Test::Unit::TestCase
 
         @deployment = Gosen::Deployment.new(@site, @environment, @nodes, { :min_deployed_nodes => 2 })
         assert_raise(Gosen::Error) {
-          @deployment.join
+          begin
+            @deployment.join
+          rescue Gosen::Error => e
+            assert_equal("Not enough nodes deployed after 1 deployment(s): needed 2 nodes, got only 1", e.message)
+            raise e
+          end
         }
       end
 
@@ -196,6 +206,37 @@ class TestDeployment < Test::Unit::TestCase
         assert_equal(@nodes, @deployment.good_nodes)
         assert_equal([], @deployment.bad_nodes)
       end
+
+      should 'continue deploying when an error happens and :continue_if_error was set' do
+        @ssh_public_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvwM1XBJCIMtAyQlweE7BVRtvgyKdwGTeYCI4AFlsTtti4y0Ipe5Hsygx3p7S0BHFiJsVZWDANMRwZ4tcjp8YnjnMkG2yp1jB1qgUf34t/MmEQL0KkoOk8tIIb28o7nTFYKO15mXJm9yBVS1JY8ozEfnA7s5hkrdnvM6h9Jv6VScp8C1XTKmpEy3sWOeUlmCkYftYSr1fLM/7qk9S2TnljA/CGiK9dq2mhJMjnDtulVrdpc1hbh+0oCzL6m2BfXX3v4q1ORml8o04oFeEYDN5qzZneL+FzK+YfJIidvsjZ9ziVTv+7Oy5ms4wvoKiUGNapP0v/meXXBU1KvFRof3VZQ== priteau@parallelogram.local'
+        @deployment_resource1 = mock()
+        @deployment_resource2 = mock()
+        @deployment_resource1.stubs(:reload)
+        @deployment_resource2.stubs(:reload)
+
+        @output = 'Your key cannot be fetched.'
+        @deployment_result2 = {
+          'paramount-1.rennes.grid5000.fr' => { 'state' => 'OK' },
+          'paramount-2.rennes.grid5000.fr' => { 'state' => 'OK' }
+        }
+        @deployment_resource1.stubs(:[]).with('status').returns('processing', 'processing', 'error')
+        @deployment_resource1.stubs(:[]).with('output').returns(@output)
+        @deployment_resource2.stubs(:[]).with('status').returns('processing', 'processing', 'terminated')
+        @deployment_resource2.expects(:[]).with('result').returns(@deployment_result2)
+        @min_deployed_nodes = 2
+        @site_deployments.expects(:submit).twice.with({ :environment => @environment, :nodes => @nodes, :key => @ssh_public_key }).returns(@deployment_resource1, @deployment_resource2)
+        @logger.expects(:info).with("Kadeploy run 1 with 2 nodes (0 already deployed, need 2 more)")
+        @logger.expects(:warn).with("Deployment error: #{@output}")
+        @logger.expects(:warn).with("Continuing because continue_if_error is set")
+        @logger.expects(:info).with("Kadeploy run 2 with 2 nodes (0 already deployed, need 2 more)")
+        @logger.expects(:info).with("Nodes deployed: paramount-1.rennes.grid5000.fr paramount-2.rennes.grid5000.fr")
+        @logger.expects(:info).with("Had to run 2 kadeploy runs, deployed 2 nodes")
+
+        @deployment = Gosen::Deployment.new(@site, @environment, @nodes, { :logger => @logger, :min_deployed_nodes => @min_deployed_nodes, :max_deploy_runs => 2, :ssh_public_key => @ssh_public_key, :continue_if_error => true })
+        @deployment.join
+        assert_equal(@nodes, @deployment.good_nodes)
+        assert_equal([], @deployment.bad_nodes)
+      end
     end
   end
 end

data/test/gosen/test_deployment_run.rb

@@ -95,6 +95,8 @@ class TestDeploymentRun < Test::Unit::TestCase
       @ssh_public_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvwM1XBJCIMtAyQlweE7BVRtvgyKdwGTeYCI4AFlsTtti4y0Ipe5Hsygx3p7S0BHFiJsVZWDANMRwZ4tcjp8YnjnMkG2yp1jB1qgUf34t/MmEQL0KkoOk8tIIb28o7nTFYKO15mXJm9yBVS1JY8ozEfnA7s5hkrdnvM6h9Jv6VScp8C1XTKmpEy3sWOeUlmCkYftYSr1fLM/7qk9S2TnljA/CGiK9dq2mhJMjnDtulVrdpc1hbh+0oCzL6m2BfXX3v4q1ORml8o04oFeEYDN5qzZneL+FzK+YfJIidvsjZ9ziVTv+7Oy5ms4wvoKiUGNapP0v/meXXBU1KvFRof3VZQ== priteau@parallelogram.local'
       @resource = mock()
       @resource.stubs(:[]).with('status').returns('processing', 'processing', 'error')
+      @output = 'Your key cannot be fetched.'
+      @resource.stubs(:[]).with('output').returns(@output)
       @resource.expects(:reload).twice
       Kernel.expects(:sleep).with(Gosen::DeploymentRun::POLLING_TIME).twice
 
@@ -106,9 +108,14 @@ class TestDeploymentRun < Test::Unit::TestCase
       @deployment = Gosen::DeploymentRun.new(@site, @environment, @nodes, { :ssh_public_key => @ssh_public_key })
     end
 
-    should 'raise an exception' do
+    should 'raise an exception and print the deployment output' do
       assert_raise(Gosen::Error) {
-        @deployment.join
+        begin
+          @deployment.join
+        rescue Gosen::Error => e
+          assert_equal("Deployment error: #{@output}", e.message)
+          raise e
+        end
       }
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Pierre Riteau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +02:00
+date: 2010-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency