itrigga-cap_deploy 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/itrigga/cap_deploy/cap_tasks.rb

@@ -64,7 +64,7 @@ configuration.load do
 
   task :symlink_site_cache_dir do
     puts "Removing existing symlink from /tmp/cache/sites"
-    run "(test -d #{web_dir}/tmp/cache && #{sudo} rm -rf #{web_dir}/tmp/cache) || echo 'no existing /tmp/cache dir'"
+    remove_dir_if_exists( "#{web_dir}/tmp/cache" )
   
     puts "Creating /shared/cache/sites dir if needed"
     run "mkdir -p #{shared_dir}/cache/sites && #{sudo} chown -R #{user} #{shared_dir}/cache"
@@ -75,11 +75,12 @@ configuration.load do
   end
 
   task :regenerate_monit do
-    puts "regenerating monit config file"
-    run "(test -d #{web_dir}/config/monit && #{sudo} rm -rf #{web_dir}/config/monit/*) || mkdir -p #{web_dir}/config/monit"
+    puts "regenerating monit config file(s)"
+    remove_dir_if_exists("#{web_dir}/config/monit")
+    run "mkdir -p #{web_dir}/config/monit"
     run "cd #{web_dir} && ruby script/generate monit"
     puts "setting permissions & ownership on monit config files"
-    run "#{sudo} chmod 0700 #{web_dir}/config/monit/* && #{sudo} chown root #{web_dir}/config/monit/*"
+    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/config/monit", :ownership=>"root", :permissions=>"0700")
   end
 
   task :resymlink_monit do  
@@ -95,10 +96,10 @@ configuration.load do
 
   task :regenerate_logrotate do
     puts "regenerating logrotate config file"
-    run "(test -d #{web_dir}/config/log_rotate && #{sudo} rm #{web_dir}/config/log_rotate/* ) || echo 'no existing config to remove'"
+    remove_dir_if_exists( "#{web_dir}/config/log_rotate" )
     run "cd #{web_dir} && ruby script/generate logrotate"
     puts "setting permissions & ownership on logrotate config files"
-    run "#{sudo} chmod 0700 #{web_dir}/config/log_rotate/* && #{sudo} chown root #{web_dir}/config/log_rotate/*"
+    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/config/log_rotate", :ownership=>"root", :permissions=>"0700" )
   end
 
   task :resymlink_logrotate do
@@ -117,17 +118,17 @@ configuration.load do
   task :regenerate_db_scripts do
     puts "regenerating db scripts"
     
-    run "test -d #{web_dir}/script/db && #{sudo} rm -rf #{web_dir}/script/db/*"
+    remove_dir_if_exists( "#{web_dir}/script/db" )
     run "cd #{web_dir} && ruby script/generate db"
     
     puts "setting permissions & ownership on cron and db scripts"
-    run "#{sudo} chmod 0700 #{web_dir}/script/db/* && #{sudo} chown root #{web_dir}/script/db/*"
+    set_permissions_on_files_in_dir( :dir=>"#{web_dir}/script/db", :ownership=>"root", :permissions=>"0700" )
   end
   
   task :regenerate_cron_scripts do
     puts "regenerating cron scripts"
     
-    run "(test -d #{web_dir}/script/cron && #{sudo} rm -rf #{web_dir}/script/cron/*) || echo 'no existing scripts/cron dir'"
+    remove_dir_if_exists( "#{web_dir}/script/cron" )
     run "cd #{web_dir} && ruby script/generate cron"
     
     puts "setting permissions & ownership on cron scripts"

data/lib/itrigga/cap_deploy/filesystem_utils.rb

@@ -25,3 +25,19 @@
           run "test -d #{dir} || #{sudo} mkdir -p #{dir}"
         end
         
+        def remove_file_if_exists( file )
+          run "(test -f #{file} && #{sudo} rm #{file}) || echo 'no existing #{file} file to remove'"
+        end
+        
+        def remove_dir_if_exists( dir )
+          run "(test -d #{dir} && #{sudo} rm -rf #{dir}) || echo 'no existing #{dir} dir to remove'"
+        end
+        
+        def set_permissions_on_files_in_dir( opts )
+          if opts[:ownership]
+            run "(test -d #{opts[:dir]} && #{sudo} chown #{opts[:ownership]} #{opts[:dir]}/* ) || echo couldnt find #{opts[:dir]}"
+          end
+          if opts[:permissions]
+            run "(test -d #{opts[:dir]} && #{sudo} chmod #{opts[:permissions]} #{opts[:dir]}/* ) || echo couldnt find #{opts[:dir]}"
+          end
+        end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-cap_deploy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Al Davidson