obbistrano 1.1.96 → 1.1.98

data/lib/obbistrano_tasks.rb

@@ -109,10 +109,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     task :git_deploy, :roles =>[:web] do
       logger.level = 2
+      pretty_print "Application being updated on branch #{branch}"
 
       set :local_branch, $1 if `git branch` =~ /\* (\S+)\s/m
       if !local_branch.eql? branch
         logger.info "You are on branch #{local_branch}, not #{branch}, please check out there before deploying to be able to combine the correct js and css files."
+        puts_fail
         exit
       end
 
@@ -124,10 +126,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       logger.level = -1
       begin
         run "ls #{deploy_to}/.git"
+        puts_ok
       rescue
         run "mkdir -p #{deploy_to}"
         run "cd #{deploy_to} && git init"
         run "cd #{deploy_to} && git remote add origin #{repository}"
+        puts_ok
       end
       logger.level = 2
 
@@ -143,7 +147,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
 
-      logger.info "Application has been updated on branch #{branch}"
     end
 
     task :svn_deploy, :roles =>[:web] do
@@ -152,6 +155,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     task :cms_deploy, :roles =>[:web] do
       logger.level = -1
+      pretty_print "--> Updating Wildfire CMS on branch #{cms}"
+      
       run "mkdir -p #{deploy_to}/plugins/cms"
       begin
         run "ls #{deploy_to}/plugins/cms/.git/"
@@ -170,13 +175,14 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd #{deploy_to}/plugins/cms && git checkout #{cms}"
       end
       run "cd #{deploy_to}/plugins/cms && git pull origin #{cms}"
+      puts_ok
       logger.level = 2
-      logger.info "Wildfire CMS has been updated on branch #{cms}"
     end
 
 
     task :php_wax_deploy, :roles =>[:web] do
       logger.level = -1
+      pretty_print "--> Updating PHP Wax has been updated on branch #{phpwax}"
       run "mkdir -p #{deploy_to}/wax"
       begin
         run "ls #{deploy_to}/wax/.git/"
@@ -191,12 +197,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       logger.level = -1
       begin
         run "cd #{deploy_to}/wax && git checkout -b #{phpwax} origin/#{phpwax}"
+        puts_ok
       rescue
         run "cd #{deploy_to}/wax && git checkout #{phpwax}"
       end
       run "cd #{deploy_to}/wax && git pull origin #{phpwax}"
       logger.level = 3
-      logger.info "PHP Wax has been updated on branch #{phpwax}"
     end
 
 
@@ -206,7 +212,13 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Clears the application's cache files from tmp/cache."
     task :clearcache, :roles =>[:web] do
-      run "cd #{deploy_to} && find tmp/cache -type f -exec rm -f \"{}\" \\;"
+      pretty_print "--> Clearing application cache directory"
+      begin
+        run "cd #{deploy_to} && find tmp/cache -type f -exec rm -f \"{}\" \\;"
+        puts_ok
+      rescue
+        puts_fail
+      end
     end
 
     desc "Clears the application's log files from tmp/log."
@@ -342,14 +354,17 @@ Capistrano::Configuration.instance(:must_exist).load do
       needs_root
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
+      pretty_print "--> Creating mysql user"
       with_user("root", "#{root_pass}") do
         "#{databases}".each do |db|
           begin
             run "mysql -uroot -p#{root_pass} -e \"CREATE USER '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
             run "mysql -uroot -p#{root_pass} -e 'CREATE DATABASE #{db}'"
             run "mysql -uroot -p#{root_pass} -e \"GRANT ALL PRIVILEGES ON #{db}.* TO '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';\""
+            puts_ok
           rescue
             logger.info "Database #{db} already exists"
+            puts_fail
           end
         end
       end
@@ -388,7 +403,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :needs_root do
-      puts "==> This operation needs root access - Please set a root password inside your /etc/capistrano.conf file".red if !defined? "#{root_pass}"
+      pretty_print "--> This operation needs root access - Please set a root password inside your /etc/capistrano.conf file".red if !defined? "#{root_pass}"
+      puts_fail if !defined? "#{root_pass}"
       exit if !defined? "#{root_pass}"
       config_check
     end
@@ -397,11 +413,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       config_check
       begin
         run "ls"
-        puts "Logged in ok"
+        pretty_print "Logged in ok"
+        puts_ok
       rescue
         print "==== The user does not yet exist. Would you like to create? [Y/N]"
         line = STDIN.gets.upcase.strip
         puts "==> Could not continue as the login does not exist" if line !="Y".red
+        puts_fail
         exit if line != "Y"
         setup_user
       end
@@ -483,18 +501,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     if defined? "#{newdeploy}" then
       if defined? "#{plugins}"
         plugins.each do |plugin|
-          print "plugin: #{plugin}\n"
+          pretty_print "--> plugin: #{plugin}\n"
           paths << "#{build_to}/plugins/#{plugin}/resources/public/stylesheets"
         end
       end
-      puts "--"
       paths.each do |path|
-        puts "folders: #{path}\n"
+        pretty_print "--> folders: #{path}\n"
       end
       Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
       paths.each do |bundle_directory|
-        puts "--"
-        puts "directory: #{bundle_directory}"
+        pretty_print "--> directory: #{bundle_directory}"
         bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/stylesheets", "").gsub("public/stylesheets/", "")
         puts " bundle name: #{bundle_name}"
         next if bundle_name.empty?
@@ -512,7 +528,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       paths << "#{build_to}/public/stylesheets/"
       Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
       paths.each do |bundle_directory|
-        puts bundle_directory
+        pretty_print bundle_directory
         bundle_name = if bundle_directory.index("plugins") then bundle_directory.gsub("#{build_to}/plugins/cms/resources/public/stylesheets", "") else bundle_directory.gsub("#{build_to}/public/stylesheets/", "") end
         bundle_name = if bundle_name.index("/") then bundle_name[0..bundle_name.index("/")-1] else bundle_name end
         next if bundle_name.empty?
@@ -533,7 +549,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     if defined? "#{newdeploy}" then
       if defined? "#{plugins}"
         plugins.each do |plugin|
-          puts "plugin: #{plugin}\n".green
+          pretty_print "--> plugin: #{plugin}\n"
           paths << "#{build_to}/plugins/#{plugin}/resources/public/javascripts"
         end
       end
@@ -543,10 +559,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
       paths.each do |bundle_directory|
-        puts "--"
-        puts "directory: #{bundle_directory}"
+        pretty_print "--> directory: #{bundle_directory}"
         bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/javascripts", "").gsub("public/javascripts/", "")
-        puts " bundle name: #{bundle_name}"
+        pretty_print "--> bundle name: #{bundle_name}"
         next if bundle_name.empty?
         files = recursive_file_list(bundle_directory, ".js")
         next if files.empty? || bundle_name == 'dev'
@@ -611,12 +626,20 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :get, :roles => :web, :except => { :no_release => true } do
       if !remote_file_exists?("#{deploy_to}/composer.phar")
         pretty_print "--> Downloading Composer"
-
-        run "sh -c 'cd #{deploy_to} && curl -s http://getcomposer.org/installer | #{php_bin}'"
+        begin
+          run "sh -c 'cd #{deploy_to} && curl -s http://getcomposer.org/installer | #{php_bin}'"
+          puts_ok
+        rescue
+          puts_fail
+        end 
       else
         pretty_print "--> Updating Composer"
-
-        run "sh -c 'cd #{deploy_to} && #{php_bin} composer.phar self-update'"
+        begin
+          run "sh -c 'cd #{deploy_to} && #{php_bin} composer.phar self-update'"
+          puts_ok
+        rescue
+          puts_fail
+        end
       end
       puts_ok
     end
@@ -624,8 +647,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Updates composer"
     task :self_update, :roles => :web, :except => { :no_release => true } do
       pretty_print "--> Updating Composer"
-      run "sh -c 'cd #{deploy_to} && #{composer_bin} self-update'"
-      puts_ok
+      begin
+        run "sh -c 'cd #{deploy_to} && #{composer_bin} self-update'"
+        puts_ok
+      rescue
+        puts_fail
+      end 
     end
 
     desc "Runs composer to install vendors from composer.lock file"
@@ -638,8 +665,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       pretty_print "--> Installing Composer dependencies"
-      run "sh -c 'cd #{deploy_to} && #{composer_bin} install #{composer_options}'"
-      puts_ok
+      begin
+        run "sh -c 'cd #{deploy_to} && #{composer_bin} install #{composer_options}'"
+        puts_ok
+      rescue
+        puts_fail
+      end 
     end
 
     desc "Runs composer to update vendors, and composer.lock file"
@@ -652,8 +683,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       pretty_print "--> Updating Composer dependencies"
-      run "sh -c 'cd #{deploy_to} && #{composer_bin} update #{composer_options}'"
-      puts_ok
+      begin
+        run "sh -c 'cd #{deploy_to} && #{composer_bin} update #{composer_options}'"
+        puts_ok
+      rescue
+        puts_fail
+      end 
     end
 
     desc "Dumps an optimized autoloader"
@@ -671,17 +706,10 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts_ok
       rescue
         puts_fail
-      end
-      
+      end      
       
     end
 
-    task :copy_vendors, :except => { :no_release => true } do
-      pretty_print "--> Copying vendors from previous release"
-
-      run "vendorDir=#{current_path}/vendor; if [ -d $vendorDir ] || [ -h $vendorDir ]; then cp -a $vendorDir #{deploy_to}/vendor; fi;"
-      puts_ok
-    end
   end
 
 

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.96"
+  s.version = "1.1.98"
   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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 96
-  version: 1.1.96
+  - 98
+  version: 1.1.98
 platform: ruby
 authors: 
 - Ross Riley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-06 00:00:00 +00:00
+date: 2013-01-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency