caploy 0.1.12 → 0.2.0

data/lib/caploy/recipes/bundler.rb

@@ -4,8 +4,10 @@ Capistrano::Configuration.instance.load do
   #_cset :bundle_gemfile,  "Gemfile"
   #_cset :bundle_dir,      File.join(fetch(:shared_path), 'bundle')
   #_cset :bundle_roles,    #{role_default} # e.g. [:app, :batch]
-  #_cset :bundle_cmd,      "/home/deploy/.rbenv/shims/bundle"
+  #_cset :rake, "bundle --gemfile Gemfile.server exec rake"
+  _cset :bundle_cmd,      "bundle"
   _cset :bundle_without,  [:development, :test, :deploy]
+
   # http://shapeshed.com/journal/using-rbenv-to-manage-rubies/
   # you can also apply a clever technique to allow you switch versions of ruby by pushing a new .rbenv-version file with capistrano. From version 1.1rc bundler allows you to specify a shebang for binstubs. To use this add the following to your capistrano recipe.
   _cset :bundle_flags,    "--deployment --quiet --binstubs --shebang ruby-local-exec"

data/lib/caploy/recipes/database.rb

@@ -48,7 +48,7 @@ Capistrano::Configuration.instance.load do |instance|
     task :dynamic_migrations do
       from = source.next_revision(current_revision)
       if capture("cd #{latest_release} && #{source.local.log(from)} db/migrate | wc -l").to_i > 0
-        run "cd #{current_release} && RAILS_ENV=#{rails_env} bundle exec rake db:migrate"
+        run "cd #{current_release} && RAILS_ENV=#{rails_env} #{rake} db:migrate"
         logger.info "New migrations added - running migrations."
       else
         logger.info "Skipping migrations - there are not any new."

data/lib/caploy/recipes/defaults.rb

@@ -48,7 +48,7 @@ Capistrano::Configuration.instance.load do
 
     desc "build missing paperclip styles"
     task :build_missing_paperclip_styles, :roles => :app do
-      run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec rake paperclip:refresh:missing_styles"
+      run "cd #{current_path}; RAILS_ENV=#{rails_env} #{rake} paperclip:refresh:missing_styles"
     end
 
     desc 'Show deployed revision'

data/lib/caploy/recipes/paperclip.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance.load do
   namespace :deploy do
     desc "build missing paperclip styles"
     task :build_missing_paperclip_styles, :roles => :app do
-      run "cd #{release_path}; RAILS_ENV=#{rails_env} bundle exec rake paperclip:refresh:missing_styles"
+      run "cd #{release_path}; RAILS_ENV=#{rails_env} #{rake} paperclip:refresh:missing_styles"
     end
   end
 

data/lib/caploy/recipes/seeding.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance.load do
 
   namespace :deploy do
     task :seed, :roles => :app do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake db:seed"
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} #{rake} db:seed"
     end
   end
 

data/lib/caploy/recipes/unicorn.rb

@@ -1,150 +1,136 @@
-require 'capistrano'
-require 'capistrano/version'
+Capistrano::Configuration.instance.load do
 
