jenkins-capistrano 0.0.2 → 0.0.3

data/README.rst

@@ -0,0 +1,86 @@
+==================
+jenkins-capistrano
+==================
+
+The capistrano tasks for Jenkins CI Server
+
+Installation
+============
+
+Add this line to your application's Gemfile::
+
+  gem 'jenkins-capistrano'
+
+And then execute::
+
+  $ bundle
+
+Or install it yourself as::
+
+  $ gem install jenkins-capistrano
+
+Example
+=======
+
+Job Configuration
+~~~~~~~~~~~~~~~~~
+
+The following code will creates or updates Jenkins jobs before each deploy task:
+
+config directory structure(name your config.xml as a job name)::
+
+  config
+  ├── deploy.rb
+  └── jenkins
+       └── jobs
+           ├── job-name1.xml
+           ├── job-name2.xml
+           └── job-name3.xml
+
+
+deploy.rb::
+
+  set :application, "your-awesome-app"
+  set :scm, :git
+  set :repository,  "https://github.com/your/repository.git"
+
+  set :jenkins_host, 'http://localhost:8080'
+  # set :jenkins_username, '' # default empty
+  # set :jenkins_password, '' # default empty
+  # set :jenkins_job_config_dir, 'config/jenkins/jobs'
+
+  before 'deploy', 'jenkins:deploy_jobs'
+
+Node Configuration
+~~~~~~~~~~~~~~~~~~
+
+config directory structure::
+
+  config
+  ├── deploy.rb
+  └── jenkins
+       └── nodes
+           ├── node1.json
+           ├── node2.json
+           └── node3.json
+
+deploy.rb::
+
+  set :application, "your-awesome-app"
+  set :scm, :git
+  set :repository,  "https://github.com/your/repository.git"
+
+  set :jenkins_host, 'http://localhost:8080'
+  # set :jenkins_username, '' # default empty
+  # set :jenkins_password, '' # default empty
+  # set :jenkins_node_config_dir, 'config/jenkins/nodes'
+
+  before 'deploy', 'jenkins:config_nodes'
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/jenkins-capistrano.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = Jenkins::Capistrano::VERSION
 
   gem.add_dependency 'capistrano'
-  gem.add_dependency 'httparty',  '~> 0.6.1'
+  gem.add_dependency 'httparty',  '~> 0.8.3'
   gem.add_dependency 'hpricot'
 
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'pry'
 end

data/lib/jenkins-capistrano.rb

@@ -18,15 +18,22 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset(:jenkins_password) { '' }
 
   _cset(:jenkins_job_config_dir) { 'config/jenkins/jobs' }
+  _cset(:jenkins_node_config_dir) { 'config/jenkins/nodes' }
 
   def client
     @client ||= Jenkins::Client.new(jenkins_host, { :username => jenkins_username,  :password => jenkins_password})
   end
 
   def job_configs
+    abort "Please create the jenkins_job_config_dir first: #{jenkins_job_config_dir}" unless Dir.exists? jenkins_job_config_dir
     Dir.glob("#{jenkins_job_config_dir}/*.xml")
   end
 
+  def node_configs
+    abort "Please create the jenkins_node_config_dir first: #{jenkins_node_config_dir}" unless Dir.exists? jenkins_node_config_dir
+    Dir.glob("#{jenkins_node_config_dir}/*.json")
+  end
+
   # minimum configurations
   #
   #   role :jenkins, 'localhost:8080'
@@ -41,7 +48,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :deploy_jobs do
       strategy = fetch(:jenkins_job_deploy_strategy, :clean)
       logger.info "deploying jenkins jobs to #{jenkins_host}"
-      logger.warn "no job configs found." if job_configs.empty?
+      logger.important "no job configs found." if job_configs.empty?
       job_configs.each do |file|
         name = File.basename(file, '.xml')
         client.create_or_update_job(name, File.read(file))
@@ -50,6 +57,26 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end
 
+    desc <<-DESC
+    Configure the nodes to Jenkins server -- meaning create or update --
+
+      set :jenkins_node_config_dir,      'config/jenkins/nodes'
+      set :jenkins_node_deploy_strategy, :clean | :merge
+    DESC
+    task :config_nodes do
+      strategy = fetch(:jenkins_node_deploy_strategy, :clean)
+      logger.info "configuring jenkins nodes to #{jenkins_host}"
+      logger.important "no node configs found." if node_configs.empty?
+      node_configs.each do |file|
+        name = File.basename(file, '.json')
+        opts = JSON.parse(File.read(file)).to_hash.
+          inject({}) { |mem, (key, val)| mem[key.to_sym] = val; mem }
+        client.config_node(name, opts)
+        logger.trace "node #{name} created."
+      end
+
+    end
+
   end
 
 end

