bard 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
-  s.date = %q{2009-10-06}
+  s.date = %q{2009-10-07}
   s.default_executable = %q{bard}
   s.description = %q{This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.}
   s.email = %q{info@botandrose.com}

data/features/bard_check.feature

@@ -63,6 +63,12 @@ Feature: Bard can check its environment for missing dependencies and potential p
     When I type "bard check ."
     Then I should see the fatal error "missing integration branch"
 
+  Scenario: Bard check detects non-tracking integration branch
+    Given a shared rails project
+    And the integration branch isnt tracking origin/integration
+    When I type "bard check ."
+    Then I should see the fatal error "tracking"
+
   Scenario: Bard check detects missing RAILS_ENV environment variable
     Given a shared rails project
     And my "RAILS_ENV" environment variable is ""

data/features/bard_pull.feature

@@ -13,6 +13,7 @@ Feature: bard pull
     Then the "integration" branch should match the "origin/integration" branch
     And there should be one new submodule
     And the submodule branch should match the submodule origin branch
+    And the submodule working directory should be clean
 
   Scenario: Pulling down when the latest changes include a submodule update
     Given a submodule
@@ -20,6 +21,7 @@ Feature: bard pull
     When I type "bard pull"
     Then the "integration" branch should match the "origin/integration" branch
     And the submodule branch should match the submodule origin branch
+    And the submodule working directory should be clean
 
   Scenario: Pulling down when the latest changes include a submodule url change
     Given a submodule
@@ -28,6 +30,7 @@ Feature: bard pull
     Then the "integration" branch should match the "origin/integration" branch
     And the submodule url should be changed
     And the submodule branch should match the submodule origin branch
+    And the submodule working directory should be clean
 
   # TODO
   #Scenario: Pulling down when the latest changes include a submodule deletion
@@ -44,6 +47,11 @@ Feature: bard pull
     Then I should see the warning "Someone has pushed some changes"
     And the "integration" branch should be a fast-forward from the "origin/integration" branch
 
+  Scenario: Trying to bard pull when not in the project root
+    Given I am in a subdirectory
+    When I type "bard pull"
+    Then I should see the fatal error "root directory"
+
   Scenario: Trying to bard pull with a dirty working directory
     Given the remote integration branch has had a commit since I last pulled
     And a dirty working directory

data/features/bard_push.feature

@@ -30,12 +30,14 @@ Feature: bard push
     When I type "bard push"
     Then there should be one new submodule on the remote
     And the submodule branch should match the submodule origin branch
+    Then the remote submodule working directory should be clean
   
   Scenario: Pushing a change that includes a submodule update
     Given a submodule
     And I have committed a set of changes that includes a submodule update
     When I type "bard push"
     Then the submodule branch should match the submodule origin branch
+    Then the remote submodule working directory should be clean
 
   Scenario: Pushing a change that includes a submodule url change
     Given a submodule
@@ -43,6 +45,7 @@ Feature: bard push
     When I type "bard push"
     Then the remote submodule url should be changed
     And the submodule branch should match the submodule origin branch
+    Then the remote submodule working directory should be clean
 
   # TODO
   #Scenario: Pushing a change that includes a submodule deletion
@@ -51,6 +54,11 @@ Feature: bard push
   #  When I type "bard push"
   #  Then the remote submodule should be deleted
 
+  Scenario: Trying to bard push when not in the project root
+    Given I am in a subdirectory
+    When I type "bard push"
+    Then I should see the fatal error "root directory"
+
   Scenario: Trying to bard push when not on the integration branch
     Given I have committed a set of changes to my local integration branch
     And I am on a non-integration branch

data/features/step_definitions/git_steps.rb

@@ -19,6 +19,12 @@ Given /^there is no integration branch on the staging server$/ do
   end
 end
 
+Given /^the integration branch isnt tracking origin\/integration$/ do
+  type "git checkout master"
+  type "git branch -d integration"
+  type "git checkout -b integration"
+end
+
 Given /^a dirty working directory$/ do
   File.open("dirty_file", "w") { |f| f.puts "dirty dirty" }
 end

data/features/step_definitions/global_steps.rb

@@ -29,6 +29,11 @@ BASH
   type "cp config/database.sample.yml config/database.yml"
 end
 
+Given /^I am in a subdirectory$/ do
+  type "mkdir test_subdirectory"
+  Dir.chdir "test_subdirectory"
+end
+
 When /^I type "([^\"]*)"$/ do |command|
   type command.sub /\b(bard)\b/, "#{ROOT}/bin/bard"
 end

data/features/step_definitions/submodule_steps.rb

@@ -182,3 +182,15 @@ Then /^the remote submodule should be deleted$/ do
     @submodule_commit.should_not match /.[a-z0-9]{40} submodule/
   end
 end
+
+Then /^the submodule working directory should be clean$/ do
+  Dir.chdir "submodule" do
+    type("git status").should include "working directory clean"
+  end
+end
+
+Then /^the remote submodule working directory should be clean$/ do
+  Dir.chdir "#{ROOT}/tmp/origin/submodule" do
+    type("git status").should include "working directory clean"
+  end
+end

data/lib/bard.rb

@@ -49,6 +49,7 @@ class Bard < Thor
   def pull
     invoke :check
 
+    ensure_project_root!
     ensure_integration_branch!
     ensure_clean_working_directory!
 
@@ -69,7 +70,8 @@ class Bard < Thor
       run_crucial "git submodule sync"
       run_crucial "git submodule init"
     end
-    run_crucial "git submodule update --rebase"
+    run_crucial "git submodule update --merge"
+    run_crucial "git submodule foreach 'git reset --hard'"
    
     if changed_files.any? { |f| f =~ %r(^config/environment.+) }
       run_crucial "rake gems:install"
@@ -82,6 +84,7 @@ class Bard < Thor
   def push
     invoke :check
 
+    ensure_project_root!
     ensure_integration_branch!
     ensure_clean_working_directory!
 
@@ -182,6 +185,7 @@ class Bard < Thor
         errors << "missing gems, please run `rake gems:install`" if `rake gems` =~ /\[ \]/
 
         errors << "missing integration branch, please complain to micah" if `git branch` !~ /\bintegration\b/
+        errors << "integration branch isnt tracking the remote integration branch, please run `grb track integration`" if `git config branch.integration.merge` !~ %r%\brefs/heads/integration\b%
         errors << "you shouldn't be working on the master branch, please work on the integration branch" if `cat .git/HEAD`.include? "refs/heads/master"
 
         if ENV['RAILS_ENV'] == "staging"

data/lib/bard/git.rb

@@ -1,5 +1,9 @@
 module BardGit
   private
+    def ensure_project_root!
+      fatal "You are not in the project's root directory!" unless File.directory? ".git"
+    end
+
     def ensure_integration_branch!
       return if `git name-rev --name-only HEAD`.chomp == "integration"
       fatal "You are not on the integration branch! Type `git checkout integration` to switch to it. If you have made changes to your current branch, please see Micah for assistance."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -07:00
+date: 2009-10-07 00:00:00 -07:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency