bard 0.3.1

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,6 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+tmp

data/.gitmodules

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

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Micah Geisel
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,25 @@
+= BARD gem
+
+  This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.
+
+== Requirements
+    gem install thor
+    gem install systemu
+    gem install term-ansicolor
+    gem install git_remote_branch
+    git --version >= 1.6.0
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but
+   bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2009 Micah Geisel. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,92 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "bard"
+    gem.summary = %Q{Tools for collaborating with Bot and Rose Design.}
+    gem.description = %Q{This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.}
+    gem.email = "info@botandrose.com"
+    gem.homepage = "http://github.com/botandrose/bard"
+    gem.authors = ["Micah Geisel", "Nick Hogle"]
+    gem.add_development_dependency "ruby-debug"
+    gem.add_development_dependency "rspec"
+    gem.add_development_dependency "cucumber"
+    gem.add_dependency(%q<rubygems-update>, [">= 1.3.2"])
+    gem.add_dependency(%q<thor>, [">= 0.11.7"])
+    gem.add_dependency(%q<grit>, [">= 1.1.1"])
+    gem.add_dependency(%q<git_remote_branch>, [">= 0.3.0"])
+    gem.add_dependency(%q<systemu>, [">= 1.2.0"])
+    gem.add_dependency(%q<term-ansicolor>, [">= 1.0.3"])
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+
+  task :features => :check_dependencies
+rescue LoadError
+  task :features do
+    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  end
+end
+
+begin
+  require 'reek/rake_task'
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "bard #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.3.1

data/bard.gemspec

@@ -0,0 +1,92 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{bard}
+  s.version = "0.3.1"
+
+  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-09-30}
+  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}
+  s.executables = ["bard"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     ".gitmodules",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bard.gemspec",
+     "bin/bard",
+     "features/bard_pull.feature",
+     "features/bard_push.feature",
+     "features/step_definitions/git_steps.rb",
+     "features/step_definitions/global_steps.rb",
+     "features/step_definitions/rails_steps.rb",
+     "features/step_definitions/submodule_steps.rb",
+     "features/support/env.rb",
+     "features/support/grit_ext.rb",
+     "features/support/io.rb",
+     "lib/bard.rb",
+     "lib/bard/git.rb",
+     "lib/bard/io.rb",
+     "spec/bard_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/botandrose/bard}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Tools for collaborating with Bot and Rose Design.}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/bard_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_runtime_dependency(%q<rubygems-update>, [">= 1.3.2"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.11.7"])
+      s.add_runtime_dependency(%q<grit>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<git_remote_branch>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<systemu>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.3"])
+    else
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<rubygems-update>, [">= 1.3.2"])
+      s.add_dependency(%q<thor>, [">= 0.11.7"])
+      s.add_dependency(%q<grit>, [">= 1.1.1"])
+      s.add_dependency(%q<git_remote_branch>, [">= 0.3.0"])
+      s.add_dependency(%q<systemu>, [">= 1.2.0"])
+      s.add_dependency(%q<term-ansicolor>, [">= 1.0.3"])
+    end
+  else
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<rubygems-update>, [">= 1.3.2"])
+    s.add_dependency(%q<thor>, [">= 0.11.7"])
+    s.add_dependency(%q<grit>, [">= 1.1.1"])
+    s.add_dependency(%q<git_remote_branch>, [">= 0.3.0"])
+    s.add_dependency(%q<systemu>, [">= 1.2.0"])
+    s.add_dependency(%q<term-ansicolor>, [">= 1.0.3"])
+  end
+end

data/bin/bard

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+
+require 'rubygems'
+require 'thor'
+require 'thor/runner'
+
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+require File.join(File.dirname(THIS_FILE), '..', 'lib', 'bard')
+
+args = ARGV
+if args[0] =~ /^[a-z]/i
+  args[0] = "bard:#{args[0]}"
+else
+  args.unshift "bard"
+end
+Thor::Runner.start args 

data/features/bard_pull.feature

@@ -0,0 +1,82 @@
+Feature: bard pull
+  Background:
+    Given a shared rails project
+
+  Scenario: Pulling down the latest changes from the remote integration branch
+    Given the remote integration branch has had a commit since I last pulled
+    When I type "bard pull"
+    Then the "integration" branch should match the "origin/integration" branch
+
+  Scenario: Pulling down when the latest changes include a submodule addition
+    Given the remote integration branch has had a commit that includes a new submodule
+    When I type "bard pull"
+    Then the "integration" branch should match the "origin/integration" branch
+    And there should be one new submodule
+    And the submodule should be checked out
+
+  Scenario: Pulling down when the latest changes include a submodule update
+    Given a submodule
+    And the remote integration branch has had a commit that includes a submodule update
+    When I type "bard pull"
+    Then the "integration" branch should match the "origin/integration" branch
+    And the submodule should be updated
+
+  Scenario: Pulling down when the latest changes include a submodule url change
+    Given a submodule
+    And the remote integration branch has had a commit that includes a submodule url change
+    When I type "bard pull"
+    Then the "integration" branch should match the "origin/integration" branch
+    And the submodule url should be changed
+    And the submodule should be checked out
+
+  # TODO
+  #Scenario: Pulling down when the latest changes include a submodule deletion
+  #  Given a submodule
+  #  And the remote integration branch has had a commit that includes a submodule deletion
+  #  When I type "bard pull"
+  #  Then the "integration" branch should match the "origin/integration" branch
+  #  And the submodule should be deleted
+
+  Scenario: Pulling latest changes from the remote integration branch after committing locally
+    Given the remote integration 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 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 with a dirty working directory
+    Given the remote integration branch has had a commit since I last pulled
+    And a dirty working directory
+    When I type "bard pull"
+    Then I should see the fatal error "You have uncommitted changes!"
+    And the "integration" branch should not match the "origin/integration" branch
+
+  Scenario: Trying to bard pull when not on the integration branch
+    Given the remote integration branch has had a commit since I last pulled
+    And I am on a non-integration 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 "origin/integration" branch
+
+  Scenario: Pulling in a change that includes a migration on a dev machine
+    Given the remote integration branch has had a commit that includes a new migration
+    And I have a development environment set up locally
+    When I type "bard pull"
+    Then the development database should include that migration
+
+  Scenario: Pulling in a change that includes a migration on a dev and testing machine
+    Given the remote integration branch has had a commit that includes a new migration
+    And I have development and test environments set up locally
+    When I type "bard pull"
+    Then both the development and test databases should include that migration
+
+  Scenario: Pulling in a change that includes a gem dependency change
+    Given I dont have the test gem installed
+    And the remote integration branch has had a commit that adds the test gem as a dependency
+    When I type "bard pull"
+    Then the test gem should be installed
+
+  Scenario: Pulling in a change should restart the rails server
+    Given the remote integration branch has had a commit since I last pulled
+    When I type "bard pull"
+    Then passenger should have been restarted

data/features/bard_push.feature

@@ -0,0 +1,89 @@
+Feature: bard push
+  Background:
+    Given a shared rails project
+
+  Scenario: Uploading local changes onto the remote integration branch
+    Given I have committed a set of changes to my local integration branch
+    When I type "bard push"
+    Then the "integration" branch should match the "origin/integration" branch
+
+  Scenario: Pushing a change that includes a migration
+    Given I have committed a set of changes that includes a new migration
+    And the staging server has a staging and test environment set up
+    When I type "bard push"
+    Then the both the staging and test databases should include that migration
+
+  Scenario: Pushing a change that includes a gem dependency change
+    Given I dont have the test gem installed
+    And I have committed a set of changes that adds the test gem as a dependency
+    When I type "bard push"
+    Then the test gem should be installed
+
+  Scenario: Pushing a change should advance the staging HEAD and restart the staging rails server
+    Given I have committed a set of changes to my local integration branch
+    When I type "bard push"
+    Then the remote directory should not be dirty
+    And the staging passenger should have been restarted
+
+  Scenario: Pushing a change that includes a submodule addition
+    Given I have committed a set of changes that includes a new submodule
+    When I type "bard push"
+    Then there should be one new submodule on the remote
+    And the remote submodule should be checked out
+  
+  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 remote submodule should be updated
+
+  Scenario: Pushing a change that includes a submodule url change
+    Given a submodule
+    Given I have committed a set of changes that includes a submodule url change
+    When I type "bard push"
+    Then the remote submodule url should be changed
+    And the remote submodule should be checked out
+
+  # TODO
+  #Scenario: Pushing a change that includes a submodule deletion
+  #  Given a submodule
+  #  Given I have committed a set of changes that includes a submodule deletion
+  #  When I type "bard push"
+  #  Then the remote submodule should be deleted
+
+  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
+    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
+
+  Scenario: Trying to bard push with a dirty working directory
+    Given I have committed a set of changes to my local integration branch
+    And a dirty working directory
+    When I type "bard push"
+    Then I should see the fatal error "You have uncommitted changes!"
+    And the "integration" branch should not match the "origin/integration" branch
+
+  Scenario: Trying to bard push with a non-fast-foward changeset
+    Given I have committed a set of changes to my local integration branch
+    And the remote integration branch has had a commit since I last pulled
+    When I type "bard push"
+    Then I should see the fatal error "Someone has pushed some changes"
+    And the "integration" branch should not match the "origin/integration" branch
+
+  Scenario: Trying to bard push with an uncommitted change to a submodule
+    Given a submodule
+    And I have committed a set of changes to my local integration branch
+    And the submodule working directory is dirty
+    When I type "bard push"
+    Then I should see the fatal error "Micah"
+    And the "integration" branch should not match the "origin/integration" branch
+
+  Scenario: Trying to bard push with a committed but unpushed change to a submodule
+    Given a submodule
+    And I have committed a set of changes to the submodule
+    And I have committed a set of changes to my local integration branch
+    When I type "bard push"
+    Then I should see the fatal error "Micah"
+    And the "integration" branch should not match the "origin/integration" branch

data/features/step_definitions/git_steps.rb

@@ -0,0 +1,55 @@
+Given /^I am on a non\-integration branch$/ do
+  type "git checkout -b bad_bad_bad"
+end
+
+Given /^a dirty working directory$/ do
+  File.open("dirty_file", "w") { |f| f.puts "dirty dirty" }
+end
+
+Given /^I have committed a set of changes to my local integration branch$/ do
+  type "echo 'fuck shit' > fuck_file"
+  type "git add ."
+  type "git commit -am'test commit to local integration branch.'"
+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"
+    type "echo 'zomg' > origin_change_file"
+    type "git add ."
+    type "git commit -am 'testing origin change'"
+  end
+end
+
+Then /^the directory should not be dirty$/ do
+  type("git status").should include "working directory clean"
+end
+
+Then /^the remote directory should not be dirty$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    type("git status").should include "working directory clean"
+  end
+end
+
+Then /^I should be on the "([^\"]*)" branch$/ do |branch|
+  @repo.head.name.should == branch
+end
+
+Then /^there should not be a "([^\"]*)" branch$/ do |branch_name|
+  @repo.branches.any? { |branch| branch.name == branch_name }
+end
+
+Then /^the "([^\"]*)" branch (should|should not) match the "([^\"]*)" branch$/ do |local_branch, which, remote_branch|
+  type "git fetch origin"
+  local_sha = @repo.commits(local_branch).first.id
+  remote_sha = @repo.commits(remote_branch).first.id
+  which = which.gsub(/ /, '_').to_sym
+  local_sha.send(which) == remote_sha
+end
+
+Then /^the "([^\"]*)" branch should be a fast\-forward from the "([^\"]*)" branch$/ do |local_branch, remote_branch|
+  local_sha = @repo.commits(local_branch).first.id
+  remote_sha = @repo.commits(remote_branch).first.id
+  common_ancestor = @repo.find_common_ancestor local_sha, remote_sha
+  common_ancestor.should  == remote_sha
+end

data/features/step_definitions/global_steps.rb

@@ -0,0 +1,41 @@
+Given /^a shared rails project$/ do
+  # TEARDOWN
+  Dir.chdir ROOT
+  type "rm -rf tmp"
+  
+  # SETUP
+  Dir.chdir ROOT
+  Dir.mkdir 'tmp'
+  type "cp -R fixtures/repo tmp/origin"
+  Dir.chdir 'tmp/origin' do
+    File.open ".git/hooks/post-receive", "w" do |f|
+      f.puts <<-BASH
+#!/bin/bash
+RAILS_ENV=staging #{ROOT}/bin/bard stage
+BASH
+      f.chmod 0775
+    end
+    type "cp config/database.yml.sample config/database.yml"
+    type "git checkout -b integration"
+  end
+  type "cp -R fixtures/repo tmp/submodule"
+  type "cp -R fixtures/repo tmp/submodule2"
+  type "git clone tmp/origin tmp/local"
+  Dir.chdir 'tmp/local'
+  @repo = Grit::Repo.new "."
+  type "grb fetch integration"
+  type "git checkout integration"
+  type "cp config/database.yml.sample config/database.yml"
+end
+
+When /^I type "([^\"]*)"$/ do |command|
+  type command
+end
+
+Then /^I should see the fatal error "([^\"]*)"$/ do |error_message|
+  @stderr.should include(error_message)
+end
+
+Then /^I should see the warning "([^\"]*)"$/ do |warning_message|
+  @stderr.should include(warning_message) 
+end

data/features/step_definitions/rails_steps.rb

@@ -0,0 +1,104 @@
+Given /^I have committed a set of changes that includes a new migration$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    type "script/generate migration test_migration"
+    type "git add ."
+    type "git commit -am'added test migration.'"
+  end
+end
+
+Given /^the remote integration branch has had a commit that includes a new migration$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    type "script/generate migration test_migration"
+    type "git add ."
+    type "git commit -am'added test migration.'"
+  end
+end
+
+Given /^I have a development environment set up locally$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    type "rake db:create"
+    type "rake db:migrate"
+  end
+end
+
+Given /^the staging server has a staging and test environment set up$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    type "rake db:create RAILS_ENV=staging && rake db:create RAILS_ENV=test"
+    type "rake db:migrate RAILS_ENV=staging && rake db:migrate RAILS_ENV=test"
+  end
+end
+
+Given /^I have development and test environments set up locally$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    type "rake db:create && rake db:create RAILS_ENV=test"
+    type "rake db:migrate && rake db:migrate RAILS_ENV=test"
+  end
+end
+
+Then /^the development database should include that migration$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    db_version = type("rake db:version")[/[0-9]{14}/]
+    test_migration_version = type("ls db/migrate/*_test_migration.rb")[/[0-9]{14}/]
+    db_version.should == test_migration_version
+  end
+end
+
+Then /^the both the staging and test databases should include that migration$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    staging_db_version = type("rake db:version RAILS_ENV=staging")[/[0-9]{14}/]
+    test_db_version = type("rake db:version RAILS_ENV=test")[/[0-9]{14}/]
+    test_migration_version = type("ls db/migrate/*_test_migration.rb")[/[0-9]{14}/]
+    staging_db_version.should == test_migration_version
+    test_db_version.should == test_migration_version
+  end
+end
+
+Then /^both the development and test databases should include that migration$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    dev_db_version = type("rake db:version")[/[0-9]{14}/]
+    test_db_version = type("rake db:version RAILS_ENV=test")[/[0-9]{14}/]
+    test_migration_version = type("ls db/migrate/*_test_migration.rb")[/[0-9]{14}/]
+    dev_db_version.should == test_migration_version
+    test_db_version.should == test_migration_version
+  end
+end
+
+Given /^I dont have the test gem installed$/ do
+  type "gem uninstall rake-dotnet -v=0.0.1 -x"
+end
+
+Given /^I have committed a set of changes that adds the test gem as a dependency$/ do
+  Dir.chdir "#{ROOT}/tmp/local" do
+    file_inject "config/environment.rb", "
+Rails::Initializer.run do |config|", <<-RUBY
+  config.gem "rake-dotnet", :version => "0.0.1"
+RUBY
+    type "git add ."
+    type "git commit -am'added test gem dependency.'"
+  end
+end
+
+Given /^the remote integration branch has had a commit that adds the test gem as a dependency$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    file_inject "config/environment.rb", "
+Rails::Initializer.run do |config|", <<-RUBY
+  config.gem "rake-dotnet", :version => "0.0.1"
+RUBY
+    type "git add ."
+    type "git commit -am'added test gem dependency.'"
+  end
+end
+
+Then /^the test gem should be installed$/ do
+  type("gem list rake-dotnet").should include "rake-dotnet (0.0.1)"
+end
+
+Then /^passenger should have been restarted$/ do
+  File.exist?("tmp/restart.txt").should be_true
+end
+
+Then /^the staging passenger should have been restarted$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    File.exist?("tmp/restart.txt").should be_true
+  end
+end

data/features/step_definitions/submodule_steps.rb

@@ -0,0 +1,172 @@
+Given /^a submodule$/ do
+  Given 'the remote integration branch has had a commit that includes a new submodule'
+  Dir.chdir "#{ROOT}/tmp/local" do
+    type "git checkout integration"
+    type "git pull --rebase"
+    type "git submodule update --init"
+    @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
+    @submodule_commit = type "git submodule status"
+  end
+end
+
+Given /^the submodule working directory is dirty$/ do
+  Dir.chdir "#{ROOT}/tmp/local/submodule" do
+    type "git checkout master"
+    type "echo 'submodule_update' > submodule_update"
+  end
+end
+
+Given /^I have committed a set of changes to the submodule$/ do
+  Dir.chdir "#{ROOT}/tmp/local/submodule" do
+    type "git checkout -b master"
+    type "echo 'submodule_update' > submodule_update"
+    type "git add ."
+    type "git commit -am 'update in submodule'"
+  end
+end
+
+Given /^the remote integration branch has had a commit that includes a new submodule$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    type "git submodule add #{ROOT}/tmp/submodule submodule"
+    Dir.chdir "submodule" do
+      type "git checkout -b master"
+      type "grb track master"
+    end
+    type "git add ."
+    type "git commit -m 'added submodule'"
+  end
+end
+
+Given /^I have committed a set of changes that includes a new submodule$/ do
+  type "git submodule add #{ROOT}/tmp/submodule submodule"
+  Dir.chdir "submodule" do
+    type "git checkout -b master"
+    type "grb track master"
+  end
+  type "git add ."
+  type "git commit -m 'added submodule'"
+end
+
+Given /^I have committed a set of changes that includes a submodule update$/ do
+  type "git checkout integration"
+  Dir.chdir "submodule" do
+    type "git checkout master"
+    type "echo 'submodule_update' > submodule_update"
+    type "git add ."
+    type "git commit -m 'update in submodule'"
+    type "git push origin HEAD"
+  end
+  type "git add ."
+  type "git commit -m 'updated submodule'"
+end
+
+Given /^the remote integration branch has had a commit that includes a submodule update$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    Dir.chdir "submodule" do
+      type "git checkout master"
+      type "echo 'submodule_update' > submodule_update"
+      type "git add ."
+      type "git commit -m 'update in submodule'"
+      type "git push origin HEAD"
+    end
+    type "git add ."
+    type "git commit -m 'updated submodule'"
+  end
+end
+
+Given /^I have committed a set of changes that includes a submodule url change$/ do
+  gsub_file ".gitmodules", /(url = .*submodule)$/ do |match| "#{match}2" end
+  type "git add ."
+  type "git commit -m 'updated submodule url'"
+end
+
+Given /^the remote integration branch has had a commit that includes a submodule url change$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    gsub_file ".gitmodules", /(url = .*submodule)$/ do |match| "#{match}2" end
+    type "git add ."
+    type "git commit -m 'updated submodule url'"
+  end
+end
+
+Given /^I have committed a set of changes that includes a submodule deletion$/ do
+  type "rm .gitmodules"
+  type "rm -rf --cached submodule"
+  type "git add ."
+  type "git commit -am'removed submodule'"
+end
+
+Given /^the remote integration branch has had a commit that includes a submodule deletion$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do 
+    type "rm .gitmodules"
+    type "rm -rf --cached submodule"
+    type "git add ."
+    type "git commit -am'removed submodule'"
+  end
+end
+
+Then /^there should be one new submodule$/ do
+  status = type "git submodule status"
+  status.should match /.[a-z0-9]{40} submodule/
+end
+
+Then /^there should be one new submodule on the remote$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    status = type "git submodule status"
+    status.should match /.[a-z0-9]{40} submodule/
+  end
+end
+
+Then /^the submodule should be checked out$/ do
+  @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
+  @submodule_commit = type "git submodule status"
+  @submodule_commit.should match %r( [a-z0-9]{40} submodule)
+end
+
+Then /^the remote submodule should be checked out$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
+    @submodule_commit = type "git submodule status"
+    @submodule_commit.should match %r( [a-z0-9]{40} submodule)
+  end
+end
+
+Then /^the submodule should be updated$/ do
+  @submodule_commit[/[a-z0-9]{40}/].should_not == type("git submodule status")[/[a-z0-9]{40}/]
+end
+
+Then /^the remote submodule should be updated$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    @submodule_commit[/[a-z0-9]{40}/].should_not == type("git submodule status")[/[a-z0-9]{40}/]
+  end
+end
+
+Then /^the submodule url should be changed$/ do
+  Dir.chdir "submodule" do
+    remote = type "git remote show origin"
+    remote.should_not match %r(Fetch URL: #{@submodule_url}$)
+    remote.should_not match %r(Push  URL: #{@submodule_url}$)
+  end
+end
+
+Then /^the remote submodule url should be changed$/ do
+  Dir.chdir "#{ROOT}/tmp/origin/submodule" do
+    remote = type "git remote show origin"
+    remote.should_not match %r(Fetch URL: #{@submodule_url}$)
+    remote.should_not match %r(Push  URL: #{@submodule_url}$)
+  end
+end
+
+Then /^the submodule should be deleted$/ do
+  Then 'the directory should not be dirty'
+  @submodule_commit = type "git submodule status"
+  @submodule_commit.should_not match /.[a-z0-9]{40} submodule/
+
+end
+
+Then /^the remote submodule should be deleted$/ do
+  Then 'the remote directory should not be dirty'
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    @submodule_commit = type "git submodule status"
+    @submodule_commit.should_not match /.[a-z0-9]{40} submodule/
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'ruby-debug'
+require 'grit'
+require 'spec/expectations'
+require 'systemu'
+
+ENV["PATH"] += ":#{File.dirname(File.expand_path(__FILE__))}/../../bin"
+
+ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')

data/features/support/grit_ext.rb

@@ -0,0 +1,16 @@
+Grit::Repo.class_eval do
+  def remote_branches(remote = "origin")
+    branches = self.remotes
+    branches.reject!  { |r| r.name !~ %r(^#{remote}/) }
+    branches.collect! { |r| r.name.split('/')[1] }
+    branches.reject!  { |b| b == "HEAD" }
+  end
+
+  def submodules
+    Grit::Submodule.config self, self.head.name
+  end
+
+  def find_common_ancestor(head1, head2)
+    `git merge-base #{head1} #{head2}`.chomp
+  end
+end

data/features/support/io.rb

@@ -0,0 +1,27 @@
+def type(command)
+  @status, @stdout, @stderr = systemu command
+  if ENV['DEBUG']
+    puts '-' * 20
+    puts "Executing command: #{command}"
+    puts "  Status: #{@status}"
+    puts "  Stdout:\n #{@stdout}"
+    puts "  Stderr:\n #{@stderr}"
+    puts '-' * 20
+  end
+  @stdout || @stderr
+end
+
+def file_inject(file_name, sentinel, string, before_after=:after)
+  gsub_file file_name, /(#{Regexp.escape(sentinel)})/mi do |match|
+    if before_after == :after 
+      "#{match}\n#{string}"
+    else
+      "#{string}\n#{match}"
+    end
+  end
+end
+
+def gsub_file(file_name, regexp, *args, &block)
+  content = File.read(file_name).gsub(regexp, *args, &block)
+  File.open(file_name, 'wb') { |file| file.write(content) }
+end

data/lib/bard.rb

@@ -0,0 +1,108 @@
+$:.unshift File.expand_path(File.dirname(__FILE__))
+require 'term/ansicolor'
+require 'systemu'
+require 'grit'
+
+require 'bard/git'
+require 'bard/io'
+
+class Bard < Thor
+  include BardGit
+  include BardIO
+
+  desc "pull", "pull changes to your local machine"
+  def pull
+    ensure_integration_branch!
+    ensure_clean_working_directory!
+
+    unless fast_forward_merge?
+      warn "Someone has pushed some changes since you last pulled.\n  Please ensure that your changes didnt break stuff."
+    end
+
+    run_crucial "git pull --rebase origin integration"
+
+    changed_files = run_crucial("git diff #{@common_ancestor} origin/integration --diff-filter=ACDMR --name-only").split("\n") 
+    puts changed_files.inspect
+   
+    if changed_files.any? { |f| f =~ %r(^db/migrate/.+) }
+      run_crucial "rake db:migrate"
+      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
+    run_crucial "git submodule update"
+   
+    if changed_files.any? { |f| f =~ %r(^config/environment.+) }
+      run_crucial "rake gems:install"
+    end
+
+    system "touch tmp/restart.txt"
+  end
+
+  desc "push", "push local changes out to the remote"
+  def push
+    ensure_integration_branch!
+    ensure_clean_working_directory!
+
+    if submodule_dirty?
+      fatal "Cannot push changes: You have uncommitted changes to a submodule!\n  Please see Micah about this."
+    end
+
+    if submodule_unpushed?
+      fatal "Cannot push changes: You have unpushed changes to a submodule!\n  Please see Micah about this."
+    end
+
+    unless fast_forward_merge?
+      fatal "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work.\n  Then run bard push again."
+    end
+
+    run_crucial "git push origin integration", true
+    
+    # git post-receive hook runs stage task below
+  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
+      if ENV['GIT_DIR'] == '.'
+        # this means the script has been called as a hook, not manually.
+        # get the proper GIT_DIR so we can descend into the working copy dir;
+        # if we don't then `git reset --hard` doesn't affect the working tree.
+        Dir.chdir '..' 
+        ENV['GIT_DIR'] = '.git'
+      end
+
+      run_crucial "git reset --hard"
+
+      # find out the current branch
+      head = File.read('.git/HEAD').chomp
+      # abort if we're on a detached head
+      exit unless head.sub! 'ref: ', ''
+
+      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") 
+
+      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 =~ %r(^config/environment.+) }
+        run_crucial "rake gems:install"
+      end
+
+      system "touch tmp/restart.txt"
+    end
+  end
+end

data/lib/bard/git.rb

@@ -0,0 +1,47 @@
+module BardGit
+  private
+    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."
+    end
+
+    def ensure_clean_working_directory!
+      return if`git status`.include? "working directory clean"
+      fatal "Cannot upload changes: You have uncommitted changes!\n  Please run git commit before attempting to push or pull."
+    end
+
+    def fast_forward_merge? 
+      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
+    end
+
+    def find_common_ancestor(head1, head2)
+      run_crucial "git merge-base #{head1} #{head2}"
+    end
+
+    def submodule_dirty?
+      @repo ||= Grit::Repo.new "."
+      submodules = Grit::Submodule.config(@repo, @repo.head.name)
+      submodules.any? do |name, submodule|
+        Dir.chdir submodule["path"] do
+          not `git status`.include? "working directory clean"
+        end
+      end
+    end
+
+    def submodule_unpushed?
+      @repo ||= Grit::Repo.new "."
+      submodules = Grit::Submodule.config(@repo, @repo.head.name)
+      submodules.any? do |name, submodule|
+        Dir.chdir submodule["path"] do
+          branch = `git name-rev --name-only HEAD`.chomp
+          `git fetch`
+          submodule["id"] != `git rev-parse origin/#{branch}`.chomp
+        end
+      end
+    end
+end
+

data/lib/bard/io.rb

@@ -0,0 +1,22 @@
+module BardIO
+  include Term::ANSIColor
+  private
+
+    def warn(message)
+      $stderr.puts yellow("!!! ") + message
+    end
+
+    def fatal(message)
+      raise Thor::Error, red("!!! ") + message
+    end
+
+    def run_crucial(command, verbose = false)
+      status, stdout, stderr = systemu command
+      fatal "Running command: #{yellow(command)}: #{stderr}" if status.to_i.nonzero?
+      if verbose
+        $stdout.puts stdout
+        $stderr.puts stderr
+      end
+      stdout.chomp
+    end
+end

data/spec/bard_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Bard" do
+  it "fails" do
+    fail "hey buddy, you should probably rename this file and start specing for real"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'bard'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -0,0 +1,169 @@
+--- !ruby/object:Gem::Specification 
+name: bard
+version: !ruby/object:Gem::Version 
+  version: 0.3.1
+platform: ruby
+authors: 
+- Micah Geisel
+- Nick Hogle
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-09-30 00:00:00 -07:00
+default_executable: bard
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubygems-update
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.11.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: grit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: git_remote_branch
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: systemu
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+description: This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.
+email: info@botandrose.com
+executables: 
+- bard
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .document
+- .gitignore
+- .gitmodules
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- bard.gemspec
+- bin/bard
+- features/bard_pull.feature
+- features/bard_push.feature
+- features/step_definitions/git_steps.rb
+- features/step_definitions/global_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/submodule_steps.rb
+- features/support/env.rb
+- features/support/grit_ext.rb
+- features/support/io.rb
+- lib/bard.rb
+- lib/bard/git.rb
+- lib/bard/io.rb
+- spec/bard_spec.rb
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/botandrose/bard
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.4
+signing_key: 
+specification_version: 3
+summary: Tools for collaborating with Bot and Rose Design.
+test_files: 
+- spec/spec_helper.rb
+- spec/bard_spec.rb