dandelion 0.3.9 → 0.3.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/dandelion.rb +2 -1
  2. data/lib/dandelion/deployment.rb +3 -5
  3. data/lib/dandelion/version.rb +1 -1
  4. metadata +11 -11
data/lib/dandelion.rb CHANGED
@@ -2,7 +2,8 @@ module Dandelion
2
2
  class << self
3
3
  def logger
4
4
  return @log if @log
5
- @log = Logger.new(STDOUT)
5
+ $stdout.sync = true
6
+ @log = Logger.new($stdout)
6
7
  @log.level = Logger::DEBUG
7
8
  @log.formatter = formatter
8
9
  @log
data/lib/dandelion/deployment.rb CHANGED
@@ -43,9 +43,7 @@ module Dandelion
43
43
 
44
44
  def validate
45
45
  begin
46
- @repo.remote_list.each do |remote|
47
- raise FastForwardError if fast_forwardable(remote)
48
- end
46
+ raise FastForwardError if fast_forwardable
49
47
  rescue Grit::Git::CommandFailed
50
48
  end
51
49
  end
@@ -62,8 +60,8 @@ module Dandelion
62
60
 
63
61
  private
64
62
 
65
- def fast_forwardable(remote)
66
- !(@repo.git.native(:remote, {:raise => true, :timeout => false}, 'show', remote) =~ /fast-forward/i).nil?
63
+ def fast_forwardable
64
+ !@repo.git.native(:cherry, {:raise => true, :timeout => false}).empty?
67
65
  end
68
66
  end
69
67
 
data/lib/dandelion/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dandelion
2
- VERSION = '0.3.9'
2
+ VERSION = '0.3.10'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dandelion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.9
4
+ version: 0.3.10
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-13 00:00:00.000000000Z
12
+ date: 2013-01-29 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: grit
16
- requirement: &2156506100 !ruby/object:Gem::Requirement
16
+ requirement: &2152433100 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 2.4.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2156506100
24
+ version_requirements: *2152433100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: mocha
27
- requirement: &2156505520 !ruby/object:Gem::Requirement
27
+ requirement: &2152425820 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.9.12
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2156505520
35
+ version_requirements: *2152425820
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: net-sftp
38
- requirement: &2156505000 !ruby/object:Gem::Requirement
38
+ requirement: &2152424660 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.0.5
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2156505000
46
+ version_requirements: *2152424660
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: aws-s3
49
- requirement: &2156504480 !ruby/object:Gem::Requirement
49
+ requirement: &2152422040 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: 0.6.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2156504480
57
+ version_requirements: *2152422040
58
58
  description: Incremental Git repository deployment
59
59
  email:
60
60
  - scottbnel@gmail.com
@@ -137,7 +137,7 @@ rubyforge_project:
137
137
  rubygems_version: 1.8.13
138
138
  signing_key:
139
139
  specification_version: 3
140
- summary: dandelion-0.3.9
140
+ summary: dandelion-0.3.10
141
141
  test_files:
142
142
  - test/fixtures/diff
143
143
  - test/fixtures/ls_tree