gta 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c83543f7db348de676f317ef0e8370cfd608ff
-  data.tar.gz: af6b5c0dcf5e84ebd32146d9f5fe2bddd9bc40c1
+  metadata.gz: 093d6a1fbd07d5b20659ce86fed7c7963054178c
+  data.tar.gz: 4b9274f3debfacc84bfb401616da12e804b973bf
 SHA512:
-  metadata.gz: aaad9aea700001ba735cafb6a02694a02dd40e7f01ef18190d9001bffe93fb9ae093e3bf7c59ba3044542179acae609fdbb639d4242e1ae6fa97acba275cf62e
-  data.tar.gz: 174d4ee8738fd9ed3abbd31a353a2fd5f03e09944acc47d40d52a45f517deeb4a9b35bc2eaa09c98cadf3a850ac00a8348fbaab973c1a912e552e971a1845bc3
+  metadata.gz: 4dba86bb31b251c7a8f2abc670412d1b9576b5c9f0ff1a88ec5292ea0c9060376d1e944af2c156ee08007b3076a7db4a81f02a005a58a9e2c2d1156b8c58a1da
+  data.tar.gz: a79e1a1c20300dba478d7be8d37458c06c61e6036f3faf1fceab8c8128744a12293f056044897c2d60f0dc6498f56c14ed7c2569e50344f8cc163f8cc47e8a76

data/lib/gta/deploy.rb

@@ -1,5 +1,7 @@
 module GTA
   class Deploy
+    include Sh
+
     attr_reader :gta_config_path, :stage_name
 
     def initialize(stage_name, gta_config_path=nil)
@@ -24,8 +26,11 @@ module GTA
       source.fetch!
 
       source.checkout! # so the tracking branch exists
+      sh("git checkout master") # in case the latest deploy code is not on that branch
 
       forced == :force ? destination.force_push : destination.push
+
+      sh('git checkout master')
     end
   end
 end

data/lib/gta/tasks/heroku_db.rake

@@ -5,6 +5,12 @@ namespace :gta do
         @gta_db ||= GTA::DB.new(GTA::Manager.env_config, GTA::LocalDB.local_database_env)
       end
 
+      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])
+      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])

data/lib/gta/version.rb

@@ -1,3 +1,3 @@
 module GTA
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gta
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - socialchorus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi