dandelion 0.4.17 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317add4350e3f191268e262e1947f35313f4a13b
-  data.tar.gz: f8a1ea25badbe77e8723a32a45aef8a22c05be08
+  metadata.gz: dfa2a084aedc78ea79f21a41bf1536aca3f1709b
+  data.tar.gz: baab9852c5d2adea02a24839e37a40c2234eeb10
 SHA512:
-  metadata.gz: 94800c3e6a2b28d747912075c51ca31826ecc6cc5281505fe59420786dd1a4b4f6bc87bfb2cf0807a224e5a34393d84bebe6cf1ccea0eefad39682524f1c24ea
-  data.tar.gz: 82936f82f49cbc03de7e3881d13cc5f5c5ba168fb66457ba18e50e5e13a710a3cfff5acef811fe0db2d96f18a6908aacc83a4129b1a4103a1ed85857c5d92734
+  metadata.gz: 9a6782c6f02a58ea73d9f878d717884bb0143039ca9d0be142ab919095c75e2e181e2c3eeeab49bcefc46c65c1eb671315b00e634b14618d7ef6d906d81f5f14
+  data.tar.gz: 6b89c90540d0d5d0d908467528b8636d2a5af0f35cbf462f748e315aec3524b1b8c04698327f96ecddebdab3b8dda99e13e8b95e87727a4f4e6280fbf32a4b95

data/lib/dandelion/adapter/noop.rb

@@ -9,6 +9,9 @@ module Dandelion
 
       def delete(path)
       end
+
+      def symlink(path, data)
+      end
     end
   end
 end

data/lib/dandelion/adapter/sftp.rb

@@ -55,6 +55,19 @@ module Dandelion
         end
       end
 
+      def symlink(file, target)
+        begin
+          @sftp.symlink!(target, path(file))
+        rescue Net::SFTP::StatusException => e
+          if e.code == 2
+            mkdir_p(File.dirname(path(file)))
+          else
+            @sftp.remove!(path(file))
+          end
+          @sftp.symlink!(target, path(file))
+        end
+      end
+
       def to_s
         "sftp://#{@config['username']}@#{@config['host']}/#{@config['path']}"
       end

data/lib/dandelion/change.rb

@@ -12,4 +12,4 @@ module Dandelion
       @read.() if @read
     end
   end
-end
+end

data/lib/dandelion/changeset.rb

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

data/lib/dandelion/deployer.rb

@@ -50,6 +50,13 @@ module Dandelion
       when :delete
         log.debug("Deleting file: #{change.path}")  
         @adapter.delete(change.path)
+      when :symlink
+        if @adapter.respond_to?(:symlink)
+          log.debug("Creating symlink: #{change.path}")
+          @adapter.symlink(change.path, change.data)
+        else
+          log.debug("Skipped creating symlink:  #{change.path} -> #{change.data}")
+        end
       end
     end
 

data/lib/dandelion/tree.rb

@@ -7,6 +7,11 @@ 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
+    end
+
     def data(path)
       submodule = @repo.submodules[path]
 
@@ -15,48 +20,21 @@ module Dandelion
         nil
       else
         info, obj = object(path)
-        content(info, obj)
+        blob_content(obj)
       end
     end
 
     private
 
     def object(path)
-      object = @commit.tree
-      info = {}
-
-      path.split('/').each do |name|
-        info = object[name]
-        return nil unless info
-        return nil unless info[:type]
-
-        object = @repo.lookup(info[:oid])
-
-        return nil unless object
-      end
-
+      info = @commit.tree.path(path)
+      object = @repo.lookup(info[:oid])
       [info, object]
     end
 
-    def content(info, object)
-      # https://github.com/libgit2/libgit2/blob/development/include/git2/types.h
-      if info[:filemode] == 0120000
-        symlink_content(object)
-      else
-        blob_content(object)
-      end
-    end
-
     def blob_content(object)
       object.read_raw.data
     end
 
-    def symlink_content(object)
-      path = object.read_raw.data
-
-      result = data(path)
-      result ||= IO.binread(path) # external link
-      result
-    end
   end
 end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.17'
+  VERSION = '0.5.0'
 end

data/spec/dandelion/changeset_spec.rb

@@ -70,4 +70,30 @@ describe Dandelion::Changeset do
       end
     end
   end
+
+  context 'diff adds symlink' do
+    let(:changeset) { test_changeset_with_symlinks }
+
+    describe '#enumerable' do
+      let(:changes) { changeset.to_a }
+
+      it 'returns all changes' do
+        expect(changes).to be_a(Array)
+        expect(changes.length).to eq 1
+        expect(changes.map(&:path)).to eq ['link']
+        expect(changes.map(&:type)).to eq [:symlink]
+      end
+
+      it 'returns data for write changes' do
+        expect(changes.select { |c| c.type != :delete }.map(&:data)).to eq ["baz/bar"]
+      end
+    end
+
+    describe '#empty?' do
+      it 'returns false' do
+        expect(changeset.empty?).to eq false
+      end
+    end
+  end
+
 end

data/spec/dandelion/tree_spec.rb

@@ -16,8 +16,8 @@ describe Dandelion::Tree do
       let(:repo) { test_repo('repo_symlink') }
       let(:tree) { test_tree(repo: repo, commit: repo.lookup('4c19bbe7ba04230a0ae2281c1abbc48a76a66550')) }
 
-      it 'returns content of link source path' do
-        expect(tree.data('link')).to eq "bar\n"
+      it 'returns target path of the symlink' do
+        expect(tree.data('link')).to eq "baz/bar"
       end
     end
 

data/spec/spec_helper.rb

@@ -27,6 +27,14 @@ def test_changeset(options = {})
   Dandelion::Changeset.new(test_tree, test_commits.first, options)
 end
 
+def test_changeset_with_symlinks(options = {})
+  repo = test_repo('repo_symlink')
+  commit0 = repo.lookup('3d9b743acb4a84dd99002d2c6f3fcf1a47e9f06b')
+  commit1 = repo.lookup('4c19bbe7ba04230a0ae2281c1abbc48a76a66550')
+  tree = test_tree(repo: repo, commit: commit1)
+  Dandelion::Changeset.new(tree, commit0, options)
+end
+
 def test_diff
   test_changeset.diff
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.0
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged