dandelion 0.2.3 → 0.3.0

data/README.md

@@ -1,5 +1,6 @@
-dandelion
+Dandelion
 =========
+Incremental Git repository deployment.
 
 Install
 -------
@@ -15,8 +16,8 @@ Alternatively, you can build the gem yourself:
     
 Config
 ------
-Configuration options are specified in a YAML file (the root of your Git repository
-is searched for a file named `dandelion.yml` by default). Example:
+Configuration options are specified in a YAML file (by default, the root of your
+Git repository is searched for a file named `dandelion.yml`). Example:
 
     # Required
     scheme: sftp
@@ -38,18 +39,43 @@ by the given scheme.
 
 **SFTP**: `scheme: sftp`
 
-Required: `host`, `username`, `password`
-Optional: `path`, `exclude`
+Required:
+
+ * `host`
+ * `username`
+ * `password`
+
+Optional:
+
+ * `path`
+ * `exclude`
     
 **FTP**: `scheme: ftp`
 
-Required: `host`, `username`, `password`
-Optional: `path`, `exclude`, `passive` (defaults to true)
+Required:
+
+ * `host`
+ * `username`
+ * `password`
+
+Optional:
+
+ * `path`
+ * `exclude`
+ * `passive` (defaults to true)
     
 **Amazon S3**: `scheme: s3`
 
-Required: `access_key_id`, `secret_access_key`, `bucket_name`
-Optional: `path`, `exclude`
+Required:
+
+ * `access_key_id`
+ * `secret_access_key`
+ * `bucket_name`
+
+Optional:
+
+ * `path`
+ * `exclude`
 
 Usage
 -----
@@ -57,28 +83,30 @@ From within your Git repository, run:
 
     $ dandelion deploy
     
-Or:
+This will deploy the local `HEAD` revision to the location specified in the config
+file.  Dandelion keeps track of the currently deployed revision so that only files
+which have been added/changed/deleted need to be transferred.
 
-    $ dandelion deploy path/to/config.yml
-    
-This will deploy the local `HEAD` revision to the server specified in the config
-file.  Dandelion keeps track of the most recently deployed revision so that only
-files which have changed since the last deployment need to be transferred.
+You can specify the revision you wish to deploy and Dandelion will determine which
+files need to be transferred:
+
+    $ dandelion deploy <revision>
 
 For a more complete summary of usage options, run:
 
     $ dandelion -h
-    Usage: dandelion [options] [[command] [options]] [config_file]
+    Usage: dandelion [options] <command> [<args>]
         -v, --version                    Display the current version
         -h, --help                       Display this screen
             --repo=[REPO]                Use the given repository
+            --config=[CONFIG]            Use the given configuration file
 
     Available commands:
         deploy
         status
+        
+Note that when specifying the repository or configuration file, the given paths
+are relative to the current working directory (not the repository root).  To see
+the options for a particular command, run:
 
-Or:
-
-    $ dandelion COMMAND -h
-
-To see the options for a given command.
+    $ dandelion <command> -h

data/bin/dandelion

@@ -2,6 +2,6 @@
 
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
-require 'dandelion/cli'
+require 'dandelion/application'
 
-Dandelion::Cli::Main.execute(ARGV.dup)
+Dandelion::Application.execute(ARGV.dup)

data/lib/dandelion/application.rb

