jtrupiano-capistrano-extensions 0.1.4 → 0.1.6

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/ISSUES.txt

@@ -0,0 +1,10 @@
+Known Bugs and Shortcomings
+
+(this one is specific to passenger-recipes, which really should be merged into capistrano-extensions...)
+* When introducing a new shared content directory, a bug can manifest itself when trying to sync production data back to your staging server.  Consider the following scenario:
+  1) Add a new upload field to your app (e.g. using file_column)
+  2) Update the deploy script to reference this new shared directory (via either :shared_content or :content_directories)
+  3) Try cap remote:sync FROM=production TO=staging --> It will fail when it tries to tarball up the shared content on production.
+  
+Currently, the best workaround is to log onto your production server and created the shared content directory, e.g. #{shared_path}/content/model_that_you_added_file_column_to
+

data/Manifest.txt

@@ -1,11 +1,12 @@
 History.txt
+ISSUES.txt
 Manifest.txt
 README.txt
 Rakefile
 bin/capistrano-extensions-sync-content
 bin/capistrano-extensions-sync-db
+capistrano-extensions.gemspec
 lib/capistrano-extensions.rb
 lib/capistrano-extensions/deploy.rb
 lib/capistrano-extensions/geminstaller_dependency.rb
 lib/capistrano-extensions/version.rb
-

data/README.txt

@@ -1,12 +1,13 @@
 = capistrano-extensions
 
-* http://github.com/jtrupiano/capistrano-extensions
+* Stable API: http://johntrupiano.rubyforge.org/capistrano-extensions
+* Source: http://github.com/jtrupiano/capistrano-extensions
 
 == DESCRIPTION/FEATURES:
 
 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,12 +21,13 @@ 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.5
+* GemInstaller ~> 0.5.1
 
 == INSTALL:
 
-* sudo gem install capistrano-extensions
+* sudo gem install capistrano-extensions (stable from rubyforge)
+* sudo gem install jtrupiano-capistrano-extensions (HEAD of repo from github)
 
 == LICENSE:
 

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.5"]
+  p.extra_deps << ["geminstaller", "~> 0.5.1"]
   p.need_zip = true
   p.need_tar = false
 end

data/capistrano-extensions.gemspec

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{capistrano-extensions}
+  s.version = "0.1.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Trupiano"]
+  s.date = %q{2009-03-11}
+  s.description = %q{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}
+  s.email = %q{jtrupiano@gmail.com}
+  s.executables = ["capistrano-extensions-sync-content", "capistrano-extensions-sync-db"]
+  s.extra_rdoc_files = ["History.txt", "ISSUES.txt", "Manifest.txt", "README.txt"]
+  s.files = ["History.txt", "ISSUES.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/capistrano-extensions-sync-content", "bin/capistrano-extensions-sync-db", "capistrano-extensions.gemspec", "lib/capistrano-extensions.rb", "lib/capistrano-extensions/deploy.rb", "lib/capistrano-extensions/geminstaller_dependency.rb", "lib/capistrano-extensions/version.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/jtrupiano/capistrano-extensions}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{johntrupiano}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{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}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<capistrano>, ["~> 2.5.5"])
+      s.add_runtime_dependency(%q<geminstaller>, ["~> 0.5.1"])
+      s.add_development_dependency(%q<hoe>, [">= 1.9.0"])
+    else
+      s.add_dependency(%q<capistrano>, ["~> 2.5.5"])
+      s.add_dependency(%q<geminstaller>, ["~> 0.5.1"])
+      s.add_dependency(%q<hoe>, [">= 1.9.0"])
+    end
+  else
+    s.add_dependency(%q<capistrano>, ["~> 2.5.5"])
+    s.add_dependency(%q<geminstaller>, ["~> 0.5.1"])
+    s.add_dependency(%q<hoe>, [">= 1.9.0"])
+  end
+end

data/lib/capistrano-extensions/deploy.rb

@@ -87,9 +87,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       mappings = content_directories.inject(shared_content) { |hsh, dir| hsh.merge({"content/#{dir}" => "public/#{dir}"}) }
       mappings.each_pair do |remote, local|
         run <<-CMD
+          umask 0022 && 
           mkdir -p #{shared_path}/#{remote} &&
-          ln -sf #{shared_path}/#{remote} #{latest_release}/#{local} &&
-          chmod 755 -R #{shared_path}/#{remote}
+          ln -sf #{shared_path}/#{remote} #{latest_release}/#{local}
         CMD
       end
     end
@@ -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  = 6
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jtrupiano-capistrano-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Trupiano
@@ -9,35 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -07:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.3
+        version: 2.5.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: geminstaller
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.9.0
     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
@@ -48,15 +51,18 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- ISSUES.txt
 - Manifest.txt
 - README.txt
 files: 
 - History.txt
+- ISSUES.txt
 - Manifest.txt
 - README.txt
 - Rakefile
 - bin/capistrano-extensions-sync-content
 - bin/capistrano-extensions-sync-db
+- capistrano-extensions.gemspec
 - lib/capistrano-extensions.rb
 - lib/capistrano-extensions/deploy.rb
 - lib/capistrano-extensions/geminstaller_dependency.rb