-module Unicorn
-  class CapistranoIntegration
-    def self.load_into(capistrano_config)
-      capistrano_config.load do
-
-        # Check if remote file exists
-        #
-        def remote_file_exists?(full_path)
-          'true' == capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
-        end
-
-        # Check if process is running
-        #
-        def process_exists?(pid_file)
-          capture("ps -p $(cat #{pid_file}) ; true").strip.split("\n").size == 2
-        end
-
-        # Set unicorn vars
-        #
-        _cset(:app_env, (fetch(:rails_env) rescue 'production'))
-        _cset :unicorn_bin, "bundle exec unicorn"
-        _cset(:unicorn_pid, "#{fetch(:current_path)}/tmp/pids/unicorn.pid")
-        _cset(:unicorn_env, (fetch(:app_env)))
-        _cset :unicorn_std_log, "log/unicorn.stderr.log"
-        _cset :unicorn_err_log, "log/unicorn.stderr.log"
-        _cset :unicorn_worker_processes, 2
-        _cset :unicorn_timeout, 30
-        _cset :unicorn_listen_backlog, 2048
-        _cset :sidekiq_redis_count, 1
-        _cset :sidekiq_redis_url, nil
-        _cset :unicorn_hard_restart, false
-
-        namespace :unicorn do
-          desc 'Start Unicorn'
-          task :start, :roles => :app, :except => {:no_release => true} do
-            if remote_file_exists?(unicorn_pid)
-              if process_exists?(unicorn_pid)
-                logger.important("Unicorn is already running!", "Unicorn")
-                next
-              else
-                run "rm #{unicorn_pid}"
-              end
-            end
+  # Check if remote file exists
+  #
+  def remote_file_exists?(full_path)
+    'true' == capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+  end
 
-            config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
-            if remote_file_exists?(config_path)
-              logger.important("Starting...", "Unicorn")
-              run "cd #{current_path} && BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec #{unicorn_bin} -c #{config_path} -E #{app_env} -D"
-            else
-              logger.important("Config file for \"#{unicorn_env}\" environment was not found at \"#{config_path}\"", "Unicorn")
-            end
-          end
+  # Check if process is running
+  #
+  def process_exists?(pid_file)
+    capture("ps -p $(cat #{pid_file}) ; true").strip.split("\n").size == 2
+  end
 
-          desc 'Stop Unicorn'
-          task :stop, :roles => :app, :except => {:no_release => true} do
-            if remote_file_exists?(unicorn_pid)
-              if process_exists?(unicorn_pid)
-                logger.important("Stopping...", "Unicorn")
-                run "#{try_sudo} kill `cat #{unicorn_pid}`"
-              else
-                run "rm #{unicorn_pid}"
-                logger.important("Unicorn is not running.", "Unicorn")
-              end
-            else
-              logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
-            end
-          end
+  # Set unicorn vars
+  #
+  _cset :app_env, fetch(:rails_env, 'production')
+  _cset :unicorn_bin, "unicorn"
+  _cset :unicorn_pid, "#{fetch(:current_path)}/tmp/pids/unicorn.pid"
+  _cset :unicorn_env, app_env
+  _cset :unicorn_std_log, "log/unicorn.stderr.log"
+  _cset :unicorn_err_log, "log/unicorn.stderr.log"
+  _cset :unicorn_worker_processes, 2
+  _cset :unicorn_timeout, 30
+  _cset :unicorn_listen_backlog, 2048
+  _cset :sidekiq_redis_url, nil
+  _cset :unicorn_hard_restart, false
 
-          desc 'Unicorn graceful shutdown'
-          task :graceful_stop, :roles => :app, :except => {:no_release => true} do
-            if remote_file_exists?(unicorn_pid)
-              if process_exists?(unicorn_pid)
-                logger.important("Stopping...", "Unicorn")
-                run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"
-              else
-                run "rm #{unicorn_pid}"
-                logger.important("Unicorn is not running.", "Unicorn")
-              end
-            else
-              logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
-            end
-          end
+  namespace :unicorn do
+    desc 'Start Unicorn'
+    task :start, :roles => :app, :except => {:no_release => true} do
+      if remote_file_exists?(unicorn_pid)
+        if process_exists?(unicorn_pid)
+          logger.important("Unicorn is already running!", "Unicorn")
+          next
+        else
+          run "rm #{unicorn_pid}"
+        end
+      end
 
-          desc 'Reload Unicorn'
-          task :reload, :roles => :app, :except => {:no_release => true} do
-            if remote_file_exists?(unicorn_pid)
-              logger.important("Stopping...", "Unicorn")
-              if unicorn_hard_restart
-                unicorn.stop
-                sleep(2)
-                unicorn.start
-              else
-                run "#{try_sudo} kill -s USR2 `cat #{unicorn_pid}`"
-              end
-            else
-              logger.important("No PIDs found. Starting Unicorn server...", "Unicorn")
-              config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
-              if remote_file_exists?(config_path)
-                run "cd #{current_path} && BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec #{unicorn_bin} -c #{config_path} -E #{app_env} -D"
-              else
-                logger.important("Config file for \"#{unicorn_env}\" environment was not found at \"#{config_path}\"", "Unicorn")
-              end
-            end
-          end
+      config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
+      if remote_file_exists?(config_path)
+        logger.important("Starting...", "Unicorn - #{bundle_cmd} ")
+        run "cd #{current_path} && #{bundle_cmd} exec #{unicorn_bin} -c #{config_path} -E #{app_env} -D"
+      else
+        logger.important("Config file for \"#{unicorn_env}\" environment was not found at \"#{config_path}\"", "Unicorn")
+      end
+    end
 
-          desc "Setup unicorn"
-          task :setup, :roles => :app, :except => {:no_release => true} do
-            run "mkdir -p \"#{shared_path}/config/unicorn\""
-            config_path = "#{shared_path}/config/unicorn/#{rails_env}.rb"
-            template_path = File.expand_path('../../templates/unicorn/unicorn.rb.erb', __FILE__)
-            vars = {
-                'application' => application,
-                'current_path' => current_path,
-                'unicorn_pid' => unicorn_pid,
-                'unicorn_std_log' => unicorn_std_log,
-                'unicorn_err_log' => unicorn_err_log,
-                'stage' => stage,
-                'unicorn_listen_backlog' => unicorn_listen_backlog,
-                'unicorn_worker_processes' => unicorn_worker_processes,
-                'unicorn_timeout' => unicorn_timeout,
-                'sidekiq_redis_count' => sidekiq_redis_count,
-                'sidekiq_redis_url' => sidekiq_redis_url
-            }
-            put(render_erb_template(template_path, vars), config_path)
-          end
+    desc 'Stop Unicorn'
+    task :stop, :roles => :app, :except => {:no_release => true} do
+      if remote_file_exists?(unicorn_pid)
+        if process_exists?(unicorn_pid)
+          logger.important("Stopping...", "Unicorn")
+          run "#{try_sudo} kill `cat #{unicorn_pid}`"
+        else
+          run "rm #{unicorn_pid}"
+          logger.important("Unicorn is not running.", "Unicorn")
         end
+      else
+        logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
+      end
+    end
 
-        after :"deploy:restart", :"unicorn:reload"
-        after :"deploy:setup", :"unicorn:setup";
-
-        namespace :deploy do
-          task :start, :roles => :app do
-            unicorn.start
-          end
+    desc 'Unicorn graceful shutdown'
+    task :graceful_stop, :roles => :app, :except => {:no_release => true} do
+      if remote_file_exists?(unicorn_pid)
+        if process_exists?(unicorn_pid)
+          logger.important("Stopping...", "Unicorn")
+          run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"
+        else
+          run "rm #{unicorn_pid}"
+          logger.important("Unicorn is not running.", "Unicorn")
+        end
+      else
+        logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
+      end
+    end
 
-          task :stop, :roles => :app do
-            unicorn.stop
-          end
+    desc 'Reload Unicorn'
+    task :reload, :roles => :app, :except => {:no_release => true} do
+      if remote_file_exists?(unicorn_pid)
+        logger.important("Stopping...", "Unicorn")
+        if unicorn_hard_restart
+          unicorn.stop
+          sleep(2)
+          unicorn.start
+        else
+          run "#{try_sudo} kill -s USR2 `cat #{unicorn_pid}`"
+        end
+      else
+        logger.important("No PIDs found. Starting Unicorn server...", "Unicorn")
+        config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
+        if remote_file_exists?(config_path)
+          run "cd #{current_path} && #{bundle_cmd} exec #{unicorn_bin} -c #{config_path} -E #{app_env} -D"
+        else
+          logger.important("Config file for \"#{unicorn_env}\" environment was not found at \"#{config_path}\"", "Unicorn")
         end
       end
     end
+
+    desc "Setup unicorn"
+    task :setup, :roles => :app, :except => {:no_release => true} do
+      run "mkdir -p \"#{shared_path}/config/unicorn\""
+      config_path = "#{shared_path}/config/unicorn/#{rails_env}.rb"
+      template_path = File.expand_path('../../templates/unicorn/unicorn.rb.erb', __FILE__)
+      vars = {
+          'application' => application,
+          'current_path' => current_path,
+          'unicorn_pid' => unicorn_pid,
+          'unicorn_std_log' => unicorn_std_log,
+          'unicorn_err_log' => unicorn_err_log,
+          'stage' => stage,
+          'unicorn_listen_backlog' => unicorn_listen_backlog,
+          'unicorn_worker_processes' => unicorn_worker_processes,
+          'unicorn_timeout' => unicorn_timeout,
+          'sidekiq_redis_count' => sidekiq_redis_count,
+          'sidekiq_redis_url' => sidekiq_redis_url
+      }
+      put(render_erb_template(template_path, vars), config_path)
+    end
   end
-end
 
-if Capistrano::Configuration.instance
-  Unicorn::CapistranoIntegration.load_into(Capistrano::Configuration.instance)
+  after :"deploy:restart", :"unicorn:reload"
+  after :"deploy:setup", :"unicorn:setup";
+
+  namespace :deploy do
+    task :start, :roles => :app do
+      unicorn.start
+    end
+
+    task :stop, :roles => :app do
+      unicorn.stop
+    end
+  end
 end

data/lib/caploy/version.rb

@@ -1,3 +1,3 @@
 module Caploy
-  VERSION = "0.1.12"
+  VERSION = "0.2.0"
 end

data/lib/mysql.rb

@@ -50,7 +50,7 @@ module Database
     # cleanup = true removes the mysqldump file after loading, false leaves it in db/
     def load(file, cleanup)
       unzip_file = File.join(File.dirname(file), File.basename(file, '.bz2'))
-      @cap.run "cd #{@cap.current_path}; bunzip2 -f #{file} && RAILS_ENV=#{@cap.rails_env} rake db:drop db:create && #{import_cmd(unzip_file)}"
+      @cap.run "cd #{@cap.current_path}; bunzip2 -f #{file} && RAILS_ENV=#{@cap.rails_env} #{rake} db:drop db:create && #{import_cmd(unzip_file)}"
       File.unlink(unzip_file) if cleanup
     end
   end
@@ -64,7 +64,7 @@ module Database
     # cleanup = true removes the mysqldump file after loading, false leaves it in db/
     def load(file, cleanup)
       unzip_file = File.join(File.dirname(file), File.basename(file, '.bz2'))
-      system("bunzip2 -f #{file} && rake db:drop db:create && #{import_cmd(unzip_file)} && rake db:migrate") 
+      system("bunzip2 -f #{file} && #{rake} db:drop db:create && #{import_cmd(unzip_file)} && #{rake} db:migrate")
       File.unlink(unzip_file) if cleanup
     end
     

metadata

@@ -2,143 +2,143 @@
 name: caploy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Schiller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
   name: gemcutter
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.13.4
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capistrano
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.4
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
-    none: false
+        version: 2.13.4
+- !ruby/object:Gem::Dependency
   name: capistrano-ext
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
-    none: false
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
   name: capistrano_colors
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.5
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    none: false
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
   name: capistrano-file_db
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
-    none: false
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: capistrano-uptodate
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
-    none: false
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
   name: rvm-capistrano
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
   name: erubis
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de
@@ -189,17 +189,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -207,3 +207,4 @@ signing_key:
 specification_version: 3
 summary: capistrano deployment task for my projects
 test_files: []
+has_rdoc: