cipr 0.1.1 → 0.1.2

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.
Files changed (3) hide show
  1. data/lib/cipr/github.rb +1 -1
  2. data/lib/cipr/version.rb +1 -1
  3. metadata +11 -11
data/lib/cipr/github.rb CHANGED
@@ -35,7 +35,7 @@ module Cipr
35
35
  ready = false
36
36
  if pr.mergeable?
37
37
  puts "Applying Pull Request ##{pr.number}"
38
- ready = pr.apply =~ /Updating/
38
+ ready = (pr.apply =~ /(Already|CONFLICT)/).nil?
39
39
  else
40
40
  puts "Checking out Pull Request ##{pr.number}"
41
41
  pr.checkout
data/lib/cipr/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Cipr
2
- Version = VERSION = "0.1.1"
2
+ Version = VERSION = "0.1.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cipr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-11-10 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: choice
16
- requirement: &70334079784280 !ruby/object:Gem::Requirement
16
+ requirement: &70297168544660 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70334079784280
24
+ version_requirements: *70297168544660
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: httparty
27
- requirement: &70334079783760 !ruby/object:Gem::Requirement
27
+ requirement: &70297168543280 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70334079783760
35
+ version_requirements: *70297168543280
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: git
38
- requirement: &70334079783200 !ruby/object:Gem::Requirement
38
+ requirement: &70297168542200 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70334079783200
46
+ version_requirements: *70297168542200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &70334079782640 !ruby/object:Gem::Requirement
49
+ requirement: &70297168541060 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70334079782640
57
+ version_requirements: *70297168541060
58
58
  description: cipr tests your pull requests and comments the results
59
59
  email: mark@quarternotecoda.com
60
60
  executables:
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
84
84
  version: '0'
85
85
  segments:
86
86
  - 0
87
- hash: 788645874266044182
87
+ hash: -4369604186663598742
88
88
  required_rubygems_version: !ruby/object:Gem::Requirement
89
89
  none: false
90
90
  requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
93
93
  version: '0'
94
94
  segments:
95
95
  - 0
96
- hash: 788645874266044182
96
+ hash: -4369604186663598742
97
97
  requirements: []
98
98
  rubyforge_project:
99
99
  rubygems_version: 1.8.10