capistrano-scm-jenkins 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.0.2)
+    capistrano-scm-jenkins (0.0.3)
       capistrano
+      net-netrc
 
 GEM
   remote: http://rubygems.org/
   specs:
+    Platform (0.4.0)
     capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
@@ -15,6 +17,8 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     diff-lcs (1.1.3)
     highline (1.6.8)
+    net-netrc (0.2.2)
+      Platform (>= 0.3.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)

data/NEWS.md

@@ -1,3 +1,7 @@
+## 0.0.3 (2011-12-13)
+
+* support netrc
+
 ## 0.0.2 (2011-11-26)
 
 * honor :scm_username and :scm_password

data/README.md

@@ -19,11 +19,17 @@ a sample config/deploy.rb
     set :scm, :jenkins
 
     # uncomment following line if you want deploy unstable version
-    # set :jenkins_use_unstable, true
+    #   set :jenkins_use_unstable, true
 
     # jenkins username and password
-    # set :scm_username, ENV['JENKINS_USERNAME']
-    # set :scm_password, ENV['JENKINS_PASSWORD']
+    #   set :scm_username, ENV['JENKINS_USERNAME']
+    #   set :scm_password, ENV['JENKINS_PASSWORD']
+    # or use the netrc support for curl
+    #   set :jenkins_use_netrc, true
+    #
+    # if you use netrc, add the following line in your $HOME/.netrc
+    #   machine jenkins.example.com login USERNAME password secret
+
 
     set :user, 'lidaobing'
     set :use_sudo, false

data/capistrano-scm-jenkins.gemspec

@@ -23,5 +23,6 @@ deploy your build artifact with capistrano.
 
   # specify any dependencies here; for example:
   s.add_runtime_dependency "capistrano"
+  s.add_runtime_dependency "net-netrc"
   s.add_development_dependency "rspec"
 end

data/lib/capistrano-scm-jenkins/version.rb

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

data/lib/capistrano/recipes/deploy/scm/jenkins.rb

@@ -3,6 +3,7 @@ require 'tmpdir'
 require 'rexml/document'
 
 require 'capistrano/recipes/deploy/scm/base'
+require 'net/netrc'
 
 module Capistrano
   module Deploy
@@ -43,7 +44,9 @@ module Capistrano
         private
 
         def authentication
-          if variable(:scm_username) and variable(:scm_password)
+          if variable(:jenkins_use_netrc)
+            "--netrc"
+          elsif variable(:scm_username) and variable(:scm_password)
             "--user '#{variable(:scm_username)}:#{variable(:scm_password)}'"
           else
             ""
@@ -126,8 +129,8 @@ module Capistrano
         end
 
         def auth_opts
-          if variable(:scm_username) and variable(:scm_username)
-            {:http_basic_authentication => [variable(:scm_username), variable(:scm_password)]}
+          if jenkins_username and jenkins_password
+            {:http_basic_authentication => [jenkins_username, jenkins_password]}
           else
             {}
           end
@@ -136,6 +139,38 @@ module Capistrano
         def artifact_zip_url(revision)
           "#{repository}/#{revision}/artifact/*zip*/archive.zip"
         end
+
+        def jenkins_username
+          @jenkins_username ||= begin
+                                  if variable(:jenkins_use_netrc)
+                                    rc = Net::Netrc.locate(jenkins_hostname)
+                                    raise ".netrc missing or no entry found" if rc.nil?
+                                    rc.login
+                                  elsif variable(:scm_username)
+                                    variable(:scm_username)
+                                  else
+                                    nil
+                                  end
+                                end
+        end
+
+        def jenkins_password
+          @jenkins_password ||= begin
+                                  if variable(:jenkins_use_netrc)
+                                    rc = Net::Netrc.locate(jenkins_hostname)
+                                    raise ".netrc missing or no entry found" if rc.nil?
+                                    rc.password
+                                  elsif variable(:scm_password)
+                                    variable(:scm_password)
+                                  else
+                                    nil
+                                  end
+                                end
+        end
+
+        def jenkins_hostname
+          @jenkins_hostname ||= URI.parse(repository).host
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: capistrano-scm-jenkins
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - LI Daobing
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 +08:00
+date: 2011-12-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: net-netrc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -33,8 +33,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: "\n\
   With this plugin, you can use jenkins build artifact as a repository, and\n\
   deploy your build artifact with capistrano.\n  "