gta 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a402ae4132a2d3ab9159de4812b34a26e5d0fbe
-  data.tar.gz: 85a81e0cdef130f23ba49c537fc584c86c6390e9
+  metadata.gz: b7c83543f7db348de676f317ef0e8370cfd608ff
+  data.tar.gz: af6b5c0dcf5e84ebd32146d9f5fe2bddd9bc40c1
 SHA512:
-  metadata.gz: fb6112662bae1c01c45610fb22b7f9ebac9ee3604f274a99cce2b0290841d848cf1ee13a48b2bdecd5a20bb145208dca02cb8456c9c69bcbd0388c37a30be8bf
-  data.tar.gz: e8ca1779c9613c309009227ac9d7f03ea2762aaefa4c7786a3d39a586ceb2fff96f2e7976bbc1c0ec4c2fa1b6d5933d2b41fb32ccee0022878bfcf212f15d827
+  metadata.gz: aaad9aea700001ba735cafb6a02694a02dd40e7f01ef18190d9001bffe93fb9ae093e3bf7c59ba3044542179acae609fdbb639d4242e1ae6fa97acba275cf62e
+  data.tar.gz: 174d4ee8738fd9ed3abbd31a353a2fd5f03e09944acc47d40d52a45f517deeb4a9b35bc2eaa09c98cadf3a850ac00a8348fbaab973c1a912e552e971a1845bc3

data/README.md

@@ -1,3 +1,5 @@
+[![Code Climate](https://codeclimate.com/github/socialchorus/gta.png)](https://codeclimate.com/github/socialchorus/gta)
+
 # GTA - the Git Transit Authority
 
 GTA is a git-based deploy tool for moving code from stage to stage.

data/lib/gta/deploy.rb

@@ -0,0 +1,31 @@
+module GTA
+  class Deploy
+    attr_reader :gta_config_path, :stage_name
+
+    def initialize(stage_name, gta_config_path=nil)
+      @stage_name = stage_name
+      @gta_config_path = gta_config_path
+    end
+
+    def manager
+      @manager ||= Manager.new(gta_config_path)
+    end
+
+    def destination
+      @destination ||= manager.stage!(stage_name)
+    end
+
+    def source
+      @source ||= destination.source
+    end
+
+    def deploy(forced=nil)
+      destination.fetch!
+      source.fetch!
+
+      source.checkout! # so the tracking branch exists
+
+      forced == :force ? destination.force_push : destination.push
+    end
+  end
+end

data/lib/gta/stage.rb

@@ -33,10 +33,12 @@ module GTA
     end
 
     def checkout
+      delete_existing_branch if existing_branch?
       sh(checkout_command)
     end
 
     def checkout!
+      delete_existing_branch if existing_branch?
       sh!(checkout_command)
     end
 
@@ -64,6 +66,15 @@ module GTA
       "git fetch #{name}"
     end
 
+    def delete_existing_branch
+      sh("git checkout master") # in case already on branch
+      sh("git branch -D #{name}")
+    end
+
+    def existing_branch?
+      sh('git branch').include?(name)
+    end
+
     def ==(other)
        other.is_a?(self.class) &&
         name == other.name &&

data/lib/gta/tasks/deploy.rake

@@ -6,22 +6,19 @@ namespace :gta do
     desc 'task that will be run after a deploy'
     task :after, :stage_name
 
-    def gta_manager(args={})
-      return @manager if @manager
-      raise GTA::Manager.stage_name_error unless stage_name = args[:stage_name]
-      @manager = GTA::Manager.new(GTA::Manager.env_config)
+    def deployer(args)
+      stage_name = args[:stage_name]
+      GTA::Deploy.new(stage_name, GTA::Manager.env_config)
     end
 
     # the meat of a deploy, a git push from source to destination
     task :gta_push, :stage_name do |t, args|
-      stage_name = args[:stage_name]
-      gta_manager(args).push_to(stage_name)
+      deployer(args).deploy
     end
 
     # a forced version of the meat of the matter
     task :gta_force_push, :stage_name do |t, args|
-      stage_name = args[:stage_name]
-      gta_manager(args).push_to(stage_name, :force)
+      deployer(args).deploy(:force)
     end
 
     task :deploy, :stage_name do |t, args|

data/lib/gta/version.rb

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

data/lib/gta.rb

@@ -14,3 +14,4 @@ require "gta/tag_finder"
 require "gta/commander"
 require "gta/file_logger"
 require "gta/diff"
+require "gta/deploy"

data/spec/deploy_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe GTA::Deploy do
+  let(:config_path) { File.dirname(__FILE__) + "/fixtures/config/gta.yml" }
+  let(:deployer) { GTA::Deploy.new('qa', config_path) }
+  let(:destination) { deployer.destination }
+  let(:source) { deployer.source }
+
+  it "has the right source and destination" do
+    destination.name.should == 'qa'
+    source.name.should == 'staging'
+  end
+
+  describe '#deploy' do
+    before do
+      destination.stub(:fetch!)
+      destination.stub(:push)
+      destination.stub(:force_push)
+
+      source.stub(:checkout!)
+      source.stub(:fetch!)
+
+      deployer.stub(:sh)
+    end
+
+    it "fetches the destination" do
+      destination.should_receive(:fetch!)
+      deployer.deploy
+    end
+
+    it "fetches the source" do
+      source.should_receive(:fetch!)
+      deployer.deploy
+    end
+
+    it "checks out the source" do
+      source.should_receive(:checkout!)
+      deployer.deploy
+    end
+
+    context "non-forced push" do
+      it "pushes the destination" do
+        destination.should_receive(:push)
+        deployer.deploy
+      end
+    end
+
+    context "forced push" do
+      it "forces a push" do
+        destination.should_receive(:force_push)
+        deployer.deploy(:force)
+      end
+    end
+  end
+end

data/spec/stage_spec.rb

@@ -40,9 +40,50 @@ describe GTA::Stage do
   end
 
   describe '#checkout' do
-    it "send the command to checkout a tracking branch from the remote" do
-      stage.should_receive(:sh).with("git checkout -b staging -t staging/master")
-      stage.checkout
+    let(:commands) { [] }
+
+    context "branch exists" do
+      before do
+        stage.stub(:sh) do |command|
+          commands << command
+
+          if command == "git branch"
+            "  master\n* staging\n  qa"
+          end
+        end
+      end
+
+      it "removes the existing branch" do
+        stage.checkout
+        commands.should include("git branch -D staging")
+      end
+
+      it "checks out a new tracking branch" do
+        stage.checkout
+        commands.should include("git checkout -b staging -t staging/master")
+      end
+    end
+
+    context "branch does not exist yet" do
+      before do
+        stage.stub(:sh) do |command|
+          commands << command
+
+          if command == "git branch"
+            "* master\n"
+          end
+        end
+      end
+
+      it "does not try to delete the branch" do
+        stage.checkout
+        commands.should_not include("git branch -D staging")
+      end
+
+      it "checks out a new tracking branch" do
+        stage.checkout
+        commands.should include("git checkout -b staging -t staging/master")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gta
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - socialchorus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -86,6 +86,7 @@ files:
 - lib/gta.rb
 - lib/gta/commander.rb
 - lib/gta/db.rb
+- lib/gta/deploy.rb
 - lib/gta/diff.rb
 - lib/gta/file_logger.rb
 - lib/gta/heroku_db.rb
@@ -107,6 +108,7 @@ files:
 - lib/gta/version.rb
 - spec/commander_spec.rb
 - spec/db_spec.rb
+- spec/deploy_spec.rb
 - spec/diff_spec.rb
 - spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml
@@ -147,6 +149,7 @@ summary: 'GTA: the Git Transit Authority - A git based deploy tool for moving co
 test_files:
 - spec/commander_spec.rb
 - spec/db_spec.rb
+- spec/deploy_spec.rb
 - spec/diff_spec.rb
 - spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml