dandelion 0.3.11 → 0.3.12

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.DS_Store

data/README.md

@@ -7,30 +7,44 @@ Install
 Ensure that Ruby and RubyGems are 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
 ------
 Configuration options are specified in a YAML file (by default, the root of your
 Git repository is searched for a file named `dandelion.yml`). Example:
 
     # Required
+    # --------
+
     scheme: sftp
     host: example.com
     username: user
     password: pass
-    
+
     # Optional
+    # --------
+
+    # Remote path
     path: path/to/deployment
+
+    # Local Path
+    local_path: path/in/repo
+
+    # Remote file name in which the current revision is stored
+    revision_file: .revision
+
+    # These files (from Git) will not be uploaded during a deploy
     exclude:
         - .gitignore
         - dandelion.yml
-    revision_file: .revision
+
+    # These files (from your working directory) will be uploaded on every deploy
     additional:
         - public/css/print.css
         - public/css/screen.css
@@ -53,7 +67,9 @@ Required:
 Optional:
 
  * `path`
- * `exclude`
+ * `local_path` (defaults to repository root)
+ * `exclude` (if local_path is set, files are relative to that path)
+ * `additional`
  * `port`
  * `revision_file` (defaults to .revision)
  * `preserve_permissions` (defaults to true)
@@ -69,11 +85,13 @@ Required:
 Optional:
 
  * `path`
- * `exclude`
+ * `local_path` (defaults to repository root)
+ * `exclude` (if local_path is set, files are relative to that path)
+ * `additional`
  * `port`
  * `revision_file` (defaults to .revision)
  * `passive` (defaults to true)
-    
+
 **Amazon S3**: `scheme: s3`
 
 Required:
@@ -85,7 +103,9 @@ Required:
 Optional:
 
  * `path`
- * `exclude`
+ * `local_path` (defaults to repository root)
+ * `exclude` (if local_path is set, files are relative to that path)
+ * `additional`
  * `revision_file` (defaults to .revision)
 
 Usage
@@ -93,7 +113,7 @@ Usage
 From within your Git repository, run:
 
     $ dandelion deploy
-    
+
 This will deploy the local `HEAD` revision to the location specified in the config
 file.  Dandelion keeps track of the currently deployed revision so that only files
 which have been added/changed/deleted need to be transferred.
@@ -115,7 +135,7 @@ 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:

data/lib/dandelion/command.rb

@@ -9,7 +9,7 @@ require 'yaml'
 module Dandelion
   module Command
     class InvalidCommandError < StandardError; end
-    
+
     class Base
       class << self
         @@commands = {}
@@ -23,11 +23,11 @@ module Dandelion
           raise InvalidCommandError unless @@commands.include?(name)
           @@commands[name]
         end
-        
+
         def commands
           @@commands.keys
         end
-        
+
         def require_commands
           Dir.glob(File.join(File.dirname(__FILE__), 'command', '*.rb')) { |file| require file }
         end
@@ -65,16 +65,16 @@ module Dandelion
             opts.on('--repo=[REPO]', 'Use the given repository') do |repo|
               options[:repo] = File.expand_path(repo)
             end
-            
+
             options[:config] = nil
             opts.on('--config=[CONFIG]', 'Use the given configuration file') do |config|
               options[:config] = File.expand_path(config)
             end
           end
         end
-        
+
         private
-        
+
         def closest_repo(dir)
           if File.exists?(File.join(dir, '.git'))
             dir
@@ -85,15 +85,15 @@ module Dandelion
       end
 
       def initialize(options)
-        @options = options        
+        @options = options
         @config = YAML.load_file(@options[:config])
         @repo = Git::Repo.new(@options[:repo])
-        
+
         yield(self) if block_given?
       end
-      
+
       protected
-      
+
       def log
         Dandelion.logger
       end
@@ -113,17 +113,19 @@ module Dandelion
           exit 1
         end
       end
-    
+
       def deployment(revision, backend = nil)
         begin
           backend ||= backend()
           revision_file = @config['revision_file'].nil? ? '.revision' : @config['revision_file']
+          local_path = @config['local_path'].nil? ? '' : @config['local_path']
           options = {
             :dry => @options[:dry],
             :exclude => @config['exclude'],
             :additional => @config['additional'],
             :revision => revision,
-            :revision_file => revision_file
+            :revision_file => revision_file,
+            :local_path => local_path
           }
 
           Deployment::Deployment.create(@repo, backend, options)

data/lib/dandelion/deployment.rb

@@ -4,7 +4,7 @@ module Dandelion
   module Deployment
     class RemoteRevisionError < StandardError; end
     class FastForwardError < StandardError; end
-  
+
     class Deployment
       class << self
         def create(repo, backend, options)
@@ -15,39 +15,39 @@ module Dandelion
           end
         end
       end
-      
+
       def initialize(repo, backend, options = {})
         @repo = repo
         @backend = backend
