bard 0.3.1 → 0.4.0

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "fixtures/repo"]
 	path = fixtures/repo
-	url = staging@staging.botandrose.com:fuelcafe
+	url = staging@staging.botandrose.com:bard/fixtures/repo

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "bard.gemspec",
      "bin/bard",
+     "features/bard_check.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",

data/features/bard_check.feature

@@ -0,0 +1,8 @@
+Feature: Bard can check its environment for missing dependencies and potential problems
+
+  Scenario: Bard check returns its version
+    When I type "bard check"
+    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
+    And I should see the current version of ruby

data/features/step_definitions/check_steps.rb

@@ -0,0 +1,20 @@
+Then /^I should see the current version of bard$/ do
+  version = File.read("#{ROOT}/VERSION").chomp
+  @stdout.should include "bard     (#{version})"
+end
+
+Then /^I should see the current version of git$/ do
+  version = `git --version`[/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/]
+  @stdout.should include "git      (#{version})"
+end
+
+Then /^I should see the current version of rubygems$/ do
+  version = `gem --version`.chomp
+  @stdout.should include "rubygems (#{version})"
+end
+
+Then /^I should see the current version of ruby$/ do
+  version = `ruby --version`[/[0-9]+\.[0-9]+\.[0-9]+/]
+  @stdout.should include "ruby     (#{version})"
+end
+

data/features/step_definitions/global_steps.rb

@@ -11,7 +11,7 @@ Given /^a shared rails project$/ do
     File.open ".git/hooks/post-receive", "w" do |f|
       f.puts <<-BASH
 #!/bin/bash
-RAILS_ENV=staging #{ROOT}/bin/bard stage
+RAILS_ENV=staging #{ROOT}/bin/bard stage $@
 BASH
       f.chmod 0775
     end
@@ -29,6 +29,9 @@ BASH
 end
 
 When /^I type "([^\"]*)"$/ do |command|
+  if command =~ /^bard/
+    command = "#{ROOT}/bin/#{command}"
+  end
   type command
 end
 

data/features/step_definitions/submodule_steps.rb

@@ -3,7 +3,8 @@ Given /^a submodule$/ do
   Dir.chdir "#{ROOT}/tmp/local" do
     type "git checkout integration"
     type "git pull --rebase"
-    type "git submodule update --init"
+    type "git submodule init"
+    type "git submodule update"
     @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
     @submodule_commit = type "git submodule status"
   end

data/lib/bard.rb

@@ -10,6 +10,29 @@ class Bard < Thor
   include BardGit
   include BardIO
 
+  desc "check", "check environment for missing dependencies"
+  def check
+    required = Hash.new
+    required['bard'] = `gem list bard --remote`[/[0-9]+\.[0-9]+\.[0-9]+/]
+    required['git'] = '1.6.0'
+    required['rubygems'] = '1.3.4'
+    required['ruby'] = '1.8.6'
+
+    actual = Hash.new
+    actual['bard'] = `gem list bard`[/[0-9]+\.[0-9]+\.[0-9]+/]
+    actual['git'] = `git --version`[/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/]
+    actual['rubygems'] = `gem --version`.chomp
+    actual['ruby'] = `ruby --version`[/[0-9]+\.[0-9]+\.[0-9]+/]
+
+    %w(bard git rubygems ruby).each do |pkg|
+      if actual[pkg] < required[pkg]
+        puts red("#{pkg.ljust(9)} (#{actual[pkg]}) ... NEED (#{required[pkg]})")
+      else
+        puts green("#{pkg.ljust(9)} (#{actual[pkg]})")
+      end
+    end
+  end
+
   desc "pull", "pull changes to your local machine"
   def pull
     ensure_integration_branch!

data/lib/bard/git.rb

@@ -38,7 +38,7 @@ module BardGit
       submodules.any? do |name, submodule|
         Dir.chdir submodule["path"] do
           branch = `git name-rev --name-only HEAD`.chomp
-          `git fetch`
+          `git fetch origin`
           submodule["id"] != `git rev-parse origin/#{branch}`.chomp
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Micah Geisel
@@ -122,8 +122,10 @@ files:
 - VERSION
 - bard.gemspec
 - bin/bard
+- features/bard_check.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