capistrano-extensions 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,6 @@
+=== v0.1.5 / 2009-02-22
+* Fixed local:restore_content to work better with :content_directories.
+
 === v0.1.4 / 2008-09-12
 * In local:restore_db, the db import would previously fail if the username was not specified in your database.yml
   file.  I have corrected this and set it to default to 'root' now (as rails does).

data/README.txt

@@ -6,7 +6,7 @@
 
 This gem provides a base set of Capistrano extensions including the following:
   * a new :gemfile RemoteDependency type
-  * tasks/helpers for handling public asset folders (e.g. created by the file_column plugin)
+  * tasks/helpers for handling public and private asset folders (e.g. created by the file_column plugin)
   * tasks/helpers for auto-syncing server gems (via integration with Chad Wooley's GemInstaller gem)
   * helpers for dealing with multiple deployable environments (e.g. staging, prodtest, production)
   * tasks for working with remote logfiles
@@ -20,8 +20,8 @@ For a detailed exploration of these features, check out the wiki: http://github.
 
 == REQUIREMENTS:
 
-* Capistrano >= 2.4.3
-* GemInstaller = 0.4.3
+* Capistrano ~> 2.5.4
+* GemInstaller ~> 0.5.0
 
 == INSTALL:
 

data/Rakefile

@@ -26,8 +26,8 @@ Hoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.summary = p.description # More details later??
   p.remote_rdoc_dir = PKG_NAME # Release to /PKG_NAME
   #  p.changes = p.paragraphs_of('CHANGELOG', 0..1).join("\n\n")
-  p.extra_deps << ["capistrano", ">= 2.4.3"]
-  p.extra_deps << ["geminstaller", ">= 0.4.3"]
+  p.extra_deps << ["capistrano", "~> 2.5.4"]
+  p.extra_deps << ["geminstaller", "~> 0.5.0"]
   p.need_zip = true
   p.need_tar = false
 end

data/lib/capistrano-extensions/deploy.rb

@@ -261,7 +261,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "cd #{shared_path} && tar czf #{shared_path}/content_backup.tar.gz #{folders.join(' ')}"
       
       #run "cd #{content_path} && tar czf #{shared_path}/content_backup.tar.gz *"
-      get "#{shared_path}/content_backup.tar.gz", "#{application}-#{rails_env}-content_backup.tar.gz"
+      download("#{shared_path}/content_backup.tar.gz", "#{application}-#{rails_env}-content_backup.tar.gz")
       run "rm -f #{shared_path}/content_backup.tar.gz"
     end
     
@@ -272,11 +272,17 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :restore_content do
       from = ENV['FROM'] || rails_env
       
-      system "tar xzf #{application}-#{from}-content_backup.tar.gz -C public/"
+      system "mkdir -p tmp/content-#{from}"
+      system "tar xzf #{application}-#{from}-content_backup.tar.gz -C tmp/content-#{from}"
       system "rm -f #{application}-#{from}-content_backup.tar.gz"
 
       shared_content.each_pair do |remote, local|
-        system "rm -rf #{local} && mv public/#{remote} #{local}"
+        system "rm -rf #{local} && mv tmp/content-#{from}/#{remote} #{local}"
+      end
+      
+      content_directories.each do |public_dir|
+        system "rm -rf public/#{public_dir}"
+        system "mv tmp/content-#{from}/content/#{public_dir} public/"
       end
 
     end

data/lib/capistrano-extensions/version.rb

@@ -12,7 +12,7 @@ module CapistranoExtensions
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - John Trupiano
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -04:00
+date: 2009-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.3
+        version: 2.5.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: geminstaller
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: A base set of Capistrano extensions-- aids with the file_column plugin, the GemInstaller gem, multiple deployable environments, logfile helpers, and database/asset synchronization from production to local environment
 email: jtrupiano@gmail.com
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: johntrupiano
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A base set of Capistrano extensions-- aids with the file_column plugin, the GemInstaller gem, multiple deployable environments, logfile helpers, and database/asset synchronization from production to local environment