capistrano-scm-jenkins 0.0.5 → 0.0.6

data/.gitignore

@@ -3,3 +3,4 @@
 pkg/*
 *.swp
 test
+.idea

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
         - 1.8.7
         - 1.9.2
         - 1.9.3
+        - 2.0.0
         - jruby-18mode
         - jruby-19mode
         - rbx-18mode

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-scm-jenkins.gemspec
 gemspec

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.0.5)
+    capistrano-scm-jenkins (0.0.6)
       capistrano
       net-netrc
       rubyzip
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     Platform (0.4.0)
-    capistrano (2.14.1)
+    capistrano (2.14.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    diff-lcs (1.1.3)
-    highline (1.6.15)
+    diff-lcs (1.2.1)
+    highline (1.6.16)
     net-netrc (0.2.2)
       Platform (>= 0.3.0)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.3)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     rubyzip (0.9.9)
 
 PLATFORMS

data/NEWS.md

@@ -1,3 +1,7 @@
+## 0.0.6 (2013-0319)
+
+* [#1, #7] support https  (thanks @lostintime)
+
 ## 0.0.5 (2013-01-31)
 
 * works under Windows (thanks @Iristyle)

data/README.md

@@ -31,6 +31,12 @@ a sample config/deploy.rb
     #
     # if you use netrc, add the following line in your $HOME/.netrc
     #   machine jenkins.example.com login USERNAME password secret
+    # 
+    # bypass ssl verification
+    #   set :jenkins_insecure, true
+    #
+    # deploy from artifact subfolder. (ex: mv zipout/#{:jenkins_artifact_path} #{destination})
+    #   set :jenkins_artifact_path, 'archive'
 
 
     set :user, 'lidaobing'

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Scm
     module Jenkins
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

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

@@ -18,46 +18,33 @@ module Capistrano
         end
 
         def query_revision(revision)
-          return revision if revision =~ /^\d+$/
+          return revision if revision.to_s =~ /^\d+$/
           raise "invalid revision: #{revision}"
         end
 
         def checkout(revision, destination)
-          download_url = artifact_zip_url(revision)
-          Dir.mktmpdir { |dir|
-            if variable(:jenkins_use_netrc)
-              zip_path = File.expand_path(File.join(dir, 'archive.zip'))
-              `curl #{authentication} -sO '#{download_url}'`
-              if $?.exitstatus != 0
-                raise "could not execute curl"
-              end
-            else
-              options = {
-                "User-Agent" => "capistrano-scm-jenkins@capistrano",
-                "Referer" => "https://github.com/lidaobing/capistrano-scm-jenkins"
-              }
-              if variable(:scm_username) and variable(:scm_password)
-                options[:http_basic_authentication] = [variable(:scm_username), variable(:scm_password)]
-              end
-
-              zip_path = open(download_url, options).path
-            end
+          execute = []
 
-            logger.info("Extracting #{zip_path} to #{destination}")
-            Zip::ZipFile.open(zip_path) do |zipfile|
-              zipfile.each { |e|
-                fpath = File.join(destination, e.to_s)
-                FileUtils.mkdir_p(File.dirname(fpath))
-                # true to overwrite existing files
-                zipfile.extract(e, fpath){ true }
-              }
-            end
-          }
+          unless destination.end_with?('/')
+            destination = destination.to_s + '/'
+          end
+
+          execute << 'TMPDIR=`mktemp -d`'
+          execute << 'cd $TMPDIR'
+          execute << "curl #{curl_interface} #{insecure} #{authentication} -sO '#{artifact_zip_url(revision)}'"
+          if variable(:jenkins_artifact_path)
+            execute << 'unzip archive.zip -d \'out/\''
+            execute << "mv out/#{variable(:jenkins_artifact_path)} #{destination}"
+          else
+            execute << "unzip archive.zip -d \"#{destination}\""
 
-          # HACK: rather than using shell commands to download / extract and
-          # move files, use something cross platform, and fake a shell success
-          # this does break the benchmarking of the system call, but oh well
-          return 'true'
+          end
+          execute << 'rm -rf "$TMPDIR"'
+
+          execute.compact.join(' && ').gsub(/\s+/, ' ')
+        rescue ArgumentError => e
+          logger.log(Logger::IMPORTANT, e.message)
+          exit
         end
 
         alias_method :export, :checkout
@@ -85,6 +72,22 @@ module Capistrano
           end
         end
 
+        def insecure
+          if variable(:jenkins_insecure)
+            '--insecure'
+          else
+            ''
+          end
+        end
+
+        def curl_interface
+          if variable(:jenkins_curl_interface)
+            "--interface '#{variable(:jenkins_curl_interface)}'"
+          else
+            ''
+          end
+        end
+
         def use_unstable?
           !!variable(:jenkins_use_unstable)
         end
@@ -95,7 +98,7 @@ module Capistrano
           logger.info ''
           logger.info "BUILD LOG"
           logger.info '========='
-          REXML::XPath.each(doc,"./entry") do |entry|
+          REXML::XPath.each(doc, "./entry") do |entry|
             title = REXML::XPath.first(entry, "./title").text
             time = REXML::XPath.first(entry, "./updated").text
             build_number = get_build_number_from_rss_all_title(title).to_i
@@ -110,7 +113,7 @@ module Capistrano
           doc = REXML::Document.new(message).root
           logger.info "SCM LOG"
           logger.info '======='
-          REXML::XPath.each(doc,"./entry") do |entry|
+          REXML::XPath.each(doc, "./entry") do |entry|
             title = REXML::XPath.first(entry, "./title").text
             time = REXML::XPath.first(entry, "./updated").text
             content = REXML::XPath.first(entry, "./content").text
@@ -131,7 +134,7 @@ module Capistrano
           if use_unstable
             valid_end_strings << '(unstable)'
           end
-          REXML::XPath.each(doc,"./entry/title") do |title|
+          REXML::XPath.each(doc, "./entry/title") do |title|
             title = title.text
             for x in valid_end_strings
               return get_build_number_from_rss_all_title(title) if title.end_with? x
@@ -150,14 +153,14 @@ module Capistrano
 
         def rss_all
           begin
-            @rss_all ||= open(repository + '/rssAll', accept_language.merge(auth_opts)).read()
+            @rss_all ||= open(repository + '/rssAll', accept_language.merge(auth_opts).merge(ssl_opts)).read()
           rescue => e
             raise Capistrano::Error, "open url #{repository + '/rssAll'} failed: #{e}"
           end
         end
 
         def rss_changelog
-          @rss_changelog ||= open(repository + '/rssChangelog', accept_language.merge(auth_opts)).read()
+          @rss_changelog ||= open(repository + '/rssChangelog', accept_language.merge(auth_opts).merge(ssl_opts)).read()
         end
 
         def accept_language
@@ -172,36 +175,44 @@ module Capistrano
           end
         end
 
+        def ssl_opts
+          if variable(:jenkins_insecure)
+            {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE}
+          else
+            {}
+          end
+        end
+
         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
+            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
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2250672160818474877
+      hash: 1219470571275363423
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,10 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2250672160818474877
+      hash: 1219470571275363423
 requirements: []
 rubyforge_project: capistrano-scm-jenkins
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: use jenkins as a capistrano scm