capistrano-scm-jenkins 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: db7a5920ba131c19e129ae44d4e1937e4f9704b5b2a231b2543df68e7b44f605920d701f9a208c5d63d1d6c31376f51e4a1851fb9824212904948696589586f3
+  data.tar.gz: f613bc243dc1eced0ecef8ebb0d8b77c1137c80b8ad6e1039523b83c899580fe750bcdf19a0d2e1710a94411d5b2163e4f0b6165572684937bc4af1a88c9ff32
+SHA1: 
+  metadata.gz: c4033db8b2078f140f2bb9b3b38e6cf13042fbd5
+  data.tar.gz: 9e63243ea9d780c282faeee4ca00340d1cabf1ae

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+branches:
+        only:
+                - master
 rvm:
         - 1.8.7
         - 1.9.2

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.0.6)
-      capistrano
+    capistrano-scm-jenkins (0.0.7)
+      capistrano (~> 2.0)
       net-netrc
-      rubyzip
+      rubyzip (~> 0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     Platform (0.4.0)
-    capistrano (2.14.2)
+    capistrano (2.15.5)
       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.2.1)
-    highline (1.6.16)
+    diff-lcs (1.2.4)
+    highline (1.6.20)
     net-netrc (0.2.2)
       Platform (>= 0.3.0)
-    net-scp (1.1.0)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
+    net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
+    net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    rake (10.0.3)
-    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)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.4)
     rubyzip (0.9.9)
 
 PLATFORMS

data/NEWS.md

@@ -1,4 +1,8 @@
-## 0.0.6 (2013-0319)
+## 0.0.7 (2013-10-28)
+
+* [#9] fix crash on strange title
+
+## 0.0.6 (2013-03-19)
 
 * [#1, #7] support https  (thanks @lostintime)
 

data/README.md

@@ -13,39 +13,44 @@ deploy your build artifact with capistrano.
 
 a sample config/deploy.rb
 
-    require 'capistrano-scm-jenkins'
-
-    set :application, "example"
-    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']
-    # 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
-    # 
-    # 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'
-    set :use_sudo, false
-    set :deploy_to, "/home/#{user}/apps/#{application}"
-
-    role :web, "test.example.com"                          # Your HTTP server, Apache/etc
-    role :app, "test.example.com"                          # This may be the same as your `Web` server
-    role :db,  "test.example.com", :primary => true # This is where Rails migrations will run
+```ruby
+require 'capistrano-scm-jenkins'
+
+set :application, "example"
+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']
+# 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
+#
+# bypass ssl verification
+#   set :jenkins_insecure, true
+#
+# deploy from artifact subfolder. (ex: mv zipout/#{:jenkins_artifact_path} #{destination})
+#   set :jenkins_artifact_path, 'archive'
+#
+# deploy a single file.
+#   set :jenkins_artifact_file, 'webapp.war'
+#
+
+set :user, 'lidaobing'
+set :use_sudo, false
+set :deploy_to, "/home/#{user}/apps/#{application}"
+
+role :web, "test.example.com"                          # Your HTTP server, Apache/etc
+role :app, "test.example.com"                          # This may be the same as your `Web` server
+role :db,  "test.example.com", :primary => true # This is where Rails migrations will run
+```
 
 for more information about capistrano, check https://github.com/capistrano/capistrano
 
@@ -53,7 +58,9 @@ for more information about capistrano, check https://github.com/capistrano/capis
 
 for the maven module, you should include the module name in your repository url. for example:
 
-    set :repository,  "http://jenkins.example.com/job/example/com.example.helloworld$helloworld/"
+```ruby
+set :repository,  "http://jenkins.example.com/job/example/com.example.helloworld$helloworld/"
+```
 
 ## LICENSE
 

data/capistrano-scm-jenkins.gemspec

@@ -22,9 +22,9 @@ deploy your build artifact with capistrano.
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "capistrano"
+  s.add_runtime_dependency "capistrano", "~> 2.0"
   s.add_runtime_dependency "net-netrc"
-  s.add_runtime_dependency "rubyzip"
+  s.add_runtime_dependency "rubyzip", "~> 0.0"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
 end

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

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

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

@@ -31,8 +31,11 @@ module Capistrano
 
           execute << 'TMPDIR=`mktemp -d`'
           execute << 'cd $TMPDIR'
-          execute << "curl #{curl_interface} #{insecure} #{authentication} -sO '#{artifact_zip_url(revision)}'"
-          if variable(:jenkins_artifact_path)
+          execute << "curl #{curl_interface} #{insecure} #{authentication} -sO '#{artifact_url(revision)}'"
+          if artifact = variable(:jenkins_artifact_file)
+            execute << "mkdir '#{destination}'"
+            execute << "mv #{File.basename(artifact)} '#{destination}'"
+          elsif variable(:jenkins_artifact_path)
             execute << 'unzip archive.zip -d \'out/\''
             execute << "mv out/#{variable(:jenkins_artifact_path)} #{destination}"
           else
@@ -144,13 +147,24 @@ module Capistrano
         end
 
         def get_build_number_from_rss_all_title(title)
-          /#(\d+) \([^(]+$/.match(title)[1]
+          /#(\d+) /.match(strip_right_parentheses(title))[1]
         end
 
         def get_build_number_from_rss_changelog_title(title)
           /^#(\d+) /.match(title)[1]
         end
 
+        def strip_right_parentheses(title)
+          return title if title.slice(title.size-1, 1) != ')'
+          count = 1
+          (title.size-2).downto(0).each do |idx|
+            count += 1 if title.slice(idx, 1) == ')'
+            count -= 1 if title.slice(idx, 1) == '('
+            return title.slice(0, idx) if count == 0
+          end
+          return ""
+        end
+
         def rss_all
           begin
             @rss_all ||= open(repository + '/rssAll', accept_language.merge(auth_opts).merge(ssl_opts)).read()
@@ -183,8 +197,12 @@ module Capistrano
           end
         end
 
-        def artifact_zip_url(revision)
-          "#{repository}/#{revision}/artifact/*zip*/archive.zip"
+        def artifact_url(revision)
+          if artifact = variable(:jenkins_artifact_file)
+            "#{repository}/#{revision}/artifact/#{artifact}"
+          else
+            "#{repository}/#{revision}/artifact/*zip*/archive.zip"
+          end
         end
 
         def jenkins_username

data/spec/capistrano/recipes/deploy/scm/jenkins_spec.rb

@@ -28,5 +28,27 @@ module Capistrano::Deploy::SCM
         @jenkins.send(:last_deploy_build, msg, :use_unstable => true).should == '1450'
       end
     end
+
+    context 'get_build_number_from_rss_all_title' do
+      {
+        "account #22 (1 more test is failing (total 19))" => 22,
+        "account #37 (stable)" => 37
+      }.each do |text, build_number|
+        it "should convert `#{text}` to `#{build_number}`" do
+          @jenkins.send(:get_build_number_from_rss_all_title, text).should == "#{build_number}"
+        end
+      end
+    end
+
+    context 'strip_right_parentheses' do
+      {
+        "account #22 (1 more test is failing (total 19))" => "account #22 ",
+        "account #37 (stable)" => "account #37 "
+      }.each do |from, to|
+        it "should convert `#{from}` to `#{to}" do
+          @jenkins.send(:strip_right_parentheses, from).should == to
+        end
+      end
+    end
   end
 end

metadata

@@ -1,104 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capistrano-scm-jenkins
-version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2013-10-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
+  name: capistrano
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-netrc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id004 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  name: net-netrc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.0"
+  name: rubyzip
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "\nWith this plugin, you can use jenkins build artifact as a repository,
-  and\ndeploy your build artifact with capistrano.\n  "
-email:
+  requirement: *id006
+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: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -115,34 +86,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/lidaobing/capistrano-scm-jenkins
 licenses: []
+
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1219470571275363423
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1219470571275363423
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: capistrano-scm-jenkins
-rubygems_version: 1.8.25
+rubygems_version: 2.0.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: use jenkins as a capistrano scm
-test_files:
+test_files: 
 - spec/capistrano/recipes/deploy/scm/jenkins_spec.rb
 - spec/spec_helper.rb