jenkins-capistrano 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b6019b192880535dd9d66cb22721daf6112a1250
+  data.tar.gz: 5d174c5d0e64394012b940b12599abaff41d7aba
+SHA512:
+  metadata.gz: 2528db9a04a3ac8c64fb7833dae8283af55d004353cd234fd8c4948a21ffc757ce426905c33474ae136364ea155df302f64c0790f69fb324f37f36f95fa9b574
+  data.tar.gz: b8516fa27c17eb739bea9c61294bbe9aa71afa97c2b5d852918e40aa4468e333d47f53dac8bb6af6fb6de97b8860376bc7c7737693c0e8d63c89500cd4102e2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jenkins-capistrano (0.1.0)
+    jenkins-capistrano (0.1.1)
       capistrano (< 3.0.0)
       jenkins_api_client (>= 1.0.0)
 

data/README.md

@@ -300,6 +300,10 @@ gem 'jenkins_api_client', github: 'cynipe/jenkins_api_client', branch: 'fix-mult
 
 ## Release Notes
 
+### 0.1.1
+  * Abort when json file found in node config and show user-friendly message
+  * Remove unimplemented `jenkin:reverse_config` task
+
 ### 0.1.0
   * **[INCOMPATIBLE CHANGE]** Remove plugin support
   * **[INCOMPATIBLE CHANGE]** Change node configuration to use config.xml instead of json config

data/features/config_nodes.feature

@@ -119,3 +119,43 @@ Feature: Configuring Nodes
       """
       node node1 created.
       """
+
+  Scenario: Configuring the node with Json
+    Given the plain Jenkins server
+    And a file named "Capfile" with:
+      """
+      require 'jenkins-capistrano'
+      load 'config/deploy'
+      """
+    And a file named "config/deploy.rb" with:
+      """
+      set :jenkins_host, 'http://localhost:8080'
+      """
+    And a file named "config/jenkins/nodes/node1.json" with:
+      """
+      {
+        "description" : "Slave1",
+        "slave_fs"    : "/home/jenkins",
+        "executors"   : 5,
+        "exclusive"   : true,
+        "labels"      : "hello",
+        "slave_host"  : "dev-slave01.local",
+        "slave_port"  : 22,
+        "slave_user"  : "jenkins",
+        "master_key"  : "/var/lib/jenkins/.ssh/id_rsa",
+        "jvm_options" : "-Dfile.encoding=UTF-8",
+        "env_vars": {
+          "LANG"            : "ja_JP.UTF-8",
+          "ENVIRONMENT"     : "production",
+        }
+      }
+      """
+    When I run `bundle exec cap jenkins:config_nodes`
+    Then the exit status should be 1
+    And the output should contain:
+      """
+      Configuring the node using json is not supported anymore, use config.xml instead.
+      You could get the node's config.xml from a running Jenkins with following command:
+
+      $ curl -o config/jenkins/nodes/<node_name>.xml http://<jenkins-host>/computer/<node_name>/config.xml
+      """

data/lib/jenkins-capistrano/configurator.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require 'jenkins-capistrano/template'
 require 'jenkins_api_client'
 

data/lib/jenkins-capistrano/tasks.rb

@@ -71,14 +71,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       config_jobs
     end
 
-    desc <<-DESC
-
-    DESC
-    task :reverse_jobs do
-      logger.important '[DEPRECATED] Use jenkins:config_jobs instead.'
-      config_jobs
-    end
-
     desc <<-DESC
       Configure the nodes to Jenkins server.
 
@@ -90,6 +82,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task :config_nodes do
       logger.info "configuring jenkins nodes to #{jenkins_host}"
+      abort <<-MSG.gsub(/^ +/, '') unless Dir.glob(File.join(jenkins_node_config_dir, '*.json')).empty?
+        Configuring the node using json is not supported anymore, use config.xml instead.
+        You could get the node's config.xml from a running Jenkins with following command:
+
+        $ curl -o config/jenkins/nodes/<node_name>.xml http://<jenkins-host>/computer/<node_name>/config.xml
+      MSG
       configurator.configure_nodes(node_configs)
     end
 

data/lib/jenkins-capistrano/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   module Capistrano
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - cynipe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -30,81 +27,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: tapp
   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'
 - !ruby/object:Gem::Dependency
   name: aruba
   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
@@ -155,33 +142,26 @@ files:
 - lib/jenkins-capistrano/version.rb
 homepage: https://github.com/cynipe/jenkins-capistrano
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1694678970093714243
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1694678970093714243
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - features/config_jobs.feature