chicken_soup 0.2.0 → 0.3.0

data/lib/chicken_soup/capabilities/unix/unix-tasks.rb

@@ -2,37 +2,51 @@
 #                             UNIX TASKS                             #
 ######################################################################
 Capistrano::Configuration.instance(:must_exist).load do
-  before "deploy:config:symlink",                 "deploy:config:create"
+  before "deploy:shared_files:symlink",        "deploy:shared_files:setup"
 
   namespace :deploy do
-    namespace :config do
+    namespace :shared_files do
       desc <<-DESC
         Creates the directory where the `symlink` task will look for its configuration files.
 
         It will first look in the local Rails directory to see if there is
-        a file of the same name as one of the shared files with the deployment environment
-        appended on the end.
+        a file or directory of the same name as one of the shared files with the deployment
+        environment appended on the end.
 
-        For example, if you had `config/database.yml` as one of your global_shared_files and
-        you were deploying to the `staging` environment, this task will look for:
+        For example, if you had `config/database.yml` as one of your
+        global_shared_elements and you were deploying to the `staging` environment, this
+        task will look for:
 
             \#{Rails.root}/config/database.yml.staging
 
-        If it finds it, it will upload the file to the shared directory on the server.
+        If it finds it, it will upload the file or directory to the shared directory on
+        the server and rename it to the proper file name.
 
-        If it doesn't find it, it will check to see if the remote file exists and finally,
-        if not, it will just create an empty file.
-      DESC
-      task :create do
-        run "if [ ! -d #{shared_path}/config ]; then mkdir -p #{shared_path}/config; fi"
+        If it doesn't find it, it will check to see if the remote file exists, if not,
+        it will use whatever local file is available with that name.
 
-        global_shared_files.each do |shared_file|
-          local_shared_file = "#{Dir.pwd}/#{shared_file}.#{rails_env}"
+        As a last resort, it will error out because the symlink task which follows will
+        fail due to the missing file.
 
-          if File.exists?(local_shared_file)
-            top.upload(local_shared_file, "#{shared_path}/#{shared_file}", :mode => "600")
-          elsif !remote_file_exists?("#{shared_path}/#{shared_file}")
-            run "touch #{shared_path}/#{shared_file}"
+        Note: This task will also work for setting up shared directories for user uploads, etc.
+      DESC
+      task :setup do
+        global_shared_elements.each do |shared_file|
+          base_dir_of_shared_file         = shared_file.match(%r{/?((?:.*)/)})[1]
+          run "mkdir -p '#{shared_path}/#{base_dir_of_shared_file}'"
+
+          remote_shared_file              = "#{shared_path}/#{shared_file}"
+          local_shared_file               = "#{Dir.pwd}/#{shared_file}"
+          local_environment_specific_file = "#{local_shared_file}.#{rails_env}"
+
+          if File.exists?(local_environment_specific_file)
+            top.upload(local_environment_specific_file, remote_shared_file, :mode => "600")
+          elsif !remote_file_exists?(remote_shared_file)
+            if File.exists?(local_shared_file)
+              top.upload(local_shared_file, remote_shared_file, :mode => "600")
+            else
+              abort "I'm sorry Dave, but I couldn't find a local file or directory at '#{local_shared_file}' or '#{local_environment_specific_file}'"
+            end
           end
         end
       end
@@ -43,7 +57,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         By default, these live in the shared directory that Capistrano sets up.
       DESC
       task :symlink do
-        global_shared_files.each do |shared_file|
+        global_shared_elements.each do |shared_file|
           run "ln -nfs #{shared_path}/#{shared_file} #{latest_release}/#{shared_file}"
         end
       end

data/lib/chicken_soup/deploy.rb

@@ -9,7 +9,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :base do
       transaction do
         deploy.update
-        deploy.config.symlink
+        deploy.shared_files.symlink
         gems.install
         deploy.migrate
         deploy.cleanup

data/lib/chicken_soup/environment/defaults.rb

@@ -44,7 +44,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         _cset :keep_releases,             15
 
-        _cset :global_shared_files,       ["config/database.yml"]
+        _cset :global_shared_elements,    ["config/database.yml"]
 
         _cset(:application_short)         {application}
         _cset(:application_underscored)   {application.gsub(/-/, "_")}

data/lib/chicken_soup/global.rb

@@ -99,18 +99,22 @@ end
 ###
 # Runs a command on the remote server to see if the file currently exists.
 #
-# @param [String] file The filename (optionally including path) that is may
-#   or may not exist.
+# @param [String] file The filename (optionally including path), directory,
+#   or symlink that is may or may not exist.
 #
-# @return [Boolean] Whether or not the file exists.
+# @return [Boolean] Whether or not the file, directory or symlink exists.
 #
 # @example File without path:
 #   remote_file_exists? 'server.log'
 # @example File with path:
 #   remote_file_exists? '/var/www/myappdir/log/production.log'
+# @example Directory:
+#   remote_file_exists? '/var/www/myappdir/log'
+# @example Symbolic Link:
+#   remote_file_exists? '/var/www/myappdir/current'
 #
 def remote_file_exists?(file)
-  capture("if [ -f #{file} ]; then echo 'exists'; fi;").chomp == "exists"
+  capture("if [[ -d #{file} ]] || [[ -h #{file} ]] || [[ -f #{file} ]]; then echo -n 'exists'; fi;") == "exists"
 end
 
 def require_if_exists(file)

data/lib/chicken_soup/version.rb

@@ -1,3 +1,3 @@
 module ChickenSoup
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: chicken_soup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - thekompanee
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -05:00
+date: 2011-06-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,6 @@ rubyforge_project: chicken_soup
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: chicken_soup-0.2.0
+summary: chicken_soup-0.3.0
 test_files: 
 - spec/support/focused.rb