obbistrano 1.1.72 → 1.1.73

data/lib/obbistrano_tasks.rb

@@ -1,5 +1,5 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  
+
   #### Performs the initial setup for tasks ####
   task :config_setup do
     set :root_pass, root rescue nil
@@ -7,11 +7,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     set :build_to, build_to rescue set :build_to, deploy_to
   end
 
- 
+
   #### Slicehost Namespace.... Allows Auto Creation of DNS ####
- 
+
   namespace :slicehost do
- 
+
     desc "Sets up slicehost DNS for each of the servers specified with a role of web."
     task :setup do
       puts "*** You need to set a Slicehost API key in /etc/capistrano.conf to run this operation" if !defined? SLICEHOST_API_PASSWORD
@@ -33,7 +33,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         [recordOne, recordTwo, recordThree, recordFour, recordFive, recordSix, recordSeven].each {|r| r.save}
       end
     end
-  
+
     task :get_slice_ip do
       set :slice_ip, get_ip(fetch("host", false))
     end
@@ -65,19 +65,19 @@ Capistrano::Configuration.instance(:must_exist).load do
         [recordOne, recordTwo].each {|r| r.save}
       end
     end
- 
+
   end
 
 
   #### Github Namespace.... Allows Auto Creation of Repository, ssh keys and Repo permissions ####
 
   namespace :github do
-    
+
     task :init do
       puts "*** You need to specify a github login and token to run this operation" if !defined? "#{github_login}" || !defined? "#{github_token}"
       exit if !defined? "#{github_login}" || !defined? "#{github_token}"
     end
-    
+
     desc "Sets up a Github Project and allows access for the devs at One Black Bear"
     task :setup do
       init
@@ -95,7 +95,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       api.add_collaborator("MichalNoskovic")
       github:key
     end
-    
+
     desc "Grabs the SSH key from the server and adds it to the Github deploy keys"
     task :key do
       init
@@ -105,16 +105,16 @@ Capistrano::Configuration.instance(:must_exist).load do
       server_ssh_key
       api.add_key({:title=>"#{host}",:key=>server_ssh_key})
     end
-    
+
 
   end
-  
-  namespace :app do  
+
+  namespace :app do
 
     # =============================================================================
     # DEPLOYING APPLICATIONS
     # =============================================================================
-  
+
     task :full_deploy, :roles =>[:web] do
       host.config_check
       deploy_check
@@ -123,7 +123,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       bundle.css
       bundle.js
     end
-    
+
     desc "Deploys the application only - no Framework / Plugins"
     task :deploy, :roles =>[:web] do
       host.config_check
@@ -131,14 +131,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       bundle.css
       bundle.js
     end
-  
-    task :deploy_check, :roles =>[:web] do 
+
+    task :deploy_check, :roles =>[:web] do
       fetch "repository" rescue abort "You have not specified a repository for this application"
       git_copy if deploy_via=="copy" rescue ""
       git_deploy if repository.include? "git"
       svn_deploy if repository.include? "svn"
     end
-    
+
     task :git_copy, :roles=>[:web] do
       Dir.mkdir("tmp/deploy_cache") rescue ""
       system("git clone --depth 1 #{repository} tmp/deploy_cache/" )
@@ -146,16 +146,16 @@ Capistrano::Configuration.instance(:must_exist).load do
       upload "tmp/deploy_cache/", "#{deploy_to}", :via => :scp, :recursive=>true
       FileUtils.rm_rf 'tmp/deploy_cache'
     end
-  
+
     task :git_deploy, :roles =>[:web] do
       logger.level = 2
-      
+
       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." 
+        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."
         exit
       end
-      
+
       if defined? "#{commit}"
         logger.info "Deploying application from #{repository} on commit #{commit}"
       else
@@ -170,9 +170,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd #{deploy_to} && git remote add origin #{repository}"
       end
       logger.level = 2
-      
+
       run "cd #{deploy_to} && git fetch"
-      
+
       if defined? "#{commit}"
         run "cd #{deploy_to} && git checkout #{commit} && git submodule update --init --recursive"
       else
@@ -182,14 +182,14 @@ Capistrano::Configuration.instance(:must_exist).load do
           run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch} && git submodule update --init --recursive"
         end
       end
-      
+
       logger.info "Application has been updated on branch #{branch}"
     end
-  
+
     task :svn_deploy, :roles =>[:web] do
       run "svn export #{repository} #{deploy_to} --force"
     end
-  
+
     task :cms_deploy, :roles =>[:web] do
       logger.level = -1
       run "mkdir -p #{deploy_to}/plugins/cms"
@@ -213,8 +213,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       logger.level = 2
       logger.info "Wildfire CMS has been updated on branch #{cms}"
     end
-    
-  
+
+
     task :php_wax_deploy, :roles =>[:web] do
       logger.level = -1
       run "mkdir -p #{deploy_to}/wax"
@@ -238,30 +238,30 @@ Capistrano::Configuration.instance(:must_exist).load do
       logger.level = 3
       logger.info "PHP Wax has been updated on branch #{phpwax}"
     end
-  
-  
+
+
     # =============================================================================
     # GENERAL ADMIN FOR APPLICATIONS
     # =============================================================================
-  
+
     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 \"{}\" \\;"
     end
-  
+
     desc "Clears the application's log files from tmp/log."
     task :clearlogs, :roles =>[:web] do
       run "cd #{deploy_to} && find tmp/log -type f -exec rm -f \"{}\" \\;"
     end
-    
-    
+
+
     desc "Uses configs in the app/platform directory to configure servers"
-    task :install, :roles =>[:host] do 
+    task :install, :roles =>[:host] do
       host.config_check
       host.needs_root
       set :user_to_config, "#{user}"
       begin
-        with_user("root", "#{root_pass}") do 
+        with_user("root", "#{root_pass}") do
           run "rm -f /etc/nginx/sites-enabled/#{user_to_config}.conf; ln -s /home/#{user_to_config}/#{deploy_to}/app/platform/nginx.conf /etc/nginx/sites-enabled/#{user_to_config}.conf"
           run "rm -f /etc/apache2/sites-enabled/#{user_to_config}.conf; ln -s /home/#{user_to_config}/#{deploy_to}/app/platform/apache.conf /etc/apache2/sites-enabled/#{user_to_config}.conf"
         end
@@ -269,10 +269,10 @@ Capistrano::Configuration.instance(:must_exist).load do
         logger.info "Writing User Cron File"
         write_crontab(user_cron_tasks)
       rescue
-        
+
       end
     end
-    
+
     def write_crontab(data)
       tmp_cron_file = Tempfile.new('temp_cron').path
       File.open(tmp_cron_file, File::WRONLY | File::APPEND) do |file|
@@ -291,8 +291,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         exit(1)
       end
     end
-    
-  
+
+
   end
 
 
@@ -302,22 +302,22 @@ Capistrano::Configuration.instance(:must_exist).load do
     t[3]
   end
 
-  def with_user(new_user, new_pass, &block) 
-    old_user, old_pass = user, password 
-    set :user, new_user 
-    set :password, new_pass 
-    close_sessions 
-    yield 
-    set :user, old_user 
-    set :password, old_pass 
-    close_sessions 
-  end 
-  def close_sessions 
-    sessions.values.each { |session| session.close } 
-    sessions.clear 
+  def with_user(new_user, new_pass, &block)
+    old_user, old_pass = user, password
+    set :user, new_user
+    set :password, new_pass
+    close_sessions
+    yield
+    set :user, old_user
+    set :password, old_pass
+    close_sessions
   end
-  
-  
+  def close_sessions
+    sessions.values.each { |session| session.close }
+    sessions.clear
+  end
+
+
   namespace :deploy do
     desc "Uses the specified repository to deploy an application. Also checks for correct versions of PHPWax and plugins."
     task :default, :roles => [:web]  do
@@ -325,17 +325,17 @@ Capistrano::Configuration.instance(:must_exist).load do
       app.full_deploy
     end
   end
-  
+
   namespace :setup do
     desc "Sets up the server with a user, home directory and mysql login."
     task :default do
       host.setup
     end
   end
-  
-  namespace :host do        
-    
-    
+
+  namespace :host do
+
+
     desc "Sets up the server with a user, home directory and mysql login."
     task :setup, :roles => [:host] do
       try_login
@@ -345,25 +345,25 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Restarts the web server."
     task :restart, :roles => [:host] do
-      needs_root      
+      needs_root
       fedora.restart
     end
-    
+
     desc "Creates a new Apache VHost."
     task :vhost, :roles => [:host] do
       needs_root
       fedora.vhost
       fedora.restart
     end
-    
+
     desc "Sets up a new user."
     task :setup_user, :roles => [:host] do
       needs_root
       fedora.setup_user
     end
-    
+
     desc "Creates or gets an ssh key for the application"
-    task :ssh_key, :roles =>[:host] do 
+    task :ssh_key, :roles =>[:host] do
       config_check
       begin
         run "cat .ssh/id_rsa.pub"
@@ -373,7 +373,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cat .ssh/id_rsa.pub"
       end
     end
-    
+
     desc "Creates a MySQL user and database"
     task :setup_mysql, :roles =>[:host] do
       needs_root
@@ -391,7 +391,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
     end
-    
+
     desc "Detects what flavour of linux is being used"
     task :detect_os, :roles =>[:host] do
       begin
@@ -406,30 +406,30 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       eval "#{os_ver}".testos
     end
-    
-    
-    
+
+
+
     # =============================================================================
     # +MIGRATING+ APPLICATIONS
     # =============================================================================
-    
-    
-    
-    
+
+
+
+
     ###### Private tasks for server operations #############
-    
+
     task :config_check do
       config_setup
       databases rescue set(:databases, ["#{application}"])
       aliases rescue set(:aliases, []);
     end
-  
+
     task :needs_root do
       puts "*** This operation needs root access - Please set a root password inside your /etc/capistrano.conf file" if !defined? "#{root_pass}"
       exit if !defined? "#{root_pass}"
       config_check
     end
-    
+
     task :try_login, :roles =>[:host] do
       config_check
       begin
@@ -443,22 +443,22 @@ Capistrano::Configuration.instance(:must_exist).load do
         setup_user
       end
     end
-    
+
   end
-  
+
   namespace :fedora do
 
     task :setup_user, :roles =>[:host] do
       set :user_to_add, "#{user}"
       set :passwd_to_add, "#{password}"
-      with_user("root", "#{root_pass}") do 
+      with_user("root", "#{root_pass}") do
         run "useradd -m -r -p `openssl passwd #{passwd_to_add}` #{user_to_add}"
         run "chmod -R 0755 /home/#{user_to_add}"
       end
     end
-  
+
     task :vhost, :roles =>[:host] do
-      with_user("root", "#{root_pass}") do 
+      with_user("root", "#{root_pass}") do
         public_ip = ""
         run "ifconfig eth0 | grep inet | awk '{print $2}' | sed 's/addr://'" do |_, _, public_ip| end
         public_ip = public_ip.strip
@@ -469,31 +469,31 @@ Capistrano::Configuration.instance(:must_exist).load do
           buffer = ERB.new(contents)
           config = buffer.result(binding())
           put config, "/etc/httpd/conf.d/#{webserver}-apache-vhost.conf"
-        end  
+        end
       end
     end
 
     task :restart, :roles =>[:host] do
-      with_user("root", "#{root_pass}") do 
+      with_user("root", "#{root_pass}") do
         run "/etc/init.d/httpd restart"
       end
     end
-    
-    task :ostest, :roles => [:host] do 
+
+    task :ostest, :roles => [:host] do
       puts "#{os_ver}"
       exit
     end
 
   end
-  
+
   namespace :ubuntu do
-    task :ostest, :roles => [:host] do 
+    task :ostest, :roles => [:host] do
       puts "#{os_ver}"
       exit
     end
   end
-  
-  task :mirror do 
+
+  task :mirror do
     print "==== Which server would you like to copy #{application} to? [Full Domain Name] "
     new_server = STDIN.gets.strip
     old_roles = roles[:web]
@@ -508,25 +508,26 @@ Capistrano::Configuration.instance(:must_exist).load do
     "#{databases}".each do |db|
       run "mysqldump #{db} | ssh #{user}@#{new_server} mysql #{db}"
     end
-  
-  end  
 
+  end
 
-  namespace :bundle do 
+
+  namespace :bundle do
 
    task :css, :roles => [:web] do
     paths = get_top_level_directories("#{build_to}/public/stylesheets")
-    if defined? "#{newdeploy}" then      
+    if defined? "#{newdeploy}" then
       paths << "#{build_to}/public/stylesheets/"
       if defined? "#{plugins}"
         plugins.each do |plugin|
+          print "#{plugin}"
           paths << "#{build_to}/plugins/#{plugin}/resources/public/stylesheets"
         end
       end
       Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
-      paths.each do |bundle_directory|      
-        bundle_name = bundle_directory.gsub(/(\/plugins)|(resources)|(public)|(stylesheets)|(\/)/i, "")
-        bundle_name = if(bundle_name.index(".") == 0) then bundle_name[1..bundle_name.length] else bundle_name end
+      paths.each do |bundle_directory|
+        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/stylesheets", "")
+        puts "  #{bundle_name}"
         next if bundle_name.empty?
         files = recursive_file_list(bundle_directory, ".css")
         next if files.empty? || bundle_name == 'dev'
@@ -542,6 +543,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
         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?
@@ -560,7 +562,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   task :js , :roles => [:web] do
     paths = get_top_level_directories("#{build_to}/public/javascripts")
-    if defined? "#{newdeploy}" then      
+    if defined? "#{newdeploy}" then
       paths << "#{build_to}/public/javascripts/"
       if defined? "#{plugins}"
         plugins.each do |plugin|
@@ -570,8 +572,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
       paths.each do |bundle_directory|
         puts bundle_directory
-        bundle_name = bundle_directory.gsub(/(\/plugins)|(resources)|(public)|(javascripts)|(\/)/i, "")
-        bundle_name = if(bundle_name.index(".") == 0) then bundle_name[1..bundle_name.length] else bundle_name end
+        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/javascripts", "")
+        puts "  #{bundle_name}"
         next if bundle_name.empty?
         files = recursive_file_list(bundle_directory, ".js")
         next if files.empty? || bundle_name == 'dev'
@@ -603,7 +605,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     upload "#{build_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/", :via => :scp, :recursive=>true
 
   end
-  
+
 
     require 'find'
     def recursive_file_list(basedir, ext)

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.72"
+  s.version = "1.1.73"
   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
-  - 72
-  version: 1.1.72
+  - 73
+  version: 1.1.73
 platform: ruby
 authors: 
 - Ross Riley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 +00:00
+date: 2012-05-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency