itrigga-cap_deploy 0.1.4 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/lib/itrigga/cap_deploy/cap_tasks.rb

@@ -84,10 +84,11 @@ configuration.load do
   end
 
   task :resymlink_monit do  
+    monit_file = "#{web_dir}/config/monit/monit.#{File.basename(itrigga_config_file)}.config"
     std_monit_file = "/etc/monit/conf.d/#{application_stub}"
     puts "re-symlinking monit config"
     run "(test -L #{std_monit_file} && #{sudo} rm #{std_monit_file}) || echo 'no existing link'"
-    run "#{sudo} ln -s #{web_dir}/config/monit/monit.`readlink /etc/trigga_config_file | xargs basename`.config #{std_monit_file} "  
+    run "#{sudo} ln -s #{monit_file} #{std_monit_file} "  
   end
 
   task :reload_monit do
@@ -103,11 +104,11 @@ configuration.load do
   end
 
   task :resymlink_logrotate do
-    logrotate_config_file = "#{web_dir}/config/log_rotate/log_rotate.#{File.basename(trigga_config_file)}.config"
+    logrotate_config_file = "#{web_dir}/config/log_rotate/log_rotate.#{File.basename(itrigga_config_file)}.config"
     std_logrotate_file = "/etc/logrotate.d/#{application_stub}"
     puts "re-symlinking logrotate config"
     run "(test -L #{std_logrotate_file} && #{sudo} rm #{std_logrotate_file}) || echo nothing to remove"
-    run "#{sudo} ln -s #{web_dir}/config/log_rotate/log_rotate.`readlink /etc/trigga_config_file | xargs basename`.config #{std_logrotate_file} "
+    run "#{sudo} ln -s #{logrotate_config_file} #{std_logrotate_file} "
   end
 
   task :chown_entire_project_dir do

data/lib/itrigga/cap_deploy/filesystem_utils.rb

@@ -33,11 +33,20 @@
           run "(test -d #{dir} && #{sudo} rm -rf #{dir}) || echo 'no existing #{dir} dir to remove'"
         end
         
+        def set_permissions_on_dir( opts )
+          if opts[:ownership]
+            run "(test -d #{opts[:dir]} && #{sudo} chown #{opts[:ownership]} ) || echo couldnt find #{opts[:dir]}"
+          end
+          if opts[:permissions]
+            run "(test -d #{opts[:dir]} && #{sudo} chmod #{opts[:permissions]} ) || echo couldnt find #{opts[:dir]}"
+          end
+        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]}"
+            run "(test -d #{opts[:dir]} && find #{opts[:dir]} -mindepth 1 | xargs #{sudo} chown #{opts[:ownership]} ) || 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]}"
+            run "(test -d #{opts[:dir]} && find #{opts[:dir]} -mindepth 1 | xargs #{sudo} chmod #{opts[:permissions]} ) || 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: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Al Davidson
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +01:00
+date: 2011-09-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -34,8 +33,8 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -50,8 +49,8 @@ dependencies:
         - 4
         version: 1.6.4
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -64,8 +63,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -80,8 +79,8 @@ dependencies:
         - 4
         version: 1.6.4
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rspec
   version_requirements: &id005 !ruby/object:Gem::Requirement 
@@ -94,8 +93,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: capistrano
   version_requirements: &id006 !ruby/object:Gem::Requirement 
@@ -108,8 +107,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: capistrano-ext
   version_requirements: &id007 !ruby/object:Gem::Requirement 
@@ -122,6 +121,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
+  type: :development
 description: "Provides\n    - handy filesystem utility methods\n    - common capistrano tasks\n    - common hooks for deployment \n    "
 email: aldavidson@itrigga.com
 executables: []