bard 0.11.1 → 0.11.2

data/.gitignore

@@ -4,3 +4,4 @@ coverage
 rdoc
 pkg
 tmp
+.bundle

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use ree-1.8.7-2010.02@bard

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://gemcutter.org"
+
+group :test, :cucumber do
+  gem "rspec", "~>1.3.0"
+end
+
+group :cucumber do
+  gem "cucumber"
+end

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://gemcutter.org/
+  specs:
+    builder (2.1.2)
+    cucumber (0.9.4)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    json (1.4.6)
+    rspec (1.3.1)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  rspec (~> 1.3.0)

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   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-10-18}
+  s.date = %q{2010-11-15}
   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}
@@ -22,6 +22,9 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      ".gitmodules",
+     ".rvmrc",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/bard.rb

@@ -65,8 +65,7 @@ class Bard < Thor
     raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
 
     run_crucial "git push origin #{current_branch}", true
-    
-    run_crucial_via_bard "bard stage"
+    run_crucial "cap stage"
   end
 
   desc "deploy", "pushes, merges integration branch into master and deploys it to production"
@@ -100,16 +99,6 @@ class Bard < Thor
     run_crucial "cap deploy"
   end
 
-  desc "stage", "!!! INTERNAL USE ONLY !!! reset HEAD to integration, update submodules, run migrations, install gems, restart server"
-  def stage
-    ensure_sanity!(true)
-
-    run_crucial "git fetch"
-    run_crucial "git checkout master && git reset --hard origin/master"
-    run_crucial "git checkout integration && git reset --hard origin/integration"
-    run_crucial "rake bootstrap RAILS_ENV=staging"
-  end
-
   private
     def ensure_sanity!(dirty_ok = false)
       auto_update!

data/lib/bard/capistrano.rb

@@ -1,6 +1,10 @@
 require 'uri'
 
 Capistrano::Configuration.instance(:must_exist).load do
+  $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
+  require "rvm/capistrano"
+  set :rvm_type, :user
+
   role :staging, "www@staging.botandrose.com:22022"
   set :asset_paths, []
 
@@ -29,10 +33,16 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   after 'data:pull', 'data:pull:assets'
 
-  desc "push app from staging to production"
+  desc "push app 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
+
+  desc "push app to staging"
+  task :stage, :roles => :staging do
+    run "cd #{application} && git fetch && git checkout -f origin/integration && rake bootstrap"
+    puts "Stage Succeeded"
+  end
 end

data/lib/bard/ssh_delegation.rb

@@ -28,9 +28,4 @@ class Bard < Thor
     def command_for(user, command)
       %(sudo -H -u #{user} bash -c "cd ~ && #{command}")
     end
-
-    def run_crucial_via_bard(command)
-      return if ENV['TESTING']
-      run_crucial %(ssh www@staging.botandrose.com -p22022 "cd #{project_name} && #{command}")
-    end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Micah Geisel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -07:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,6 +202,9 @@ files:
 - .document
 - .gitignore
 - .gitmodules
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile