dandelion 0.2.1 → 0.2.2

data/README.md

@@ -44,7 +44,7 @@ Optional: `path`, `exclude`
 **FTP**: `scheme: ftp`
 
 Required: `host`, `username`, `password`
-Optional: `path`, `exclude`
+Optional: `path`, `exclude`, `passive` (defaults to true)
     
 **Amazon S3**: `scheme: s3`
 

data/lib/dandelion/backend.rb

@@ -19,7 +19,7 @@ module Dandelion
         
         def create(config)
           Dir.glob(File.join(File.dirname(__FILE__), 'backend', '*.rb')) { |file| require file }
-          raise UnsupportedSchemeError unless @@backends.include? config['scheme']
+          raise UnsupportedSchemeError unless @@backends.include?(config['scheme'])
           begin
             @@backends[config['scheme']].new(config)
           rescue LoadError

data/lib/dandelion/backend/ftp.rb

@@ -9,7 +9,7 @@ module Dandelion
         require 'net/ftp'
         @config = config
         @ftp = Net::FTP.open(@config['host'], @config['username'], @config['password'])
-        @ftp.passive = true
+        @ftp.passive = @config['passive'].nil? ? true : to_b(@config['passive'])
         @ftp.chdir(@config['path']) if @config['path']
       end
 
@@ -30,18 +30,18 @@ module Dandelion
       def write(file, data)
         temp(file, data) do |temp|
           begin
-            @ftp.putbinaryfile temp, file
+            @ftp.putbinaryfile(temp, file)
           rescue Net::FTPPermError => e
-            mkdir_p File.dirname(file)
-            @ftp.putbinaryfile temp, file
+            mkdir_p(File.dirname(file))
+            @ftp.putbinaryfile(temp, file)
           end
         end
       end
 
       def delete(file)
         begin
-          @ftp.delete file
-          cleanup File.dirname(file)
+          @ftp.delete(file)
+          cleanup(File.dirname(file))
         rescue Net::FTPPermError => e
         end
       end
@@ -54,9 +54,9 @@ module Dandelion
 
       def cleanup(dir)
         unless dir == File.dirname(dir)
-          if empty? dir
-            @ftp.rmdir dir
-            cleanup File.dirname(dir)
+          if empty?(dir)
+            @ftp.rmdir(dir)
+            cleanup(File.dirname(dir))
           end
         end
       end
@@ -68,13 +68,17 @@ module Dandelion
       def mkdir_p(dir)
         unless dir == File.dirname(dir)
           begin
-            @ftp.mkdir dir
+            @ftp.mkdir(dir)
           rescue Net::FTPPermError => e
-            mkdir_p File.dirname(dir)
-            @ftp.mkdir dir
+            mkdir_p(File.dirname(dir))
+            @ftp.mkdir(dir)
           end
         end
       end
+      
+      def to_b(value)
+        return [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
+      end
     end
   end
 end

data/lib/dandelion/backend/s3.rb

@@ -16,18 +16,18 @@ module Dandelion
 
       def read(file)
         s3connect!
-        raise MissingFileError unless AWS::S3::S3Object.exists? path(file), @bucket_name
-        AWS::S3::S3Object.value path(file), @bucket_name
+        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
+        AWS::S3::S3Object.store(path(file), data, @bucket_name)
       end
 
       def delete(file)
         s3connect!
-        AWS::S3::S3Object.delete path(file), @bucket_name
+        AWS::S3::S3Object.delete(path(file), @bucket_name)
       end
       
       def to_s

data/lib/dandelion/backend/sftp.rb

@@ -27,19 +27,19 @@ module Dandelion
       def write(file, data)
         temp(file, data) do |temp|
           begin
-            @sftp.upload! temp, path(file)
+            @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)
+            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))
+          @sftp.remove!(path(file))
+          cleanup(File.dirname(path(file)))
         rescue Net::SFTP::StatusException => e
           raise unless e.code == 2
         end
@@ -57,9 +57,9 @@ module Dandelion
 
       def cleanup(dir)
         unless cleanpath(dir) == cleanpath(@config['path']) or dir == File.dirname(dir)
-          if empty? dir
-            @sftp.rmdir! dir
-            cleanup File.dirname(dir)
+          if empty?(dir)
+            @sftp.rmdir!(dir)
+            cleanup(File.dirname(dir))
           end
         end
       end
@@ -70,17 +70,17 @@ module Dandelion
 
       def mkdir_p(dir)
         begin
-          @sftp.mkdir! dir
+          @sftp.mkdir!(dir)
         rescue Net::SFTP::StatusException => e
           raise unless e.code == 2
-          mkdir_p File.dirname(dir)
-          retry
+          mkdir_p(File.dirname(dir))
+          @sftp.mkdir!(dir)
         end
       end
       
       def path(file)
         if @config['path'] and !@config['path'].empty?
-          File.join @config['path'], file
+          File.join(@config['path'], file)
         else
           file
         end

data/lib/dandelion/cli.rb

@@ -20,10 +20,10 @@ module Dandelion
       end
       
       def parse(args)
-        order @global, args
+        order(@global, args)
         command = args.shift
         if command and @commands[command]
-          order @commands[command], args
+          order(@commands[command], args)
         end
         
         if @commands.key? command
@@ -108,11 +108,11 @@ module Dandelion
       
       def initialize(args)
         @options = Options.new
-        @command = @options.parse args
+        @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])
+        @config = YAML.load_file(File.expand_path(@options.config_file))
+        @repo = Git::Repo.new(File.expand_path(@options[:repo]))
       end
       
       def log
@@ -120,9 +120,26 @@ module Dandelion
       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")
@@ -132,29 +149,18 @@ module Dandelion
           log.fatal("Unsupported scheme: #{@config['scheme']}")
           exit
         end
-        
+      end
+      
+      def deployment
         begin
-          deployment = Deployment::Deployment.create(@repo, backend, @config['exclude'])
+          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
-
-        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|
@@ -171,11 +177,11 @@ module Dandelion
       end
       
       def validate_files
-        unless File.exists? File.expand_path File.join(@options[:repo], '.git')
+        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)
+        unless File.exists?(File.expand_path(@options.config_file))
           log.fatal("Could not find file: #{@options.config_file}")
           exit
         end

data/lib/dandelion/deployment.rb

@@ -7,11 +7,11 @@ module Dandelion
   
     class Deployment
       class << self
-        def create(repo, backend, exclude)
+        def create(repo, backend, exclude = nil, revision = 'HEAD')
           begin
-            DiffDeployment.new(repo, backend, exclude)
+            DiffDeployment.new(repo, backend, exclude, revision)
           rescue RemoteRevisionError
-            FullDeployment.new(repo, backend, exclude)
+            FullDeployment.new(repo, backend, exclude, revision)
           end
         end
       end
@@ -37,7 +37,7 @@ module Dandelion
       
       def validate_state(remote = nil)
         begin
-          if remote and @repo.git.native(:remote, {:raise => true}, 'show', remote) =~ /fast-forward/i
+          if remote and fast_forwardable(remote)
             raise FastForwardError
           end
         rescue Grit::Git::CommandFailed
@@ -53,6 +53,12 @@ module Dandelion
       def exclude_file?(file)
         return @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
+      end
     end
   
     class DiffDeployment < Deployment

data/lib/dandelion/git.rb

@@ -20,7 +20,7 @@ module Dandelion
         @from_revision = from_revision
         @to_revision = to_revision
         begin
-          @files = parse_diff @repo.git.native(:diff, {:name_status => true, :raise => true}, from_revision, to_revision)
+          @files = parse(diff)
         rescue Grit::Git::CommandFailed
           raise DiffError
         end
@@ -35,8 +35,12 @@ module Dandelion
       end
 
       private
+      
+      def diff
+        @repo.git.native(:diff, {:name_status => true, :raise => true}, from_revision, to_revision)
+      end
     
-      def parse_diff(diff)
+      def parse(diff)
         files = {}
         diff.split("\n").each do |line|
           status, file = line.split("\t")

data/lib/dandelion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-19 00:00:00.000000000 -04:00
+date: 2011-05-25 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2161286340 !ruby/object:Gem::Requirement
+  requirement: &2157532620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161286340
+  version_requirements: *2157532620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2161285840 !ruby/object:Gem::Requirement
+  requirement: &2157532120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2161285840
+  version_requirements: *2157532120
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2161285380 !ruby/object:Gem::Requirement
+  requirement: &2157531660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2161285380
+  version_requirements: *2157531660
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2161284920 !ruby/object:Gem::Requirement
+  requirement: &2157531200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2161284920
+  version_requirements: *2157531200
 description: Incremental Git repository deployment
 email:
 - scottbnel@gmail.com
@@ -135,7 +135,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: dandelion-0.2.1
+summary: dandelion-0.2.2
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree