capistrano-git-methods 0.0.3 → 0.0.4

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 .Ds_Store
 .rvmrc
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v 0.0.4: Capistrano config extention
+
+Upadted the way that we extend capistrano configuration. You should now include the gem and then use `::CapistranoGitMethods.load` to actually load the methods into capistrano.
+
+This is done to ensure that bundler doesn't extend the rake tasks with the ones defined in the gem.
+
 ## v 0.0.3: Lazy loading
 
 Added lazyloading of the settings to avoid conflicts when using multistage.

data/README.md

@@ -1,10 +1,10 @@
-# Capistrano git methods
+# Capistrano Git Methods [![Build Status](https://secure.travis-ci.org/ekampp/capistrano-git-methods.png)](http://travis-ci.org/ekampp/capistrano-git-methods)
 
 This is a namespace containing methods for maintaining a remote server through git instead of the standard capistrano way.
 
 ## Usage
 
-Including this gem with `require `capistrano-git-methods` in your recipe gives access to the `git.<method>` methods.
+Including this gem with `require capistrano-git-methods` in your recipe gives access to the `git.<method>` methods.
 
 ## Methods
 
@@ -14,3 +14,12 @@ There is the following methods available:
 * `update_code` updates the remote code to match the latest head in the given `branch`.
 * `repo` sets the branch to the current head of the remote version of the code.
 * `cleanup` cleans up after the git processes.
+
+## Configuration
+
+You can configure the library from your deploy recipe, as it lazy-loads all the settings variables, so you don't need to worry about where you require this library.
+
+The following sonfiguration options are available:
+
+* `repository` defines the specific repository that you want to clone.
+* `brach` sets the branch within the repository to check out.

data/lib/capistrano-git-methods.rb

@@ -9,33 +9,45 @@ require "capistrano-git-methods/version"
 # This requires the <tt>current_path</tt> variable to be present. This should
 # already be available in the standard capistrano deploy scheme.
 #
-Capistrano::Configuration.instance.load do
+module CapistranoGitMethods
+  def self.load
+    Capistrano::Configuration.instance(true).load do
 
-  namespace :git do
-    set(:branch) { "master" }
+      namespace :git do
+        set(:branch) { "master" }
 
-    desc "Setup your git-based deployment app"
-    task :setup, :except => { :no_release => true } do
-      puts "\n\nSetting up the remote git target...\n\n"
-      dirs = [deploy_to, shared_path]
-      dirs += shared_children.map { |d| File.join(shared_path, d) }
-      run "mkdir -p #{dirs.join(' ')} && chmod g+w #{dirs.join(' ')}"
-      run "git clone #{repository} #{latest_release}"
-    end
+        desc "Setup your git-based deployment app"
+        task :setup, :except => { :no_release => true } do
+          dirs = [deploy_to, shared_path]
+          dirs += shared_children.map { |d| File.join(shared_path, d) }
+          run "mkdir -p #{dirs.join(' ')} && chmod g+w #{dirs.join(' ')}"
+          run "git clone #{repository} #{latest_release}"
+        end
 
-    desc "Update the deployed code."
-    task :update_code, :except => { :no_release => true } do
-      run "cd #{latest_release}; git fetch origin; git reset --hard #{branch}"
-    end
+        desc "Update the deployed code."
+        task :update_code, :except => { :no_release => true } do
+          run "cd #{latest_release}; git fetch origin; git reset --hard #{branch}" do |c, s, d|
+            case s.to_s
+            when "err"
+              if d.to_s.include?("From ") or d.to_s.include?("->") # Assumes non-errors
+                logger.important "[#{c[:host]}] #{d}"
+              end
+            when "out"
+              logger.important "[#{c[:host]}] #{d}"
+            end
+          end
+        end
 
-    desc "Moves the repo back to the previous version of HEAD"
-    task :repo, :except => { :no_release => true } do
-      set :branch, "HEAD@{1}"
-    end
+        desc "Moves the repo back to the previous version of HEAD"
+        task :repo, :except => { :no_release => true } do
+          set :branch, "HEAD@{1}"
+        end
 
-    desc "Rewrite reflog so HEAD@{1} will continue to point to at the next previous release."
-    task :cleanup, :except => { :no_release => true } do
-      run "cd #{latest_release}; git reflog delete --rewrite HEAD@{1}; git reflog delete --rewrite HEAD@{1}"
+        desc "Rewrite reflog so HEAD@{1} will continue to point to at the next previous release."
+        task :cleanup, :except => { :no_release => true } do
+          run "cd #{latest_release}; git reflog delete --rewrite HEAD@{1}; git reflog delete --rewrite HEAD@{1}"
+        end
+      end
     end
   end
 end

data/lib/capistrano-git-methods/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Git
     module Methods
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-methods
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184819936500 !ruby/object:Gem::Requirement
+  requirement: &70306010155840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184819936500
+  version_requirements: *70306010155840
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70184819935520 !ruby/object:Gem::Requirement
+  requirement: &70306010154940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184819935520
+  version_requirements: *70306010154940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70184819934420 !ruby/object:Gem::Requirement
+  requirement: &70306010153860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184819934420
+  version_requirements: *70306010153860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70184819933380 !ruby/object:Gem::Requirement
+  requirement: &70306010152840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184819933380
+  version_requirements: *70306010152840
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70184819932440 !ruby/object:Gem::Requirement
+  requirement: &70306010151860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184819932440
+  version_requirements: *70306010151860
 description: Contains a git namespace with methods for deploying to a single folder
   using git as the versioning tool instead of the buildin capistrano versioning
 email: