bard 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   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-10-07}
+  s.date = %q{2009-11-05}
   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}
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "features/support/io.rb",
      "lib/bard.rb",
      "lib/bard/check.rb",
+     "lib/bard/error.rb",
      "lib/bard/git.rb",
      "lib/bard/io.rb",
      "spec/bard_spec.rb",

data/bin/bard

@@ -1,17 +1,9 @@
 #!/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"
+require 'bard'
+begin
+  Bard.start ARGV
+rescue BardError => e
+  fatal e.message
 end
-Thor::Runner.start args 

data/lib/bard.rb

@@ -5,6 +5,7 @@ require 'systemu'
 require 'grit'
 require 'thor'
 
+require 'bard/error'
 require 'bard/git'
 require 'bard/io'
 
@@ -27,58 +28,22 @@ class Bard < Thor
 
   desc "pull", "pull changes to your local machine"
   def pull
-    check_dependencies
-
-    ensure_project_root!
-    ensure_integration_branch!
-    ensure_clean_working_directory!
+    ensure_sanity!
 
-    unless fast_forward_merge?
-      warn "Someone has pushed some changes since you last pulled.\n  Please ensure that your changes didnt break stuff."
-    end
+    warn NonFastForwardError unless fast_forward_merge?
 
     run_crucial "git pull --rebase origin integration"
 
-    changed_files = run_crucial("git diff #{@common_ancestor} origin/integration --diff-filter=ACDMR --name-only").split("\n") 
-   
-    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 --merge"
-    run_crucial "git submodule foreach 'git reset --hard'"
-   
-    if changed_files.any? { |f| f =~ %r(^config/environment.+) }
-      run_crucial "rake gems:install"
-    end
-
-    system "touch tmp/restart.txt"
+    prepare_environment = changed_files(@common_ancestor, "origin/integration")
   end
 
   desc "push", "push local changes out to the remote"
   def push
-    check_dependencies
+    ensure_sanity!
 
-    ensure_project_root!
-    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
+    raise SubmoduleDirtyError if submodule_dirty?
+    raise SubmoduleUnpushedError if submodule_unpushed?
+    raise NonFastFowardError unless fast_forward_merge?
 
     run_crucial "git push origin integration", true
     
@@ -92,8 +57,7 @@ class Bard < Thor
     run_crucial "git fetch origin"
     run_crucial "git checkout master"
     run_crucial "git pull --rebase origin master"
-    if not fast_forward_merge? "master", "integration"
-      fatal "master has advanced since last deploy, probably due to a bugfix. rebase your integration branch on top of it, and check for breakage."
+    raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
     end
 
     run_crucial "git merge integration"
@@ -116,35 +80,41 @@ class Bard < Thor
         ENV['GIT_DIR'] = '.git'
       end
 
-      # 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, branch = revs
+      raise StagingDetachedHeadError unless current_branch
+      old_rev, new_rev, branch = revs.split(' ') # get the low down about the commit from the git hook
 
-      if head == branch
+      if current_branch == branch
         run_crucial "git reset --hard"
+        prepare_environment changed_files(old_rev, new_rev)
+      end
+    end
+  end
 
-        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
+  private
+    def ensure_sanity!
+      check_dependencies
+      raise NotInProjectRootError unless File.directory? ".git"
+      raise NotOnIntegrationError if current_branch == "integration"
+      raise WorkingTreeDirtyError unless `git status`.include? "working directory clean"
+    end
 
-        system "touch tmp/restart.txt"
+    def prepare_environment(changed_files)
+      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
+      run_crucial "git submodule update --merge"
+      run_crucial "git submodule foreach 'git reset --hard'"
+     
+      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/check.rb

@@ -35,7 +35,6 @@ class Bard < Thor
 
     def check_project(project)
       errors = []
-      warnings = []
       Dir.chdir project do
         status, stdout, stderr = systemu "rake db:abort_if_pending_migrations"
         errors << "missing config/database.yml, adapt from config/database.sample.yml." if stderr.include? "config/database.yml"
@@ -44,13 +43,15 @@ class Bard < Thor
         errors << "pending migrations, please run `rake db:migrate`" if stdout.include? "pending migrations"
 
         errors << "missing submodule, please run git submodule update --init" if `git submodule status` =~ /^-/
-        errors << "submodule has a detached head, please complain to micah" unless system 'git submodule foreach "git symbolic-ref HEAD"'
+        errors << "submodule has a detached head, please complain to micah" unless system 'git submodule foreach "git symbolic-ref HEAD 1>/dev/null 2>/dev/null"'
 
         errors << "missing gems, please run `rake gems:install`" if `rake gems` =~ /\[ \]/
 
         errors << "missing integration branch, please complain to micah" if `git branch` !~ /\bintegration\b/
-        errors << "integration branch isnt tracking the remote integration branch, please run `grb track integration`" if `git config branch.integration.merge` !~ %r%\brefs/heads/integration\b%
-        errors << "you shouldn't be working on the master branch, please work on the integration branch" if `cat .git/HEAD`.include? "refs/heads/master"
+        unless ENV['RAILS_ENV'] == "staging"
+          errors << "integration branch isnt tracking the remote integration branch, please run `grb track integration`" if `git config branch.integration.merge` !~ %r%\brefs/heads/integration\b%
+        end
+        errors << "you shouldn't be working on the master branch, please work on the integration branch" if current_branch == "master"
 
         if ENV['RAILS_ENV'] == "staging"
           if not File.exist? ".git/hooks/post-receive" 
@@ -61,17 +62,13 @@ class Bard < Thor
           end
           errors << "the git config variable receive.denyCurrentBranch is not set to ignore, please complain to micah" if `git config receive.denyCurrentBranch`.chomp != "ignore"
         end
-
-        warnings << "RAILS_ENV is not set, please complain to micah" if ENV['RAILS_ENV'].nil? or ENV['RAILS_ENV'].empty?
       end
 
       if not errors.empty?
         fatal "#{errors.length} problems detected:\n  #{errors.join("\n  ")}"
-      elsif not warnings.empty?
-        warn "#{warnings.length} potential problems detected:\n  #{warnings.join("\n  ")}"
       else
         puts green("No problems detected in project: #{project}")
-        if ENV['RAILS_ENV'] != "staging"
+        unless ENV['RAILS_ENV'] == "staging"
           puts "please run it on the staging server by typing `cap shell` and then `bard check [PROJECT_NAME]`"
         end
       end

data/lib/bard/error.rb

@@ -0,0 +1,21 @@
+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.",
+    "NonFastForwardError"       => "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work, and try again",
+    "MasterNonFastForwardError" => "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your integration branch on top of it, and check for breakage.",
+    "NotInProjectRootError"     => "You are not in the project's root directory!",
+    "NotOnIntegrationError"     => "You are not on the integration branch!\n  Type `git checkout integration` to switch to it. If you have made changes to your current branch, please see Micah for assistance.",
+    "WorkingTreeDirtyError"     => "You have uncommitted changes!\n  Please run git commit before attempting to push or pull.",
+    "StagingDetachedHeadError"  => "The staging server is on a detached HEAD!\n  Please see Micah for assistance."
+  }.each do |error, message|
+    eval <<-RUBY
+    class #{error} < BardError
+      def message
+        %q{#{message}}
+      end
+    end
+  RUBY
+  end
+end

data/lib/bard/git.rb

@@ -1,17 +1,9 @@
 module BardGit
   private
-    def ensure_project_root!
-      fatal "You are not in the project's root directory!" unless File.directory? ".git"
-    end
-
-    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."
+    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"
     end
 
     def fast_forward_merge?(root = "origin/integration", branch = "HEAD")
@@ -26,6 +18,10 @@ module BardGit
       run_crucial "git merge-base #{head1} #{head2}"
     end
 
+    def changed_files(old_rev, new_rev)
+      run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
+    end
+
     def submodule_dirty?
       @repo ||= Grit::Repo.new "."
       submodules = Grit::Submodule.config(@repo, @repo.head.name)
@@ -41,9 +37,8 @@ module BardGit
       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 origin`
-          submodule["id"] != `git rev-parse origin/#{branch}`.chomp
+          submodule["id"] != `git rev-parse origin/#{current_branch}`.chomp
         end
       end
     end

data/lib/bard/io.rb

@@ -3,11 +3,12 @@ module BardIO
   private
 
     def warn(message)
-      $stderr.puts yellow("!!! ") + message
+      message = message.message if message.is_a? BardError
+      $stderr.puts yellow("!   ") + message
     end
 
     def fatal(message)
-      raise Thor::Error, red("!!! ") + message
+      raise 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.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,6 +136,7 @@ files:
 - features/support/io.rb
 - lib/bard.rb
 - lib/bard/check.rb
+- lib/bard/error.rb
 - lib/bard/git.rb
 - lib/bard/io.rb
 - spec/bard_spec.rb