heroku_san 4.2.3 → 4.2.5

data/examples/auto_tagger.rake

@@ -18,9 +18,10 @@
 
 STAGES = %w[ci staging production]
 
-def create_and_push(stage)
+def create_and_push(stage, revision = nil)
   auto_tag = AutoTagger::Base.new(stages: STAGES, stage: stage, verbose: true, push_refs: false, refs_to_keep: 100)
-  tag = auto_tag.create_ref(auto_tag.last_ref_from_previous_stage.try(:sha))
+  sha = revision || auto_tag.last_ref_from_previous_stage.try(:sha)
+  tag = auto_tag.create_ref(sha)
   sh "git push origin #{tag.name}"
   auto_tag.delete_locally
   auto_tag.delete_on_remote
@@ -32,7 +33,7 @@ end
 
 task :after_deploy do
   each_heroku_app do |stage|
-    create_and_push(stage.name)
+    create_and_push(stage.name, stage.revision)
   end
   Rake::Task['autotag:list'].invoke
 end
@@ -58,5 +59,4 @@ namespace :autotag do
       puts " ** %-12s %s" % [stage, log]
     end
   end
-end
 end

data/lib/heroku_san.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'

data/lib/heroku_san/git.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

data/lib/heroku_san/parser.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)

data/lib/heroku_san/project.rb

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

data/lib/heroku_san/stage.rb

@@ -5,7 +5,7 @@ MOCK = false unless defined?(MOCK)
 
 module HerokuSan
   class Stage
-    include Git
+    include HerokuSan::Git
     attr_reader :name
     attr_reader :options
 

data/lib/heroku_san/tasks.rb

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

data/lib/heroku_san/version.rb

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

data/spec/git_spec.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 @@ describe GitTest do
       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

data/spec/heroku_san/stage_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

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: heroku_san
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 4.2.5
   prerelease: 
-  segments: 
-  - 4
-  - 2
-  - 3
-  version: 4.2.3
 platform: ruby
-authors: 
+authors:
 - Elijah Miller
 - Glenn Roberts
 - Ryan Ahearn
@@ -17,161 +12,175 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: heroku-api
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
-  version_requirements: *id001
-  name: heroku-api
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  version_requirements: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: git-smart
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: godot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -191,7 +200,6 @@ files:
 - features/support/env.rb
 - heroku_san.gemspec
 - lib/generators/heroku_san_generator.rb
-- lib/git.rb
 - lib/heroku_san.rb
 - lib/heroku_san/api.rb
 - lib/heroku_san/configuration.rb
@@ -199,6 +207,7 @@ files:
 - lib/heroku_san/deploy/noop.rb
 - lib/heroku_san/deploy/rails.rb
 - lib/heroku_san/deploy/sinatra.rb
+- lib/heroku_san/git.rb
 - lib/heroku_san/parser.rb
 - lib/heroku_san/project.rb
 - lib/heroku_san/stage.rb
@@ -222,39 +231,35 @@ files:
 - spec/support/heroku.rb
 - spec/support/mocks.rb
 homepage: http://github.com/fastestforward/heroku_san
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4414701449810336455
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The Heroku Toolbelt must be installed to use this gem. https://toolbelt.heroku.com/"
-test_files: 
+summary: ! 'A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The
+  Heroku Toolbelt must be installed to use this gem. https://toolbelt.heroku.com/'
+test_files:
 - features/config.feature
 - features/extended-config.feature
 - features/issue_113.feature

data/lib/git.rb

@@ -1,49 +0,0 @@
-require 'rake'
-require 'rake/dsl_definition'
-
-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