@@ -0,0 +1,73 @@
+require 'dandelion/command'
+
+module Dandelion
+  class Application
+    class << self
+      def execute(args)
+        new(args).execute
+      end
+    end
+
+    def initialize(args)
+      @args = args
+      @options = {}
+      @parser = OptionParser.new
+    end
+
+    def execute
+      global = Command::Base.parser(@options)
+      parse(global)
+
+      begin
+        name = @args.shift
+        command = Command::Base.create(name)
+        parse(command.parser(@options))
+      rescue Command::InvalidCommandError
+        log.fatal("Invalid command: #{name}")
+        log.fatal(global.help)
+        log.fatal("Available commands:")
+        log.fatal(Command::Base.commands.map { |name| "    #{name}" }.join("\n"))
+        exit 1
+      end
+      
+      prepare
+      validate
+      
+      command.new(@options) do |cmd|
+        cmd.setup(@args) if cmd.respond_to?(:setup)
+        cmd.execute
+      end
+    end
+    
+    def log
+      Dandelion.logger
+    end
+
+    private
+
+    def parse(parser)
+      begin
+        parser.order!(@args)
+      rescue OptionParser::InvalidOption => e
+        log.fatal(e.to_s.capitalize)
+        log.fatal(parser.help)
+        exit 1
+      end
+    end
+    
+    def prepare
+      @options[:config] ||= File.join(@options[:repo], 'dandelion.yml')
+    end
+    
+    def validate
+      unless File.exists?(File.join(@options[:repo], '.git'))
+        log.fatal("Not a git repository: #{@options[:repo]}")
+        exit 1
+      end
+      unless File.exists?(@options[:config])
+        log.fatal("Could not find file: #{@options[:config]}")
+        exit 1
+      end
+    end
+  end
+end

data/lib/dandelion/backend.rb

@@ -13,7 +13,7 @@ module Dandelion
       end
     end
 
-    class Backend
+    class Base
       class << self
         @@backends = {}
         

data/lib/dandelion/backend/ftp.rb

@@ -2,7 +2,7 @@ require 'dandelion/backend'
 
 module Dandelion
   module Backend
-    class FTP < Backend
+    class FTP < Backend::Base
       scheme 'ftp'
       
       def initialize(config)

data/lib/dandelion/backend/s3.rb

@@ -2,7 +2,7 @@ require 'dandelion/backend'
 
 module Dandelion
   module Backend
-    class S3 < Backend
+    class S3 < Backend::Base
       scheme 's3'
       gems 'aws-s3'
       

data/lib/dandelion/backend/sftp.rb

@@ -3,7 +3,7 @@ require 'pathname'
 
 module Dandelion
   module Backend
-    class SFTP < Backend
+    class SFTP < Backend::Base
       scheme 'sftp'
       gems 'net-sftp'
       

data/lib/dandelion/command.rb

@@ -0,0 +1,118 @@
+require 'dandelion'
+require 'dandelion/backend'
+require 'dandelion/deployment'
+require 'dandelion/git'
+require 'dandelion/version'
+require 'optparse'
+require 'yaml'
+
+module Dandelion
+  module Command
+    class InvalidCommandError < StandardError; end
+    
+    class Base
+      class << self
+        @@commands = {}
+
+        def command(name)
+          @@commands[name] = self
+        end
+
+        def create(name)
+          require_commands
+          raise InvalidCommandError unless @@commands.include?(name)
+          @@commands[name]
+        end
+        
+        def commands
+          @@commands.keys
+        end
+        
+        def require_commands
+          Dir.glob(File.join(File.dirname(__FILE__), 'command', '*.rb')) { |file| require file }
+        end
+
+        def parser(options)
+          OptionParser.new do |opts|
+            opts.banner = 'Usage: dandelion [options] <command> [<args>]'
+
+            opts.on('-v', '--version', 'Display the current version') do
+              puts "Dandelion #{Dandelion::VERSION}"
+              exit
+            end
+
+            opts.on('-h', '--help', 'Display this screen') do
+              require_commands
+              puts opts
+              puts "\nAvailable commands:"
+              puts commands.map { |name| "    #{name}" }.join("\n")
+              exit
+            end
+
+            options[:repo] = closest_repo(File.expand_path('.'))
+            opts.on('--repo=[REPO]', 'Use the given repository') do |repo|
+              options[:repo] = File.expand_path(repo)
+            end
+            
+            options[:config] = nil
+            opts.on('--config=[CONFIG]', 'Use the given configuration file') do |config|
+              options[:config] = File.expand_path(config)
+            end
+          end
+        end
+        
+        private
+        
+        def closest_repo(dir)
+          if File.exists?(File.join(dir, '.git'))
+            dir
+          else
+            File.dirname(dir) != dir && closest_repo(File.dirname(dir)) || File.expand_path('.')
+          end
+        end
+      end
+
+      def initialize(options)
+        @options = options        
+        @config = YAML.load_file(@options[:config])
+        @repo = Git::Repo.new(@options[:repo])
+        
+        yield(self) if block_given?
+      end
+      
+      protected
+      
+      def log
+        Dandelion.logger
+      end
+
+      def backend
+        begin
+          backend = Backend::Base.create(@config)
+          log.info("Connecting to #{backend}")
+          backend
+        rescue Backend::MissingDependencyError => e
+          log.fatal("The '#{@config['scheme']}' scheme requires additional gems:")
+          log.fatal(e.gems.map { |name| "    #{name}" }.join("\n"))
+          log.fatal("Please install the gems: gem install #{e.gems.join(' ')}")
+          exit 1
+        rescue Backend::UnsupportedSchemeError
+          log.fatal("Unsupported scheme: #{@config['scheme']}")
+          exit 1
+        end
+      end
+    
+      def deployment(revision, backend = nil)
+        begin
+          backend ||= backend()
+          options = { :excldue => @config['exclude'], :revision => revision, :dry => @options[:dry] }
+          Deployment::Deployment.create(@repo, backend, options)
+        rescue Git::DiffError
+          log.fatal('Error: could not generate diff')
+          log.fatal('Try merging remote changes before running dandelion again')
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/dandelion/command/deploy.rb

@@ -0,0 +1,55 @@
+module Dandelion
+  module Command
+    class Deploy < Command::Base
+      command 'deploy'
+  
+      class << self
+        def parser(options)
+          OptionParser.new do |opts|
+            opts.banner = 'Usage: deploy [options] [<revision>]'
+      
+            options[:force] = false
+            opts.on('-f', '--force', 'Force deployment') do
+              options[:force] = true
+            end
+            
+            options[:dry] = false
+            opts.on('--dry-run', 'Show what would have been deployed') do
+              options[:dry] = true
+            end
+          end
+        end
+      end
+      
+      def setup(args)
+        @revision = args.shift || 'HEAD'
+      end
+  
+      def execute
+        begin
+          @deployment = deployment(@revision)
+        rescue Git::RevisionError
+          log.fatal("Invalid revision: #{@revision}")
+          exit 1
+        end
+        
+        log.info("Remote revision:      #{@deployment.remote_revision || '---'}")
+        log.info("Deploying revision:   #{@deployment.local_revision}")
+        
+        begin
+          @deployment.validate
+        rescue Deployment::FastForwardError
+          if !@options[:force]
+            log.warn('Warning: you are trying to deploy unpushed commits')
+            log.warn('This could potentially prevent others from being able to deploy')
+            log.warn('If you are sure you want to this, use the -f option to force deployment')
+            exit 1
+          end
+        end
+        
+        @deployment.deploy
+        log.info("Deployment complete")
+      end
+    end
+  end
+end

data/lib/dandelion/command/status.rb

@@ -0,0 +1,22 @@
+module Dandelion
+  module Command
+    class Status < Command::Base
+      command 'status'
+  
+      class << self
+        def parser(options)
+          OptionParser.new do |opts|
+            opts.banner = 'Usage: dandelion status'
+          end
+        end
+      end
+  
+      def execute
+        @deployment = deployment('HEAD')
+        
+        log.info("Remote revision:       #{@deployment.remote_revision || '---'}")
+        log.info("Local HEAD revision:   #{@deployment.local_revision}")
+      end
+    end
+  end
+end

data/lib/dandelion/deployment.rb

@@ -7,20 +7,26 @@ module Dandelion
   
     class Deployment
       class << self
-        def create(repo, backend, exclude = nil, revision = 'HEAD')
+        def create(repo, backend, options)
           begin
-            DiffDeployment.new(repo, backend, exclude, revision)
+            DiffDeployment.new(repo, backend, options)
           rescue RemoteRevisionError
-            FullDeployment.new(repo, backend, exclude, revision)
+            FullDeployment.new(repo, backend, options)
           end
         end
       end
       
-      def initialize(repo, backend, exclude = nil, revision = 'HEAD')
+      def initialize(repo, backend, options = {})
         @repo = repo
         @backend = backend
-        @exclude = exclude || []
-        @tree = Git::Tree.new(@repo, revision)
+        @options = { :exclude => [], :revision => 'HEAD' }.merge(options)
+        @tree = Git::Tree.new(@repo, @options[:revision])
+        
+        if @options[:dry]
+          # Stub out the destructive backend methods
+          def @backend.write(file, data); end
+          def @beckend.delete(file); end
+        end
       end
     
       def local_revision
@@ -35,10 +41,10 @@ module Dandelion
         @backend.write('.revision', local_revision)
       end
       
-      def validate_state(remote = nil)
+      def validate
         begin
-          if remote and fast_forwardable(remote)
-            raise FastForwardError
+          @repo.remote_list.each do |remote|
+            raise FastForwardError if fast_forwardable(remote)
           end
         rescue Grit::Git::CommandFailed
         end
@@ -51,20 +57,20 @@ module Dandelion
       protected
     
       def exclude_file?(file)
-        return @exclude.map { |e| file.start_with?(e) }.any?
+        return @options[:exclude].map { |e| file.start_with?(e) }.any?
       end
       
       private
       
       def fast_forwardable(remote)
-        @repo.git.native(:remote, {:raise => true}, 'show', remote) =~ /fast-forward/i
+        !(@repo.git.native(:remote, {:raise => true}, 'show', remote) =~ /fast-forward/i).nil?
       end
     end
   
     class DiffDeployment < Deployment
-      def initialize(repo, backend, exclude = nil, revision = 'HEAD')
-        super(repo, backend, exclude, revision)
-        @diff = Git::Diff.new(@repo, read_remote_revision, revision)
+      def initialize(repo, backend, options = {})
+        super(repo, backend, options)
+        @diff = Git::Diff.new(@repo, read_remote_revision, @options[:revision])
       end
     
       def remote_revision

data/lib/dandelion/git.rb

@@ -3,6 +3,7 @@ require 'grit'
 module Dandelion
   module Git
     class DiffError < StandardError; end
+    class RevisionError < StandardError; end
   
     class Repo < Grit::Repo
       def initialize(dir)
@@ -54,6 +55,7 @@ module Dandelion
       def initialize(repo, revision)
         @repo = repo
         @commit = @repo.commit(revision)
+        raise RevisionError if @commit.nil?
         @tree = @commit.tree
       end
     

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/test/test_diff_deployment.rb

@@ -87,7 +87,7 @@ class TestDiffDeployment < Test::Unit::TestCase
     @remote_revision = 'ff1f1d4bd0c99e1c9cca047c46b2194accf89504'
     @repo = MockRepo.new
     @backend = MockBackend.new(@remote_revision)
-    @diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @backend, [], @head_revision)
+    @diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @backend, :revision => @head_revision)
   end
   
   def test_diff_deployment_local_revision

metadata

@@ -1,69 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dandelion
-version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000 -04:00
+
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: grit
-  requirement: &2153656700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 1
         version: 2.4.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2153656700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2153656200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
   type: :development
-  prerelease: false
-  version_requirements: *2153656200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: &2153683620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 5
         version: 2.0.5
   type: :development
-  prerelease: false
-  version_requirements: *2153683620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: aws-s3
-  requirement: &2153683160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :development
-  prerelease: false
-  version_requirements: *2153683160
+  version_requirements: *id004
 description: Incremental Git repository deployment
-email:
+email: 
 - scottbnel@gmail.com
-executables:
+executables: 
 - dandelion
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -71,11 +94,14 @@ files:
 - bin/dandelion
 - dandelion.gemspec
 - lib/dandelion.rb
+- lib/dandelion/application.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/command.rb
+- lib/dandelion/command/deploy.rb
+- lib/dandelion/command/status.rb
 - lib/dandelion/deployment.rb
 - lib/dandelion/git.rb
 - lib/dandelion/version.rb
@@ -114,29 +140,36 @@ files:
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: dandelion-0.2.3
-test_files:
+summary: dandelion-0.3.0
+test_files: 
 - test/fixtures/diff
 - test/fixtures/ls_tree
 - test/test_diff_deployment.rb

data/lib/dandelion/cli.rb

@@ -1,201 +0,0 @@
-require 'dandelion'
-require 'dandelion/backend'
-require 'dandelion/deployment'
-require 'dandelion/git'
-require 'dandelion/version'
-require 'optparse'
-require 'yaml'
-
-module Dandelion
-  module Cli
-    class Options
-      def initialize
-        @options = {}
-        @config_file = nil
-        @global = global_parser
-        @commands = { 'deploy' => deploy_parser, 'status' => status_parser }
-        @commands_help = "\nAvailable commands:\n    #{@commands.keys.join("\n    ")}"
-      end
-      
-      def parse(args)
-        order(@global, args)
-        command = args.shift
-        if command and @commands[command]
-          order(@commands[command], args)
-        end
-        
-        if @commands.key? command
-          @config_file = args.shift.strip if args[0]
-          command
-        else
-          if not @command.nil?
-            puts "Invalid command: #{command}"
-          end
-          puts @global.help
-          puts @commands_help
-          exit
-        end
-      end
-      
-      def [](key)
-        @options[key]
-      end
-
-      def []=(key, value)
-        @options[key] = value
-      end
-      
-      def config_file
-        @config_file || File.join(@options[:repo], 'dandelion.yml')
-      end
-      
-      private
-      
-      def closest_repo(dir)
-        if File.exists?(File.join(dir, '.git'))
-          dir
-        else
-          File.dirname(dir) != dir && closest_repo(File.dirname(dir))
-        end
-      end
-      
-      def global_parser
-        OptionParser.new do |opts|
-          opts.banner = 'Usage: dandelion [options] [[command] [options]]'
-
-          opts.on('-v', '--version', 'Display the current version') do
-            puts "Dandelion v#{Dandelion::VERSION}"
-            exit
-          end
-
-          opts.on('-h', '--help', 'Display this screen') do
-            puts opts
-            puts @commands_help
-            exit
-          end
-          
-          @options[:repo] = closest_repo(File.expand_path('.'))
-          opts.on('--repo=[REPO]', 'Use the given repository') do |repo|
-            @options[:repo] = repo
-          end
-        end
-      end
-      
-      def deploy_parser
-        OptionParser.new do |opts|
-          opts.banner = 'Usage: dandelion deploy [options]'
-          
-          @options[:force] = false
-          opts.on('-f', '--force', 'Force deployment') do
-            @options[:force] = true
-          end
-        end
-      end
-      
-      def status_parser
-        OptionParser.new do |opts|
-          opts.banner = 'Usage: dandelion status'
-        end
-      end
-      
-      def order(parser, args)
-        begin
-          parser.order!(args)
-        rescue OptionParser::InvalidOption => e
-          puts e.to_s.capitalize
-          puts parser.help
-          exit
-        end
-      end
-    end
-    
-    class Main
-      class << self
-        def execute(args)
-          new(args).execute
-        end
-      end
-      
-      def initialize(args)
-        @options = Options.new
-        @command = @options.parse(args)
-        
-        validate_files
-        @config = YAML.load_file(File.expand_path(@options.config_file))
-        @repo = Git::Repo.new(File.expand_path(@options[:repo]))
-      end
-      
-      def log
-        Dandelion.logger
-      end
-      
-      def execute
-        deployment = deployment()
-        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 backend
-        begin
-          backend = Backend::Backend.create(@config)
-          log.info("Connecting to:    #{backend}")
-          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
-      
-      def deployment
-        begin
-          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
-      end
-      
-      def validate_deployment(deployment)
-        begin
-          @repo.remote_list.each do |remote|
-            deployment.validate_state(remote)
-          end
-        rescue Deployment::FastForwardError
-          if !@options[:force]
-            log.warn('Warning: you are trying to deploy unpushed commits')
-            log.warn('This could potentially prevent others from being able to deploy')
-            log.warn('If you are sure you want to this, use the -f option to force deployment')
-            exit
-          end
-        end
-      end
-      
-      def validate_files
-        unless File.exists?(File.expand_path(File.join(@options[:repo], '.git')))
-          log.fatal("Not a git repository: #{@options[:repo]}")
-          exit
-        end
-        unless File.exists?(File.expand_path(@options.config_file))
-          log.fatal("Could not find file: #{@options.config_file}")
-          exit
-        end
-      end
-    end
-  end
-end