dandelion 0.2.0 → 0.2.1

data/README.md

@@ -15,11 +15,11 @@ Alternatively, you can build the gem yourself:
     
 Config
 ------
-Configuration options are specified in a YAML file (Dandelion looks for a file
-named `dandelion.yml` by default):
+Configuration options are specified in a YAML file (Dandelion looks for 
+`dandelion.yml` by default). Example:
 
     # Required
-    scheme: sftp # sftp/ftp
+    scheme: sftp
     host: example.com
     username: user
     password: pass
@@ -29,7 +29,28 @@ named `dandelion.yml` by default):
     exclude:
         - .gitignore
         - dandelion.yml
+
+Schemes
+-------
+There is support for multiple backend file transfer schemes.  The configuration
+must specify one of these schemes and the set of additional parameters required
+by the given scheme.
+
+**SFTP**: `scheme: sftp`
+
+Required: `host`, `username`, `password`
+Optional: `path`, `exclude`
     
+**FTP**: `scheme: ftp`
+
+Required: `host`, `username`, `password`
+Optional: `path`, `exclude`
+    
+**Amazon S3**: `scheme: s3`
+
+Required: `access_key_id`, `secret_access_key`, `bucket_name`
+Optional: `path`, `exclude`
+
 Usage
 -----
 From the root directory of a Git repository, run:

data/dandelion.gemspec

@@ -10,10 +10,13 @@ Gem::Specification.new do |s|
   s.email       = ['scottbnel@gmail.com']
   s.homepage    = 'http://github.com/scttnlsn/dandelion'
   s.summary     = "dandelion-#{s.version}"
-  s.description = 'Git repository deployment via FTP/SFTP'
+  s.description = 'Incremental Git repository deployment'
   
-  s.add_dependency 'net-sftp', '>= 2.0.5'
   s.add_dependency 'grit', '>= 2.4.1'
+  
+  s.add_development_dependency 'mocha', '>= 0.9.12'
+  s.add_development_dependency 'net-sftp', '>= 2.0.5'
+  s.add_development_dependency 'aws-s3', '>= 0.6.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/dandelion/backend.rb

@@ -0,0 +1,54 @@
+require 'tempfile'
+
+module Dandelion
+  module Backend
+    class MissingFileError < StandardError; end
+    class UnsupportedSchemeError < StandardError; end
+    
+    class MissingDependencyError < StandardError
+      attr_reader :gems
+      
+      def initialize(gems)
+        @gems = gems
+      end
+    end
+
+    class Backend
+      class << self
+        @@backends = {}
+        
+        def create(config)
+          Dir.glob(File.join(File.dirname(__FILE__), 'backend', '*.rb')) { |file| require file }
+          raise UnsupportedSchemeError unless @@backends.include? config['scheme']
+          begin
+            @@backends[config['scheme']].new(config)
+          rescue LoadError
+            raise MissingDependencyError.new(@@backends[config['scheme']].gem_list)
+          end
+        end
+        
+        def scheme(scheme)
+          @@backends[scheme] = self
+        end
+        
+        def gems(*gems)
+          @gems = gems
+        end
+        
+        def gem_list
+          @gems
+        end
+      end
+
+      protected
+
+      def temp(file, data)
+        tmp = Tempfile.new(file.gsub('/', '.'))
+        tmp << data
+        tmp.flush
+        yield(tmp.path)
+        tmp.close
+      end
+    end
+  end
+end

data/lib/dandelion/backend/ftp.rb

@@ -0,0 +1,80 @@
+require 'dandelion/backend'
+
+module Dandelion
+  module Backend
+    class FTP < Backend
+      scheme 'ftp'
+      
+      def initialize(config)
+        require 'net/ftp'
+        @config = config
+        @ftp = Net::FTP.open(@config['host'], @config['username'], @config['password'])
+        @ftp.passive = true
+        @ftp.chdir(@config['path']) if @config['path']
+      end
+
+      def read(file)
+        begin
+          # Implementation of FTP#getbinaryfile differs between 1.8
+          # and 1.9 so we call FTP#retrbinary directly
+          content = ''
+          @ftp.retrbinary("RETR #{file}", 4096) do |data|
+            content += data
+          end
+          content
+        rescue Net::FTPPermError => e
+          raise MissingFileError
+        end
+      end
+
+      def write(file, data)
+        temp(file, data) do |temp|
+          begin
+            @ftp.putbinaryfile temp, file
+          rescue Net::FTPPermError => e
+            mkdir_p File.dirname(file)
+            @ftp.putbinaryfile temp, file
+          end
+        end
+      end
+
+      def delete(file)
+        begin
+          @ftp.delete file
+          cleanup File.dirname(file)
+        rescue Net::FTPPermError => e
+        end
+      end
+      
+      def to_s
+        "ftp://#{@config['username']}@#{@config['host']}/#{@config['path']}"
+      end
+
+      private
+
+      def cleanup(dir)
+        unless dir == File.dirname(dir)
+          if empty? dir
+            @ftp.rmdir dir
+            cleanup File.dirname(dir)
+          end
+        end
+      end
+
+      def empty?(dir)
+        return @ftp.nlst(dir).empty?
+      end
+
+      def mkdir_p(dir)
+        unless dir == File.dirname(dir)
+          begin
+            @ftp.mkdir dir
+          rescue Net::FTPPermError => e
+            mkdir_p File.dirname(dir)
+            @ftp.mkdir dir
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dandelion/backend/s3.rb

@@ -0,0 +1,52 @@
+require 'dandelion/backend'
+
+module Dandelion
+  module Backend
+    class S3 < Backend
+      scheme 's3'
+      gems 'aws-s3'
+      
+      def initialize(config)
+        require 'aws/s3'
+        @access_key_id = config['access_key_id']
+        @secret_access_key = config['secret_access_key']
+        @bucket_name = config['bucket_name']
+        @path = config['path']
+      end
+
+      def read(file)
+        s3connect!
+        raise MissingFileError unless AWS::S3::S3Object.exists? path(file), @bucket_name
+        AWS::S3::S3Object.value path(file), @bucket_name
+      end
+
+      def write(file, data)
+        s3connect!
+        AWS::S3::S3Object.store path(file), data, @bucket_name
+      end
+
+      def delete(file)
+        s3connect!
+        AWS::S3::S3Object.delete path(file), @bucket_name
+      end
+      
+      def to_s
+        "s3://#{@access_key_id}@#{@bucket_name}/#{@path}"
+      end
+
+      protected
+      
+      def s3connect!
+        AWS::S3::Base.establish_connection!(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key, :use_ssl => true) unless AWS::S3::Base.connected? 
+      end
+            
+      def path(file)
+        if @path and !@path.empty?
+          "#{@path}/#{file}"
+        else
+          file
+        end
+      end
+    end
+  end
+end

data/lib/dandelion/backend/sftp.rb

@@ -0,0 +1,90 @@
+require 'dandelion/backend'
+require 'pathname'
+
+module Dandelion
+  module Backend
+    class SFTP < Backend
+      scheme 'sftp'
+      gems 'net-sftp'
+      
+      def initialize(config)
+        require 'net/sftp'
+        @config = config
+        @sftp = Net::SFTP.start(@config['host'], @config['username'], :password => @config['password'])
+      end
+
+      def read(file)
+        begin
+          @sftp.file.open(path(file), 'r') do |f|
+            f.gets
+          end
+        rescue Net::SFTP::StatusException => e
+          raise unless e.code == 2
+          raise MissingFileError
+        end
+      end
+
+      def write(file, data)
+        temp(file, data) do |temp|
+          begin
+            @sftp.upload! temp, path(file)
+          rescue Net::SFTP::StatusException => e
+            raise unless e.code == 2
+            mkdir_p File.dirname(path(file))
+            @sftp.upload! temp, path(file)
+          end
+        end
+      end
+
+      def delete(file)
+        begin
+          @sftp.remove! path(file)
+          cleanup File.dirname(path(file))
+        rescue Net::SFTP::StatusException => e
+          raise unless e.code == 2
+        end
+      end
+      
+      def to_s
+        "sftp://#{@config['username']}@#{@config['host']}/#{@config['path']}"
+      end
+
+      private
+      
+      def cleanpath(path)
+        Pathname.new(path).cleanpath.to_s if path
+      end
+
+      def cleanup(dir)
+        unless cleanpath(dir) == cleanpath(@config['path']) or dir == File.dirname(dir)
+          if empty? dir
+            @sftp.rmdir! dir
+            cleanup File.dirname(dir)
+          end
+        end
+      end
+      
+      def empty?(dir)
+        @sftp.dir.entries(dir).delete_if { |file| file.name == '.' or file.name == '..' }.empty?
+      end
+
+      def mkdir_p(dir)
+        begin
+          @sftp.mkdir! dir
+        rescue Net::SFTP::StatusException => e
+          raise unless e.code == 2
+          mkdir_p File.dirname(dir)
+          retry
+        end
+      end
+      
+      def path(file)
+        if @config['path'] and !@config['path'].empty?
+          File.join @config['path'], file
+        else
+          file
+        end
+      end
+    end
+  end
+end

data/lib/dandelion/cli.rb

@@ -1,7 +1,7 @@
 require 'dandelion'
+require 'dandelion/backend'
 require 'dandelion/deployment'
 require 'dandelion/git'
-require 'dandelion/service'
 require 'dandelion/version'
 require 'optparse'
 require 'yaml'
@@ -120,51 +120,41 @@ module Dandelion
       end
       
       def execute
-        log.info("Connecting to:    #{service.uri}")
-        deployment(service) do |d|
-          log.info("Remote revision:  #{d.remote_revision || '---'}")
-          log.info("Local revision:   #{d.local_revision}")
-          
-          if @command == 'status'
-            exit
-          elsif @command == 'deploy'
-            validate_deployment d
-            d.deploy
-            log.info("Deployment complete")
-          end
+        begin
+          backend = Backend::Backend.create(@config)
+          log.info("Connecting to:    #{backend}")
+        rescue Backend::MissingDependencyError => e
+          log.fatal("The '#{@config['scheme']}' scheme requires additional gems:")
+          log.fatal('    ' + e.gems.join("\n    ") + "\n")
+          log.fatal("Please install the gems: gem install #{e.gems.join(' ')}")
+          exit
+        rescue Backend::UnsupportedSchemeError
+          log.fatal("Unsupported scheme: #{@config['scheme']}")
+          exit
         end
-      end
-      
-      private
-      
-      def deployment(service)
+        
         begin
-          deployment = Deployment::DiffDeployment.new(@repo, service, @config['exclude'])
-        rescue Deployment::RemoteRevisionError
-          deployment = Deployment::FullDeployment.new(@repo, service, @config['exclude'])
+          deployment = Deployment::Deployment.create(@repo, backend, @config['exclude'])
         rescue Git::DiffError
           log.fatal('Error: could not generate diff')
           log.fatal('Try merging remote changes before running dandelion again')
           exit
         end
-        if block_given?
-          yield(deployment)
-        else
-          deployment
-        end
-      end
-      
-      def service
-        if @config['scheme'] == 'sftp'
-          Service::SFTP.new(@config['host'], @config['username'], @config['password'], @config['path'])
-        elsif @config['scheme'] == 'ftp'
-          Service::FTP.new(@config['host'], @config['username'], @config['password'], @config['path'])
-        else
-          log.fatal("Unsupported scheme: #{@config['scheme']}")
+
+        log.info("Remote revision:  #{deployment.remote_revision || '---'}")
+        log.info("Local revision:   #{deployment.local_revision}")
+          
+        if @command == 'status'
           exit
+        elsif @command == 'deploy'
+          validate_deployment deployment
+          deployment.deploy
+          log.info("Deployment complete")
         end
       end
       
+      private
+      
       def validate_deployment(deployment)
         begin
           @repo.remote_list.each do |remote|

data/lib/dandelion/deployment.rb

@@ -6,9 +6,19 @@ module Dandelion
     class FastForwardError < StandardError; end
   
     class Deployment
-      def initialize(repo, service, exclude = nil, revision = 'HEAD')
+      class << self
+        def create(repo, backend, exclude)
+          begin
+            DiffDeployment.new(repo, backend, exclude)
+          rescue RemoteRevisionError
+            FullDeployment.new(repo, backend, exclude)
+          end
+        end
+      end
+      
+      def initialize(repo, backend, exclude = nil, revision = 'HEAD')
         @repo = repo
-        @service = service
+        @backend = backend
         @exclude = exclude || []
         @tree = Git::Tree.new(@repo, revision)
       end
@@ -21,12 +31,8 @@ module Dandelion
         nil
       end
     
-      def remote_uri
-        @service.uri
-      end
-    
       def write_revision
-        @service.write('.revision', local_revision)
+        @backend.write('.revision', local_revision)
       end
       
       def validate_state(remote = nil)
@@ -50,8 +56,8 @@ module Dandelion
     end
   
     class DiffDeployment < Deployment
-      def initialize(repo, service, exclude = nil, revision = 'HEAD')
-        super(repo, service, exclude, revision)
+      def initialize(repo, backend, exclude = nil, revision = 'HEAD')
+        super(repo, backend, exclude, revision)
         @diff = Git::Diff.new(@repo, read_remote_revision, revision)
       end
     
@@ -77,7 +83,7 @@ module Dandelion
             log.info("Skipping file: #{file}")
           else
             log.info("Uploading file: #{file}")
-            @service.write(file, @tree.show(file))
+            @backend.write(file, @tree.show(file))
           end
         end
       end
@@ -88,7 +94,7 @@ module Dandelion
             log.info("Skipping file: #{file}")
           else
             log.info("Deleting file: #{file}")
-            @service.delete(file)
+            @backend.delete(file)
           end
         end
       end
@@ -105,8 +111,8 @@ module Dandelion
     
       def read_remote_revision
         begin
-          @service.read('.revision').chomp
-        rescue Service::MissingFileError
+          @backend.read('.revision').chomp
+        rescue Backend::MissingFileError
           raise RemoteRevisionError
         end
       end
@@ -119,7 +125,7 @@ module Dandelion
             log.info("Skipping file: #{file}")
           else
             log.info("Uploading file: #{file}")
-            @service.write(file, @tree.show(file))
+            @backend.write(file, @tree.show(file))
           end
         end
         write_revision

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/test_diff_deployment.rb

@@ -1,6 +1,5 @@
 require 'dandelion'
 require 'dandelion/deployment'
-require 'dandelion/service'
 require 'test/unit'
 
 def fixture(name)
@@ -57,7 +56,7 @@ class MockRepo
   end
 end
 
-class MockService
+class MockBackend
   attr_reader :reads, :writes, :deletes
   
   def initialize(remote_revision)
@@ -87,8 +86,8 @@ class TestDiffDeployment < Test::Unit::TestCase
     @head_revision = '0ca605e9f0f1d42ce8193ac36db11ec3cc9efc08'
     @remote_revision = 'ff1f1d4bd0c99e1c9cca047c46b2194accf89504'
     @repo = MockRepo.new
-    @service = MockService.new(@remote_revision)
-    @diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @service, [], @head_revision)
+    @backend = MockBackend.new(@remote_revision)
+    @diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @backend, [], @head_revision)
   end
   
   def test_diff_deployment_local_revision
@@ -101,7 +100,7 @@ class TestDiffDeployment < Test::Unit::TestCase
   
   def test_diff_deployment_write_revision
     @diff_deployment.write_revision
-    assert_equal @head_revision, @service.writes['.revision']
+    assert_equal @head_revision, @backend.writes['.revision']
   end
   
   def test_diff_deployment_revisions_match
@@ -114,10 +113,10 @@ class TestDiffDeployment < Test::Unit::TestCase
   
   def test_diff_deployment_deploy
     @diff_deployment.deploy
-    assert_equal 3, @service.writes.length
-    assert_equal 'bar', @service.writes['foo']
-    assert_equal 'bar', @service.writes['baz/foo']
-    assert_equal @head_revision, @service.writes['.revision']
-    assert_equal ['foobar'], @service.deletes
+    assert_equal 3, @backend.writes.length
+    assert_equal 'bar', @backend.writes['foo']
+    assert_equal 'bar', @backend.writes['baz/foo']
+    assert_equal @head_revision, @backend.writes['.revision']
+    assert_equal ['foobar'], @backend.deletes
   end
 end

data/test/test_ftp.rb

@@ -0,0 +1,47 @@
+require 'dandelion/backend/ftp'
+require 'mocha'
+require 'net/ftp'
+require 'test/unit'
+
+class TestFTP < Test::Unit::TestCase
+  def setup
+    @ftp = mock()
+    Net::FTP.stubs(:open).returns(@ftp)
+    @ftp.expects(:passive=).with(true).once
+    @ftp.expects(:chdir).with('foo').once
+    @backend = Dandelion::Backend::FTP.new('path' => 'foo')
+    class << @backend
+      def temp(file, data)
+        yield(:temp)
+      end
+    end
+  end
+  
+  def test_read
+    @ftp.expects(:retrbinary).with('RETR bar', 4096).once
+    @ftp.expects(:retrbinary).with('RETR bar/baz', 4096).once
+    @ftp.expects(:retrbinary).with('RETR bar/baz/qux', 4096).once
+    @backend.read('bar')
+    @backend.read('bar/baz')
+    @backend.read('bar/baz/qux')
+  end
+  
+  def test_write
+    @ftp.expects(:putbinaryfile).with(:temp, 'bar').once
+    @ftp.expects(:putbinaryfile).with(:temp, 'bar/baz').once
+    @backend.write('bar', 'baz')
+    @backend.write('bar/baz', 'qux')
+  end
+  
+  def test_delete
+    @ftp.expects(:delete).with('bar').once
+    @ftp.expects(:delete).with('bar/baz').once
+    @ftp.expects(:delete).with('bar/baz/qux').once
+    @ftp.expects(:rmdir).with('bar').twice
+    @ftp.expects(:rmdir).with('bar/baz').once
+    @backend.stubs(:empty?).returns(true)
+    @backend.delete('bar')
+    @backend.delete('bar/baz')
+    @backend.delete('bar/baz/qux')
+  end
+end

data/test/test_sftp.rb

@@ -0,0 +1,47 @@
+require 'dandelion/backend/sftp'
+require 'mocha'
+require 'net/sftp'
+require 'test/unit'
+
+class TestSFTP < Test::Unit::TestCase
+  def setup
+    @sftp = mock()
+    Net::SFTP.stubs(:start).returns(@sftp)
+    @backend = Dandelion::Backend::SFTP.new('path' => 'foo')
+    class << @backend
+      def temp(file, data)
+        yield(:temp)
+      end
+    end
+  end
+  
+  def test_read
+    file = mock()
+    @sftp.stubs(:file).returns(file)
+    file.expects(:open).with('foo/bar', 'r').once
+    file.expects(:open).with('foo/bar/baz', 'r').once
+    file.expects(:open).with('foo/bar/baz/qux', 'r').once
+    @backend.read('bar')
+    @backend.read('bar/baz')
+    @backend.read('bar/baz/qux')
+  end
+  
+  def test_write
+    @sftp.expects(:upload!).with(:temp, 'foo/bar').once
+    @sftp.expects(:upload!).with(:temp, 'foo/bar/baz').once
+    @backend.write('bar', 'baz')
+    @backend.write('bar/baz', 'qux')
+  end
+  
+  def test_delete
+    @sftp.expects(:remove!).with('foo/bar').once
+    @sftp.expects(:remove!).with('foo/bar/baz').once
+    @sftp.expects(:remove!).with('foo/bar/baz/qux').once
+    @sftp.expects(:rmdir!).with('foo/bar').twice
+    @sftp.expects(:rmdir!).with('foo/bar/baz').once
+    @backend.stubs(:empty?).returns(true)
+    @backend.delete('bar')
+    @backend.delete('bar/baz')
+    @backend.delete('bar/baz/qux')
+  end
+end

metadata

@@ -1,62 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dandelion
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-17 00:00:00 -04:00
+date: 2011-05-19 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &2161286340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161286340
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2161285840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2161285840
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: &2161285380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.5
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grit
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161285380
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &2161284920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 1
-        version: 2.4.1
-  type: :runtime
-  version_requirements: *id002
-description: Git repository deployment via FTP/SFTP
-email: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *2161284920
+description: Incremental Git repository deployment
+email:
 - scottbnel@gmail.com
-executables: 
+executables:
 - dandelion
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -64,14 +71,18 @@ files:
 - bin/dandelion
 - dandelion.gemspec
 - lib/dandelion.rb
+- lib/dandelion/backend.rb
+- lib/dandelion/backend/ftp.rb
+- lib/dandelion/backend/s3.rb
+- lib/dandelion/backend/sftp.rb
 - lib/dandelion/cli.rb
 - lib/dandelion/deployment.rb
 - lib/dandelion/git.rb
-- lib/dandelion/service.rb
 - lib/dandelion/version.rb
 - test/fixtures/diff
 - test/fixtures/ls_tree
 - test/test_diff_deployment.rb
+- test/test_ftp.rb
 - test/test_git.git/HEAD
 - test/test_git.git/config
 - test/test_git.git/description
@@ -99,42 +110,37 @@ files:
 - test/test_git.git/objects/ff/1f1d4bd0c99e1c9cca047c46b2194accf89504
 - test/test_git.git/refs/heads/master
 - test/test_git.rb
+- test/test_sftp.rb
 has_rdoc: true
 homepage: http://github.com/scttnlsn/dandelion
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: dandelion-0.2.0
-test_files: 
+summary: dandelion-0.2.1
+test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree
 - test/test_diff_deployment.rb
+- test/test_ftp.rb
 - test/test_git.git/HEAD
 - test/test_git.git/config
 - test/test_git.git/description
@@ -162,3 +168,4 @@ test_files:
 - test/test_git.git/objects/ff/1f1d4bd0c99e1c9cca047c46b2194accf89504
 - test/test_git.git/refs/heads/master
 - test/test_git.rb
+- test/test_sftp.rb

data/lib/dandelion/service.rb

@@ -1,168 +0,0 @@
-require 'net/ftp'
-require 'net/sftp'
-require 'tempfile'
-
-module Dandelion
-  module Service
-    class MissingFileError < StandardError; end
-
-    class Service
-      def initialize(host, username, path)
-        @host = host
-        @username = username
-        @path = path
-      end
-
-      def uri
-        "#{@scheme}://#{@username}@#{@host}/#{@path}"
-      end
-
-      protected
-
-      def temp(file, data)
-        tmp = Tempfile.new(file.gsub('/', '.'))
-        tmp << data
-        tmp.flush
-        yield(tmp.path)
-        tmp.close
-      end
-    end
-
-    class FTP < Service
-      def initialize(host, username, password, path)
-        super(host, username, path)
-        @scheme = 'ftp'
-        @ftp = Net::FTP.open(host, username, password)
-        @ftp.passive = true
-        @ftp.chdir(path)
-      end
-
-      def read(file)
-        begin
-          # Implementation of FTP#getbinaryfile differs between 1.8
-          # and 1.9 so we call FTP#retrbinary directly
-          content = ''
-          @ftp.retrbinary("RETR #{file}", 4096) do |data|
-            content += data
-          end
-          content
-        rescue Net::FTPPermError => e
-          raise MissingFileError
-        end
-      end
-
-      def write(file, data)
-        # Creates directory only if necessary
-        mkdir_p(File.dirname(file))
-
-        temp(file, data) do |temp|
-          @ftp.putbinaryfile(temp, file)
-        end
-      end
-
-      def delete(file)
-        begin
-          @ftp.delete(file)
-          cleanup(File.dirname(file))
-        rescue Net::FTPPermError => e
-        end
-      end
-
-      private
-
-      def cleanup(dir)
-        unless File.identical?(dir, @path)
-          if empty?(dir)
-            @ftp.rmdir(dir)
-            cleanup(File.dirname(dir))
-          end
-        end
-      end
-
-      def empty?(dir)
-        return @ftp.nlst(dir).empty?
-      end
-
-      def mkdir_p(dir)
-        return if dir == "."
-        parent_dir = File.dirname(dir)
-        file_names = @ftp.nlst(parent_dir)
-        unless file_names.include? dir
-          mkdir_p(parent_dir)
-          @ftp.mkdir(dir)
-        end
-
-      end
-    end
-
-    class SFTP < Service
-      def initialize(host, username, password, path)
-        super(host, username, path)
-        @scheme = 'sftp'
-        @sftp = Net::SFTP.start(host, username, :password => password)
-      end
-
-      def read(file)
-        begin
-          @sftp.file.open(File.join(@path, file), 'r') do |f|
-            f.gets
-          end
-        rescue Net::SFTP::StatusException => e
-          raise unless e.code == 2
-          raise MissingFileError
-        end
-      end
-
-      def write(file, data)
-        path = File.join(@path, file)
-        begin
-          dir = File.dirname(path)
-          @sftp.stat!(dir)
-        rescue Net::SFTP::StatusException => e
-          raise unless e.code == 2
-          mkdir_p(dir)
-        end
-        temp(file, data) do |temp|
-          @sftp.upload!(temp, path)
-        end
-      end
-
-      def delete(file)
-        begin
-          path = File.join(@path, file)
-          @sftp.remove!(path)
-          cleanup(File.dirname(path))
-        rescue Net::SFTP::StatusException => e
-          raise unless e.code == 2
-        end
-      end
-
-      private
-
-      def cleanup(dir)
-        unless File.identical?(dir, @path)
-          if empty?(dir)
-            @sftp.rmdir!(dir)
-            cleanup(File.dirname(dir))
-          end
-        end
-      end
-
-      def empty?(dir)
-        @sftp.dir.entries(dir).map do |entry|
-          entry.name unless entry.name == '.' or entry.name == '..'
-        end.compact.empty?
-      end
-
-      def mkdir_p(dir)
-        begin
-          @sftp.mkdir!(dir)
-        rescue Net::SFTP::StatusException => e
-          raise unless e.code == 2
-          mkdir_p(File.dirname(dir))
-          mkdir_p(dir)
-        end
-      end
-    end
-  end
-end