dandelion 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b380cba965412c94b9fb15e2358c6fe6083e335
-  data.tar.gz: 05d509be4f049bffaa751cbac830ec7415ea3ead
+SHA256:
+  metadata.gz: 6ff4ba37b8419deac5f0853252d57e9bcd6a8b07f532b0429f83c92b5e1a40d5
+  data.tar.gz: e62ebf5a1502e45400a7a71c1c937ade7d660ac0ef1b99628e909a4eed2011e5
 SHA512:
-  metadata.gz: 9c2be58a38b4681db98fc8ba2d9d79614c7b9236412cd8c5a3e0a06b17bb25c9b64aaebf1e3939f8e8dcb87d8af7ed06c2bda830f12db1ff69be194f93ae3a19
-  data.tar.gz: 1f63aecd879d84d059094bafb51eb21228da5a7ab195ec958ce8f6f6ea954fe20edabc68bbb07d2ca08e3136863a2a4b9ba9a287da555e0bc243b13425fd57e5
+  metadata.gz: 382c28b517ec058ba9862549e586f62e3415a2518ee8c72438b5ccd55479aa06208eda9359e94dc940cc8009cf69b832b66f76f6f302ff6f9e5ee4356f8e95ba
+  data.tar.gz: a3259adefc5282f38301df1f558356a14e3bdfde7f2eeb5ae1d8601c8349c38f34c2f5ddd9529d37321700353c9f2e79c0394c0a4d2bac704025e256e9fb0040

data/README.md

@@ -2,7 +2,6 @@ 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.
@@ -22,6 +21,8 @@ or
 
     $ apt-get install pkg-config cmake
 
+You may also need to install the Ruby headers if you're using a version of Ruby installed by your OS package manager (`ruby-dev` on Debian, `ruby-all-dev` on Ubuntu).
+
 Config
 ------
 
@@ -107,7 +108,7 @@ 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)
+**FTPS**: `adapter: ftps`
 
 Required: (same as FTP)
 
@@ -119,7 +120,6 @@ 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)
 

data/dandelion.gemspec

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

data/lib/dandelion/adapter/ftp.rb

@@ -19,7 +19,7 @@ module Dandelion
 
       def read(file)
         begin
-          @ftp.getbinaryfile(path(file), nil)
+          @ftp.get(path(file), nil)
         rescue Net::FTPPermError => e
           nil
         end
@@ -28,11 +28,11 @@ module Dandelion
       def write(file, data)
         temp(file, data) do |temp|
           begin
-            @ftp.putbinaryfile(temp, path(file))
+            @ftp.put(temp, path(file))
           rescue Net::FTPPermError => e
             raise e unless e.to_s =~ /550|553/
             mkdir_p(File.dirname(path(file)))
-            @ftp.putbinaryfile(temp, path(file))
+            @ftp.put(temp, path(file))
           end
         end
       end
@@ -54,6 +54,9 @@ module Dandelion
       def ftp_client
         ftp = Net::FTP.new
         ftp.connect(@config['host'], @config['port'])
+        if @config['ascii']
+          ftp.binary=false
+        end
         ftp.login(@config['username'], @config['password'])
         ftp.passive = @config['passive']
         ftp

data/lib/dandelion/adapter/ftps.rb

@@ -6,14 +6,12 @@ module Dandelion
       include ::Dandelion::Utils
 
       adapter 'ftps'
-      requires_gems 'double-bag-ftps'
 
       def initialize(config)
-        require 'double_bag_ftps'
+        require 'net/ftp'
 
-        config[:auth_tls] = to_b(config[:auth_tls])
         config[:ftps_implicit] = to_b(config[:ftps_implicit])
-        config[:inscecure] = to_b(config[:insecure])
+        config[:insecure] = to_b(config[:insecure])
 
         super(config)
       end
@@ -21,24 +19,27 @@ module Dandelion
     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)
+        host = @config['host']
+        ftps = Net::FTP.new(host, connection_params)
+        if @config['ascii']
+          ftps.binary = false
         end
 
-        ftps.login(@config['username'], @config['password'], nil, ftps_auth)
-        ftps.passive = @config[:passive]
-
-        ftps
-      end
-
-      def ftps_auth
-        @config['auth_tls'] ? 'TLS' : nil
+        def connection_params
+          {
+             port: @config['port'],
+             ssl: ssl_context_params,
+             passive: @config['passive'],
+             implicit_ftps: @config['ftps_implicit'],
+             username: @config['username'],
+             password: @config['password'],
+             debug_mode: @config['debug']
+          }
+        end
       end
 
-      def ftps_mode
-        @config['ftps_implicit'] ? DoubleBagFTPS::IMPLICIT : DoubleBagFTPS::EXPLICIT
+      def ssl_context_params
+        @config['insecure'] ? { verify_mode: OpenSSL::SSL::VERIFY_NONE } : true
       end
     end
   end

data/lib/dandelion/changeset.rb

@@ -25,8 +25,8 @@ module Dandelion
             yield Change.new(path, change.type)
           else
             read = -> { @tree.data(change.path) }
-            
-            if @tree.is_symlink?(change.path)
+
+            if @tree.symlink?(change.path)
               yield Change.new(path, :symlink, read)
             else
               yield Change.new(path, change.type, read)

data/lib/dandelion/diff.rb

@@ -26,7 +26,11 @@ private
 
   class PartialDiff
     def initialize(diff)
-      @deltas = diff.deltas
+      @deltas = []
+
+      diff.each_delta do |delta|
+        @deltas << delta
+      end
     end
 
     def empty?
@@ -42,7 +46,11 @@ private
 
   class FullDiff
     def initialize(diff)
-      @deltas = diff.patches.map(&:delta)
+      @deltas = []
+      
+      diff.each_patch do |patch|
+        @deltas << patch.delta
+      end
     end
 
     def empty?
@@ -55,4 +63,4 @@ private
       end
     end
   end
-end
+end

data/lib/dandelion/tree.rb

@@ -1,5 +1,10 @@
 module Dandelion
   class Tree
+    # https://github.com/libgit2/libgit2/blob/development/include/git2/types.h
+    FILEMODE_BLOB = 0100644
+    FILEMODE_BLOB_EXECUTABLE = 0100755
+    FILEMODE_SYMLINK = 0120000
+
     attr_reader :commit
 
     def initialize(repo, commit)
@@ -7,34 +12,42 @@ module Dandelion
       @commit = commit
     end
 
-    def is_symlink?(path)
-      # https://github.com/libgit2/libgit2/blob/development/include/git2/types.h
-      @commit.tree.path(path)[:filemode] == 0120000
+    def symlink?(path)
+      filemode(path) == FILEMODE_SYMLINK
     end
 
-    def data(path)
-      submodule = @repo.submodules[path]
+    def blob?(path)
+      mode = filemode(path)
+      mode == FILEMODE_BLOB || mode == FILEMODE_BLOB_EXECUTABLE
+    end
 
-      if submodule
+    def data(path)
+      if blob?(path) || symlink?(path)
+        obj = object(path)
+        blob_content(obj)
+      else
         # TODO
         nil
-      else
-        info, obj = object(path)
-        blob_content(obj)
       end
     end
 
     private
 
+    def info(path)
+      @commit.tree.path(path)
+    end
+
+    def filemode(path)
+      info(path)[:filemode]
+    end
+
     def object(path)
-      info = @commit.tree.path(path)
-      object = @repo.lookup(info[:oid])
-      [info, object]
+      oid = info(path)[:oid]
+      @repo.lookup(oid)
     end
 
     def blob_content(object)
       object.read_raw.data
     end
-
   end
 end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Scott Nelson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
-description: 
+        version: 0.27.7
+description:
 email:
 - scott@scttnlsn.com
 executables:
@@ -180,9 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Incremental Git repository deployment
 test_files: