bard 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "features/support/grit_ext.rb",
      "features/support/io.rb",
      "lib/bard.rb",
+     "lib/bard/check.rb",
      "lib/bard/git.rb",
      "lib/bard/io.rb",
      "spec/bard_spec.rb",

data/features/bard_check.feature

@@ -1,7 +1,7 @@
 Feature: Bard can check its environment for missing dependencies and potential problems
 
   Scenario: Bard check returns its version
-    When I type "bard check"
+    When I type "bard check -v"
     Then I should see the current version of bard
     And I should see the current version of git
     And I should see the current version of rubygems
@@ -9,96 +9,96 @@ Feature: Bard can check its environment for missing dependencies and potential p
 
   Scenario: Bard check examines a local project for problems
     Given a shared rails project
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see "No problems"
 
   Scenario: Bard check detects missing database
     Given a shared rails project
     And the database is missing
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "missing database"
   
   Scenario: Bard check detects pending migrations
     Given a shared rails project
     And I have committed a set of changes that includes a new migration
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "pending migrations"
 
   Scenario: Bard check detects missing config/database.yml
     Given a shared rails project
     And "config/database.yml" is missing
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "missing config/database.yml"
 
   Scenario: Bard check detects missing submodules
     Given a shared rails project
     And a submodule
     And the submodule is missing
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "missing submodule"
 
   Scenario: Bard check detects submodules with detached heads
     Given a shared rails project
     And a submodule
     And the submodule has a detached head
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "submodule has a detached head"
 
   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
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "missing gems"
 
   Scenario: Bard check detects master branch checked out
     Given a shared rails project
     And I am on the master branch
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "master branch"
 
   Scenario: Bard check detects missing integration branch
     Given a shared rails project
     And there is no integration branch
-    When I type "bard check ."
+    When I type "bard check"
     Then I should see the fatal error "missing integration branch"
 
   Scenario: Bard check detects non-tracking integration branch
     Given a shared rails project
     And the integration branch isnt tracking origin/integration
-    When I type "bard check ."
+    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 ."
+    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"
     And there is no git hook on the staging server
-    When I type "bard check ." on the staging server
+    When I type "bard check" on the staging server
     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 I type "bard check" on the staging server
     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 I type "bard check" on the staging server
     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 I type "bard check" on the staging server
     Then I should see the fatal error "denyCurrentBranch"

data/lib/bard.rb

@@ -8,46 +8,26 @@ require 'thor'
 require 'bard/git'
 require 'bard/io'
 
+require 'bard/check'
+
 class Bard < Thor
   include BardGit
   include BardIO
 
-  desc "check [PROJECT]", "check PROJECT or environment for missing dependencies"
-  def check(project = nil)
-    required = {
-      'bard'     => Net::HTTP.get(URI.parse("http://gemcutter.org/gems/bard.json")).match(/"version":"([0-9.]+)"/)[1],
-      'git'      => '1.6.4',
-      'rubygems' => '1.3.4',
-      'ruby'     => '1.8.6'
-    }
-    actual = {
-      'bard'     =>  File.read(File.expand_path(File.dirname(__FILE__) + "../../VERSION")).chomp,
-      'git'      => `git --version`[/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/],
-      'rubygems' =>  Gem::VERSION,
-      'ruby'     =>  RUBY_VERSION
-    }
-    help = {
-      'bard'     => 'please type `gem install bard` to update',
-      'git'      => 'please visit http://git-scm.com/download and install the appropriate package for your architecture',
-      'rubygems' => 'please type `gem update --system` to update',
-      'ruby'     => 'um... ask micah?'
-    }
-
-    %w(bard git rubygems ruby).each do |pkg|
-      if actual[pkg] < required[pkg]
-        puts red("#{pkg.ljust(9)} (#{actual[pkg]}) ... NEED (#{required[pkg]})")
-        puts red("  #{help[pkg]}")
-      else
-        puts green("#{pkg.ljust(9)} (#{actual[pkg]})")
-      end
-    end
+  VERSION = File.read(File.expand_path(File.dirname(__FILE__) + "../../VERSION")).chomp
+
+  method_options %w( verbose -v ) => :boolean
 
-    check_project(project) if project
+  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"
+    check_dependencies
+    check_project project_path if project_path
   end
 
   desc "pull", "pull changes to your local machine"
   def pull
-    invoke :check
+    check_dependencies
 
     ensure_project_root!
     ensure_integration_branch!
@@ -82,7 +62,7 @@ class Bard < Thor
 
   desc "push", "push local changes out to the remote"
   def push
-    invoke :check
+    check_dependencies
 
     ensure_project_root!
     ensure_integration_branch!
@@ -107,7 +87,6 @@ class Bard < Thor
 
   desc "deploy", "pushes, merges integration branch into master and deploys it to production"
   def deploy
-    invoke :check
     invoke :push
 
     run_crucial "git fetch origin"
@@ -119,12 +98,13 @@ class Bard < Thor
 
     run_crucial "git merge integration"
     run_crucial "git push origin master"
+    run_crucial "git checkout integration"
   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
-      invoke :check
+      check_dependencies
 
       if ENV['GIT_DIR'] == '.'
         # this means the script has been called as a hook, not manually.
@@ -140,12 +120,12 @@ class Bard < Thor
       head = File.read('.git/HEAD').chomp
       # abort if we're on a detached head
       exit unless head.sub! 'ref: ', ''
-      if head == "master"
-        run_crucial "cap deploy"
-      else
-        revs = gets.split ' '  
-        old_rev, new_rev = revs if head == revs.pop
+      revs = gets.split ' '  
+      old_rev, new_rev, branch = revs
 
+      if branch == "master"
+        run_crucial "cap deploy"
+      elsif read == branch
         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/.+) }
@@ -167,49 +147,4 @@ class Bard < Thor
       end
     end
   end
-
-  private
-    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"
-        errors << "missing config/database.sample.yml, please complain to micah" if not File.exist? "config/database.sample.yml"
-        errors << "missing database, please run `rake db:create db:migrate" if stderr.include? "Unknown database"
-        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 << "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"
-
-        if ENV['RAILS_ENV'] == "staging"
-          if not File.exist? ".git/hooks/post-receive" 
-            errors << "missing git hook, please complain to micah" 
-          else
-            errors << "unexecutable git hook, please complain to micah" unless File.executable? ".git/hooks/post-receive" 
-            errors << "improper git hook, please complain to micah" unless File.read(".git/hooks/post-receive").include? "bard stage $@"
-          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"
-          puts "please run it on the staging server by typing `cap shell` and then `bard check [PROJECT_NAME]`"
-        end
-      end
-    end
 end

data/lib/bard/check.rb

@@ -0,0 +1,76 @@
+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],
+        'git'      => '1.6.4',
+        'rubygems' => '1.3.4',
+        'ruby'     => '1.8.6'
+      }
+      actual = {
+        'bard'     =>  Bard::VERSION,
+        'git'      => `git --version`[/[0-9.]+/],
+        'rubygems' =>  Gem::VERSION,
+        'ruby'     =>  RUBY_VERSION
+      }
+      help = {
+        'bard'     => 'please type `gem install bard` to update',
+        'git'      => 'please visit http://git-scm.com/download and install the appropriate package for your architecture',
+        'rubygems' => 'please type `gem update --system` to update',
+        'ruby'     => 'um... ask micah?'
+      }
+
+      %w(bard git rubygems ruby).each do |pkg|
+        if actual[pkg] < required[pkg]
+          puts red("#{pkg.ljust(9)} (#{actual[pkg]}) ... NEED (#{required[pkg]})")
+          puts red("  #{help[pkg]}")
+        elsif options.verbose?
+          puts green("#{pkg.ljust(9)} (#{actual[pkg]})") 
+        end
+      end
+    end
+
+    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"
+        errors << "missing config/database.sample.yml, please complain to micah" if not File.exist? "config/database.sample.yml"
+        errors << "missing database, please run `rake db:create db:migrate" if stderr.include? "Unknown database"
+        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 << "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"
+
+        if ENV['RAILS_ENV'] == "staging"
+          if not File.exist? ".git/hooks/post-receive" 
+            errors << "missing git hook, please complain to micah" 
+          else
+            errors << "unexecutable git hook, please complain to micah" unless File.executable? ".git/hooks/post-receive" 
+            errors << "improper git hook, please complain to micah" unless File.read(".git/hooks/post-receive").include? "bard stage $@"
+          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"
+          puts "please run it on the staging server by typing `cap shell` and then `bard check [PROJECT_NAME]`"
+        end
+      end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Micah Geisel
@@ -135,6 +135,7 @@ files:
 - features/support/grit_ext.rb
 - features/support/io.rb
 - lib/bard.rb
+- lib/bard/check.rb
 - lib/bard/git.rb
 - lib/bard/io.rb
 - spec/bard_spec.rb