propel 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/propel/propel.rb +3 -1
  3. data/lib/propel/version.rb +1 -1
  4. data/spec/propel/propel_spec.rb +6 -6
  5. metadata +21 -2
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- propel (0.4.0)
4
+ propel (0.4.1)
5
5
  json
6
6
 
7
7
  GEM
data/lib/propel/propel.rb CHANGED
@@ -6,7 +6,9 @@ module Propel
6
6
  end
7
7
 
8
8
  def start
9
- @repository.pull(@rebase) && rake && @repository.push
9
+ ( @repository.pull(@rebase).exitstatus == 0 ) &&
10
+ rake &&
11
+ @repository.push
10
12
  end
11
13
 
12
14
  private
data/lib/propel/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Propel
2
- VERSION = "0.4.0"
2
+ VERSION = "0.4.1"
3
3
  end
data/spec/propel/propel_spec.rb CHANGED
@@ -8,21 +8,21 @@ describe Propel::Propel do
8
8
 
9
9
  it "should call pull on the repository with rebase when rebase is true" do
10
10
  propel = Propel::Propel.new(@repository, true)
11
- @repository.should_receive(:pull).with(true)
11
+ @repository.should_receive(:pull).with(true).and_return(Propel::GitRepository::Result.new('failing', 1))
12
12
 
13
13
  propel.start
14
14
  end
15
15
 
16
16
  it "should call pull on the repository without rebase when rebase is false" do
17
17
  propel = Propel::Propel.new(@repository, false)
18
- @repository.should_receive(:pull).with(false).and_return(false)
18
+ @repository.should_receive(:pull).with(false).and_return(Propel::GitRepository::Result.new('failing', 1))
19
19
 
20
20
  propel.start
21
21
  end
22
22
 
23
23
  it"should call rake if the pull passes" do
24
24
  propel = Propel::Propel.new(@repository, true)
25
- @repository.should_receive(:pull).and_return(true)
25
+ @repository.should_receive(:pull).and_return(Propel::GitRepository::Result.new('passing', 0))
26
26
  propel.should_receive(:rake).and_return(false)
27
27
 
28
28
  propel.start
@@ -30,7 +30,7 @@ describe Propel::Propel do
30
30
 
31
31
  it "should not call rake if the pull fails" do
32
32
  propel = Propel::Propel.new(@repository, true)
33
- @repository.should_receive(:pull).and_return(false)
33
+ @repository.should_receive(:pull).and_return(Propel::GitRepository::Result.new('failing', 1))
34
34
  propel.should_not_receive(:rake)
35
35
 
36
36
  propel.start
@@ -38,7 +38,7 @@ describe Propel::Propel do
38
38
 
39
39
  it"should call push if rake passes" do
40
40
  propel = Propel::Propel.new(@repository, true)
41
- @repository.should_receive(:pull).and_return(true)
41
+ @repository.should_receive(:pull).and_return(Propel::GitRepository::Result.new('passing', 0))
42
42
  propel.should_receive(:rake).and_return(true)
43
43
  @repository.should_receive(:push)
44
44
 
@@ -47,7 +47,7 @@ describe Propel::Propel do
47
47
 
48
48
  it "should not call push if rake fails" do
49
49
  propel = Propel::Propel.new(@repository, true)
50
- @repository.should_receive(:pull).and_return(true)
50
+ @repository.should_receive(:pull).and_return(Propel::GitRepository::Result.new('passing', 0))
51
51
  propel.should_receive(:rake).and_return(false)
52
52
  @repository.should_not_receive(:push)
53
53
 
metadata CHANGED
@@ -1,8 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: propel
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 13
4
5
  prerelease:
5
- version: 0.4.0
6
+ segments:
7
+ - 0
8
+ - 4
9
+ - 1
10
+ version: 0.4.1
6
11
  platform: ruby
7
12
  authors:
8
13
  - Justin Leitgeb
@@ -21,6 +26,9 @@ dependencies:
21
26
  requirements:
22
27
  - - ">="
23
28
  - !ruby/object:Gem::Version
29
+ hash: 3
30
+ segments:
31
+ - 0
24
32
  version: "0"
25
33
  type: :runtime
26
34
  version_requirements: *id001
@@ -32,6 +40,11 @@ dependencies:
32
40
  requirements:
33
41
  - - ~>
34
42
  - !ruby/object:Gem::Version
43
+ hash: 27
44
+ segments:
45
+ - 2
46
+ - 5
47
+ - 0
35
48
  version: 2.5.0
36
49
  type: :development
37
50
  version_requirements: *id002
@@ -91,17 +104,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
91
104
  requirements:
92
105
  - - ">="
93
106
  - !ruby/object:Gem::Version
107
+ hash: 3
108
+ segments:
109
+ - 0
94
110
  version: "0"
95
111
  required_rubygems_version: !ruby/object:Gem::Requirement
96
112
  none: false
97
113
  requirements:
98
114
  - - ">="
99
115
  - !ruby/object:Gem::Version
116
+ hash: 3
117
+ segments:
118
+ - 0
100
119
  version: "0"
101
120
  requirements: []
102
121
 
103
122
  rubyforge_project:
104
- rubygems_version: 1.5.2
123
+ rubygems_version: 1.6.2
105
124
  signing_key:
106
125
  specification_version: 3
107
126
  summary: Propel helps you to follow best practices for pushing code to a remote git repo