jenkins-capistrano 0.0.3 → 0.0.4

data/README.rst

@@ -54,7 +54,7 @@ deploy.rb::
 Node Configuration
 ~~~~~~~~~~~~~~~~~~
 
-config directory structure::
+config directory structure(name your json file as a node name)::
 
   config
   ├── deploy.rb
@@ -64,6 +64,28 @@ config directory structure::
            ├── node2.json
            └── node3.json
 
+sample node configuration::
+
+  {
+    "name"        : "example",
+    "type"        : "hudson.slaves.DumbSlave$DescriptorImpl",
+    "description" : "some description",
+    "executors"   : 2,
+    "labels"      : "linux, java, ruby",
+    "slave_host"  : "example.com",
+    "slave_port"  : 22,
+    "slave_user"  : "jenkins",
+    "master_key"  : "/var/lib/jenkins/.ssh/id_rsa",
+    "slave_fs"    : "/home/jenkins",
+    "exclusive"   : true,
+    "java_path": "/opt/java/bin/java",
+    "jvm_options": "-Xmx512M",
+    "env_vars": {
+      "key1": "val1",
+      "key2": "val2"
+    }
+  }
+
 deploy.rb::
 
   set :application, "your-awesome-app"
@@ -77,7 +99,8 @@ deploy.rb::
 
   before 'deploy', 'jenkins:config_nodes'
 
-## Contributing
+Contributing
+============
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/jenkins-capistrano/client.rb

@@ -42,11 +42,12 @@ module Jenkins
       options = default_node_options.merge(opts)
       options[:name] = name
       options[:labels] = options[:labels].split(/\s*,\s*/).join(' ') if options[:labels]
+      options[:env_vars] = options[:env_vars].map { |k, v| { :key => k, :value => v } }
 
       response = post_form("/computer/doCreateItem", node_form_fields(options))
       case response
       when Net::HTTPFound
-        { :name => options[:name], :slave_host => options[:slave_host] }
+        { :name => name, :slave_host => options[:slave_host] }
       else
         raise ServerError, parse_error_message(response)
       end
@@ -56,11 +57,12 @@ module Jenkins
       options = default_node_options.merge(opts)
       options[:name] = name
       options[:labels] = options[:labels].split(/\s*,\s*/).join(' ') if options[:labels]
+      options[:env_vars] = options[:env_vars].map { |k, v| { :key => k, :value => v } }
 
       response = post_form("/computer/#{CGI::escape(name)}/configSubmit", node_form_fields(options))
       case response
       when Net::HTTPFound
-        { :name => options[:name], :slave_host => options[:slave_host] }
+        { :name => name, :slave_host => options[:slave_host] }
       else
         raise ServerError, parse_error_message(response)
       end
@@ -127,19 +129,25 @@ module Jenkins
           "labelString"       => options[:labels],
           "mode"              => options[:exclusive] ? "EXCLUSIVE" : "NORMAL",
           "retentionStrategy" => { "stapler-class"  => "hudson.slaves.RetentionStrategy$Always" },
-          "nodeProperties"    => { "stapler-class-bag" => "true" },
           "launcher"          => {
             "stapler-class" => "hudson.plugins.sshslaves.SSHLauncher",
             "host"          => options[:slave_host],
             "port"          => options[:slave_port],
             "username"      => options[:slave_user],
             "privatekey"    => options[:master_key],
+            "javaPath"      => options[:java_path],
+            "jvmOptions"    => options[:jvm_options]
+          },
+          "nodeProperties"    => {
+            "stapler-class-bag" => "true",
+            "hudson-slaves-EnvironmentVariablesNodeProperty" => {
+              "env" => options[:env_vars]
+            }
           }
         }.to_json
       }
     end
 
-
   end
 end
 

data/lib/jenkins-capistrano/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   module Capistrano
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2715284464672624709
+      hash: 2200036594680116764
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2715284464672624709
+      hash: 2200036594680116764
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24