dandelion 0.3.12 → 0.3.13

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .DS_Store
+.ruby-version

data/README.md

@@ -1,10 +1,12 @@
 Dandelion
 =========
+
 Incremental Git repository deployment.
 
 Install
 -------
-Ensure that Ruby and RubyGems are installed, then run:
+
+Ensure that Ruby is installed, then run:
 
     $ gem install dandelion
 
@@ -16,42 +18,47 @@ Alternatively, you can build the gem yourself:
 
 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:
+Git repository is searched for a file named `dandelion.yml`).
 
-    # Required
-    # --------
+Example:
 
-    scheme: sftp
-    host: example.com
-    username: user
-    password: pass
+```yaml
+scheme: sftp
+host: example.com
+username: user
+password: pass
+path: path/to/deployment
 
-    # Optional
-    # --------
+exclude:
+    - .gitignore
+    - dandelion.yml
+    - folder/
 
-    # Remote path
-    path: path/to/deployment
+additional:
+    - public/css/print.css
+    - public/css/screen.css
+    - public/js/main.js
+```
 
-    # Local Path
-    local_path: path/in/repo
+Required:
+
+ * `scheme` (the file transfer scheme, see below)
 
-    # Remote file name in which the current revision is stored
-    revision_file: .revision
+Optional:
 
-    # These files (from Git) will not be uploaded during a deploy
-    exclude:
-        - .gitignore
-        - dandelion.yml
+* `path` (relative path from root of remote file tree, defaults to the root)
+* `local_path` (relative path from root of local repository, defaults to repository root)
+* `exclude` (list of files or directories to exclude from deployment, if `local_path` is set files are relative to that path)
+* `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)
 
-    # These files (from your working directory) will be uploaded on every deploy
-    additional:
-        - public/css/print.css
-        - public/css/screen.css
-        - public/js/main.js
+Each scheme also has additional required and optional configuration parameters (see below).
 
 Schemes
 -------
+
 There is support for multiple backend file transfer schemes.  The configuration
 must specify one of these schemes and the set of additional parameters required
 by the given scheme.
@@ -66,12 +73,7 @@ Required:
 
 Optional:
 
- * `path`
- * `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)
+ * `port` (defaults to 22)
  * `preserve_permissions` (defaults to true)
 
 **FTP**: `scheme: ftp`
@@ -84,12 +86,7 @@ Required:
 
 Optional:
 
- * `path`
- * `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)
+ * `port` (defaults to 21)
  * `passive` (defaults to true)
 
 **Amazon S3**: `scheme: s3`
@@ -100,16 +97,9 @@ Required:
  * `secret_access_key`
  * `bucket_name`
 
-Optional:
-
- * `path`
- * `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
 -----
+
 From within your Git repository, run:
 
     $ dandelion deploy

data/dandelion.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/scttnlsn/dandelion'
   s.summary     = "dandelion-#{s.version}"
   s.description = 'Incremental Git repository deployment'
+  s.license     = 'MIT'
   
   s.add_dependency 'grit', '>= 2.4.1'
   

data/lib/dandelion/git.rb

@@ -19,12 +19,9 @@ module Dandelion
       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
+        @from_revision = revision_string(from_revision)
+        @to_revision = revision_string(to_revision)
+
         begin
           @files = parse(diff)
         rescue Grit::Git::CommandFailed
@@ -43,7 +40,7 @@ module Dandelion
       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)
@@ -54,6 +51,14 @@ module Dandelion
         end
         files
       end
+
+      def revision_string(revision)
+        if @local_path.nil? || @local_path.empty?
+          revision
+        else
+          "#{revision}:#{@local_path}"
+        end
+      end
     end
 
     class Tree
@@ -67,23 +72,43 @@ module Dandelion
       end
 
       def files
-        @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")
+        @repo.git.native(:ls_tree, { :name_only => true, :full_tree => true, :r => true }, revision_string).split("\n")
       end
 
       def show(file)
-        @file = file
-        @file = "#{@local_path}/#{file}" unless @local_path.nil? || @local_path.empty?
-        if (@tree / "#{@file}").is_a?(Grit::Submodule)
+        blob = @tree / file_path(file)
+        if blob.is_a?(Grit::Submodule)
           puts "#{file} is a submodule, ignoring."
-          return
+        else
+          blob.data
         end
-        (@tree / "#{@file}").data
       end
 
       def revision
         @commit.sha
       end
+
+      private
+
+      def file_path(file)
+        if local_path?
+          File.join(@local_path, file)
+        else
+          file
+        end
+      end
+
+      def revision_string
+        if local_path?
+          "#{@revision}:#{@local_path}"
+        else
+          @revision
+        end
+      end
+
+      def local_path?
+        !@local_path.nil? && !@local_path.empty?
+      end
     end
   end
 end

data/lib/dandelion/version.rb

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

metadata

@@ -2,14 +2,14 @@
 name: dandelion
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -135,7 +135,8 @@ files:
 - test/test_git.rb
 - test/test_sftp.rb
 homepage: http://github.com/scttnlsn/dandelion
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -157,7 +158,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: dandelion-0.3.12
+summary: dandelion-0.3.13
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree