bard 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1c6c9dceac8bcf010f8f0fbcbdf9b6678d21f1
-  data.tar.gz: 2d4b58d4760e2c1c22fc4a1d74cb0c24bacbd567
+  metadata.gz: 07d5c93a6df172df91066f90c0bc8832aeb68b80
+  data.tar.gz: fceecc7432bd7e7fed5e6f43efae4a44b02662cf
 SHA512:
-  metadata.gz: c5437ee43af1d313b7712c4e86def8311dd67bae1a90082d6170645030a62d7f6a133f55da4d321f01360c86fd04601aa61c49198b40ff5e38d64f3a40a429c0
-  data.tar.gz: edb8cdb7ce7b8d60eff67b6f4d5fe57a0d1e80e78da93ef8f8bcaa91df4aadc5c043af243097f3ffee3009300d8204891b1a39c86fd9fc1ab4f79b36abee7bdb
+  metadata.gz: 716ea0db922225e502aeacefff4e53d2d45e29d455ff62c2008be67d82420f5517d299da35e293216a38990eefb94d786451cd7408e4f33d463e3815a1f5170a
+  data.tar.gz: 66847050ea9676a3f92f541e49a4101aa7bd36f3c50098f92f11ada2f5ca97ceb67d00c40e271920fa499628cc2f53b25fed24fd5fd7ee1024241e652c0371a8

data/.gitignore

@@ -1,8 +1,12 @@
 *.sw?
+*.gem
 .DS_Store
+.bundle
 coverage
 rdoc
-pkg
 tmp
 .bundle
 .rvmrc
+Gemfile.lock
+pkg/*
+

data/.ruby-gemset

@@ -0,0 +1 @@
+bard

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.2

data/Gemfile

@@ -1,3 +1,5 @@
-source "http://gemcutter.org"
+source "http://rubygems.org"
 
+# Specify your gem's dependencies in bard.gemspec
 gemspec
+

data/Gemfile.lock

@@ -1,68 +1,78 @@
 PATH
   remote: .
   specs:
-    bard (0.15.4)
+    bard (0.23.0)
       bard-rake (>= 0.1.1)
       capistrano (= 2.5.10)
-      git_remote_branch (>= 0.3.0)
-      grit (= 1.1.1)
       rvm-capistrano
       systemu (>= 1.2.0)
       term-ansicolor (>= 1.0.3)
       thor (= 0.11.7)
-      versionomy (>= 0.3.0)
 
 GEM
-  remote: http://gemcutter.org/
+  remote: http://rubygems.org/
   specs:
-    bard-rake (0.4.3)
-    blockenspiel (0.4.3)
-    builder (2.1.2)
+    bard-rake (0.12.0)
+      rake
+    builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capistrano (2.5.10)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.0.0)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    git_remote_branch (0.3.3)
-      rainbow
-    grit (1.1.1)
-      diff-lcs (>= 1.1.2)
-      mime-types (>= 1.15)
-    highline (1.6.11)
-    json (1.4.6)
-    mime-types (1.18)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    rainbow (1.1.3)
-    rspec (1.3.1)
-    rvm-capistrano (1.0.2)
+    columnize (0.8.9)
+    cucumber (1.3.17)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    highline (1.6.21)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    rake (10.4.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rvm-capistrano (1.4.1)
       capistrano (>= 2.0.0)
-    systemu (2.5.0)
-    term-ansicolor (1.0.5)
+    slop (3.6.0)
+    systemu (2.6.4)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.11.7)
-    versionomy (0.4.3)
-      blockenspiel (>= 0.4.3)
+    tins (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bard!
-  cucumber (~> 0.9.0)
-  rspec (~> 1.3.0)
+  byebug
+  cucumber
+  rspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Micah Geisel
+Copyright (c) 2014 Micah Geisel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,124 +1,16 @@
-= BARD gem
+= BARD
 
-This is a collection of tools designed to ease collaboration within BOTandROSE design.
-It wraps git, capistrano, thor, and rake to make things as simple as:
+This is a collection of tools designed to ease collaboration within Bot and Rose Design.
+It wraps git, capistrano, and rake to make things as simple as:
 
-  bard push
   bard pull
+  bard stage
+  bard deploy
 
-=== Requirements
-    git      --version >= 1.6.4
-    rubygems --version >= 1.3.4
-    ruby     --version == 1.8.7
-
-=== Joining Bard
-
-	==== On any platform:
-		- gem install bard
-
-	==== On Linux:
-
-		- Install RubyGems:
-			$> wget ...
-			$> ...
-
-		- Install Rake:
-			$> sudo gem install rake
-			( NOTE: the sudo )
-
-		- Install Apache
-			$> sudo apt-get install apache2
-
-		- Install Mysql
-			$> sudo apt-get install mysql-server
-			$> sudo /etc/init.d/mysql start
-			( No password for root, if it asks )
-			
-		- Install Passenger
-			$> sudo gem install passenger
-
-			$> sudo apt-get install apache2-prefork-dev as root.
-			$> sudo apt-get install libapr1-dev as root.
-			$> sudo apt-get install libaprutil1
-
-			$> sudo passenger-install-apache2-module
-
-		- Setup rails environment:
-			Add line to /etc/apache2/apache2.conf:
-				RailsEnv development
-			$> apache2ctl restart
-				
-	==== On Mac:
-		- ???Wtf ? I dunno. eff macs
-
-== Todos
-
-=== Joining an existing project
-	bard join will probably either do all these steps automatically, or help you do them:
-	This list summarizes the existing steps needed to join a project.
-
-	$> bard join <project-name>
-
-	- Clone the project
-		- (git clone git@git.botandrose.com:<project-name>.git)
-		- Init and update submodules
-
-	- Set up local environment:
-		- Apache
-			Put in /etc/apache2/sites-avaliable/<project-name>:
-				<VirtualHost *:80>
-					ServerName <project-name>.local
-					DocumentRoot $HOME/$BardRoot/<project-name>/public
-				</VirtualHost>
-
-			$> a2ensite <project-name>
-			$> apache2ctl restart
-
-		- Set up /etc/hosts:
-			append this line to /etc/hosts:
-				127.0.0.1 <project-name>.local
-
-		- Setup database yaml
-			- sensible default:
-				login: &login
-					adapter: mysql
-					database: <project-name>
-					username: root
-					password:
-					socket: /var/run/mysqld/mysqld.sock
-
-				development:
-					<<: *login
-
-				test: &TEST
-					<<: *login
-					database: <project-name>_test
-
-				cucumber:
-					<<: *TEST
-
-
-		- Set up gems:
-			$> rake gems:install
-
-		- Set up database
-			$> rake db:create
-			$> rake db:migrate
-
-		- Seed database from staging or production
-			$> bard data
-
-=== 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.
+Seed database from staging or production:
+  bard data
 
 == Copyright
 
-Copyright (c) 2009 Micah Geisel, Nick Hogle. See LICENSE for details.
+Copyright (c) 2014 Micah Geisel. See LICENSE for details.
+

data/Rakefile

@@ -1,2 +1,2 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
+

data/bard.gemspec

@@ -1,26 +1,31 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "bard/version"
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Micah Geisel", "Nick Hogle"]
-  gem.email         = ["micah@botandrose.com"]
-  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.summary       = %q{Tools for collaborating with Bot and Rose Design.}
-  gem.homepage      = "https://github.com/botandrose/bard"
+Gem::Specification.new do |spec|
+  spec.name          = "bard"
+  spec.version       = Bard::VERSION
+  spec.authors       = ["Micah Geisel"]
+  spec.email         = ["micah@botandrose.com"]
+  spec.summary       = %Q{CLI to automate common development tasks.}
+  spec.description   = %Q{CLI to automate common development tasks.}
+  spec.homepage      = "http://github.com/botandrose/bard"
+  spec.license       = "MIT"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "bard"
-  gem.require_paths = ["lib"]
-  gem.version       = File.read("VERSION").chomp
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_dependency "thor", "0.11.7"
-  gem.add_dependency "capistrano", "2.5.10"
-  gem.add_dependency "rvm-capistrano"
-  gem.add_dependency "systemu", ">=1.2.0"
-  gem.add_dependency "term-ansicolor", ">=1.0.3"
-  gem.add_dependency "bard-rake", ">=0.1.1"
+  spec.add_dependency "thor", "= 0.11.7"
+  spec.add_dependency "capistrano", "= 2.5.10"
+  spec.add_dependency "rvm-capistrano"
+  spec.add_dependency "systemu", ">= 1.2.0"
+  spec.add_dependency "term-ansicolor", ">= 1.0.3"
+  spec.add_dependency "bard-rake", ">= 0.1.1"
 
-  gem.add_development_dependency "rspec", "~>1.3.0"
-  gem.add_development_dependency "cucumber", "~>0.9.0"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "cucumber"
 end

data/lib/bard.rb

@@ -3,47 +3,32 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 module Bard; end
 
 require "bard/base"
-require "bard/error"
 require "bard/git"
+require "bard/ci"
 
 class Bard::CLI < Thor
-  include Bard::CLI::Git
-
   desc "data [FROM=production, TO=local]", "copy database and assets from FROM to TO"
   def data(from = "production", to = "local")
-    if to == "local"
-      if from == "production" and heroku?
-        exec "heroku db:pull --confirm #{project_name}"
-      else
-        exec "cap _2.5.10_ data:pull ROLES=#{from}"
-      end
-
-    else
-      if from == "local"
-        exec "cap _2.5.10_ data:push ROLES=#{to}"
-      end
-    end
+    exec "cap _2.5.10_ data:pull ROLES=#{from}" if to == "local"
+    exec "cap _2.5.10_ data:push ROLES=#{to}" if from == "local"
   end
 
   method_options %w( verbose -v ) => :boolean
   desc "pull", "pull changes to your local machine"
   def pull
-    run_crucial "git pull --rebase origin #{current_branch}", options.verbose?
-    run_crucial "bundle && bundle exec rake bootstrap", options.verbose?
-  end
+    branch = Git.current_branch
 
-  method_options %w( verbose -v ) => :boolean
-  desc "push", "push local changes out to the remote"
-  def push
-    run_crucial "git push -u origin #{current_branch}", true
+    run_crucial "git pull --rebase origin #{branch}", options.verbose?
+    run_crucial "bundle && bundle exec rake bootstrap", options.verbose?
   end
 
   method_options %w( verbose -v ) => :boolean
   desc "stage", "pushes current branch, and stages it"
   def stage
-    invoke :push
+    branch = Git.current_branch
 
-    run_crucial "cap _2.5.10_ stage BRANCH=#{current_branch}", options.verbose?
+    run_crucial "git push -u origin #{branch}", true
+    run_crucial "cap _2.5.10_ stage BRANCH=#{branch}", options.verbose?
 
     puts green("Stage Succeeded")
   end
@@ -51,41 +36,34 @@ class Bard::CLI < Thor
   method_options %w( verbose -v ) => :boolean
   desc "deploy", "checks that branch is a ff with master, checks with ci, and then merges into master and deploys to production, and deletes branch."
   def deploy
-    branch = current_branch
+    branch = Git.current_branch
 
-    run_crucial "git fetch origin"
-    raise MasterNonFastForwardError if not fast_forward_merge? "origin/master", "master"
+    run_crucial "git fetch origin master:master"
 
     if branch == "master"
-      run_crucial "git push origin master"
+      run_crucial "git push origin master:master"
       invoke :ci
 
     else
-      run_crucial "git checkout master"
-      run_crucial "git merge origin/master"
-      run_crucial "git checkout #{branch}"
-      raise MasterNonFastForwardError if not fast_forward_merge? "master", branch
+      if not Git.fast_forward_merge? "master", branch
+        raise "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your branch on top of it, and check for breakage."
+      end
 
-      run_crucial "git push -f origin #{branch}"
+      run_crucial "git push -f origin #{branch}:#{branch}"
 
-      invoke :ci, current_sha
+      invoke :ci
 
-      run_crucial "git checkout master"
-      run_crucial "git merge #{branch}"
-      run_crucial "git push origin master"
+      run_crucial "git push origin #{branch}:master"
+      run_crucial "git fetch origin master:master"
     end
 
-    if heroku?
-      run_crucial "git push production master", options.verbose?
-      run_crucial "heroku run rake bootstrap:production:post", options.verbose?
-    else
-      run_crucial "cap _2.5.10_ deploy", options.verbose?
-    end
+    run_crucial "cap _2.5.10_ deploy", options.verbose?
 
     puts green("Deploy Succeeded")
 
     if branch != "master"
       puts "Deleting branch: #{branch}"
+      run_crucial "git checkout master" if current_branch == branch
       run_crucial "git push --delete origin #{branch}"
       run_crucial "git branch -d #{branch}"
     end
@@ -93,20 +71,14 @@ class Bard::CLI < Thor
 
   method_options %w( verbose -v ) => :boolean
   desc "ci", "runs ci against current HEAD"
-  def ci sha=current_sha
-    return unless has_ci?
-
-    puts "Continuous integration: starting build on #{sha}..."
-    last_build_number = get_last_build_number
-    last_time_elapsed = get_last_time_elapsed
-    start_ci sha
-    sleep(2) while last_build_number == get_last_build_number
-
-    start_time = Time.new.to_i
-    while (response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`).include? "<building>true</building>"
-      elapsed_time = Time.new.to_i - start_time
-      if last_time_elapsed
-        percentage = (elapsed_time.to_f / last_time_elapsed.to_f * 100).to_i
+  def ci
+    ci = CI.new(project_name, Git.current_sha)
+    return unless ci.exists?
+    puts "Continuous integration: starting build on #{Git.current_branch}..."
+
+    success = ci.run do |elapsed_time, last_time|
+      if last_time
+        percentage = (elapsed_time.to_f / last_time.to_f * 100).to_i
         output = "  Estimated completion: #{percentage}%"
       else
         output = "  No estimated completion time. Elapsed time: #{elapsed_time} sec"
@@ -114,61 +86,16 @@ class Bard::CLI < Thor
       print "\x08" * output.length
       print output
       $stdout.flush
-      sleep(2)
-    end
-    puts
-
-    case response
-      when /<result>FAILURE<\/result>/ then 
-        puts
-        puts `curl -s #{ci_host}/lastBuild/console?token=botandrose`.match(/<pre>(.+)<\/pre>/m)[1]
-        puts
-        raise TestsFailedError, "#{ci_host}/#{get_last_build_number}/console"
-
-      when /<result>ABORTED<\/result>/ then 
-        raise TestsAbortedError, "#{ci_host}/#{get_last_build_number}/console"
-
-      when /<result>SUCCESS<\/result>/ then
-        puts "Continuous integration: success! deploying to production"
-
-      else raise "Unknown response from CI server: #{response}"
     end
-  end
-
-  private
-
-  def heroku?
-    `git remote -v`.include? "production\tgit@heroku.com:"
-  end
 
-  def ci_host
-    "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
-  end
-
-  def has_ci?
-    `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
-  end
-
-  def start_ci sha=nil
-    if sha
-      command = "curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{sha}'"
+    if success
+      puts
+      puts "Continuous integration: success! deploying to production"
     else
-      command = "curl -s -I -X POST '#{ci_host}/build?token=botandrose'"
+      puts
+      puts ci.console
+      puts "Automated tests failed!"
     end
-    puts command if options.verbose?
-    `#{command}`
-  end
-
-  def get_last_build_number
-    response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`
-    response.match(/<number>(\d+)<\/number>/)
-    $1 ? $1.to_i : nil
-  end
-
-  def get_last_time_elapsed
-    response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
-    response.match(/<duration>(\d+)<\/duration>/)
-    $1 ? $1.to_i / 1000 : nil
   end
 end
 

data/lib/bard/base.rb

@@ -8,7 +8,7 @@ class Bard::CLI < Thor
   private
 
   def fatal(message)
-    raise Bard::CLI::Error, red("!!! ") + message
+    raise red("!!! ") + message
   end
 
   def run_crucial(command, verbose = false)

data/lib/bard/capistrano.rb

@@ -16,6 +16,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace "pull" do
       desc "pull data"
       task "default" do
+        exec "heroku db:pull --confirm #{project_name}" if heroku?
+
         run "cd #{application} && bundle exec rake db:dump && gzip -9f db/data.sql"
         transfer :down, "#{application}/db/data.sql.gz", "db/data.sql.gz"
         system "gunzip -f db/data.sql.gz && bundle exec rake db:load"
@@ -60,14 +62,28 @@ Capistrano::Configuration.instance(:must_exist).load do
   after 'data:push', 'data:push:assets'
 
   desc "push app to production"
-  task :deploy, :roles => :production do
-    system "git push github" if `git remote` =~ /\bgithub\b/
-    run "cd #{application} && git pull origin master && bundle && bundle exec rake bootstrap:production"
+  task :deploy do
+    if heroku? "production"
+      system "git push production master"
+      system "heroku run rake bootstrap:production:post"
+    else
+      system "git push github" if `git remote` =~ /\bgithub\b/
+      run "cd #{application} && git pull origin master && bundle && bundle exec rake bootstrap:production", :roles => :production
+    end
   end
 
   desc "push app to staging"
-  task :stage, :roles => :staging do
-    branch = ENV.fetch("BRANCH")
-    run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bundle && bundle exec rake bootstrap:production"
+  task :stage do
+    if heroku? "staging"
+      system "git push -f staging master"
+      system "heroku run rake bootstrap:production:post"
+    else
+      branch = ENV.fetch("BRANCH")
+      run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bundle && bundle exec rake bootstrap:production", :roles => :staging
+    end
+  end
+
+  def heroku? role
+    `git remote -v`.include? "#{role}\tgit@heroku.com:"
   end
 end

data/lib/bard/ci.rb

@@ -0,0 +1,51 @@
+class Bard::CLI < Thor
+  class CI < Struct.new(:project_name, :current_sha)
+    def run
+      last_build_number = get_last_build_number
+      last_time_elapsed = get_last_time_elapsed
+      start
+      sleep(2) while last_build_number == get_last_build_number
+
+      start_time = Time.new.to_i
+      while (response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`).include? "<building>true</building>"
+        elapsed_time = Time.new.to_i - start_time
+        yield elapsed_time, last_time_elapsed
+        sleep(2)
+      end
+
+      response =~ /<result>SUCCESS<\/result>/
+    end
+
+    def exists?
+      `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
+    end
+
+    def console
+      raw = `curl -s #{ci_host}/lastBuild/console?token=botandrose`
+      raw[/<pre>(.+)<\/pre>/m, 1]
+    end
+
+    private
+
+    def ci_host
+      "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
+    end
+
+    def start
+      `curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{current_sha}'`
+    end
+
+    def get_last_build_number
+      response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`
+      response.match(/<number>(\d+)<\/number>/)
+      $1 ? $1.to_i : nil
+    end
+
+    def get_last_time_elapsed
+      response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
+      response.match(/<duration>(\d+)<\/duration>/)
+      $1 ? $1.to_i / 1000 : nil
+    end
+  end
+end
+

data/lib/bard/git.rb

@@ -1,5 +1,5 @@
 module Bard::CLI::Git
-  private
+  module_function
 
   def current_branch
     ref = `git symbolic-ref HEAD 2>&1`.chomp
@@ -12,14 +12,10 @@ module Bard::CLI::Git
   end
 
   def fast_forward_merge?(root, branch)
-    root_head = run_crucial "git rev-parse #{root}"
-    branch_head = run_crucial "git rev-parse #{branch}"
-    @common_ancestor = find_common_ancestor root_head, branch_head 
-    @common_ancestor == root_head
-  end
-
-  def find_common_ancestor(head1, head2)
-    run_crucial "git merge-base #{head1} #{head2}"
+    root_head = `git rev-parse #{root}`.chomp
+    branch_head = `git rev-parse #{branch}`.chomp
+    common_ancestor = `git merge-base #{root_head} #{branch_head}`.chomp
+    common_ancestor == root_head
   end
 end
 

data/lib/bard/version.rb

@@ -0,0 +1,4 @@
+module Bard
+  VERSION = "0.23.1"
+end
+

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Micah Geisel
-- Nick Hogle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,36 +94,49 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-description: This immaculate work of engineering genius allows mere mortals to collaborate
-  with beings of transcendent intelligence like Micah, Michael, and Nick.
+        version: '0'
+description: CLI to automate common development tasks.
 email:
 - micah@botandrose.com
 executables:
@@ -135,12 +147,13 @@ files:
 - ".document"
 - ".gitignore"
 - ".gitmodules"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bard.gemspec
 - bin/bard
 - features/bard_check.feature
@@ -158,12 +171,14 @@ files:
 - lib/bard.rb
 - lib/bard/base.rb
 - lib/bard/capistrano.rb
-- lib/bard/error.rb
+- lib/bard/ci.rb
 - lib/bard/git.rb
+- lib/bard/version.rb
 - spec/bard_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/botandrose/bard
-licenses: []
+homepage: http://github.com/botandrose/bard
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -184,5 +199,19 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Tools for collaborating with Bot and Rose Design.
-test_files: []
+summary: CLI to automate common development tasks.
+test_files:
+- features/bard_check.feature
+- features/bard_deploy.feature
+- features/bard_pull.feature
+- features/bard_push.feature
+- features/step_definitions/check_steps.rb
+- 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
+- spec/bard_spec.rb
+- spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.23.0

data/lib/bard/error.rb

@@ -1,25 +0,0 @@
-class Bard::CLI < Thor
-  class NonFastForwardError < Bard::CLI::Error
-    def message
-      "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work, and try again"
-    end
-  end
-
-  class MasterNonFastForwardError < Bard::CLI::Error
-    def message
-      "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your branch on top of it, and check for breakage."
-    end
-  end
-  
-  class TestsFailedError < Bard::CLI::Error
-    def message
-      "Automated tests failed!\n  See #{super} for more info."
-    end
-  end
-
-  class TestsAbortedError < Bard::CLI::Error
-    def message
-      "Automated tests aborted!\n  See #{super} for more info."
-    end
-  end
-end