dandelion 0.3.6 → 0.3.7

data/README.md

@@ -30,6 +30,7 @@ Git repository is searched for a file named `dandelion.yml`). Example:
     exclude:
         - .gitignore
         - dandelion.yml
+    revision_file: .revision
 
 Schemes
 -------
@@ -50,8 +51,9 @@ Optional:
  * `path`
  * `exclude`
  * `port`
+ * `revision_file` (defaults to .revision)
  * `preserve_permissions` (defaults to true)
-    
+
 **FTP**: `scheme: ftp`
 
 Required:
@@ -65,6 +67,7 @@ Optional:
  * `path`
  * `exclude`
  * `port`
+ * `revision_file` (defaults to .revision)
  * `passive` (defaults to true)
     
 **Amazon S3**: `scheme: s3`
@@ -79,6 +82,7 @@ Optional:
 
  * `path`
  * `exclude`
+ * `revision_file` (defaults to .revision)
 
 Usage
 -----

data/lib/dandelion/command.rb

@@ -105,7 +105,8 @@ module Dandelion
       def deployment(revision, backend = nil)
         begin
           backend ||= backend()
-          options = { :exclude => @config['exclude'], :revision => revision, :dry => @options[:dry] }
+          revision_file = @config['revision_file'].nil? ? '.revision' : @config['revision_file']
+          options = { :exclude => @config['exclude'], :revision => revision, :revision_file => revision_file, :dry => @options[:dry] }
           Deployment::Deployment.create(@repo, backend, options)
         rescue Git::DiffError
           log.fatal('Error: could not generate diff')
@@ -115,4 +116,4 @@ module Dandelion
       end
     end
   end
-end
+end

data/lib/dandelion/deployment.rb

@@ -19,7 +19,7 @@ module Dandelion
       def initialize(repo, backend, options = {})
         @repo = repo
         @backend = backend
-        @options = { :exclude => [], :revision => 'HEAD' }.merge(options)
+        @options = { :exclude => [], :revision => 'HEAD', :revision_file => '.revision' }.merge(options)
         @tree = Git::Tree.new(@repo, @options[:revision])
         
         if @options[:dry]
@@ -38,7 +38,7 @@ module Dandelion
       end
     
       def write_revision
-        @backend.write('.revision', local_revision)
+        @backend.write(@options[:revision_file], local_revision)
       end
       
       def validate
@@ -123,7 +123,7 @@ module Dandelion
     
       def read_remote_revision
         begin
-          @backend.read('.revision').chomp
+          @backend.read(@options[:revision_file]).chomp
         rescue Backend::MissingFileError
           raise RemoteRevisionError
         end
@@ -144,4 +144,4 @@ module Dandelion
       end
     end
   end
-end
+end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/test/test_diff_deployment.rb

@@ -119,4 +119,4 @@ class TestDiffDeployment < Test::Unit::TestCase
     assert_equal @head_revision, @backend.writes['.revision']
     assert_equal ['foobar'], @backend.deletes
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2156899540 !ruby/object:Gem::Requirement
+  requirement: &2155973620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156899540
+  version_requirements: *2155973620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156899040 !ruby/object:Gem::Requirement
+  requirement: &2155972540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2156899040
+  version_requirements: *2155972540
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2156898580 !ruby/object:Gem::Requirement
+  requirement: &2155971220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156898580
+  version_requirements: *2155971220
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2156898120 !ruby/object:Gem::Requirement
+  requirement: &2155969540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156898120
+  version_requirements: *2155969540
 description: Incremental Git repository deployment
 email:
 - scottbnel@gmail.com
@@ -137,7 +137,7 @@ rubyforge_project:
 rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
-summary: dandelion-0.3.6
+summary: dandelion-0.3.7
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree