Merge pull request #126 from socialchorus/master

Namespace Git module to avoid collision with the Git gem

Author: kmayer

lib/git.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'railtie.rb') if defined?(Rails) && Rails::VERSION::MAJOR >= 3
-require 'git'
+require 'heroku_san/git'
 require 'heroku_san/api'
 require 'heroku_san/stage'
 require 'heroku_san/parser'

lib/heroku_san.rb

@@ -0,0 +1,51 @@
+require 'rake'
+require 'rake/dsl_definition'
+
+module HerokuSan
+  module Git
+    class NoTagFoundError < Exception; end
+
+    include Rake::DSL
+
+    def git_clone(repos, dir)
+      sh "git clone #{repos} #{dir}"
+    end
+
+    def git_active_branch
+      %x{git branch}.split("\n").select { |b| b =~ /^\*/ }.first.split(" ").last.strip
+    end
+
+    def git_push(commit, repo, options = [])
+      commit ||= "HEAD"
+      options ||= []
+      begin
+        sh "git update-ref refs/heroku_san/deploy #{commit}^{commit}"
+        sh "git push #{repo} #{options.join(' ')} refs/heroku_san/deploy:refs/heads/master"
+      ensure
+        sh "git update-ref -d refs/heroku_san/deploy"
+      end
+    end
+
+    def git_parsed_tag(tag)
+      git_rev_parse(git_tag(tag))
+    end
+
+    def git_rev_parse(ref)
+      return nil if ref.nil?
+      %x{git rev-parse #{ref}}.split("\n").first
+    end
+
+    def git_tag(glob)
+      return nil if glob.nil?
+      %x{git tag -l '#{glob}'}.split("\n").last || (raise NoTagFoundError, "No tag found [#{glob}]")
+    end
+
+    def git_revision(repo)
+      %x{git ls-remote --heads #{repo} master}.split.first
+    end
+
+    def git_named_rev(ref)
+      %x{git name-rev #{ref}}.chomp
+    end
+  end
+end

lib/heroku_san/git.rb

@@ -1,6 +1,6 @@
 module HerokuSan
   class Parser
-    include Git
+    include HerokuSan::Git
     attr_accessor :settings
     def parse(parseable)
       @settings = parse_yaml(parseable.config_file)

lib/heroku_san/parser.rb

@@ -1,6 +1,6 @@
 module HerokuSan
   class Project
-    include Git
+    include HerokuSan::Git
     attr_reader :config_file
     attr_reader :options
     attr_writer :configuration

lib/heroku_san/project.rb

@@ -5,7 +5,7 @@
 
 module HerokuSan
   class Stage
-    include Git
+    include HerokuSan::Git
     attr_reader :name
     attr_reader :options
 

lib/heroku_san/stage.rb

@@ -1,6 +1,6 @@
 require 'heroku_san'
 require 'git'
-include Git
+include HerokuSan::Git
 
 if defined?(Rails)
   HerokuSan.project ||= HerokuSan::Project.new(

lib/heroku_san/tasks.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.2.3"
+  VERSION = "4.2.5"
 end

lib/heroku_san/version.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'git'
+require 'heroku_san/git'
 
-class GitTest; include Git; end
+class GitTest; include HerokuSan::Git; end
 
 describe GitTest do
   describe "#git_push" do    
@@ -44,7 +44,7 @@ class GitTest; include Git; end
       subject.should_receive("`").with("git tag -l 'pattern*'") { "\n" }
       expect {
         subject.git_tag('pattern*')
-      }.to raise_error(Git::NoTagFoundError)
+      }.to raise_error(HerokuSan::Git::NoTagFoundError)
     end
 
     it "returns nil for a nil glob" do

spec/git_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HerokuSan::Stage do
-  include Git
+  include HerokuSan::Git
   subject { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"})}
   STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
   before do