bard 0.8.10 → 0.8.11

data/VERSION

@@ -1 +1 @@
-0.8.10
+0.8.11

data/bard.gemspec

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

data/features/bard_check.feature

@@ -68,3 +68,27 @@ Feature: Bard can check its environment for missing dependencies and potential p
     And the integration branch isnt tracking origin/integration
     When I type "bard check"
     Then I should see the fatal error "tracking"
+
+  Scenario: Bard check detects gitignored Capfile
+    Given a shared rails project
+    And the ".gitignore" file includes "Capfile"
+    When I type "bard check"
+    Then I should see the fatal error "Capfile should not be gitignored"
+
+  Scenario: Bard check detects gitignored config/deploy.rb
+    Given a shared rails project
+    And the ".gitignore" file includes "config/deploy.rb"
+    When I type "bard check"
+    Then I should see the fatal error "config/deploy.rb should not be gitignored"
+
+  Scenario: Bard check detects missing bard rake tasks
+    Given a shared rails project
+    And the "Rakefile" file does not include "bard/rake"
+    When I type "bard check"
+    Then I should see the fatal error "missing bard rake tasks"
+
+  Scenario: Bard check detects missing bard cap tasks
+    Given a shared rails project
+    And the "Capfile" file does not include "bard/capistrano"
+    When I type "bard check"
+    Then I should see the fatal error "missing bard capistrano tasks"

data/features/step_definitions/rails_steps.rb

@@ -34,3 +34,11 @@ end
 Then /^passenger should have been restarted$/ do
   File.exist?("tmp/restart.txt").should be_true
 end
+
+Given /^the "([^\"]+)" file includes "([^\"]+)"$/ do |file, contents|
+  file_append file, contents
+end
+
+Given /^the "([^\"]+)" file does not include "([^\"]+)"$/ do |file, contents|
+  gsub_file file, contents, ""
+end

data/features/support/io.rb

@@ -11,6 +11,10 @@ def type(command)
   @stdout || @stderr
 end
 
+def file_append(file_name, contents)
+  File.open(file_name, 'ab') { |file| file.puts("\n#{contents}") }
+end
+
 def file_inject(file_name, sentinel, string, before_after=:after)
   gsub_file file_name, /(#{Regexp.escape(sentinel)})/mi do |match|
     if before_after == :after 

data/lib/bard/check.rb

@@ -62,6 +62,11 @@ class Bard < Thor
           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"
+
+        errors << "Capfile should not be gitignored" if File.read(".gitignore") =~ /\bCapfile\b/
+        errors << "config/deploy.rb should not be gitignored" if File.read(".gitignore") =~ /\bconfig\/deploy\.rb\b/
+        errors << "missing bard rake tasks, please complain to micah" if File.read("Rakefile") !~ /\bbard\/rake\b/
+        errors << "missing bard capistrano tasks, please complain to micah" if File.read("Capfile") !~ /\bbard\/capistrano\b/
       end
 
       if not errors.empty?

data/lib/bard/template/initial.rb

@@ -14,6 +14,7 @@ plugin 'asset_packager', :git => 'git://github.com/sbecker/asset_packager.git'
 #plugin 'fckeditor', :git => 'git://github.com/originofstorms/fckeditor.git'
  
 # Install gems
+gem "bard"
 gem "haml", :version => "2.2.17"
 gem "compass", :version => "0.8.17"
 rake "gems:install"
@@ -44,14 +45,6 @@ END
 rake "db:create"
 rake "db:migrate"
 
-# Restart task
-file "lib/tasks/restart.rake", <<-END
-task :restart do
-  system("touch tmp/restart.txt")
-  system("touch tmp/debug.txt") if ENV["DEBUG"] == 'true'
-end
-END
-
 # Staging Environment
 run "cp config/environments/development.rb config/environments/staging.rb"
 
@@ -184,6 +177,13 @@ public/stylesheets/*.css
 END
 
 # Deployment and staging setup
+file_append "Rakefile", <<-END
+
+begin
+  require 'bard/rake'
+rescue LoadError; end
+END
+
 file "Capfile", <<-END
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 require 'bard/capistrano'

metadata

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