dandelion 0.1.3 → 0.1.4

data/lib/dandelion.rb

@@ -33,24 +33,29 @@ module Dandelion
       puts "Connecting to:    #{service.uri}"
 
       begin
-        # Deploy changes since remote revision
-        deployment = Deployment::DiffDeployment.new('.', service, config['exclude'])
-
-        puts "Remote revision:  #{deployment.remote_revision}"
-        puts "Local revision:   #{deployment.local_revision}"
-
-        deployment.deploy
-      rescue Deployment::RemoteRevisionError
-        # No remote revision, deploy everything
-        deployment = Deployment::FullDeployment.new('.', service, config['exclude'])
-
-        puts "Remote revision:  ---"
-        puts "Local revision:   #{deployment.local_revision}"
-
-        deployment.deploy
+        begin
+          # Deploy changes since remote revision
+          deployment = Deployment::DiffDeployment.new('.', service, config['exclude'])
+
+          puts "Remote revision:  #{deployment.remote_revision}"
+          puts "Local revision:   #{deployment.local_revision}"
+
+          deployment.deploy
+        rescue Service::RemoteRevisionError
+          # No remote revision, deploy everything
+          deployment = Deployment::FullDeployment.new('.', service, config['exclude'])
+
+          puts "Remote revision:  ---"
+          puts "Local revision:   #{deployment.local_revision}"
+
+          deployment.deploy
+        end
+        
+        puts "Deployment complete"
+      rescue Git::DiffError
+        puts "Failed to deploy"
+        puts "Try merging remote changes before deploying again"
       end
-
-      puts "Deployment complete"
     end
   end
 end

data/lib/dandelion/deployment.rb

@@ -1,8 +1,6 @@
 require 'dandelion/git'
 
 module Deployment
-  class RemoteRevisionError < StandardError; end
-  
   class Deployment
     def initialize(dir, service, exclude = nil, revision = 'HEAD')
       @service = service
@@ -21,6 +19,12 @@ module Deployment
     def write_revision
       @service.write('.revision', local_revision)
     end
+    
+    protected
+    
+    def exclude_file?(file)
+      return @exclude.map { |e| file.start_with?(e) }.any?
+    end
   end
   
   class DiffDeployment < Deployment
@@ -47,7 +51,7 @@ module Deployment
     
     def deploy_changed
       @diff.changed.each do |file|
-        if @exclude.include?(file)
+        if exclude_file?(file)
           puts "Skipping file: #{file}"
         else
           puts "Uploading file: #{file}"
@@ -58,7 +62,7 @@ module Deployment
     
     def deploy_deleted
       @diff.deleted.each do |file|
-        if @exclude.include?(file)
+        if exclude_file?(file)
           puts "Skipping file: #{file}"
         else
           puts "Deleting file: #{file}"
@@ -78,19 +82,14 @@ module Deployment
     private
     
     def read_revision
-      begin
-        @service.read('.revision').chomp
-      rescue Net::SFTP::StatusException => e
-        raise unless e.code == 2
-        raise RemoteRevisionError
-      end
+      @service.read('.revision').chomp
     end
   end
   
   class FullDeployment < Deployment
     def deploy
       @tree.files.each do |file|
-        unless @exclude.include?(file)
+        unless exclude_file?(file)
           puts "Uploading file: #{file}"
           @service.write(file, @tree.show(file))
         end

data/lib/dandelion/git.rb

@@ -1,12 +1,15 @@
 require 'grit'
 
 module Git
+  class DiffError < StandardError; end
+  
   class Diff
     attr_reader :revision
   
     def initialize(dir, revision)
       @revision = revision
       @raw = `cd #{dir}; git diff --name-status #{@revision} HEAD`
+      check_state!
     end
 
     def changed
@@ -27,6 +30,12 @@ module Git
       end
       items
     end
+    
+    def check_state!
+      if $?.exitstatus != 0
+        raise DiffError
+      end
+    end
   end
 
   class Tree

data/lib/dandelion/service.rb

@@ -2,6 +2,8 @@ require 'net/sftp'
 require 'tempfile'
 
 module Service
+  class RemoteRevisionError < StandardError; end
+  
   class Service
     def initialize(host, username, path)
       @host = host
@@ -22,8 +24,13 @@ module Service
     end
     
     def read(file)
-      @sftp.file.open(File.join(@path, file), 'r') do |f|
-        f.gets
+      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 RemoteRevisionError
       end
     end
     
@@ -44,9 +51,13 @@ module Service
     end
     
     def delete(file)
-      path = File.join(@path, file)
-      @sftp.remove!(path)
-      cleanup(File.dirname(path))
+      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

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -2,7 +2,7 @@
 name: dandelion
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Scott Nelson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,6 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: dandelion-0.1.3
+summary: dandelion-0.1.4
 test_files: []