data/lib/jenkins-capistrano/client.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'cgi/util'
+require 'json'
 
 module Jenkins
   class Client
@@ -37,6 +38,42 @@ module Jenkins
       end
     end
 
+    def add_node(name, opts = {})
+      options = default_node_options.merge(opts)
+      options[:name] = name
+      options[:labels] = options[:labels].split(/\s*,\s*/).join(' ') if options[:labels]
+
+      response = post_form("/computer/doCreateItem", node_form_fields(options))
+      case response
+      when Net::HTTPFound
+        { :name => options[:name], :slave_host => options[:slave_host] }
+      else
+        raise ServerError, parse_error_message(response)
+      end
+    end
+
+    def update_node(name, opts = {})
+      options = default_node_options.merge(opts)
+      options[:name] = name
+      options[:labels] = options[:labels].split(/\s*,\s*/).join(' ') if options[:labels]
+
+      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] }
+      else
+        raise ServerError, parse_error_message(response)
+      end
+    end
+
+    def config_node(name, opts = {})
+      begin
+        add_node(name, opts)
+      rescue ServerError => e
+        update_node(name, opts)
+      end
+    end
+
     private
     def xml_body(xml_str)
       {
@@ -52,6 +89,57 @@ module Jenkins
       error_msg = doc.search("td#main-panel p")
       error_msg.inner_text.empty? ? "Server error: code=#{response.code}, #{response.body}" : error_msg
     end
+
+    def post_form(path, fields)
+      url = URI.parse("#{self.class.base_uri}/#{path}")
+      req = Net::HTTP::Post.new(url.path)
+
+      basic_auth = self.class.default_options[:basic_auth]
+      req.basic_auth basic_auth[:username], basic_auth[:password] if basic_auth
+
+      req.set_form_data(fields)
+      http = Net::HTTP.new(url.host, url.port)
+      http.request(req)
+    end
+
+    def default_node_options
+      {
+        :slave_port  => 22,
+        :slave_user  => 'jenkins',
+        :master_key  => "/var/lib/jenkins/.ssh/id_rsa",
+        :slave_fs    => "/data/jenkins-slave/",
+        :description => "Automatically created by capistrano-jenkins",
+        :executors   => 2,
+        :exclusive   => true
+      }
+    end
+
+    def node_form_fields(options = {})
+      {
+        "name" => options[:name],
+        "type" => "hudson.slaves.DumbSlave$DescriptorImpl",
+        "json" => {
+          "name"              => options[:name],
+          "type"              => "hudson.slaves.DumbSlave$DescriptorImpl",
+          "nodeDescription"   => options[:description],
+          "numExecutors"      => options[:executors],
+          "remoteFS"          => options[:slave_fs],
+          "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],
+          }
+        }.to_json
+      }
+    end
+
+
   end
 end
 

data/lib/jenkins-capistrano/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The capistrano tasks for Jenkins CI Server
 email:
 - cynipe@gmail.com
@@ -85,7 +101,7 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README.md
+- README.rst
 - Rakefile
 - jenkins-capistrano.gemspec
 - lib/jenkins-capistrano.rb
@@ -105,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -981150246330867854
+      hash: 2715284464672624709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -981150246330867854
+      hash: 2715284464672624709
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/README.md

@@ -1,53 +0,0 @@
-# jenkins-capistrano
-
-The capistrano tasks for Jenkins CI Server
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'jenkins-capistrano'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install jenkins-capistrano
-
-## Example
-
-The following code will creates or updates Jenkins jobs before each deploy task:
-
-config directory structure(name your config.xml as a job name):
-
-  config
-  ├── deploy.rb
-  └── jenkins
-       └── jobs
-           ├── job-name1.xml
-           ├── job-name2.xml
-           └── job-name3.xml
-
-
-deploy.rb:
-
-  set :application, "your-awesome-app"
-  set :scm, :git
-  set :repository,  "https://github.com/your/repository.git"
-
-  set :jenkins_host, 'http://localhost:8080'
-  # set :jenkins_username, '' # default empty
-  # set :jenkins_password, '' # default empty
-  # set :jenkins_job_config_dir, 'config/jenkins/jobs'
-
-  before 'deploy', 'jenkins:deploy_jobs'
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request