dandelion 0.3.6 → 0.3.7

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.
data/README.md CHANGED
@@ -30,6 +30,7 @@ Git repository is searched for a file named `dandelion.yml`). Example:
30
30
  exclude:
31
31
  - .gitignore
32
32
  - dandelion.yml
33
+ revision_file: .revision
33
34
 
34
35
  Schemes
35
36
  -------
@@ -50,8 +51,9 @@ Optional:
50
51
  * `path`
51
52
  * `exclude`
52
53
  * `port`
54
+ * `revision_file` (defaults to .revision)
53
55
  * `preserve_permissions` (defaults to true)
54
-
56
+
55
57
  **FTP**: `scheme: ftp`
56
58
 
57
59
  Required:
@@ -65,6 +67,7 @@ Optional:
65
67
  * `path`
66
68
  * `exclude`
67
69
  * `port`
70
+ * `revision_file` (defaults to .revision)
68
71
  * `passive` (defaults to true)
69
72
 
70
73
  **Amazon S3**: `scheme: s3`
@@ -79,6 +82,7 @@ Optional:
79
82
 
80
83
  * `path`
81
84
  * `exclude`
85
+ * `revision_file` (defaults to .revision)
82
86
 
83
87
  Usage
84
88
  -----
@@ -105,7 +105,8 @@ module Dandelion
105
105
  def deployment(revision, backend = nil)
106
106
  begin
107
107
  backend ||= backend()
108
- options = { :exclude => @config['exclude'], :revision => revision, :dry => @options[:dry] }
108
+ revision_file = @config['revision_file'].nil? ? '.revision' : @config['revision_file']
109
+ options = { :exclude => @config['exclude'], :revision => revision, :revision_file => revision_file, :dry => @options[:dry] }
109
110
  Deployment::Deployment.create(@repo, backend, options)
110
111
  rescue Git::DiffError
111
112
  log.fatal('Error: could not generate diff')
@@ -115,4 +116,4 @@ module Dandelion
115
116
  end
116
117
  end
117
118
  end
118
- end
119
+ end
@@ -19,7 +19,7 @@ module Dandelion
19
19
  def initialize(repo, backend, options = {})
20
20
  @repo = repo
21
21
  @backend = backend
22
- @options = { :exclude => [], :revision => 'HEAD' }.merge(options)
22
+ @options = { :exclude => [], :revision => 'HEAD', :revision_file => '.revision' }.merge(options)
23
23
  @tree = Git::Tree.new(@repo, @options[:revision])
24
24
 
25
25
  if @options[:dry]
@@ -38,7 +38,7 @@ module Dandelion
38
38
  end
39
39
 
40
40
  def write_revision
41
- @backend.write('.revision', local_revision)
41
+ @backend.write(@options[:revision_file], local_revision)
42
42
  end
43
43
 
44
44
  def validate
@@ -123,7 +123,7 @@ module Dandelion
123
123
 
124
124
  def read_remote_revision
125
125
  begin
126
- @backend.read('.revision').chomp
126
+ @backend.read(@options[:revision_file]).chomp
127
127
  rescue Backend::MissingFileError
128
128
  raise RemoteRevisionError
129
129
  end
@@ -144,4 +144,4 @@ module Dandelion
144
144
  end
145
145
  end
146
146
  end
147
- end
147
+ end
@@ -1,3 +1,3 @@
1
1
  module Dandelion
2
- VERSION = '0.3.6'
2
+ VERSION = '0.3.7'
3
3
  end
@@ -119,4 +119,4 @@ class TestDiffDeployment < Test::Unit::TestCase
119
119
  assert_equal @head_revision, @backend.writes['.revision']
120
120
  assert_equal ['foobar'], @backend.deletes
121
121
  end
122
- end
122
+ 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.6
4
+ version: 0.3.7
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-02-24 00:00:00.000000000Z
12
+ date: 2012-07-25 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: grit
16
- requirement: &2156899540 !ruby/object:Gem::Requirement
16
+ requirement: &2155973620 !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: *2156899540
24
+ version_requirements: *2155973620
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: mocha
27
- requirement: &2156899040 !ruby/object:Gem::Requirement
27
+ requirement: &2155972540 !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: *2156899040
35
+ version_requirements: *2155972540
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: net-sftp
38
- requirement: &2156898580 !ruby/object:Gem::Requirement
38
+ requirement: &2155971220 !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: *2156898580
46
+ version_requirements: *2155971220
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: aws-s3
49
- requirement: &2156898120 !ruby/object:Gem::Requirement
49
+ requirement: &2155969540 !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: *2156898120
57
+ version_requirements: *2155969540
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.6
140
+ summary: dandelion-0.3.7
141
141
  test_files:
142
142
  - test/fixtures/diff
143
143
  - test/fixtures/ls_tree