capistrano-scm-jenkins 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
- ---
2
- SHA512:
3
- metadata.gz: db7a5920ba131c19e129ae44d4e1937e4f9704b5b2a231b2543df68e7b44f605920d701f9a208c5d63d1d6c31376f51e4a1851fb9824212904948696589586f3
4
- data.tar.gz: f613bc243dc1eced0ecef8ebb0d8b77c1137c80b8ad6e1039523b83c899580fe750bcdf19a0d2e1710a94411d5b2163e4f0b6165572684937bc4af1a88c9ff32
5
- SHA1:
6
- metadata.gz: c4033db8b2078f140f2bb9b3b38e6cf13042fbd5
7
- data.tar.gz: 9e63243ea9d780c282faeee4ca00340d1cabf1ae
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 25d5e5245a1e984616071446f359f69427267f6f
4
+ data.tar.gz: d9666aaa9d65272fef0db88cbfe2ae8787e1b5a9
5
+ SHA512:
6
+ metadata.gz: 00fefa56ee36b013f4ffd2e7d885d5b3e2a4270444b7154024f53c8ebf29ef10eaf9ef834553b69f3d15910ef8c91b20a2471eef12899226cf54ff2cf392ad58
7
+ data.tar.gz: 28eb0861a4b63a9cf2faf8b4c66a079d17ba344bf3c5a9c8c3d72999181cd6e54f09d2f5293e82dd1f4aaa127253ee796d2111834c5c0f7bca85e4ec3407adeb
data/.travis.yml CHANGED
@@ -7,6 +7,7 @@ rvm:
7
7
  - 1.9.2
8
8
  - 1.9.3
9
9
  - 2.0.0
10
+ - 2.1.0
10
11
  - jruby-18mode
11
12
  - jruby-19mode
12
13
  - rbx-18mode
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- capistrano-scm-jenkins (0.0.7)
4
+ capistrano-scm-jenkins (0.0.8)
5
5
  capistrano (~> 2.0)
6
6
  net-netrc
7
7
  rubyzip (~> 0.0)
@@ -16,7 +16,7 @@ GEM
16
16
  net-sftp (>= 2.0.0)
17
17
  net-ssh (>= 2.0.14)
18
18
  net-ssh-gateway (>= 1.1.0)
19
- diff-lcs (1.2.4)
19
+ diff-lcs (1.2.5)
20
20
  highline (1.6.20)
21
21
  net-netrc (0.2.2)
22
22
  Platform (>= 0.3.0)
@@ -27,13 +27,13 @@ GEM
27
27
  net-ssh (2.7.0)
28
28
  net-ssh-gateway (1.2.0)
29
29
  net-ssh (>= 2.6.5)
30
- rake (10.1.0)
30
+ rake (10.1.1)
31
31
  rspec (2.14.1)
32
32
  rspec-core (~> 2.14.0)
33
33
  rspec-expectations (~> 2.14.0)
34
34
  rspec-mocks (~> 2.14.0)
35
- rspec-core (2.14.6)
36
- rspec-expectations (2.14.3)
35
+ rspec-core (2.14.7)
36
+ rspec-expectations (2.14.4)
37
37
  diff-lcs (>= 1.1.3, < 2.0)
38
38
  rspec-mocks (2.14.4)
39
39
  rubyzip (0.9.9)
data/NEWS.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 0.0.8 (2013-12-29)
2
+
3
+ * [#11] filter scm log with prefix
4
+
1
5
  ## 0.0.7 (2013-10-28)
2
6
 
3
7
  * [#9] fix crash on strange title
@@ -23,7 +27,6 @@
23
27
  * honor :scm_username and :scm_password
24
28
  * fix syntax bug under ruby 1.9
25
29
 
26
-
27
30
  ## 0.0.1 (2011-11-25)
28
31
 
29
32
  * initial version.
data/README.md CHANGED
@@ -42,8 +42,10 @@ set :scm, :jenkins
42
42
  # deploy a single file.
43
43
  # set :jenkins_artifact_file, 'webapp.war'
44
44
  #
45
+ # filter the scm log with prefix when deploy:pending
46
+ # set :jenkins_scm_log_prefix, 'project_name/'
45
47
 
46
- set :user, 'lidaobing'
48
+ set :user, 'username'
47
49
  set :use_sudo, false
48
50
  set :deploy_to, "/home/#{user}/apps/#{application}"
49
51
 
@@ -1,7 +1,7 @@
1
1
  module Capistrano
2
2
  module Scm
3
3
  module Jenkins
4
- VERSION = "0.0.7"
4
+ VERSION = "0.0.8"
5
5
  end
6
6
  end
7
7
  end
@@ -121,13 +121,23 @@ module Capistrano
121
121
  time = REXML::XPath.first(entry, "./updated").text
122
122
  content = REXML::XPath.first(entry, "./content").text
123
123
  build_number = get_build_number_from_rss_changelog_title(title).to_i
124
- if build_number > from.to_i and (to.nil? or build_number <= to.to_i)
124
+ if build_number > from.to_i \
125
+ and (to.nil? or build_number <= to.to_i) \
126
+ and scm_message_useful?(content, variable(:jenkins_scm_log_prefix))
125
127
  logger.info "#{time}\t#{title}"
126
128
  logger.info "#{content}"
127
129
  end
128
130
  end
129
131
  end
130
132
 
133
+ def scm_message_useful?(content, prefix)
134
+ return true if prefix.nil?
135
+ content.each_line do |line|
136
+ return true if line.start_with? prefix
137
+ end
138
+ false
139
+ end
140
+
131
141
  def last_deploy_build(message = nil, opts={})
132
142
  message = rss_all if message.nil?
133
143
  use_unstable = opts[:use_unstable]
@@ -45,10 +45,22 @@ module Capistrano::Deploy::SCM
45
45
  "account #22 (1 more test is failing (total 19))" => "account #22 ",
46
46
  "account #37 (stable)" => "account #37 "
47
47
  }.each do |from, to|
48
- it "should convert `#{from}` to `#{to}" do
48
+ it "should convert `#{from}` to `#{to}`" do
49
49
  @jenkins.send(:strip_right_parentheses, from).should == to
50
50
  end
51
51
  end
52
52
  end
53
+
54
+ context 'scm_message_useful?' do
55
+ {
56
+ "a" => true,
57
+ "b" => false,
58
+ "b\na\n" => true
59
+ }.each do |from, to|
60
+ it "should treat `#{from}` as #{to ? "useful" : "not useful"}" do
61
+ @jenkins.send(:scm_message_useful?, from, "a").should == to
62
+ end
63
+ end
64
+ end
53
65
  end
54
66
  end
metadata CHANGED
@@ -1,78 +1,96 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: capistrano-scm-jenkins
3
- version: !ruby/object:Gem::Version
4
- version: 0.0.7
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.0.8
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - LI Daobing
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
-
12
- date: 2013-10-28 00:00:00 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
15
- type: :runtime
16
- version_requirements: &id001 !ruby/object:Gem::Requirement
17
- requirements:
18
- - - ~>
19
- - !ruby/object:Gem::Version
20
- version: "2.0"
11
+ date: 2013-12-29 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
21
14
  name: capistrano
22
- prerelease: false
23
- requirement: *id001
24
- - !ruby/object:Gem::Dependency
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '2.0'
25
20
  type: :runtime
26
- version_requirements: &id002 !ruby/object:Gem::Requirement
27
- requirements:
28
- - &id004
29
- - ">="
30
- - !ruby/object:Gem::Version
31
- version: "0"
32
- name: net-netrc
33
21
  prerelease: false
34
- requirement: *id002
35
- - !ruby/object:Gem::Dependency
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '2.0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: net-netrc
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
36
34
  type: :runtime
37
- version_requirements: &id003 !ruby/object:Gem::Requirement
38
- requirements:
39
- - - ~>
40
- - !ruby/object:Gem::Version
41
- version: "0.0"
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
41
+ - !ruby/object:Gem::Dependency
42
42
  name: rubyzip
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '0.0'
48
+ type: :runtime
43
49
  prerelease: false
44
- requirement: *id003
45
- - !ruby/object:Gem::Dependency
46
- type: :development
47
- version_requirements: &id005 !ruby/object:Gem::Requirement
48
- requirements:
49
- - *id004
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '0.0'
55
+ - !ruby/object:Gem::Dependency
50
56
  name: rspec
51
- prerelease: false
52
- requirement: *id005
53
- - !ruby/object:Gem::Dependency
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
54
62
  type: :development
55
- version_requirements: &id006 !ruby/object:Gem::Requirement
56
- requirements:
57
- - *id004
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ">="
67
+ - !ruby/object:Gem::Version
68
+ version: '0'
69
+ - !ruby/object:Gem::Dependency
58
70
  name: rake
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: '0'
76
+ type: :development
59
77
  prerelease: false
60
- requirement: *id006
61
- description: "\n\
62
- With this plugin, you can use jenkins build artifact as a repository, and\n\
63
- deploy your build artifact with capistrano.\n "
64
- email:
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
83
+ description: "\nWith this plugin, you can use jenkins build artifact as a repository,
84
+ and\ndeploy your build artifact with capistrano.\n "
85
+ email:
65
86
  - lidaobing@gmail.com
66
87
  executables: []
67
-
68
88
  extensions: []
69
-
70
89
  extra_rdoc_files: []
71
-
72
- files:
73
- - .gitignore
74
- - .rspec
75
- - .travis.yml
90
+ files:
91
+ - ".gitignore"
92
+ - ".rspec"
93
+ - ".travis.yml"
76
94
  - Gemfile
77
95
  - Gemfile.lock
78
96
  - NEWS.md
@@ -86,27 +104,27 @@ files:
86
104
  - spec/spec_helper.rb
87
105
  homepage: https://github.com/lidaobing/capistrano-scm-jenkins
88
106
  licenses: []
89
-
90
107
  metadata: {}
91
-
92
108
  post_install_message:
93
109
  rdoc_options: []
94
-
95
- require_paths:
110
+ require_paths:
96
111
  - lib
97
- required_ruby_version: !ruby/object:Gem::Requirement
98
- requirements:
99
- - *id004
100
- required_rubygems_version: !ruby/object:Gem::Requirement
101
- requirements:
102
- - *id004
112
+ required_ruby_version: !ruby/object:Gem::Requirement
113
+ requirements:
114
+ - - ">="
115
+ - !ruby/object:Gem::Version
116
+ version: '0'
117
+ required_rubygems_version: !ruby/object:Gem::Requirement
118
+ requirements:
119
+ - - ">="
120
+ - !ruby/object:Gem::Version
121
+ version: '0'
103
122
  requirements: []
104
-
105
123
  rubyforge_project: capistrano-scm-jenkins
106
- rubygems_version: 2.0.13
124
+ rubygems_version: 2.2.0.rc.1
107
125
  signing_key:
108
126
  specification_version: 4
109
127
  summary: use jenkins as a capistrano scm
110
- test_files:
128
+ test_files:
111
129
  - spec/capistrano/recipes/deploy/scm/jenkins_spec.rb
112
130
  - spec/spec_helper.rb