dandelion 0.3.4 → 0.3.5

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 Scott Nelson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/dandelion/backend/sftp.rb

@@ -9,7 +9,7 @@ module Dandelion
       
       def initialize(config)
         require 'net/sftp'
-        @config = config
+        @config = { 'preserve_permissions' => true }.merge(config)
         options = {
           :password => @config['password'],
           :port => @config['port'] || Net::SSH::Transport::Session::DEFAULT_PORT,
@@ -38,6 +38,10 @@ module Dandelion
             @sftp.upload!(temp, path(file))
           end
         end
+        if @config['preserve_permissions']
+          mode = get_mode(file)
+          @sftp.setstat!(path(file), :permissions => mode) if mode
+        end
       end
 
       def delete(file)
@@ -54,7 +58,12 @@ module Dandelion
       end
 
       private
-      
+
+      def get_mode(file)
+        stat = File.stat(file) if File.exists?(file)
+        stat.mode if stat
+      end
+
       def cleanpath(path)
         Pathname.new(path).cleanpath.to_s if path
       end
@@ -91,4 +100,4 @@ module Dandelion
       end
     end
   end
-end
+end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/test/test_ftp.rb

@@ -1,12 +1,14 @@
 require 'dandelion/backend/ftp'
-require 'mocha'
 require 'net/ftp'
 require 'test/unit'
+require 'mocha'
 
 class TestFTP < Test::Unit::TestCase
   def setup
     @ftp = mock()
-    Net::FTP.stubs(:open).returns(@ftp)
+    Net::FTP.stubs(:new).returns(@ftp)
+    @ftp.expects(:connect).once
+    @ftp.expects(:login).once
     @ftp.expects(:passive=).with(true).once
     @ftp.expects(:chdir).with('foo').once
     @backend = Dandelion::Backend::FTP.new('path' => 'foo')
@@ -44,4 +46,4 @@ class TestFTP < Test::Unit::TestCase
     @backend.delete('bar/baz')
     @backend.delete('bar/baz/qux')
   end
-end
+end

data/test/test_sftp.rb

@@ -1,7 +1,7 @@
 require 'dandelion/backend/sftp'
-require 'mocha'
 require 'net/sftp'
 require 'test/unit'
+require 'mocha'
 
 class TestSFTP < Test::Unit::TestCase
   def setup
@@ -27,8 +27,15 @@ class TestSFTP < Test::Unit::TestCase
   end
   
   def test_write
+    File.stubs(:stat).returns(stub(mode: 0xDEADBEEF))
+    File.stubs(:exists?).with('bar').returns(true)
+    File.stubs(:exists?).with('bar/baz').returns(true)
+
     @sftp.expects(:upload!).with(:temp, 'foo/bar').once
+    @sftp.expects(:setstat!).with('foo/bar', :permissions => 0xDEADBEEF).once
     @sftp.expects(:upload!).with(:temp, 'foo/bar/baz').once
+    @sftp.expects(:setstat!).with('foo/bar/baz', :permissions => 0xDEADBEEF).once
+
     @backend.write('bar', 'baz')
     @backend.write('bar/baz', 'qux')
   end
@@ -44,4 +51,4 @@ class TestSFTP < Test::Unit::TestCase
     @backend.delete('bar/baz')
     @backend.delete('bar/baz/qux')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2153369760 !ruby/object:Gem::Requirement
+  requirement: &2153620700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153369760
+  version_requirements: *2153620700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153369000 !ruby/object:Gem::Requirement
+  requirement: &2153620200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2153369000
+  version_requirements: *2153620200
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2153367980 !ruby/object:Gem::Requirement
+  requirement: &2153619740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2153367980
+  version_requirements: *2153619740
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2153366420 !ruby/object:Gem::Requirement
+  requirement: &2153619280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153366420
+  version_requirements: *2153619280
 description: Incremental Git repository deployment
 email:
 - scottbnel@gmail.com
@@ -65,6 +65,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/dandelion
@@ -136,7 +137,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: dandelion-0.3.4
+summary: dandelion-0.3.5
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree