dandelion 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f3d202883168a8166c28a422c0a46d2c8e691b50e170e3c176432159ecadceae
-  data.tar.gz: e6a0118befa06a36746d0862c478a98be301e5f71935a928a72a983c84355d68
+SHA1:
+  metadata.gz: 3cabf65a76a5c2f1d342e37622bd46eacbfac685
+  data.tar.gz: 8867a0b64744e90b42c96b6ce40a0117acaf54c5
 SHA512:
-  metadata.gz: 04e3edcb6148b6033c392f69fb260ea59142aa8d8971eaf12f68f3c52d038afc156be5d00bee75b578b874046cf2a613cbaecca6bf30958afcd917cd7696f253
-  data.tar.gz: cdd934044c7374e15437bd62cb7fd71da41d4adf313241ab1e3cf9a21caefaa4ef6a005476e4f4ce85fd8b8e2965202bbb6aa59a4fa093453cb9a629c18c5801
+  metadata.gz: b2d8284ac4667afe38f92bbf0cf7375de3b3897cd4597821c2810d20fda17104e136de9a100b6db108c8279b3b29ddc114d180363f78fd63e6a3c83d4cdd2a7d
+  data.tar.gz: 9169b0716f5e4e30739532fda1a89a125998b7c88d48c6d8a27ef7868e3383daf0ae16a30ecff3e3e41df93fcd3a8376b13cc6e7a081d11c938ba2e2926ccf54

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
 ------
 

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/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/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.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,14 +16,14 @@ 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
+        version: 0.27.7
 description: 
 email:
 - scott@scttnlsn.com
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Incremental Git repository deployment