gosen 0.1.3 → 0.1.4

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "gosen"
     gem.summary = %Q{A Ruby library for the Grid'5000 RESTful API}
-    gem.description = %Q{Gosen is a Ruby library providing high-level operations using the Grid'5000 RESTful API, such as Kadeploy deployments}
+    gem.description = %Q{Gosen is a Ruby library providing high-level operations using the Grid'5000 RESTful API, such as Kadeploy deployments.}
     gem.email = "priteau@gmail.com"
     gem.homepage = "http://github.com/priteau/gosen"
     gem.authors = ["Pierre Riteau"]

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/gosen/deployment.rb

@@ -23,10 +23,10 @@ module Gosen
       @api_options = {}
       @logger = options.delete(:logger) || NullLogger.new
 
-      @min_deployed_nodes = options[:min_deployed_nodes] || 1
+      @min_deployed_nodes = options.delete(:min_deployed_nodes) || 1
       raise Gosen::Error if @min_deployed_nodes > @nodes.length || @min_deployed_nodes < 0
 
-      @max_deploy_runs = options[:max_deploy_runs] || 1
+      @max_deploy_runs = options.delete(:max_deploy_runs) || 1
       raise Gosen::Error if @max_deploy_runs < 1
 
       if options[:ssh_public_key]

data/lib/gosen/deployment_run.rb

@@ -16,10 +16,10 @@ module Gosen
       @nodes = nodes
       @good_nodes = []
       @bad_nodes = Array.new(@nodes)
-      @api_options = {}
+      @api_options = options
 
-      if options[:ssh_public_key]
-        @api_options[:key] = @ssh_public_key = options[:ssh_public_key]
+      if @api_options[:ssh_public_key]
+        @api_options[:key] = @ssh_public_key = @api_options.delete(:ssh_public_key)
       end
       submit_deployment
     end

data/test/gosen/test_deployment.rb

@@ -129,7 +129,7 @@ class TestDeployment < Test::Unit::TestCase
         @site_deployments.expects(:submit).with({ :environment => @environment, :nodes => @nodes }).returns(@deployment_resource)
         @min_deployed_nodes = 2
         @logger.expects(:info).with("Kadeploy run 1 with #{@nodes.length} nodes (0 already deployed, need #{@min_deployed_nodes} more)")
-          @logger.expects(:info).with("Nodes deployed: paramount-1.rennes.grid5000.fr paramount-2.rennes.grid5000.fr")
+        @logger.expects(:info).with("Nodes deployed: paramount-1.rennes.grid5000.fr paramount-2.rennes.grid5000.fr")
         @logger.expects(:info).with("Had to run 1 kadeploy runs, deployed #{@deployment_result.length} nodes")
 
         @deployment = Gosen::Deployment.new(@site, @environment, @nodes, { :logger => @logger, :min_deployed_nodes => @min_deployed_nodes })
@@ -152,6 +152,17 @@ class TestDeployment < Test::Unit::TestCase
         }
       end
 
+      should 'pass extra API options to the deployment resource' do
+        @deployment_result = {
+          'paramount-1.rennes.grid5000.fr' => { 'state' => 'OK' },
+          'paramount-2.rennes.grid5000.fr' => { 'state' => 'OK' }
+        }
+        @deployment_resource.expects(:[]).with('result').returns(@deployment_result)
+        @site_deployments.expects(:submit).with({ :environment => @environment, :nodes => @nodes, :reformat_tmp => 'ext3' }).returns(@deployment_resource)
+        @deployment = Gosen::Deployment.new(@site, @environment, @nodes, { :reformat_tmp => 'ext3' })
+        @deployment.join
+      end
+
       should 'submit new deployment runs when needed' do
         @ssh_public_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvwM1XBJCIMtAyQlweE7BVRtvgyKdwGTeYCI4AFlsTtti4y0Ipe5Hsygx3p7S0BHFiJsVZWDANMRwZ4tcjp8YnjnMkG2yp1jB1qgUf34t/MmEQL0KkoOk8tIIb28o7nTFYKO15mXJm9yBVS1JY8ozEfnA7s5hkrdnvM6h9Jv6VScp8C1XTKmpEy3sWOeUlmCkYftYSr1fLM/7qk9S2TnljA/CGiK9dq2mhJMjnDtulVrdpc1hbh+0oCzL6m2BfXX3v4q1ORml8o04oFeEYDN5qzZneL+FzK+YfJIidvsjZ9ziVTv+7Oy5ms4wvoKiUGNapP0v/meXXBU1KvFRof3VZQ== priteau@parallelogram.local'
         @deployment_resource1 = mock()

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Pierre Riteau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -04:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
         version: 2.10.2
   type: :development
   version_requirements: *id003
-description: Gosen is a Ruby library providing high-level operations using the Grid'5000 RESTful API, such as Kadeploy deployments
+description: Gosen is a Ruby library providing high-level operations using the Grid'5000 RESTful API, such as Kadeploy deployments.
 email: priteau@gmail.com
 executables: []