bard 0.8.9 → 0.8.10

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.10

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.8.9"
+  s.version = "0.8.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-02-28}
   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}

data/features/step_definitions/submodule_steps.rb

@@ -23,10 +23,9 @@ end
 
 Given /^a commit with a new submodule$/ do
   type "git submodule add #{ROOT}/tmp/submodule_a.git submodule"
-  type "git submodule init"
-  type "git submodule update --merge"
+  type "git submodule update --init"
   Dir.chdir "submodule" do
-    type "git checkout -b master origin/master"
+    type "git checkout master"
   end
   type "git add ."
   type "git commit -m 'added submodule'"

data/features/support/env.rb

@@ -13,10 +13,19 @@ ENV["GIT_INDEX_FILE"] = nil
 ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')
 
 # setup fixtures
-FileUtils.rm_rf "tmp"
-FileUtils.mkdir "tmp"
+if File.exist?("/dev/shm")
+  FileUtils.rm_rf "tmp"
+  tmp_dir = "/dev/shm/bard_testing_tmp"
+  FileUtils.rm_rf tmp_dir
+  FileUtils.mkdir tmp_dir
+  `ln -s #{tmp_dir} tmp`
+else 
+  FileUtils.rm_rf "tmp"
+  FileUtils.mkdir "tmp"
+end
+
 Dir.chdir 'tmp' do
-  `git clone --mirror --recursive ../fixtures/repo origin.git`
+  `git clone --mirror --recursive #{ROOT}/fixtures/repo origin.git`
 
   `git clone --bare --recursive origin.git submodule_a.git`
   `git clone --bare --recursive origin.git submodule_b.git`

data/lib/bard.rb

@@ -20,26 +20,27 @@ class Bard < Thor
 
   VERSION = File.read(File.expand_path(File.dirname(__FILE__) + "../../VERSION")).chomp
 
-  method_options %w( verbose -v ) => :boolean
-
   desc "create [PROJECT_NAME]", "create new project"
   def create(project_name)
+    auto_update!
     check_dependencies
     template_path = File.expand_path(File.dirname(__FILE__) + "/bard/template.rb")
     command = "rails --template=#{template_path} #{project_name}"
     exec command
   end
 
+  method_options %w( verbose -v ) => :boolean
   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" and File.exist? "config/environment.rb"
+    auto_update!
     check_dependencies
     check_project project_path if project_path
   end
 
   desc "data", "copy production database down to your local machine"
   def data
-    check_dependencies
+    ensure_sanity!
     exec "cap data:pull"
   end
 
@@ -50,8 +51,7 @@ class Bard < Thor
     warn NonFastForwardError unless fast_forward_merge?
 
     run_crucial "git pull --rebase origin integration"
-
-    prepare_environment changed_files(@common_ancestor, "origin/integration")
+    run_crucial "rake bootstrap:test"
   end
 
   desc "push", "push local changes out to the remote"
@@ -100,37 +100,19 @@ class Bard < Thor
 
   desc "stage", "!!! INTERNAL USE ONLY !!! reset HEAD to integration, update submodules, run migrations, install gems, restart server"
   def stage
-    check_dependencies
+    ensure_sanity!
 
-    ENV['RAILS_ENV'] = "staging"
     run_crucial "git fetch"
     run_crucial "git reset --hard origin/integration"
-    prepare_environment
+    run_crucial "rake bootstrap RAILS_ENV=staging"
   end
 
   private
     def ensure_sanity!
+      auto_update!
       check_dependencies
       raise NotInProjectRootError unless File.directory? ".git"
       raise NotOnIntegrationError unless current_branch == "integration"
       raise WorkingTreeDirtyError unless `git status`.include? "working directory clean"
     end
-
-    def prepare_environment(changed_files = nil)
-      if changed_files.nil? or changed_files.any? { |f| f =~ %r(^config/environment.+) }
-        run_crucial "rake gems:install"
-      end
-     
-      if changed_files.nil? or changed_files.any? { |f| f =~ %r(^db/migrate/.+) }
-        run_crucial "rake db:migrate"
-        run_crucial "rake db:migrate RAILS_ENV=test" unless ENV['RAILS_ENV'] == 'staging'
-      end
-       
-      run_crucial "git submodule sync"
-      run_crucial "git submodule init"
-      run_crucial "git submodule update --merge"
-      run_crucial "git submodule foreach 'git checkout `git name-rev --name-only HEAD`'"
-
-      system "touch tmp/restart.txt"
-    end
 end

data/lib/bard/capistrano.rb

@@ -26,17 +26,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     # system "rm db/data.sql"
   end
 
-  namespace "deploy" do
-    desc "push app from staging to production"
-    task :default, :roles => :production do
-      system "git push github" if `git remote` =~ /\bgithub\b/
-      run "cd #{application} && git pull"
-      run "cd #{application} && rake gems:install" if File.exist?("Rakefile")
-      run "cd #{application} && script/runner 'Sass::Plugin.options[:always_update] = true; Sass::Plugin.update_stylesheets'" if File.exist?("public/stylesheets/sass") or File.exist?("app/sass")
-      run "cd #{application} && rake asset:packager:build_all" if File.exist?("vendor/plugins/asset_packager")
-      run "cd #{application} && git submodule init && git submodule update" if File.exist?(".gitmodules")
-      run "cd #{application} && rake db:migrate && rake restart" if File.exist?("Rakefile")
-      puts "Deploy Succeeded"
-    end
+  desc "push app from staging to production"
+  task :deploy, :roles => :production do
+    system "git push github" if `git remote` =~ /\bgithub\b/
+    run "cd #{application} && git pull origin/master && rake bootstrap:production"
+    puts "Deploy Succeeded"
   end
 end

data/lib/bard/check.rb

@@ -1,27 +1,37 @@
 class Bard < Thor
   private
+    def auto_update!
+      original_command = [ENV["_"], @_invocations[Bard], ARGV].flatten.join(" ")
+      required = `curl -s http://gemcutter.org/api/v1/gems/bard.json`.match(/"version":"([0-9.]+)"/)[1]
+      if Versionomy.parse(Bard::VERSION) < Versionomy.parse(required)
+        original_command = [ENV["_"], @_invocations[Bard], ARGV].flatten.join(" ")
+        puts "bard gem is out of date... updating to new version"
+        exec "gem install bard && #{original_command}"
+      end
+      if options.verbose?
+        puts green("#{"bard".ljust(9)} (#{Bard::VERSION})") 
+      end
+    end
+
     def check_dependencies
       required = {
-        'bard'     => `curl -s http://gemcutter.org/api/v1/gems/bard.json`.match(/"version":"([0-9.]+)"/)[1],
         'git'      => '1.6.4',
         'rubygems' => '1.3.4',
-        'ruby'     => '1.8.6'
+        'ruby'     => '1.8.7'
       }
       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?'
+        'ruby'     => 'ruby 1.8.7 is required for all projects now. talk to micah for upgrade help'
       }
 
       errors = []
-      %w(bard git rubygems ruby).each do |pkg|
+      %w(git rubygems ruby).each do |pkg|
         if Versionomy.parse(actual[pkg]) < Versionomy.parse(required[pkg])
           errors << red("#{pkg.ljust(9)} (#{actual[pkg]}) ... NEED (#{required[pkg]})\n  #{help[pkg]}")
         elsif options.verbose?

data/lib/bard/rake.rb

@@ -1,10 +1,36 @@
-task :bootstrap do
-  `git submodule update --init` if `git submodule` =~ /^[^ ]/
-  `cp config/database.sample.yml config/database.yml` unless File.exist?('config/database.yml')
-  `rake gems:install db:create db:schema:load RAILS_ENV=test`
-  `rake gems:install RAILS_ENV=cucumber`
+task :restart do
+  system "touch tmp/restart.txt"
+  system "touch tmp/debug.txt" if ENV["DEBUG"] == 'true'
+end
+
+desc "Bootstrap project"
+task :bootstrap => %w(bootstrap:files gems:install db:create db:migrate restart)
+
+namespace :bootstrap do
+  desc "Bootstrap project to run tests"
+  task :test => :bootstrap do
+    system "rake gems:install db:create db:schema:load RAILS_ENV=test"
+    system "rake gems:install RAILS_ENV=cucumber"
+  end
+
+  desc "Bootstrap project to run in production"
+  task :production => :bootstrap do
+    if File.exist?("public/stylesheets/sass") or File.exist?("app/sass")
+      Sass::Plugin.options[:always_update] = true;
+      Sass::Plugin.update_stylesheets
+    end
+    Rake::Task["asset:packager:build_all"].invoke if File.exist?("vendor/plugins/asset_packager")
+  end
+
+  task :files do
+    system "git submodule sync"
+    system "git submodule init"
+    system "git submodule update --merge"
+    system "git submodule foreach 'git checkout `git name-rev --name-only HEAD`'"
+    system "cp config/database.sample.yml config/database.yml" unless File.exist?('config/database.yml')
+  end
 end
 
 Rake::Task[:default].clear
 desc "Bootstrap the current project and run the tests."
-task :default => [:bootstrap, :spec, :cucumber]
+task :default => ["bootstrap:test", :spec, :cucumber]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-02-28 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency