factorylabs-fdlcap 0.3.20 → 0.3.21

data/.gitignore

@@ -1 +1,2 @@
+.idea/
 pkg/

data/VERSION

@@ -1 +1 @@
-0.3.20
+0.3.21

data/fdlcap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.20"
+  s.version = "0.3.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs"]
-  s.date = %q{2009-09-16}
+  s.date = %q{2009-09-24}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]

data/lib/fdlcap/recipes/database.rb

@@ -131,17 +131,41 @@ Capistrano::Configuration.instance(:must_exist).load do
       database = db_info["database"]
       tables = ENV['TABLES'] ? ENV['TABLES'].split(',').join(' ') : ''
       dump_file = "/tmp/#{database}.sql"
-      
+
+      db_dump_found = false
+      run "if [ -f #{dump_file}.gz ]; then echo exists; else echo not_found; fi" do |channel, stream, data|
+        puts "Result: #{channel[:server]} -> #{dump_file}.gz ( #{data} )"
+        db_dump_found = data.strip == 'exists' ? true : false
+        break if stream == :err
+      end
+
       db_host = db_info["host"]
       host = ""
       host_arg = " -h #{db_host}" if db_host
-      run "mysqldump -e -q --single-transaction \
+      db_dump_cmd = "mysqldump -e -q --single-transaction \
         -u #{db_info["username"]} --password=#{db_info["password"]} \
          #{host_arg} #{db_info["database"]} #{tables} | gzip > #{dump_file}.gz"
 
+      if db_dump_found
+        run "ls -l #{dump_file}.gz"
+        puts %{
+          ! INFO !: The remote database dump '#{dump_file}.gz' already exists
+
+          If you would like to use the existing database dump type "USE EXISTING":
+        }
+
+        if ($stdin.gets.strip != "USE EXISTING")
+          puts "Ignoring existing file and regenerating #{dump_file}.gz"
+          run db_dump_cmd
+        else
+          puts "You confirmed that you want to use the existing file [#{dump_file}.gz], here we go"
+        end
+      else
+        run db_dump_cmd
+      end
 
       get "#{dump_file}.gz", "#{dump_file}.gz"
-      run "rm #{dump_file}.gz"
+      run "rm #{dump_file}.gz" unless ENV['LEAVE_ON_SERVER']
 
       target_env = ENV['LOCAL_ENV'] || "development"
       target_db_info = all_db_info[target_env]

data/lib/fdlcap/recipes/delayed_job.rb

@@ -1,17 +1,23 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  define_recipe :delayed_job do
+  define_recipe :delayed_job do |*args|
+
+    options = args.empty? ? {} : args.first
+    prefix = options[:prefix] || 'dj'
+    set :dj_monit_prefix, prefix unless exists?(:dj_monit_prefix)
+    
     namespace :delayed_job do
+
       desc "Start delayed_job"
       task :start, :only => {:delayed_job => true} do
-        sudo "/usr/bin/monit start all -g dj_#{application}"
+        sudo "/usr/bin/monit start all -g #{dj_monit_prefix}_#{application}"
       end
       desc "Stop delayed_job"
       task :stop, :only => {:delayed_job => true} do
-        sudo "/usr/bin/monit stop all -g dj_#{application}"
+        sudo "/usr/bin/monit stop all -g #{dj_monit_prefix}_#{application}"
       end
       desc "Restart delayed_job"
       task :restart, :only => {:delayed_job => true} do
-        sudo "/usr/bin/monit restart all -g dj_#{application}"
+        sudo "/usr/bin/monit restart all -g #{dj_monit_prefix}_#{application}"
       end        
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factorylabs-fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: fdlcap
 dependencies: 
 - !ruby/object:Gem::Dependency