bard 0.8.12 → 0.8.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/bard.gemspec +1 -1
- data/lib/bard.rb +2 -1
- data/lib/bard/capistrano.rb +1 -1
- metadata +1 -1
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.8.
|
|
1
|
+
0.8.13
|
data/bard.gemspec
CHANGED
data/lib/bard.rb
CHANGED
|
@@ -103,7 +103,8 @@ class Bard < Thor
|
|
|
103
103
|
ensure_sanity!
|
|
104
104
|
|
|
105
105
|
run_crucial "git fetch"
|
|
106
|
-
run_crucial "git reset --hard origin
|
|
106
|
+
run_crucial "git checkout master && git reset --hard origin master"
|
|
107
|
+
run_crucial "git checkout integration && reset --hard origin integration"
|
|
107
108
|
run_crucial "rake bootstrap RAILS_ENV=staging"
|
|
108
109
|
end
|
|
109
110
|
|
data/lib/bard/capistrano.rb
CHANGED
|
@@ -29,7 +29,7 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
|
29
29
|
desc "push app from staging to production"
|
|
30
30
|
task :deploy, :roles => :production do
|
|
31
31
|
system "git push github" if `git remote` =~ /\bgithub\b/
|
|
32
|
-
run "cd #{application} && git pull origin
|
|
32
|
+
run "cd #{application} && git pull origin master && rake bootstrap:production"
|
|
33
33
|
puts "Deploy Succeeded"
|
|
34
34
|
end
|
|
35
35
|
end
|