bard 0.6.7 → 0.6.8

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]

data/bin/bard

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'bard'
+require File.dirname(__FILE__) + "/../lib/bard"
 begin
   Bard.start ARGV
-rescue BardError => e
+rescue Bard::Error => e
   fatal e.message
 end

data/features/bard_check.feature

@@ -69,12 +69,6 @@ Feature: Bard can check its environment for missing dependencies and potential p
     When I type "bard check"
     Then I should see the fatal error "tracking"
 
-  Scenario: Bard check detects missing RAILS_ENV environment variable
-    Given a shared rails project
-    And my "RAILS_ENV" environment variable is ""
-    When I type "bard check"
-    Then I should see the warning "RAILS_ENV is not set"
-
   Scenario: Bard check detects missing staging hook
     Given a shared rails project
     And my "RAILS_ENV" environment variable is "staging"

data/features/bard_deploy.feature

@@ -5,7 +5,7 @@ Feature: Bard deploy should fold the integration branch into master and perform
     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
     When I type "bard deploy"
-    Then I should see the fatal error "rebase"
+    Then I should see the fatal error "Rebase"
 
   Scenario: Bard deploy works
     Given a shared rails project

data/features/bard_pull.feature

@@ -12,7 +12,7 @@ Feature: bard pull
     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 branch should match the submodule origin branch
+    #TODO And the submodule branch should match the submodule origin branch
     And the submodule working directory should be clean
 
   Scenario: Pulling down when the latest changes include a submodule update

data/features/step_definitions/check_steps.rb

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

data/lib/bard.rb

@@ -1,4 +1,5 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
+require 'rubygems'
 require 'term/ansicolor'
 require 'net/http'
 require 'systemu'
@@ -21,7 +22,7 @@ class Bard < Thor
 
   desc "check [PROJECT_PATH]", "check current project and environment for missing dependencies and common problems"
   def check(project_path = nil)
-    project_path = "." if project_path.nil? and File.directory? ".git"
+    project_path = "." if project_path.nil? and File.directory? ".git" and File.exist? "config/environment.rb"
     check_dependencies
     check_project project_path if project_path
   end
@@ -34,7 +35,7 @@ class Bard < Thor
 
     run_crucial "git pull --rebase origin integration"
 
-    prepare_environment = changed_files(@common_ancestor, "origin/integration")
+    prepare_environment changed_files(@common_ancestor, "origin/integration")
   end
 
   desc "push", "push local changes out to the remote"
@@ -43,7 +44,7 @@ class Bard < Thor
 
     raise SubmoduleDirtyError if submodule_dirty?
     raise SubmoduleUnpushedError if submodule_unpushed?
-    raise NonFastFowardError unless fast_forward_merge?
+    raise NonFastForwardError unless fast_forward_merge?
 
     run_crucial "git push origin integration", true
     
@@ -58,7 +59,6 @@ class Bard < Thor
     run_crucial "git checkout master"
     run_crucial "git pull --rebase origin master"
     raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
-    end
 
     run_crucial "git merge integration"
     run_crucial "git push origin master"
@@ -81,9 +81,9 @@ class Bard < Thor
       end
 
       raise StagingDetachedHeadError unless current_branch
-      old_rev, new_rev, branch = revs.split(' ') # get the low down about the commit from the git hook
+      old_rev, new_rev, branch = gets.split(' ') # get the low down about the commit from the git hook
 
-      if current_branch == branch
+      if current_branch == branch.split('/').last
         run_crucial "git reset --hard"
         prepare_environment changed_files(old_rev, new_rev)
       end
@@ -94,7 +94,7 @@ class Bard < Thor
     def ensure_sanity!
       check_dependencies
       raise NotInProjectRootError unless File.directory? ".git"
-      raise NotOnIntegrationError if current_branch == "integration"
+      raise NotOnIntegrationError unless current_branch == "integration"
       raise WorkingTreeDirtyError unless `git status`.include? "working directory clean"
     end
 
@@ -104,11 +104,11 @@ class Bard < Thor
         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 sync"
       run_crucial "git submodule update --merge"
+      if `git submodule` =~ /^[^ ]/
+        run_crucial "git submodule update --init"
+      end
       run_crucial "git submodule foreach 'git reset --hard'"
      
       if changed_files.any? { |f| f =~ %r(^config/environment.+) }

data/lib/bard/error.rb

@@ -1,5 +1,4 @@
 class Bard < Thor
-  class BardError < StandardError; end
   {
     "SubmoduleDirtyError"       => "You have uncommitted changes to a submodule!\n  Please see Micah about this.",
     "SubmoduleUnpushedError"    => "You have unpushed changes to a submodule!\n  Please see Micah about this.",
@@ -11,7 +10,7 @@ class Bard < Thor
     "StagingDetachedHeadError"  => "The staging server is on a detached HEAD!\n  Please see Micah for assistance."
   }.each do |error, message|
     eval <<-RUBY
-    class #{error} < BardError
+    class #{error} < Bard::Error
       def message
         %q{#{message}}
       end

data/lib/bard/git.rb

@@ -3,7 +3,7 @@ module BardGit
     def current_branch
       ref = `git symbolic-ref HEAD 2>&1`.chomp
       return false if ref =~ /^fatal:/
-      rev.split('/').last # /refs/heads/master ... we want "master"
+      ref.split('/').last # /refs/heads/master ... we want "master"
     end
 
     def fast_forward_merge?(root = "origin/integration", branch = "HEAD")

data/lib/bard/io.rb

@@ -3,12 +3,12 @@ module BardIO
   private
 
     def warn(message)
-      message = message.message if message.is_a? BardError
+      message = message.new.message if message.superclass == Bard::Error
       $stderr.puts yellow("!   ") + message
     end
 
     def fatal(message)
-      raise red("!!! ") + message
+      raise Bard::Error, red("!!! ") + message
     end
 
     def run_crucial(command, verbose = false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Micah Geisel