bard 0.6.9 → 0.6.10

data/Rakefile

@@ -13,9 +13,8 @@ begin
     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<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"])

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/bard.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   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-11-05}
+  s.date = %q{2009-12-08}
   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}
@@ -51,11 +51,11 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.5}
   s.summary = %q{Tools for collaborating with Bot and Rose Design.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/bard_spec.rb"
+    "spec/bard_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -66,9 +66,8 @@ Gem::Specification.new do |s|
       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<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"])
@@ -76,9 +75,8 @@ Gem::Specification.new do |s|
       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<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"])
@@ -87,11 +85,11 @@ Gem::Specification.new do |s|
     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<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/features/bard_check.feature

@@ -20,7 +20,7 @@ Feature: Bard can check its environment for missing dependencies and potential p
   
   Scenario: Bard check detects pending migrations
     Given a shared rails project
-    And I have committed a set of changes that includes a new migration
+    And a commit with a new migration
     When I type "bard check"
     Then I should see the fatal error "pending migrations"
 
@@ -46,8 +46,8 @@ Feature: Bard can check its environment for missing dependencies and potential p
 
   Scenario: Bard check detects missing gems
     Given a shared rails project
-    And I have committed a set of changes that adds the test gem as a dependency
-    And I dont have the test gem installed
+    And the test gem is not installed
+    And a commit that adds the test gem as a dependency
     When I type "bard check"
     Then I should see the fatal error "missing gems"
 
@@ -73,26 +73,26 @@ Feature: Bard can check its environment for missing dependencies and potential p
     Given a shared rails project
     And my "RAILS_ENV" environment variable is "staging"
     And there is no git hook on the staging server
-    When I type "bard check" on the staging server
+    When on staging, I type "bard check"
     Then I should see the fatal error "missing git hook"
 
   Scenario: Bard check detects unexecutable staging hook
     Given a shared rails project
     And my "RAILS_ENV" environment variable is "staging"
     And the git hook on the staging server is not executable
-    When I type "bard check" on the staging server
+    When on staging, I type "bard check"
     Then I should see the fatal error "unexecutable git hook"
 
   Scenario: Bard check detects improper staging hook
     Given a shared rails project
     And my "RAILS_ENV" environment variable is "staging"
     And the git hook on the staging server is bad
-    When I type "bard check" on the staging server
+    When on staging, I type "bard check"
     Then I should see the fatal error "improper git hook"
 
   Scenario: Bard check detects missing receive.denyCurrentBranch git variable on staging
     Given a shared rails project
     And my "RAILS_ENV" environment variable is "staging"
     And the staging server git config for receive.denyCurrentBranch is not "ignore"
-    When I type "bard check" on the staging server
+    When on staging, I type "bard check"
     Then I should see the fatal error "denyCurrentBranch"

data/features/bard_deploy.feature

@@ -2,14 +2,14 @@ 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 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
+    And on staging, a commit to the master branch
+    And a commit
     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
+    And a commit
     When I type "bard deploy"
     Then the "master" branch should match the "integration" branch
     And the "integration" branch should match the "origin/integration" branch

data/features/bard_pull.feature

@@ -3,12 +3,12 @@ Feature: bard pull
     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
+    Given on staging, a commit
     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
+    Given on staging, a commit with 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
@@ -17,7 +17,7 @@ Feature: bard pull
 
   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
+    And on staging, a commit
     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
@@ -25,7 +25,7 @@ Feature: bard pull
 
   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
+    And on staging, a commit with 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
@@ -35,14 +35,14 @@ Feature: bard pull
   # 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
+  #  And on staging, a commit with 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
+    Given on staging, a commit
+    And a commit
     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
@@ -53,38 +53,40 @@ Feature: 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
+    Given on staging, a commit
     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
+    Given on staging, a commit
     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
+    Given on staging, a commit with a new migration
+    And a development database
     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
+    Given on staging, a commit with a new migration
+    And a development database
+    And a test database
     When I type "bard pull"
-    Then both the development and test databases should include that migration
+    Then the development database should include that migration
+    And the test database 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
+    Given the test gem is not installed
+    And on staging, 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
+    Given on staging, a commit
     When I type "bard pull"
     Then passenger should have been restarted

data/features/bard_push.feature

@@ -3,49 +3,51 @@ Feature: bard push
     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
+    Given a commit
     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
+    Given on staging, a staging database
+    And on staging, a test database
+    And a commit with a new migration
     When I type "bard push"
-    Then the both the staging and test databases should include that migration
+    Then on staging, the staging database should include that migration
+    And on staging, the test database 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
+    Given the test gem is not installed
+    And a commit that adds the test gem as a dependency
     When I type "bard push"
-    Then the test gem should be installed
+    Then on staging, 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
+    Given a commit
     When I type "bard push"
-    Then the remote directory should not be dirty
-    And the staging passenger should have been restarted
+    Then on staging, the directory should not be dirty
+    And on 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
+    Given a commit with a new submodule
     When I type "bard push"
-    Then there should be one new submodule on the remote
+    Then on staging, there should be one new submodule
     And the submodule branch should match the submodule origin branch
-    Then the remote submodule working directory should be clean
+    And on staging, the 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
+    And a commit with 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
+    Then on staging, the submodule working directory should be clean
 
   Scenario: Pushing a change that includes a submodule url change
     Given a submodule
-    And I have committed a set of changes that includes a submodule url change
+    And a commit with a submodule url change
     When I type "bard push"
-    Then the remote submodule url should be changed
+    Then on staging, the submodule url should be changed
     And the submodule branch should match the submodule origin branch
-    Then the remote submodule working directory should be clean
+    Then on staging, the submodule working directory should be clean
 
   # TODO
   #Scenario: Pushing a change that includes a submodule deletion
@@ -60,29 +62,29 @@ Feature: 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
+    Given a commit
     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
+    Given a commit
     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
+    Given a commit
+    And on staging, a commit
     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 a commit
     And the submodule working directory is dirty
     When I type "bard push"
     Then I should see the fatal error "Micah"
@@ -90,8 +92,8 @@ Feature: bard push
 
   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
+    And a commit to the submodule
+    And a commit
     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/check_steps.rb

@@ -5,7 +5,7 @@ end
 
 Then /^I should see the current version of git$/ do
   version = `git --version`[/[0-9]+\.[0-9]+\.[0-9]+/]
-  @stdout.should =~ /git\s+\(#{Regexp.escape(version)}\)/
+  @stdout.should =~ /git\s+\(#{Regexp.escape(version)}/
 end
 
 Then /^I should see the current version of rubygems$/ do

data/features/step_definitions/git_steps.rb

@@ -11,14 +11,6 @@ Given /^there is no integration branch$/ do
   type "git branch -d integration"
 end
 
-Given /^there is no integration branch on the staging server$/ do
-  type "git branch -d origin/integration"
-  Dir.chdir "#{ROOT}/tmp/origin" do 
-    type "git checkout master"
-    type "git branch -d integration"
-  end
-end
-
 Given /^the integration branch isnt tracking origin\/integration$/ do
   type "git checkout master"
   type "git branch -d integration"
@@ -29,41 +21,26 @@ 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"
+Given /^a commit$/ do
+  text = (rand * 100000000).round
+  type "echo '#{text}' > foobar_#{text}_file"
   type "git add ."
-  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
+  type "git commit -am'test commit'"
 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
+Given /^a commit to the master branch$/ do
+  text = (rand * 100000000).round
+  type "git checkout master"
+  type "echo '#{text}' > master_#{text}_file"
+  type "git add ."
+  type "git commit -am 'testing master change'"
+  type "git checkout integration"
 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

data/features/step_definitions/global_steps.rb

@@ -1,36 +1,19 @@
 Given /^a shared rails project$/ do
   # TEARDOWN
-  Dir.chdir ROOT
-  type "rm -rf tmp"
+  Dir.foreach "#{ROOT}/tmp" do |file|
+    FileUtils.rm_rf("#{ROOT}/tmp/#{file}") unless %w(fixtures . ..).include? file
+  end
   
   # SETUP
   Dir.chdir ROOT
-  Dir.mkdir 'tmp'
-  type "cp -R fixtures/repo tmp/origin"
-  Dir.chdir 'tmp/origin' do
-    type "git config receive.denyCurrentBranch ignore"
-    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.sample.yml 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"
+  `cp -r tmp/fixtures/* tmp/`
   Dir.chdir 'tmp/local'
   @repo = Grit::Repo.new "."
-  type "grb fetch integration"
-  type "git checkout integration"
-  type "cp config/database.sample.yml config/database.yml"
+
 end
 
 Given /^I am in a subdirectory$/ do
-  type "mkdir test_subdirectory"
+  FileUtils.mkdir "test_subdirectory"
   Dir.chdir "test_subdirectory"
 end
 
@@ -38,9 +21,9 @@ When /^I type "([^\"]*)"$/ do |command|
   type command.sub /\b(bard)\b/, "#{ROOT}/bin/bard"
 end
 
-When /^I type "([^\"]*)" on the staging server$/ do |command|
+When /^on staging, (.*$)/ do |step|
   Dir.chdir "#{ROOT}/tmp/origin" do
-    When %(I type "#{command}")
+    When step
   end
 end
 

data/features/step_definitions/rails_steps.rb

@@ -1,92 +1,30 @@
-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
+Given /^a commit with a new migration$/ do
+  type "script/generate migration test_migration"
+  type "git add ."
+  type "git commit -am'added test migration.'"
 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
+Given /^a (\w+) database$/ do |env|
+  type "rake db:create RAILS_ENV=#{env} && rake db:migrate RAILS_ENV=#{env}"
 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
+Then /^the (\w+) database should include that migration$/ do |env|
+  db_version = type("rake db:version RAILS_ENV=#{env}")[/[0-9]{14}/]
+  migration_version = type("ls db/migrate/*_test_migration.rb")[/[0-9]{14}/]
+  db_version.should == migration_version
 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
+Given /^the test gem is not 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", "
+Given /^a commit that adds the test gem as a dependency$/ 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
+  type "git add ."
+  type "git commit -am'added test gem dependency.'"
 end
 
 Then /^the test gem should be installed$/ do
@@ -96,9 +34,3 @@ 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

@@ -1,44 +1,32 @@
 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 init"
-    type "git submodule update"
-    Dir.chdir "submodule" do
-      type "git checkout master"
-    end
-    @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
-    @submodule_commit = type "git submodule status"
+  Given 'on staging, a commit with a new submodule'
+  type "git checkout integration"
+  type "git pull --rebase"
+  type "git submodule init"
+  type "git submodule update"
+  Dir.chdir "submodule" do
+    type "git checkout master"
   end
+  @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
+  @submodule_commit = type "git submodule status"
 end
 
 Given /^the submodule working directory is dirty$/ do
-  Dir.chdir "#{ROOT}/tmp/local/submodule" do
+  Dir.chdir "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
+Given /^a commit to the submodule$/ do
+  Dir.chdir "submodule" do
     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"
-    type "git submodule init"
-    type "git submodule update"
-    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
+Given /^a commit with a new submodule$/ do
   type "git submodule add #{ROOT}/tmp/submodule submodule"
   type "git submodule init"
   type "git submodule update --merge"
@@ -49,7 +37,7 @@ Given /^I have committed a set of changes that includes a new submodule$/ do
   type "git commit -m 'added submodule'"
 end
 
-Given /^I have committed a set of changes that includes a submodule update$/ do
+Given /^a commit with a submodule update$/ do
   type "git checkout integration"
   Dir.chdir "submodule" do
     type "git checkout master"
@@ -62,62 +50,24 @@ Given /^I have committed a set of changes that includes a submodule update$/ do
   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
+Given /^a commit with 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
+Given /^I a commit a with 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 branch should match the submodule origin branch$/ do
   @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
   @submodule_commit = type "git submodule status"
@@ -134,24 +84,16 @@ Then /^the submodule branch should match the submodule origin branch$/ do
   end
 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
+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 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"
@@ -160,14 +102,6 @@ Then /^the submodule url should be changed$/ do
   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"
@@ -175,22 +109,8 @@ Then /^the submodule should be deleted$/ do
 
 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
-
 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/features/support/env.rb

@@ -3,7 +3,36 @@ require 'ruby-debug'
 require 'grit'
 require 'spec/expectations'
 require 'systemu'
+gem 'sqlite3-ruby'
 
 ENV["PATH"] += ":#{File.dirname(File.expand_path(__FILE__))}/../../bin"
 
 ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')
+
+# setup fixtures
+FileUtils.rm_rf "tmp"
+FileUtils.mkdir "tmp"
+FileUtils.cp_r "fixtures/repo", "tmp/origin"
+Dir.chdir 'tmp/origin' do
+  `git config receive.denyCurrentBranch ignore`
+  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
+  FileUtils.cp "config/database.sample.yml", "config/database.yml"
+  `git checkout -b integration`
+end
+FileUtils.cp_r "fixtures/repo", "tmp/submodule"
+FileUtils.cp_r "fixtures/repo", "tmp/submodule2"
+`git clone tmp/origin tmp/local`
+Dir.chdir 'tmp/local' do
+  `grb fetch integration && git checkout integration`
+  FileUtils.cp "config/database.sample.yml", "config/database.yml"
+end
+FileUtils.mkdir "tmp/fixtures"
+Dir.foreach "tmp" do |file|
+  FileUtils.mv("tmp/#{file}", "tmp/fixtures/") unless %w(fixtures . ..).include? file
+end

data/lib/bard/check.rb

@@ -2,7 +2,7 @@ class Bard < Thor
   private
     def check_dependencies
       required = {
-        'bard'     => Net::HTTP.get(URI.parse("http://gemcutter.org/gems/bard.json")).match(/"version":"([0-9.]+)"/)[1],
+        'bard'     => Net::HTTP.get(URI.parse("http://gemcutter.org/api/v1/gems/bard.json")).match(/"version":"([0-9.]+)"/)[1],
         'git'      => '1.6.4',
         'rubygems' => '1.3.4',
         'ruby'     => '1.8.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-12-08 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,16 +43,6 @@ dependencies:
       - !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
@@ -69,7 +59,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
@@ -165,10 +155,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Tools for collaborating with Bot and Rose Design.
 test_files: 
-- spec/spec_helper.rb
 - spec/bard_spec.rb
+- spec/spec_helper.rb