-        @options = { :exclude => [], :additional => [], :revision => 'HEAD', :revision_file => '.revision' }.merge(options)
-        @tree = Git::Tree.new(@repo, @options[:revision])
-        
+        @options = { :exclude => [], :additional => [], :revision => 'HEAD', :revision_file => '.revision', :local_path => '' }.merge(options)
+        @tree = Git::Tree.new(@repo, @options[:revision], @options[:local_path])
+
         if @options[:dry]
           # Stub out the destructive backend methods
           def @backend.write(file, data); end
           def @backend.delete(file); end
         end
       end
-    
+
       def local_revision
         @tree.revision
       end
-    
+
       def remote_revision
         nil
       end
-    
+
       def write_revision
         @backend.write(@options[:revision_file], local_revision)
       end
-      
+
       def validate
         begin
           raise FastForwardError if fast_forwardable
         rescue Grit::Git::CommandFailed
         end
       end
-      
+
       def log
         Dandelion.logger
       end
@@ -63,30 +63,30 @@ module Dandelion
           @backend.write(file, IO.read(file))
         end
       end
-    
+
       protected
-    
+
       def exclude_file?(file)
         @options[:exclude].map { |e| file.start_with?(e) }.any? unless @options[:exclude].nil?
       end
-      
+
       private
-      
+
       def fast_forwardable
         !@repo.git.native(:cherry, {:raise => true, :timeout => false}).empty?
       end
     end
-  
+
     class DiffDeployment < Deployment
       def initialize(repo, backend, options = {})
         super(repo, backend, options)
-        @diff = Git::Diff.new(@repo, read_remote_revision, @options[:revision])
+        @diff = Git::Diff.new(@repo, read_remote_revision, @options[:revision], @options[:local_path])
       end
-    
+
       def remote_revision
         @diff.from_revision
       end
-    
+
       def deploy
         if !revisions_match? && any?
           deploy_changed
@@ -107,12 +107,14 @@ module Dandelion
           if exclude_file?(file)
             log.debug("Skipping file: #{file}")
           else
-            log.debug("Uploading file: #{file}")
-            @backend.write(file, @tree.show(file))
+            if data = @tree.show(file)
+              log.debug("Uploading file: #{file}")
+              @backend.write(file, data)
+            end
           end
         end
       end
-    
+
       def deploy_deleted
         @diff.deleted.each do |file|
           if exclude_file?(file)
@@ -123,17 +125,17 @@ module Dandelion
           end
         end
       end
-    
+
       def any?
         @diff.changed.any? || @diff.deleted.any?
       end
-    
+
       def revisions_match?
         remote_revision == local_revision
       end
-    
+
       private
-    
+
       def read_remote_revision
         begin
           @backend.read(@options[:revision_file]).chomp
@@ -142,18 +144,20 @@ module Dandelion
         end
       end
     end
-  
+
     class FullDeployment < Deployment
       def deploy
         @tree.files.each do |file|
           if exclude_file?(file)
             log.debug("Skipping file: #{file}")
           else
-            log.debug("Uploading file: #{file}")
-            @backend.write(file, @tree.show(file))
+            if data = @tree.show(file)
+              log.debug("Uploading file: #{file}")
+              @backend.write(file, data)
+            end
           end
         end
-        
+
         deploy_additional
         write_revision
       end

data/lib/dandelion/git.rb

@@ -4,22 +4,27 @@ module Dandelion
   module Git
     class DiffError < StandardError; end
     class RevisionError < StandardError; end
-  
+
     class Repo < Grit::Repo
       def initialize(dir)
         super(dir)
       end
     end
-  
+
     class Diff
       attr_reader :from_revision, :to_revision
-    
+
       @files = nil
-  
-      def initialize(repo, from_revision, to_revision)
+
+      def initialize(repo, from_revision, to_revision, local_path)
         @repo = repo
+        @local_path = local_path
         @from_revision = from_revision
         @to_revision = to_revision
+        unless @local_path.nil? || @local_path.empty?
+          @from_revision = "#{@from_revision}:#{@local_path}"
+          @to_revision = "#{@to_revision}:#{@local_path}"
+        end
         begin
           @files = parse(diff)
         rescue Grit::Git::CommandFailed
@@ -36,11 +41,11 @@ module Dandelion
       end
 
       private
-      
+
       def diff
-        @repo.git.native(:diff, {:name_status => true, :raise => true}, from_revision, to_revision)
+        @repo.git.native(:diff, {:name_status => true, :raise => true}, @from_revision, @to_revision)
       end
-    
+
       def parse(diff)
         files = {}
         diff.split("\n").each do |line|
@@ -52,24 +57,33 @@ module Dandelion
     end
 
     class Tree
-      def initialize(repo, revision)
+      def initialize(repo, revision, local_path)
         @repo = repo
         @commit = @repo.commit(revision)
+        @revision = revision
+        @local_path = local_path
         raise RevisionError if @commit.nil?
         @tree = @commit.tree
       end
-    
+
       def files
-        @repo.git.native(:ls_tree, {:name_only => true, :r => true}, revision).split("\n")
+        @revision = "#{@revision}:#{@local_path}" unless @local_path.nil? || @local_path.empty?
+        @repo.git.native(:ls_tree, {:name_only => true, :full_tree => true, :r => true}, @revision).split("\n")
       end
 
       def show(file)
-        (@tree / file).data
+        @file = file
+        @file = "#{@local_path}/#{file}" unless @local_path.nil? || @local_path.empty?
+        if (@tree / "#{@file}").is_a?(Grit::Submodule)
+          puts "#{file} is a submodule, ignoring."
+          return
+        end
+        (@tree / "#{@file}").data
       end
-  
+
       def revision
         @commit.sha
       end
     end
   end
-end
+end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.3.11'
+  VERSION = '0.3.12'
 end

data/test/fixtures/ls_tree

@@ -1,4 +1,5 @@
 bar
 baz/bar
 baz/foo
-foo
+baz/foo/bar
+foo

data/test/test_diff_deployment.rb

@@ -20,7 +20,7 @@ end
 
 class MockFile
   attr_reader :data
-  
+
   def initialize(data)
     @data = data
   end
@@ -36,11 +36,11 @@ class MockCommit
   def initialize(revision)
     @revision = revision
   end
-  
+
   def tree
     MockTree.new
   end
-  
+
   def sha
     @revision
   end
@@ -50,7 +50,7 @@ class MockRepo
   def commit(revision)
     MockCommit.new(revision)
   end
-  
+
   def git
     MockGit.new
   end
@@ -58,21 +58,21 @@ end
 
 class MockBackend
   attr_reader :reads, :writes, :deletes
-  
+
   def initialize(remote_revision)
     @reads = {'.revision' => remote_revision}
     @writes = {}
     @deletes = []
   end
-  
+
   def read(file)
     @reads[file]
   end
-  
+
   def write(file, data)
     @writes[file] = data
   end
-  
+
   def delete(file)
     @deletes << file
   end
@@ -89,28 +89,28 @@ class TestDiffDeployment < Test::Unit::TestCase
     @backend = MockBackend.new(@remote_revision)
     @diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @backend, :revision => @head_revision)
   end
-  
+
   def test_diff_deployment_local_revision
     assert_equal @head_revision, @diff_deployment.local_revision
   end
-  
+
   def test_diff_deployment_remote_revision
     assert_equal @remote_revision, @diff_deployment.remote_revision
   end
-  
+
   def test_diff_deployment_write_revision
     @diff_deployment.write_revision
     assert_equal @head_revision, @backend.writes['.revision']
   end
-  
+
   def test_diff_deployment_revisions_match
     assert !@diff_deployment.revisions_match?
   end
-  
+
   def test_diff_deployment_any
     assert @diff_deployment.any?
   end
-  
+
   def test_diff_deployment_deploy
     @diff_deployment.deploy
     assert_equal 3, @backend.writes.length

data/test/test_git.rb

@@ -5,40 +5,46 @@ class TestGit < Test::Unit::TestCase
   def setup
     @repo = Dandelion::Git::Repo.new(File.join(File.dirname(__FILE__), 'test_git.git'))
   end
-  
+
   def test_tree_files
-    tree = Dandelion::Git::Tree.new(@repo, 'HEAD')
+    tree = Dandelion::Git::Tree.new(@repo, 'HEAD', '')
     files = ['foo', 'bar', 'baz/foo', 'baz/bar']
     assert_equal files.sort, tree.files.sort
   end
-  
+
+  def test_tree_subfolder
+    tree = Dandelion::Git::Tree.new(@repo, 'HEAD', 'baz')
+    files = ['foo', 'bar']
+    assert_equal files.sort, tree.files.sort
+  end
+
   def test_tree_show
-    tree = Dandelion::Git::Tree.new(@repo, 'HEAD')
+    tree = Dandelion::Git::Tree.new(@repo, 'HEAD', '')
     assert_equal "bar\n", tree.show('foo')
     assert_equal "bar\n", tree.show('baz/foo')
   end
-  
+
   def test_tree_revision
     revision = 'ff1f1d4bd0c99e1c9cca047c46b2194accf89504'
-    tree = Dandelion::Git::Tree.new(@repo, revision)
+    tree = Dandelion::Git::Tree.new(@repo, revision, '')
     assert_equal revision, tree.revision
   end
-  
+
   def test_diff_changed
     from = 'ff1f1d4bd0c99e1c9cca047c46b2194accf89504'
     to = '88d4480861346093048e08ce8dcc577d8aa69379'
     files = ['foo', 'baz/foo']
-    diff = Dandelion::Git::Diff.new(@repo, from, to)
+    diff = Dandelion::Git::Diff.new(@repo, from, to, '')
     assert_equal files.sort, diff.changed.sort
     assert_equal [], diff.deleted
   end
-  
+
   def test_diff_deleted
     from = 'f55f3c44c89e5d215fbaaef9d33563117fe0b61b'
     to = '0ca605e9f0f1d42ce8193ac36db11ec3cc9efc08'
     files = ['test_delete']
-    diff = Dandelion::Git::Diff.new(@repo, from, to)
+    diff = Dandelion::Git::Diff.new(@repo, from, to, '')
     assert_equal files.sort, diff.deleted.sort
     assert_equal [], diff.changed
   end
-end
+end

metadata

@@ -2,14 +2,14 @@
 name: dandelion
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: dandelion-0.3.11
+summary: dandelion-0.3.12
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree