capistrano-scm-jenkins 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: db7a5920ba131c19e129ae44d4e1937e4f9704b5b2a231b2543df68e7b44f605920d701f9a208c5d63d1d6c31376f51e4a1851fb9824212904948696589586f3
-  data.tar.gz: f613bc243dc1eced0ecef8ebb0d8b77c1137c80b8ad6e1039523b83c899580fe750bcdf19a0d2e1710a94411d5b2163e4f0b6165572684937bc4af1a88c9ff32
-SHA1: 
-  metadata.gz: c4033db8b2078f140f2bb9b3b38e6cf13042fbd5
-  data.tar.gz: 9e63243ea9d780c282faeee4ca00340d1cabf1ae
+---
+SHA1:
+  metadata.gz: 25d5e5245a1e984616071446f359f69427267f6f
+  data.tar.gz: d9666aaa9d65272fef0db88cbfe2ae8787e1b5a9
+SHA512:
+  metadata.gz: 00fefa56ee36b013f4ffd2e7d885d5b3e2a4270444b7154024f53c8ebf29ef10eaf9ef834553b69f3d15910ef8c91b20a2471eef12899226cf54ff2cf392ad58
+  data.tar.gz: 28eb0861a4b63a9cf2faf8b4c66a079d17ba344bf3c5a9c8c3d72999181cd6e54f09d2f5293e82dd1f4aaa127253ee796d2111834c5c0f7bca85e4ec3407adeb

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.0.7)
+    capistrano-scm-jenkins (0.0.8)
       capistrano (~> 2.0)
       net-netrc
       rubyzip (~> 0.0)
@@ -16,7 +16,7 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     highline (1.6.20)
     net-netrc (0.2.2)
       Platform (>= 0.3.0)
@@ -27,13 +27,13 @@ GEM
     net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    rake (10.1.0)
+    rake (10.1.1)
     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)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     rubyzip (0.9.9)

data/NEWS.md

@@ -1,3 +1,7 @@
+## 0.0.8 (2013-12-29)
+
+* [#11] filter scm log with prefix
+
 ## 0.0.7 (2013-10-28)
 
 * [#9] fix crash on strange title
@@ -23,7 +27,6 @@
 * honor :scm_username and :scm_password
 * fix syntax bug under ruby 1.9
 
-
 ## 0.0.1 (2011-11-25)
 
 * initial version.

data/README.md

@@ -42,8 +42,10 @@ set :scm, :jenkins
 # deploy a single file.
 #   set :jenkins_artifact_file, 'webapp.war'
 #
+# filter the scm log with prefix when deploy:pending
+#   set :jenkins_scm_log_prefix, 'project_name/'
 
-set :user, 'lidaobing'
+set :user, 'username'
 set :use_sudo, false
 set :deploy_to, "/home/#{user}/apps/#{application}"
 

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

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

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

@@ -121,13 +121,23 @@ module Capistrano
             time = REXML::XPath.first(entry, "./updated").text
             content = REXML::XPath.first(entry, "./content").text
             build_number = get_build_number_from_rss_changelog_title(title).to_i
-            if build_number > from.to_i and (to.nil? or build_number <= to.to_i)
+            if build_number > from.to_i \
+              and (to.nil? or build_number <= to.to_i) \
+              and scm_message_useful?(content, variable(:jenkins_scm_log_prefix))
               logger.info "#{time}\t#{title}"
               logger.info "#{content}"
             end
           end
         end
 
+        def scm_message_useful?(content, prefix)
+          return true if prefix.nil?
+          content.each_line do |line|
+            return true if line.start_with? prefix
+          end
+          false
+        end
+
         def last_deploy_build(message = nil, opts={})
           message = rss_all if message.nil?
           use_unstable = opts[:use_unstable]

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

@@ -45,10 +45,22 @@ module Capistrano::Deploy::SCM
         "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
+        it "should convert `#{from}` to `#{to}`" do
           @jenkins.send(:strip_right_parentheses, from).should == to
         end
       end
     end
+
+    context 'scm_message_useful?' do
+      {
+        "a" => true,
+        "b" => false,
+        "b\na\n" => true
+      }.each do |from, to|
+        it "should treat `#{from}` as #{to ? "useful" : "not useful"}" do
+          @jenkins.send(:scm_message_useful?, from, "a").should == to
+        end
+      end
+    end
   end
 end

metadata

@@ -1,78 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-scm-jenkins
-version: !ruby/object:Gem::Version 
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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"
+date: 2013-12-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id004 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  name: net-netrc
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: net-netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.0"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  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: 
+  version_requirements: !ruby/object:Gem::Requirement
+    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:
 - lidaobing@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - NEWS.md
@@ -86,27 +104,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 
-  requirements: 
-  - *id004
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: capistrano-scm-jenkins
-rubygems_version: 2.0.13
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 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