capistrano-scm-jenkins 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.0.1)
+    capistrano-scm-jenkins (0.0.2)
       capistrano
 
 GEM
@@ -13,13 +13,13 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    diff-lcs (1.1.2)
-    highline (1.6.2)
+    diff-lcs (1.1.3)
+    highline (1.6.8)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
+    net-ssh (2.2.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rspec (2.7.0)

data/NEWS.md

@@ -0,0 +1,9 @@
+## 0.0.2 (2011-11-26)
+
+* honor :scm_username and :scm_password
+* fix syntax bug under ruby 1.9
+
+
+## 0.0.1 (2011-11-25)
+
+* initial version.

data/README.md

@@ -17,8 +17,14 @@ a sample config/deploy.rb
     set :repository,  "http://jenkins.example.com/job/example/"
 
     set :scm, :jenkins
+
     # uncomment following line if you want deploy unstable version
     # set :jenkins_use_unstable, true
+
+    # jenkins username and password
+    # set :scm_username, ENV['JENKINS_USERNAME']
+    # set :scm_password, ENV['JENKINS_PASSWORD']
+
     set :user, 'lidaobing'
     set :use_sudo, false
     set :deploy_to, "/home/#{user}/apps/#{application}"
@@ -35,11 +41,6 @@ for the maven module, you should include the module name in your repository url.
 
     set :repository,  "http://jenkins.example.com/job/example/com.example.helloworld$helloworld/"
 
-## TODO
-
-* how to deal with auth? (need help)
-* support unstable build
-
 ## LICENSE
 
 Permission is hereby granted, free of charge, to any person obtaining

data/capistrano-scm-jenkins.gemspec

@@ -9,7 +9,10 @@ Gem::Specification.new do |s|
   s.email       = ["lidaobing@gmail.com"]
   s.homepage    = "https://github.com/lidaobing/capistrano-scm-jenkins"
   s.summary     = %q{use jenkins as a capistrano scm}
-  s.description = %q{use jenkins as a capistrano scm}
+  s.description = %q{
+With this plugin, you can use jenkins build artifact as a repository, and
+deploy your build artifact with capistrano.
+  }
 
   s.rubyforge_project = "capistrano-scm-jenkins"
 

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

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

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

@@ -20,7 +20,7 @@ module Capistrano
         def checkout(revision, destination)
           %Q{TMPDIR=`mktemp -d` &&
             cd "$TMPDIR" &&
-            wget -nv '#{artifact_zip_url(revision)}' &&
+            curl #{authentication} -sO '#{artifact_zip_url(revision)}' &&
             unzip archive.zip &&
             mv archive "#{destination}" &&
             rm -rf "$TMPDIR"
@@ -42,6 +42,14 @@ module Capistrano
 
         private
 
+        def authentication
+          if variable(:scm_username) and variable(:scm_password)
+            "--user '#{variable(:scm_username)}:#{variable(:scm_password)}'"
+          else
+            ""
+          end
+        end
+
         def use_unstable?
           !!variable(:jenkins_use_unstable)
         end
@@ -90,7 +98,7 @@ module Capistrano
           end
           REXML::XPath.each(doc,"./entry/title") do |title|
             title = title.text
-            for x in valid_end_strings:
+            for x in valid_end_strings
               return get_build_number_from_rss_all_title(title) if title.end_with? x
             end
           end
@@ -106,11 +114,23 @@ module Capistrano
         end
 
         def rss_all
-          @rss_all ||= open(repository + '/rssAll').read()
+          begin
+            @rss_all ||= open(repository + '/rssAll', auth_opts).read()
+          rescue => e
+            raise Capistrano::Error, "open url #{repository + '/rssAll'} failed: #{e}"
+          end
         end
 
         def rss_changelog
-          @rss_changelog ||= open(repository + '/rssChangelog').read()
+          @rss_changelog ||= open(repository + '/rssChangelog', auth_opts).read()
+        end
+
+        def auth_opts
+          if variable(:scm_username) and variable(:scm_username)
+            {:http_basic_authentication => [variable(:scm_username), variable(:scm_password)]}
+          else
+            {}
+          end
         end
 
         def artifact_zip_url(revision)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-scm-jenkins
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - LI Daobing
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 +08:00
+date: 2011-11-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,13 +32,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
-description: use jenkins as a capistrano scm
+description: "\n\
+  With this plugin, you can use jenkins build artifact as a repository, and\n\
+  deploy your build artifact with capistrano.\n  "
 email: 
 - lidaobing@gmail.com
 executables: []
@@ -60,6 +51,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- NEWS.md
 - README.md
 - Rakefile
 - capistrano-scm-jenkins.gemspec
@@ -82,23 +74,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: capistrano-scm-jenkins
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: use jenkins as a capistrano scm