dandelion 0.3.15 → 0.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15da8ebaa65f3365b4aae08f6725564913aa4cba
-  data.tar.gz: 7f9ef8588e9f43540238e4204b149cf165f03602
+  metadata.gz: 0db6d6a95dd6dd735cef40b26ee73e674c17060a
+  data.tar.gz: a78f497fa3447eaa7e2049aa45ebbaec0238095b
 SHA512:
-  metadata.gz: 805d13b4368ff596aa1bb3be6888d9373a560d67a35c164bcaf19ba7fa50eeaf3c78629b5a575c137720862d36101f6f4eb365016c87565ec70ef20593bf9b35
-  data.tar.gz: f581ace941d46f3d55c3082c648fe375f9ba39a39ecb8466a46507d6c6b55c70b9aef4c48dd4219829dbc0644e057fe1ab61f85ffe72b72f2194320b357b56d8
+  metadata.gz: ef112d609e8e09b892039db536142f4d5ee270ec78aa90b29cfa3ecd15f2250a8e2919a081b757b97fce41b66b17579b08644ee433801710fb26fe9b2e0c0bc4
+  data.tar.gz: b16bfa52c5b20874e17454175b076ec3d3ae905e99b6853ae239a59e8810d507a5ef4c375a042c33ec45728e07507cf1801dda1d62473a7ba62ff899ae59524b

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -1,2 +1,13 @@
 source "http://rubygems.org"
+
 gemspec
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec', '>= 2.0'
+end
+
+group :development do
+  gem 'net-sftp'
+  gem 'aws-s3'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011 Scott Nelson
+Copyright (C) 2014 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

data/README.md

@@ -1,24 +1,19 @@
 Dandelion
 =========
 [![Gem Version](https://badge.fury.io/rb/dandelion.png)](http://badge.fury.io/rb/dandelion)
+[![Build Status](https://travis-ci.org/scttnlsn/dandelion.png)](https://travis-ci.org/scttnlsn/dandelion)
 [![Dependency Status](https://gemnasium.com/scttnlsn/dandelion.png)](https://gemnasium.com/scttnlsn/dandelion)
 [![Code Climate](https://codeclimate.com/github/scttnlsn/dandelion.png)](https://codeclimate.com/github/scttnlsn/dandelion)
 
-Incremental Git repository deployment for OS X and Linux.
+Incremental Git repository deployment.
 
 Install
 -------
 
-Ensure that Ruby is installed, then run:
+Ensure that Ruby >= 1.9 is installed, then run:
 
     $ gem install dandelion
 
-Alternatively, you can build the gem yourself:
-
-    $ git clone git://github.com/scttnlsn/dandelion.git
-    $ cd dandelion
-    $ rake install
-
 Config
 ------
 
@@ -28,7 +23,7 @@ Git repository is searched for a file named `dandelion.yml`).
 Example:
 
 ```yaml
-scheme: sftp
+adapter: sftp
 host: example.com
 username: user
 password: pass
@@ -40,14 +35,12 @@ exclude:
     - folder/
 
 additional:
-    - public/css/print.css
-    - public/css/screen.css
-    - public/js/main.js
+    - config/auth.yml
 ```
 
 Required:
 
- * `scheme` (the file transfer scheme, see below)
+ * `adapter` (alias: `scheme`, the file transfer adapter)
 
 Optional:
 
@@ -57,16 +50,16 @@ Optional:
 * `additional` (additional list of files from your working directory that will be deployed)
 * `revision_file` (remote file in which revision SHA is stored, defaults to .revision)
 
-Each scheme also has additional required and optional configuration parameters (see below).
+Each adapter also has additional required and optional configuration parameters (see below).
 
-Schemes
--------
+Adapters
+--------
 
-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.
+There is support for multiple backend file transfer adapters.  The configuration
+must specify one of these adapters and the set of additional parameters required
+by the given adapter.
 
-**SFTP**: `scheme: sftp`
+**SFTP**: `adapter: sftp`
 
 Required:
 
@@ -79,7 +72,7 @@ Optional:
  * `port` (defaults to 22)
  * `preserve_permissions` (defaults to true)
 
-**FTP**: `scheme: ftp`
+**FTP**: `adapter: ftp`
 
 Required:
 
@@ -92,7 +85,7 @@ Optional:
  * `port` (defaults to 21)
  * `passive` (defaults to true)
 
-**Amazon S3**: `scheme: s3`
+**Amazon S3**: `adapter: s3`
 
 Required:
 
@@ -100,10 +93,6 @@ Required:
  * `secret_access_key`
  * `bucket_name`
 
-Optional:
-
-* `host` (defaults to s3.amazonaws.com)
-
 Usage
 -----
 

data/Rakefile

@@ -1,10 +1,6 @@
-require 'bundler'
-require 'rake/testtask'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
 
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+task :default => :spec

data/bin/dandelion

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'dandelion/application'
+require 'dandelion'
 
-Dandelion::Application.execute(ARGV.dup)
+Dandelion::CLI.new(ARGV.dup).execute!

data/dandelion.gemspec

@@ -1,26 +1,29 @@
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'dandelion/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'dandelion'
-  s.version     = Dandelion::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Scott Nelson']
-  s.email       = ['scottbnel@gmail.com']
-  s.homepage    = 'http://github.com/scttnlsn/dandelion'
-  s.summary     = "dandelion-#{s.version}"
-  s.description = 'Incremental Git repository deployment'
-  s.license     = 'MIT'
-  
-  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.name             = 'dandelion'
+  s.version          = Dandelion::VERSION
+  s.authors          = ['Scott Nelson']
+  s.email            = ['scott@scttnlsn.com']
+  s.summary          = 'Incremental Git repository deployment'
+  s.homepage         = 'https://github.com/scttnlsn/dandelion'
+  s.license          = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
-end
+
+  s.post_install_message = <<-MSG
+!   The 'dandelion' gem is installed but you may need to install additional
+!   gems depending on the adapters you intend to use.
+!
+!   Running 'dandelion status' in your project directory will indicate which
+!   additional gems need to be installed.
+  MSG
+
+  s.add_dependency 'rugged', '~> 0.19.0'
+end

data/lib/dandelion.rb

@@ -1,20 +1,36 @@
+require 'logger'
+require 'rugged'
+require 'dandelion/adapter'
+require 'dandelion/cli'
+require 'dandelion/change'
+require 'dandelion/changeset'
+require 'dandelion/command'
+require 'dandelion/config'
+require 'dandelion/diff'
+require 'dandelion/deployer'
+require 'dandelion/tree'
+require 'dandelion/version'
+require 'dandelion/workspace'
+
 module Dandelion
   class << self
     def logger
-      return @log if @log
+      return @logger if @logger
+
       $stdout.sync = true
-      @log = Logger.new($stdout)
-      @log.level = Logger::DEBUG
-      @log.formatter = formatter
-      @log
+
+      @logger = Logger.new($stdout)
+      @logger.level = Logger::DEBUG
+      @logger.formatter = formatter
+      @logger
     end
-    
-    private
-    
+
+  private
+
     def formatter
-      proc do |severity, datetime, progname, msg| 
+      proc do |severity, datetime, progname, msg|
         "#{msg}\n"
       end
     end
   end
-end
+end

data/lib/dandelion/adapter.rb

@@ -0,0 +1,45 @@
+module Dandelion
+  module Adapter
+    class InvalidAdapterError < StandardError; end
+
+    class MissingDependencyError < StandardError
+      attr_reader :gems
+
+      def initialize(gems)
+        @gems = gems
+      end
+    end
+
+    class Base
+      class << self
+        @@adapters = {}
+
+        def adapter(name)
+          @@adapters[name] = self
+        end
+
+        def create_adapter(name, options = {})
+          klass = @@adapters[name]
+          raise InvalidAdapterError if klass.nil?
+          klass.new(options)
+        rescue LoadError
+          raise MissingDependencyError.new(klass.required_gems)
+        end
+
+        attr_reader :required_gems
+
+        def requires_gems(*gems)
+          @required_gems = gems
+        end
+      end
+
+      def initialize(options)
+      end
+    end
+  end
+end
+
+require 'dandelion/adapter/noop'
+require 'dandelion/adapter/ftp'
+require 'dandelion/adapter/sftp'
+require 'dandelion/adapter/s3'

data/lib/dandelion/{backend → adapter}/ftp.rb

@@ -1,31 +1,27 @@
-require 'dandelion/backend'
+require 'dandelion/utils'
 
 module Dandelion
-  module Backend
-    class FTP < Backend::Base
-      scheme 'ftp'
+  module Adapter
+    class FTP < Adapter::Base
+      include ::Dandelion::Utils
+
+      adapter 'ftp'
       
       def initialize(config)
         require 'net/ftp'
+
         @config = config
-        @ftp = Net::FTP.new
-        @ftp.connect(@config['host'], @config['port'] || Net::FTP::FTP_PORT)
-        @ftp.login(@config['username'], @config['password'])
-        @ftp.passive = @config['passive'].nil? ? true : to_b(@config['passive'])
-        @ftp.chdir(@config['path']) if @config['path']
+        @config.defaults(port: Net::FTP::FTP_PORT)
+        @config[:passive] = to_b(@config[:passive])
+
+        @ftp = ftp_client
       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
+          @ftp.getbinaryfile(file, nil)
         rescue Net::FTPPermError => e
-          raise MissingFileError
+          nil
         end
       end
 
@@ -54,6 +50,15 @@ module Dandelion
 
       private
 
+      def ftp_client
+        ftp = Net::FTP.new
+        ftp.connect(@config['host'], @config['port'])
+        ftp.login(@config['username'], @config['password'])
+        ftp.passive = @config['passive']
+        ftp.chdir(@config['path']) if @config['path']
+        ftp
+      end
+
       def cleanup(dir)
         unless dir == File.dirname(dir)
           if empty?(dir)

data/lib/dandelion/adapter/noop.rb

@@ -0,0 +1,14 @@
+module Dandelion
+  module Adapter
+    class NoOpAdapter < Adapter::Base
+      def read(path)
+      end
+      
+      def write(path, data)
+      end
+
+      def delete(path)
+      end
+    end
+  end
+end

data/lib/dandelion/{backend → adapter}/s3.rb

@@ -1,23 +1,22 @@
-require 'dandelion/backend'
-
 module Dandelion
-  module Backend
-    class S3 < Backend::Base
-      scheme 's3'
-      gems 'aws-s3'
+  module Adapter
+    class S3 < Adapter::Base
+      adapter 's3'
+      requires_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']
-        @host = config['host']
-        @path = config['path']
+        
+        @access_key_id = config[:access_key_id]
+        @secret_access_key = config[:secret_access_key]
+        @bucket_name = config[:bucket_name]
+        @host = config[:host]
+        @path = config[:path]
       end
 
       def read(file)
         s3connect!
-        raise MissingFileError unless AWS::S3::S3Object.exists?(path(file), @bucket_name)
+        return nil unless AWS::S3::S3Object.exists?(path(file), @bucket_name)
         AWS::S3::S3Object.value(path(file), @bucket_name)
       end
 
@@ -39,9 +38,9 @@ module Dandelion
       
       def s3connect!
         options = {
-          :access_key_id => @access_key_id,
-          :secret_access_key => @secret_access_key,
-          :use_ssl => true
+          access_key_id: @access_key_id,
+          secret_access_key: @secret_access_key,
+          use_ssl: true
         }
 
         options[:server] = @host if @host