bard 0.5.8 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.0

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "bard.gemspec",
      "bin/bard",
      "features/bard_check.feature",
+     "features/bard_deploy.feature",
      "features/bard_pull.feature",
      "features/bard_push.feature",
      "features/step_definitions/check_steps.rb",

data/features/bard_deploy.feature

@@ -0,0 +1,17 @@
+Feature: Bard deploy should fold the integration branch into master and perform a deploy
+
+  Scenario: Bard deploy detects non-fast-forward merge from integration to master
+    Given a shared rails project
+    And the remote master branch has had a commit since I last pulled
+    And I have committed a set of changes to my local integration branch
+    When I type "bard deploy"
+    Then I should see the fatal error "rebase"
+
+  Scenario: Bard deploy works
+    Given a shared rails project
+    And I have committed a set of changes to my local integration branch
+    When I type "bard deploy"
+    Then the "master" branch should match the "integration" branch
+    And the "integration" branch should match the "origin/integration" branch
+    And the "origin/master" branch should match the "origin/integration" branch
+

data/features/step_definitions/git_steps.rb

@@ -29,6 +29,16 @@ Given /^I have committed a set of changes to my local integration branch$/ do
   type "git commit -am'test commit to local integration branch.'"
 end
 
+Given /^the remote master branch has had a commit since I last pulled$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    type "git checkout master"
+    type "echo 'zomg' > origin_master_change_file"
+    type "git add ."
+    type "git commit -am 'testing origin master change'"
+    type "git checkout integration"
+  end
+end
+
 Given /^the remote integration branch has had a commit since I last pulled$/ do
   Dir.chdir "#{ROOT}/tmp/origin" do 
     type "git checkout integration"

data/lib/bard.rb

@@ -1,5 +1,6 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'term/ansicolor'
+require 'net/http'
 require 'systemu'
 require 'grit'
 require 'thor'
@@ -16,7 +17,7 @@ class Bard < Thor
     return check_project(project) if project
 
     required = {
-      'bard'     => `gem list bard --remote`[/[0-9]+\.[0-9]+\.[0-9]+/],
+      'bard'     => Net::HTTP.get(URI.parse("http://gemcutter.org/gems/bard.json")).match(/"version":"([0-9.]+)"/)[1],
       'git'      => '1.6.4',
       'rubygems' => '1.3.4',
       'ruby'     => '1.8.6'
@@ -97,6 +98,20 @@ class Bard < Thor
     # git post-receive hook runs stage task below
   end
 
+  desc "deploy", "pushes, merges integration branch into master and deploys it to production"
+  def deploy
+    invoke :push
+    run_crucial "git fetch origin"
+    run_crucial "git checkout master"
+    run_crucial "git pull --rebase origin master"
+    if not fast_forward_merge? "master", "integration"
+      fatal "master has advanced since last deploy, probably due to a bugfix. rebase your integration branch on top of it, and check for breakage."
+    end
+
+    run_crucial "git merge integration"
+    run_crucial "git push origin master"
+  end
+
   if ENV['RAILS_ENV'] == "staging"
     desc "stage", "!!! INTERNAL USE ONLY !!! reset HEAD to integration, update submodules, run migrations, install gems, restart server"
     def stage
@@ -114,28 +129,31 @@ class Bard < Thor
       head = File.read('.git/HEAD').chomp
       # abort if we're on a detached head
       exit unless head.sub! 'ref: ', ''
+      if head == "master"
+        run_crucial "cap deploy"
+      else
+        revs = gets.split ' '  
+        old_rev, new_rev = revs if head == revs.pop
 
-      revs = gets.split ' '  
-      old_rev, new_rev = revs if head == revs.pop
-
-      changed_files = run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
+        changed_files = run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
 
-      if changed_files.any? { |f| f =~ %r(^db/migrate/.+) }
-        run_crucial "rake db:migrate RAILS_ENV=staging"
-        run_crucial "rake db:migrate RAILS_ENV=test"
-      end
+        if changed_files.any? { |f| f =~ %r(^db/migrate/.+) }
+          run_crucial "rake db:migrate RAILS_ENV=staging"
+          run_crucial "rake db:migrate RAILS_ENV=test"
+        end
+         
+        if changed_files.any? { |f| f == ".gitmodules" }
+          run_crucial "git submodule sync"
+          run_crucial "git submodule init"
+        end
+        system "git submodule update"
        
-      if changed_files.any? { |f| f == ".gitmodules" }
-        run_crucial "git submodule sync"
-        run_crucial "git submodule init"
-      end
-      system "git submodule update"
-     
-      if changed_files.any? { |f| f =~ %r(^config/environment.+) }
-        run_crucial "rake gems:install"
-      end
+        if changed_files.any? { |f| f =~ %r(^config/environment.+) }
+          run_crucial "rake gems:install"
+        end
 
-      system "touch tmp/restart.txt"
+        system "touch tmp/restart.txt"
+      end
     end
   end
 

data/lib/bard/git.rb

@@ -10,12 +10,12 @@ module BardGit
       fatal "Cannot upload changes: You have uncommitted changes!\n  Please run git commit before attempting to push or pull."
     end
 
-    def fast_forward_merge? 
+    def fast_forward_merge?(root = "origin/integration", branch = "HEAD")
       run_crucial "git fetch origin"
-      head = run_crucial "git rev-parse HEAD"
-      remote_head = run_crucial "git rev-parse origin/integration"
-      @common_ancestor = find_common_ancestor head, remote_head
-      @common_ancestor == remote_head
+      root_head = run_crucial "git rev-parse #{root}"
+      branch_head = run_crucial "git rev-parse #{branch}"
+      @common_ancestor = find_common_ancestor root_head, branch_head 
+      @common_ancestor == root_head
     end
 
     def find_common_ancestor(head1, head2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors: 
 - Micah Geisel
@@ -123,6 +123,7 @@ files:
 - bard.gemspec
 - bin/bard
 - features/bard_check.feature
+- features/bard_deploy.feature
 - features/bard_pull.feature
 - features/bard_push.feature
 - features/step_definitions/check_steps.rb