gta 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 818670cc5ee8e491e1325084620ba663467e7338
-  data.tar.gz: 82b239d17e63e19a2f17b59473f4aae9d28a6edb
+  metadata.gz: 5f930a1d951fbb0fbe73a607cf5d5976d31757ac
+  data.tar.gz: 9374c93830f70044ea0ba245c5551236046d0c1c
 SHA512:
-  metadata.gz: bb3e3d9d490e45c49097f8ec78b8469389e81751604099314b97fd88ead5bf56d8079d9a04f1aa2dbcfb5511739aaf0ad1f7547e2f838f1a740757499f7591e1
-  data.tar.gz: b14356a82b2d4214a6dc41bba1cc4ac23c4779b0880d057ce419ce65cf39e0ce215fa65c881546003943983bc3a5fc7f23ad6b9810ea065e4dff89a17d7235ac
+  metadata.gz: f6d3c77c4a6b1b0f253c3af91e69fe6d65d63717c6f1a225eff5a07b27461ef0d241dd060871946646e5258359530748ddc7e8b902282e30427e0b1d8d82ace3
+  data.tar.gz: 1297e0dc51415ac9d526d8674c17597770498418913fa148af080c5c41e54dae8ecefcc51e85eca9d3c2942788783ebde29f99349d7c532a2b143d74c2449ca5

data/README.md

@@ -8,8 +8,8 @@ Heroku has made git deploys an awesome standard. Mislav's git-deploy gem
 has made this ease of deploy a possibility for servers that are not
 Heroku too. Despite the easiness of a git deploy system managing a
 series of stages, ie. origin => ci => staging => production, takes some
-care and consideration. Additionally, hotfixing changes in the middle of
-the chain causes a reordering of commits and different push proceedures
+care and consideration. Additionally, hot-fixing changes in the middle of
+the chain causes a reordering of commits and different push procedures
 that can car reek havok.
 
 GTA reads git configuration from yml file that should be checked into

data/gta.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "heroku"
 end

data/lib/gta/heroku_db.rb

@@ -26,7 +26,7 @@ module GTA
     end
 
     def file_name
-      "~/Downloads/#{app_signature}.sql"
+      "/tmp/#{app_signature}.sql"
     end
 
     def app_signature

data/lib/gta/manager.rb

@@ -16,6 +16,10 @@ module GTA
       end
     end
 
+    def account
+      @account || config && @account
+    end
+
     def app_name
       @app_name || config && @app_name
     end
@@ -46,6 +50,7 @@ module GTA
     def config
       return @config if @config
       parsed = YAML.load(File.read(config_path))
+      @account = parsed['account']
       @app_name = parsed['name']
       @database_config_path = find_database_config(parsed['database_config'])
       @config = parsed['stages']

data/lib/gta/tasks/heroku.rake

@@ -9,23 +9,23 @@ namespace :gta do
 
     def app_argument(args)
       manager = GTA::Manager.new(GTA::Manager.env_config)
-      "--app #{manager.app_name}-#{stage_name!(args)}"
+      manager.account.blank? ? "--app #{manager.app_name}-#{stage_name!(args)}" : "--app #{manager.app_name}-#{stage_name!(args)} --account #{manager.account}"
     end
 
     desc "turn maintenance on for this stage"
     task :maintenance_on, :stage_name do |t, args|
-      GTA::Commander.new("heroku maintenance:on #{app_argument(args)}").perform
+      Bundler.with_clean_env{ GTA::Commander.new("heroku maintenance:on #{app_argument(args)}").perform }
     end
 
     desc "turn maintenance on for this stage"
     task :maintenance_off, :stage_name do |t, args|
-      GTA::Commander.new("heroku maintenance:off  #{app_argument(args)}").perform
+      Bundler.with_clean_env{ GTA::Commander.new("heroku maintenance:off  #{app_argument(args)}").perform }
     end
 
     desc "run a heroku rake task in specified stage"
     task :rake, :stage_name, :command do |t, args|
       command = args[:command]
-      GTA::Commander.new("heroku run rake #{command} #{app_argument(args)}").perform
+      Bundler.with_clean_env{ GTA::Commander.new("heroku run rake #{command} #{app_argument(args)}").perform }
     end
   end
 end

data/lib/gta/tasks/heroku_db.rake

@@ -7,13 +7,13 @@ namespace :gta do
 
       desc 'fetch and load the remote database'
       task :pull, :stage_name do |t, args|
-        Rake::Task['gta:heroku:db:fetch'].invoke(args[:stage_name])
-        Rake::Task['gta:heroku:db:load'].invoke(args[:stage_name])
+        Bundler.with_clean_env{ Rake::Task['gta:heroku:db:fetch'].invoke(args[:stage_name]) }
+        Bundler.with_clean_env{ Rake::Task['gta:heroku:db:load'].invoke(args[:stage_name]) }
       end
 
       desc 'download the database from the specified stage or from the last stage'
       task :fetch, :stage_name do |t, args|
-        gta_db.fetch(args[:stage_name])
+        Bundler.with_clean_env{ gta_db.fetch(args[:stage_name]) }
       end
 
       desc 'load local database with downloaded backup from stage'
@@ -23,7 +23,7 @@ namespace :gta do
 
       desc 'restore remote database from another stage'
       task :restore, :stage_name do |t, args|
-        gta_db.restore(args[:stage_name], ENV['source'])
+        Bundler.with_clean_env{ gta_db.restore(args[:stage_name], ENV['source']) }
       end
     end
   end

data/lib/gta/version.rb

@@ -1,3 +1,3 @@
 module GTA
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/spec/fixtures/config/gta_with_account.yml

@@ -0,0 +1,29 @@
+database_config: database.yml # relative from the config file
+name: activator
+account: socialchorus
+
+stages:
+  origin:
+    repository: git@github.com:socialchorus/activator.git
+
+  ci:
+    source: origin
+    tag: ci/*
+    repository: git@github.com:socialchorus/activator.git
+
+  staging:
+    source: ci
+    repository: git@heroku.com:activator-staging.git
+    restorable: true
+    hotfixable: true
+
+  qa:
+    source: staging
+    repository: git@heroku.com:activator-qa.git
+    restorable: true
+    final: true
+    hotfixable: true
+
+  production:
+    source: qa
+    repository: git@heroku.com:activator-production.git

data/spec/heroku_db_spec.rb

@@ -33,7 +33,7 @@ describe GTA::HerokuDB do
     it "downloads the latest database backup to an appropriately named file in downloads" do
       heroku_db.should_receive(:url).and_return('http://heroku-backup-url.com')
       heroku_db.should_receive(:sh!)
-        .with('curl -o ~/Downloads/activator-staging.sql "http://heroku-backup-url.com"')
+        .with('curl -o /tmp/activator-staging.sql "http://heroku-backup-url.com"')
       heroku_db.fetch
     end
   end

data/spec/manager_spec.rb

@@ -126,4 +126,13 @@ describe GTA::Manager do
       manager.setup
     end
   end
+
+  context 'when heroku account is specified' do
+    let(:config_path_with_account) { File.dirname(__FILE__) + "/fixtures/config/gta_with_account.yml" }
+    let(:manager_with_account) { GTA::Manager.new(config_path_with_account) }
+
+    it 'has an account name' do
+      expect(manager_with_account.account).to eq 'socialchorus'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,5 +4,5 @@ require "#{here}/../lib/gta"
 Dir["#{here}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gta
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - socialchorus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -68,20 +68,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: heroku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'GTA: the Git Transit Authority - A git based deploy tool for moving
   code from stage to stage.'
 email:
@@ -126,6 +112,7 @@ files:
 - spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/gta.yml
+- spec/fixtures/config/gta_with_account.yml
 - spec/heroku_db_spec.rb
 - spec/hotfix_spec.rb
 - spec/local_db_spec.rb
@@ -168,6 +155,7 @@ test_files:
 - spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/gta.yml
+- spec/fixtures/config/gta_with_account.yml
 - spec/heroku_db_spec.rb
 - spec/hotfix_spec.rb
 - spec/local_db_spec.rb