dandelion 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e24ed3bb3d909f2dde31c896dc0a55ba7bea103
-  data.tar.gz: 40301d574cfbd917d0ccc85da4449ff79f73226e
+  metadata.gz: ba3c395e5c9d4ab9b7c3192e69c40a0f95441ef3
+  data.tar.gz: 9978670bf800e50566e1298c99ffe051626ad16a
 SHA512:
-  metadata.gz: a33bd1ff022f1c5f0c0497d52e04b545db4f38b9f69487bd7ebe6d83753e2f3189b057d1b03a670a9057f5b8d9494c2a3e62b7a84b26a0b0fe7d55980ce3fc04
-  data.tar.gz: 963b92769bd3ab6c1af4af22662f056776ce801472c9542d726e3e5adb9f3aefecde44700a3744fbc6148c3e517b9c3bf079cc359f03364ffc37c435de2ec2bc
+  metadata.gz: 1df3eea14e4b717a71f8db414e69bf52d5fe634282df26ed09c863a62937615b2b9cd5b139be20c8e9455a564ac11da15334d17c849bff9870c43162f41acc2a
+  data.tar.gz: 53b054c31c571c285cad178499ef9a20fdb57dbd587146f823e52fdd45a8d65347e103a87793b239c4cc76896898cff15f6205a43957aa8685ca281ecf7b9888

data/README.md

@@ -10,7 +10,7 @@ Incremental Git repository deployment.
 Install
 -------
 
-Ensure that Ruby >= 1.9 is installed, then run:
+Ensure that Ruby >= 1.9.2 is installed, then run:
 
     $ gem install dandelion
 
@@ -32,7 +32,7 @@ path: path/to/deployment
 exclude:
     - .gitignore
     - dandelion.yml
-    - folder/
+    - dir/
 
 additional:
     - config/auth.yml
@@ -50,6 +50,14 @@ 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)
 
+The `additional` section can either take a list of local file names or key-value formats if you want to upload something to a specific path:
+```
+additional:
+    - localdir: remotedir
+    - file.txt: remotedir/file.txt
+```
+The `localdir` in this example is relative to the repository root (ignoring `local_path` if you set it).
+
 Each adapter also has additional required and optional configuration parameters (see below).
 
 Adapters
@@ -59,13 +67,13 @@ 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**: `adapter: sftp`
+**SFTP**: `adapter: sftp` (honors SSH config files)
 
 Required:
 
  * `host`
  * `username`
- * `password`
+ * `password` (not required if you're using an SSH key)
 
 Optional:
 
@@ -85,6 +93,22 @@ Optional:
  * `port` (defaults to 21)
  * `passive` (defaults to false)
 
+**FTPS**: `adapter: ftps` (ftp over TLS, based on [DoubleBagFTPS](https://github.com/bnix/double-bag-ftps) and Dandelions native FTP adapter)
+
+Required: (same as FTP)
+
+ * `host`
+ * `username`
+ * `password`
+
+Optional: (in addition to options for FTP)
+
+ * `port`
+ * `passive`
+ * `auth_tls` (default false)
+ * `ftps_implicit` (default false: explicit TLS)
+ * `insecure` (default false, true to allow self-signed certificates)
+
 **Amazon S3**: `adapter: s3`
 
 Required:
@@ -126,9 +150,12 @@ For a more complete summary of usage options, run:
     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:
+are relative to the current working directory (not the repository root).
+        
+To see the options for a particular command, run `dandelion <command> -h`:
 
-    $ dandelion <command> -h
+    $ dandelion deploy -h
+    Usage: dandelion deploy [options] [<revision>]
+            --dry-run                    Show what would have been deployed

data/dandelion.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
 !   additional gems need to be installed.
   MSG
 
-  s.add_dependency 'rugged', '~> 0.19.0'
-end
+  s.add_dependency 'rugged', '~> 0.21.2'
+end

data/lib/dandelion/adapter.rb

@@ -42,4 +42,5 @@ end
 require 'dandelion/adapter/noop'
 require 'dandelion/adapter/ftp'
 require 'dandelion/adapter/sftp'
+require 'dandelion/adapter/ftps'
 require 'dandelion/adapter/s3'

data/lib/dandelion/adapter/ftp.rb

@@ -6,7 +6,7 @@ module Dandelion
       include ::Dandelion::Utils
 
       adapter 'ftp'
-      
+
       def initialize(config)
         require 'net/ftp'
 
@@ -19,7 +19,7 @@ module Dandelion
 
       def read(file)
         begin
-          @ftp.getbinaryfile(file, nil)
+          @ftp.getbinaryfile(path(file), nil)
         rescue Net::FTPPermError => e
           nil
         end
@@ -28,34 +28,34 @@ module Dandelion
       def write(file, data)
         temp(file, data) do |temp|
           begin
-            @ftp.putbinaryfile(temp, file)
+            @ftp.putbinaryfile(temp, path(file))
           rescue Net::FTPPermError => e
-            mkdir_p(File.dirname(file))
-            @ftp.putbinaryfile(temp, file)
+            raise e unless e.to_s =~ /553/
+            mkdir_p(File.dirname(path(file)))
+            @ftp.putbinaryfile(temp, path(file))
           end
         end
       end
 
       def delete(file)
         begin
-          @ftp.delete(file)
-          cleanup(File.dirname(file))
+          @ftp.delete(path(file))
+          cleanup(File.dirname(path(file)))
         rescue Net::FTPPermError => e
         end
       end
-      
+
       def to_s
         "ftp://#{@config['username']}@#{@config['host']}/#{@config['path']}"
       end
 
-      private
+    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
 
@@ -82,10 +82,18 @@ module Dandelion
           end
         end
       end
-      
+
+      def path(file)
+        if @config['path'] and !@config['path'].empty?
+          File.join(@config['path'], file)
+        else
+          file
+        end
+      end
+
       def to_b(value)
         return [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       end
     end
   end
-end
+end

data/lib/dandelion/adapter/ftps.rb

@@ -0,0 +1,45 @@
+require 'dandelion/utils'
+
+module Dandelion
+  module Adapter
+    class FTPS < Dandelion::Adapter::FTP
+      include ::Dandelion::Utils
+
+      adapter 'ftps'
+      requires_gems 'double-bag-ftps'
+
+      def initialize(config)
+        require 'double_bag_ftps'
+
+        config[:auth_tls] = to_b(config[:auth_tls])
+        config[:ftps_implicit] = to_b(config[:ftps_implicit])
+        config[:inscecure] = to_b(config[:insecure])
+
+        super(config)
+      end
+
+    private
+
+      def ftp_client
+        ftps = DoubleBagFTPS.new(@config['host'], nil, nil, nil, ftps_mode, {})
+
+        if @config['insecure']
+          ftps.ssl_context = DoubleBagFTPS.create_ssl_context(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+        end
+
+        ftps.login(@config['username'], @config['password'], nil, ftps_auth)
+        ftps.passive = @config[:passive]
+
+        ftps
+      end
+
+      def ftps_auth
+        @config['auth_tls'] ? 'TLS' : nil
+      end
+
+      def ftps_mode
+        @config['ftps_implicit'] ? DoubleBagFTPS::IMPLICIT : DoubleBagFTPS::EXPLICIT
+      end
+    end
+  end
+end

data/lib/dandelion/adapter/s3.rb

@@ -3,10 +3,10 @@ module Dandelion
     class S3 < Adapter::Base
       adapter 's3'
       requires_gems 'aws-s3'
-      
+
       def initialize(config)
         require 'aws/s3'
-        
+
         @config = config
         @config.defaults(preserve_permissions: true)
       end
@@ -21,7 +21,7 @@ module Dandelion
         connect!
 
         key = path(file)
-        
+
         begin
           policy = AWS::S3::S3Object.acl(key, bucket_name) if @config[:preserve_permissions]
         rescue AWS::S3::NoSuchKey
@@ -35,13 +35,13 @@ module Dandelion
         connect!
         AWS::S3::S3Object.delete(path(file), bucket_name)
       end
-      
+
       def to_s
         "s3://#{@config[:access_key_id]}@#{bucket_name}/#{@config[:path]}"
       end
 
-      protected
-      
+    protected
+
       def connect!
         options = {
           access_key_id: @config[:access_key_id],
@@ -49,14 +49,14 @@ module Dandelion
           use_ssl: true
         }
 
-        options[:server] = @config[:host] if @config[:host]
+        AWS::S3::DEFAULT_HOST.replace(@config[:host]) if @config[:host]
         AWS::S3::Base.establish_connection!(options) unless AWS::S3::Base.connected?
       end
 
       def bucket_name
         @config[:bucket_name]
       end
-            
+
       def path(file)
         if @config[:path] and !@config[:path].empty?
           "#{@config[:path]}/#{file}"
@@ -66,4 +66,4 @@ module Dandelion
       end
     end
   end
-end
+end

data/lib/dandelion/adapter/sftp.rb

@@ -8,7 +8,7 @@ module Dandelion
 
       adapter 'sftp'
       requires_gems 'net-sftp'
-      
+
       def initialize(config)
         require 'net/sftp'
 
@@ -54,12 +54,12 @@ module Dandelion
           raise unless e.code == 2
         end
       end
-      
+
       def to_s
         "sftp://#{@config['username']}@#{@config['host']}/#{@config['path']}"
       end
 
-      private
+    private
 
       def sftp_client
         options = {
@@ -87,7 +87,7 @@ module Dandelion
           end
         end
       end
-      
+
       def empty?(dir)
         @sftp.dir.entries(dir).delete_if do |file|
           file.name == '.' or file.name == '..'
@@ -103,7 +103,7 @@ module Dandelion
           @sftp.mkdir!(dir)
         end
       end
-      
+
       def path(file)
         if @config['path'] and !@config['path'].empty?
           File.join(@config['path'], file)
@@ -113,4 +113,4 @@ module Dandelion
       end
     end
   end
-end
+end

data/lib/dandelion/deployer.rb

@@ -39,7 +39,7 @@ module Dandelion
 
     def deploy_file!(local_path, remote_path)
       log.debug("Writing file:  #{local_path} -> #{remote_path}")
-      @adapter.write(remote_path, IO.read(local_path))
+      @adapter.write(remote_path, IO.binread(local_path))
     end
 
     def deploy_change!(change)

data/lib/dandelion/tree.rb

@@ -42,7 +42,7 @@ module Dandelion
       path = object.read_raw.data
 
       result = data(path)
-      result ||= IO.read(path) # external link
+      result ||= IO.binread(path) # external link
       result
     end
   end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/lib/dandelion/workspace.rb

@@ -3,7 +3,7 @@ module Dandelion
 
   class Workspace
     attr_reader :adapter, :config
-    
+
     def initialize(repo, adapter, config = nil)
       @repo = repo
       @adapter = adapter
@@ -60,17 +60,20 @@ module Dandelion
 
     def lookup_ref(val)
       ref = @repo.ref(val)
-      lookup_sha(ref.target) if ref
+      lookup_sha(ref.target.oid) if ref
     rescue Rugged::ReferenceError
       nil
     end
 
     def local_sha
-      @config[:revision] || @repo.head.target
+      @config[:revision] || @repo.head.target.oid
     end
 
     def remote_sha
-      @remote_sha ||= @adapter.read(@config[:revision_file])
+      @remote_sha ||= begin
+        sha = @adapter.read(@config[:revision_file])
+        sha.chomp if sha
+      end
     end
 
     def remote_sha=(sha)
@@ -78,4 +81,4 @@ module Dandelion
       @remote_sha = sha
     end
   end
-end
+end

data/spec/dandelion/deployer_spec.rb

@@ -33,10 +33,10 @@ describe Dandelion::Deployer do
 
   describe '#deploy_files!' do
     before(:each) do
-      IO.stub(:read).with('a.txt').and_return('A')
-      IO.stub(:read).with('b.txt').and_return('B')
-      IO.stub(:read).with('c/a.txt').and_return('cA')
-      IO.stub(:read).with('c/b.txt').and_return('cB')
+      IO.stub(:binread).with('a.txt').and_return('A')
+      IO.stub(:binread).with('b.txt').and_return('B')
+      IO.stub(:binread).with('c/a.txt').and_return('cA')
+      IO.stub(:binread).with('c/b.txt').and_return('cB')
     end
 
     context 'local paths' do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
 description: 
 email:
 - scott@scttnlsn.com
@@ -32,9 +32,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -44,6 +44,7 @@ files:
 - lib/dandelion.rb
 - lib/dandelion/adapter.rb
 - lib/dandelion/adapter/ftp.rb
+- lib/dandelion/adapter/ftps.rb
 - lib/dandelion/adapter/noop.rb
 - lib/dandelion/adapter/s3.rb
 - lib/dandelion/adapter/sftp.rb
@@ -151,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Incremental Git repository deployment