bard 0.8.20 → 0.8.21

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "fixtures/repo"]
 	path = fixtures/repo
-	url = staging@staging.botandrose.com:bard/fixtures/repo
+	url = git@git.botandrose.com:bard_fixtures_repo.git

data/VERSION

@@ -1 +1 @@
-0.8.20
+0.8.21

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.8.20"
+  s.version = "0.8.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-03-02}
   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}
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Tools for collaborating with Bot and Rose Design.}
   s.test_files = [
-    "spec/bard_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/bard_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/features/bard_check.feature

@@ -53,7 +53,7 @@ Feature: Bard can check its environment for missing dependencies and potential p
 
   Scenario: Bard check detects master branch checked out
     Given a shared rails project
-    And I am on the master branch
+    And I am on the "master" branch
     When I type "bard check"
     Then I should see the fatal error "master branch"
 

data/features/bard_deploy.feature

@@ -2,7 +2,7 @@ Feature: Bard deploy should fold the integration branch into master and perform
 
   Scenario: Bard deploy detects non-fast-forward merge from integration to master
     Given a shared rails project
-    And on development_b, a commit to the master branch
+    And on development_b, a commit on the "master" branch
     And on development_b, I type "git push origin master"
     And a commit
     When I type "bard deploy"

data/features/bard_pull.feature

@@ -52,6 +52,14 @@ 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 "development_b:integration" branch
 
+  Scenario: Bard pull from a topic branch
+    Given on development_b, a commit on the "topic" branch
+    And on development_b, I am on the "topic" branch
+    And on development_b, I type "bard push"
+    And I am on the "topic" branch
+    When I type "bard pull"
+    Then the "topic" branch should match the "development_b:topic" branch
+
   Scenario: Trying to bard pull when not in the project root
     Given I am in a subdirectory
     When I type "bard pull"
@@ -65,13 +73,14 @@ Feature: bard pull
     Then I should see the fatal error "You have uncommitted changes!"
     And the "integration" branch should not match the "development_b:integration" branch
 
-  Scenario: Trying to bard pull when not on the integration branch
-    Given on development_b, a commit
-    And on development_b, I type "bard push"
-    And I am on a non-integration branch
+  Scenario: Trying to bard pull when on the "master" branch
+    Given on development_b, a commit on the "master" branch
+    And on development_b, I am on the "master" branch
+    And on development_b, I type "git push origin master"
+    And I am on the "master" branch
     When I type "bard pull"
-    Then I should see the fatal error "not on the integration branch"
-    And the "integration" branch should not match the "development_b:integration" branch
+    Then I should see the fatal error "on the master branch"
+    And the "master" branch should not match the "development_b:master" branch
 
   Scenario: Pulling in a change that includes a migration on a dev machine
     Given on development_b, a commit with a new migration

data/features/bard_push.feature

@@ -8,6 +8,12 @@ Feature: bard push
     And on staging, I type "bard stage"
     Then the "integration" branch should match the "staging:integration" branch
 
+  Scenario: Uploading local changes onto a remote topic branch
+    Given a commit on the "topic" branch
+    And I am on the "topic" branch
+    When I type "bard push"
+    Then the "topic" branch should match the "origin/topic" branch
+
   Scenario: Pushing a change that includes a migration
     Given on staging, a staging database
     And a commit with a new migration
@@ -68,11 +74,11 @@ Feature: bard push
     Then I should see the fatal error "root directory"
 
   Scenario: Trying to bard push when not on the integration branch
-    Given a commit
-    And I am on a non-integration branch
+    Given a commit on the "master" branch
+    And I am on the "master" branch
     When I type "bard push"
-    Then I should see the fatal error "not on the integration branch"
-    And the "integration" branch should not match the "origin/integration" branch
+    Then I should see the fatal error "on the master branch"
+    And the "master" branch should not match the "origin/master" branch
 
   Scenario: Trying to bard push with a dirty working directory
     Given a commit

data/features/step_definitions/git_steps.rb

@@ -1,9 +1,9 @@
-Given /^I am on a non\-integration branch$/ do
-  type "git checkout -b bad_bad_bad"
-end
-
-Given /^I am on the master branch$/ do
-  type "git checkout master"
+Given /^I am on the "([^\"]+)" branch$/ do |branch|
+  if `git branch` =~ / #{branch}$/
+    type "git checkout #{branch}"
+  else
+    type "git checkout -b #{branch}"
+  end
 end
 
 Given /^there is no integration branch$/ do
@@ -28,12 +28,12 @@ Given /^a commit$/ do
   type "git commit -am'test commit'"
 end
 
-Given /^a commit to the master branch$/ do
+Given /^a commit on the "([^\"]+)" branch$/ do |branch|
+  Given %(I am on the "#{branch}" branch)
   text = (rand * 100000000).round
-  type "git checkout master"
-  type "echo '#{text}' > master_#{text}_file"
+  type "echo '#{text}' > #{branch}_#{text}_file"
   type "git add ."
-  type "git commit -am 'testing master change'"
+  type "git commit -am 'testing #{branch} change'"
   type "git checkout integration"
 end
 

data/features/support/env.rb

@@ -33,7 +33,12 @@ Dir.chdir 'tmp' do
     `git clone --recursive origin.git #{env}`
     Dir.chdir env do
       FileUtils.cp "config/database.sample.yml", "config/database.yml"
-      `git checkout -b integration origin/integration` unless env == "production"
+      `grb track master`
+      `git checkout master`
+      unless env == "production"
+        `grb track integration`
+        `git checkout integration`
+      end
     end
   end
   FileUtils.mkdir "fixtures"

data/lib/bard.rb

@@ -50,7 +50,7 @@ class Bard < Thor
 
     warn NonFastForwardError unless fast_forward_merge?
 
-    run_crucial "git pull --rebase origin integration"
+    run_crucial "git pull --rebase origin #{current_branch}"
     run_crucial "rake bootstrap:test"
   end
 
@@ -62,7 +62,7 @@ class Bard < Thor
     raise SubmoduleUnpushedError if submodule_unpushed?
     raise NonFastForwardError unless fast_forward_merge?
 
-    run_crucial "git push origin integration", true
+    run_crucial "git push origin #{current_branch}", true
     
     run_crucial_via_bard "bard stage"
   end
@@ -113,7 +113,7 @@ class Bard < Thor
       auto_update!
       check_dependencies
       raise NotInProjectRootError unless File.directory? ".git"
-      raise NotOnIntegrationError unless current_branch == "integration"
+      raise OnMasterBranchError if current_branch == "master"
       raise WorkingTreeDirtyError unless `git status`.include? "working directory clean"
     end
 end

data/lib/bard/error.rb

@@ -5,7 +5,7 @@ class Bard < Thor
     "NonFastForwardError"       => "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work, and try again",
     "MasterNonFastForwardError" => "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your integration branch on top of it, and check for breakage.",
     "NotInProjectRootError"     => "You are not in the project's root directory!",
-    "NotOnIntegrationError"     => "You are not on the integration branch!\n  Type `git checkout integration` to switch to it. If you have made changes to your current branch, please see Micah for assistance.",
+    "OnMasterBranchError"       => "You are on the master branch!\n  This is almost always a bad idea. Please work on a topic branch. If you have made changes on this branch, please see Micah for assistance.",
     "WorkingTreeDirtyError"     => "You have uncommitted changes!\n  Please run git commit before attempting to push or pull.",
     "StagingDetachedHeadError"  => "The staging server is on a detached HEAD!\n  Please see Micah for assistance.",
     "TestsFailedError"          => "Automated tests failed!\n  See http://integrity.botandrose.com/ for more info."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.8.20
+  version: 0.8.21
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-03-02 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,5 +181,5 @@ signing_key:
 specification_version: 3
 summary: Tools for collaborating with Bot and Rose Design.
 test_files: 
-- spec/bard_spec.rb
 - spec/spec_helper.rb
+- spec/bard_spec.rb