oneblackbear-obbistrano 1.0.15 → 1.0.16

data/lib/obbistrano_tasks.rb

@@ -116,7 +116,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd plugins/cms && git remote add origin git://github.com:phpwax/wildfire.git"
       end
       run "cd plugins/cms && git fetch"
-      run "cd plugins/cms && git checkout -b #{cms} origin/#{cms}"
+      begin
+        run "cd plugins/cms && git checkout -b #{cms} origin/#{cms}"
+      rescue
+        "cd plugins/cms && git checkout #{cms}"
+      end
     end
   
     task :php_wax_deploy do
@@ -128,7 +132,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd wax && git remote add origin git://github.com/phpwax/phpwax.git"
       end
       run "cd wax && git fetch"
-      run "cd wax && git checkout -b #{phpwax} origin/#{phpwax}"
+      begin
+        run "cd wax && git checkout -b #{phpwax} origin/#{phpwax}"
+      rescue
+        "cd wax && git checkout #{phpwax}"
+      end
     end
   
     ####### ##############
@@ -292,6 +300,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       app.deploy
     end
   end
+  
+  namespace :setup do
+    desc "Sets up the server with a user, home directory and mysql login."
+    task :default do
+      app.setup
+    end
+  end
 
 end
 

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.0.15"
+  s.version = "1.0.16"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oneblackbear-obbistrano
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors: 
 - Ross Riley