capobvious 0.3.pre24 → 1.3.pre13

data/bin/capobvious

@@ -51,14 +51,14 @@ FILE
   "config/deploy.rb" => <<FILE,
 # -*- encoding : utf-8 -*-
 set :ruby_version, '#{RUBY_VERSION}'
-set :application, '#{File.basename(Dir.getwd)}'
+set :application, "#{File.basename(Dir.getwd)}"
 set :user, "USER_NAME_HERE"
 set :serv, "IP_ADDRESS_HERE"
 
-set :repository,  '#{repository||'REPOSITORY_HERE'}'
-set :branch, 'master'
-set :server_name, 'EXAMPLE.com'
-set :server_redirect, 'WWW.EXAMPLE.COM'
+set :repository,  "#{repository||'REPOSITORY_HERE'}"
+set :branch, "master"
+set :server_name, "EXAMPLE.com"
+set :server_redirect, "WWW.EXAMPLE.COM"
 
 set :backup_db, false
 set :backup_sys, false

data/capobvious.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "capistrano", '~> 2.15.4' 
+  s.add_dependency "capistrano"
   s.add_dependency "rvm-capistrano"
 
   # specify any dependencies here; for example:

data/lib/capobvious/recipes/assets.rb

@@ -15,10 +15,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
    desc "Assets precompile"
    task :precompile, :roles => :web, :except => { :no_release => true } do
-     #if exists?(:turbo_sprockets_rails3) && fetch(:turbo_sprockets_rails3) && !previous_release.nil? && !latest_release.nil? && previous_release != latest_release
-     #  logger.info "Copying assets folder of previous release for turbo-sprockets-rails3 gem"
-     #  run("cp -r #{previous_release}/public/assets #{latest_release}/public/")
-     #end
+     if exists?(:turbo_sprockets_rails3) && fetch(:turbo_sprockets_rails3) && !previous_release.blank? && !latest_release.blank? && previous_release != latest_release
+       logger.info "Copying assets folder of previous release for turbo-sprockets-rails3 gem"
+       run("cp -r #{previous_release}/public/assets #{latest_release}/public/")
+     end
      t1 = Time.now
      run("cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} assets:precompile")
      logger.info "assets:precompile took #{(Time.now-t1).to_i} seconds"

data/lib/capobvious/recipes/backup.rb

@@ -19,14 +19,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       if yml[:adapter] == "postgresql"
         logger.info("Backup database #{yml[:database]}", "Backup:db")
         command << "export PGPASSWORD=\"#{yml[:password]}\""
-        options = {'-U' => yml[:username]}
-        options['host'] = yml[:host] if yml[:host]
-
-        options_s = ""
-        options.each do |k,v|
-          options_s += "#{k} #{v}"
-        end
-        command << "pg_dump #{options_s} #{yml[:database]} | bzip2 -c | cat"
+        command << "pg_dump -U #{yml[:username]} #{yml[:database]} | bzip2 -c | cat"
       else
         puts "Cannot backup, adapter #{yml[:adapter]} is not implemented for backup yet"
       end
@@ -67,17 +60,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "mkdir -p #{shared_path}/backup"
       if yml[:adapter] == "postgresql"
         logger.important("Backup database #{yml[:database]}", "Backup:db")
-
-        options = {'-U' => yml[:username]}
-        options['-h'] = yml[:host] if yml[:host]
-        options['-p'] = yml[:port] if yml[:port]
-        options_s = []
-        options.each do |k,v|
-          options_s << "#{k} #{v}"
-        end
-        options_s = options_s.join(' ')
-
-        run "export PGPASSWORD=\"#{yml[:password]}\" && pg_dump #{options_s} --no-owner #{yml[:database]} > #{dump_file_path}"
+        run "export PGPASSWORD=\"#{yml[:password]}\" && pg_dump -U #{yml[:username]} #{yml[:database]} > #{dump_file_path}"
         run "cd #{shared_path}/backup && #{arch_create} #{output_file} #{file_name} && rm #{dump_file_path}"
       else
         puts "Cannot backup, adapter #{yml[:adapter]} is not implemented for backup yet"

data/lib/capobvious/recipes/bundle.rb

@@ -3,11 +3,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :bundle do
     desc "Run bundle install"
     task :install do
-      opts = []
-      #opts << "-j#{fetch(:server_cores).to_i}" if fetch(:server_cores).to_i > 1
       deployment = "--deployment --quiet"
       without = ['development','test','production']-[rails_env]
-      run "cd #{latest_release} && bundle install #{opts.join(' ')} --without #{without.join(" ")}"
+      run "cd #{latest_release} && bundle install --without #{without.join(" ")}"
     end
   end
 end

data/lib/capobvious/recipes/db.rb

@@ -6,8 +6,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       config[(key.to_sym rescue key) || key] = config.delete(key)
     end
     config
-  rescue Errno::ENOENT
-    return nil
   end
 
   psql = "psql -h localhost"
@@ -56,11 +54,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-   [:seed, :migrate].each do |t|
-     task t, :roles => :db, :only => { :primary => true } do
-       run "cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} db:#{t}"
-     end
-   end
+    [:seed, :migrate].each do |t|
+      task t do
+        run "cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} db:#{t}"
+      end
+    end
 
     task :reset do
       run "cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} db:reset"

data/lib/capobvious/recipes/import.rb

@@ -1,16 +1,14 @@
 Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :import do
-    task :sys, :role => :web do
-      find_servers_for_task(current_task).each do |current_server|
-        if which('rsync') && local_which('rsync')
-          logger.important('Importing with rsync', 'import:sys')
-          system "rsync -avz --rsh='ssh -p#{current_server.port}' #{user}@#{current_server.host}:#{shared_path}/system public/"
-        else
-          backup.sys
-          system "cd public && #{arch_extract} ../#{local_folder_path}/#{sys_file_name}"
-        end
-        break
+    task :sys do
+      #system "rm -rfv public/system/"
+      if which('rsync') && local_which('rsync')
+        logger.important('Importing with rsync', 'import:sys')
+        system "rsync -avz --rsh='ssh -p#{ssh_port}' #{user}@#{serv}:#{shared_path}/system public/"
+      else
+        backup.sys
+        system "cd public && #{arch_extract} ../#{local_folder_path}/#{sys_file_name}"
       end
     end
   end

data/lib/capobvious/recipes/logrotate.rb

@@ -1,5 +1,6 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  #after 'deploy:setup', 'logrotate:init'
+  after 'deploy:setup', 'logrotate:init'
+
   _cset :logrotate_path, '/etc/logrotate.d'
   _cset(:logrotate_file_name){ "cap_#{application}_#{rails_env}"}
   _cset(:logrotate_file){ "#{logrotate_path}/#{logrotate_file_name}"}

data/lib/capobvious/recipes/main.rb

@@ -1,7 +1,5 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  set :bundle_dir, ''
-  set :bundle_flags, '--system --quiet'
-
+  _cset(:ruby_version) { RUBY_VERSION }
   _cset :rvm_type, :user
   _cset :rails_env, 'production'
   _cset :branch, 'master'
@@ -14,17 +12,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset :database_yml_path, 'config/database.yml'
   _cset :auto_migrate, true
   _cset :assets, true
-  _cset :port, 22
-  _cset(:ssh) {"ssh -p #{fetch(:port)} #{user}@#{serv}"}
+  _cset(:ssh) {"ssh -p #{fetch(:port, 22)} #{user}@#{serv}"}
   _cset(:stage){ rails_env }
   _cset(:application_env){ "#{application}_#{rails_env}"}
-  _cset(:rvm_ruby_string){ "#{ruby_version}@#{application}" }
-  _cset :robots_disallow, false
-
-  before 'deploy', 'rvm:install_rvm'  # install/update RVM
-  before 'deploy', 'rvm:install_ruby' # install Ruby and create gemset (both if missing)
 
-  #after "deploy:update_code", "create:rvmrc"
+  after "deploy:update_code", "create:rvmrc"
   after "deploy:update", "deploy:cleanup"
 
   #set :deploy_to, (exists?(:deploy_folder)? fetch(:deploy_folder) : "/home/#{user}/www/#{application}")
@@ -32,15 +24,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty] = true
   ssh_options[:forward_agent] = true
 
+
   def gem_use?(name)
     gemfile_lock = File.read("Gemfile.lock")
     return (gemfile_lock =~ /^\s*#{name}\s+\(/)? true : false
   end
 
-  def current_host
-    capture("echo $CAPISTRANO:HOST$").strip
-  end
-
   def which(name)
     str = capture("which #{name}").chop
     return false if str == ''
@@ -55,7 +44,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   rescue
     false
   end
-
+  def ssh_port
+    exists?(:port) ? fetch(:port) : 22
+  end
   def local_gem_available?(name)
     Gem::Specification.find_by_name(name)
   rescue Gem::LoadError
@@ -88,17 +79,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :create do
     desc "Create .rvmrc"
-    task :rvmrc, :roles => :web, :except => { :no_release => true }  do
-      rvmrc_string = "rvm use #{rvm_ruby_string} --create"
+    task :rvmrc do
+      rvmrc_string = "rvm use #{ruby_version}@#{application_env} --create"
       logger.info rvmrc_string
       put rvmrc_string, "#{latest_release}/.rvmrc"
     end
-
-    desc "Create deny robots.txt"
-    task :robots, :roles => :web do
-      logger.important "CREATING DISALLOW robots.txt - do not forget to remove"
-      put "User-agent: *\nDisallow: /\n", "#{latest_release}/public/robots.txt"
-    end
   end
 
 
@@ -114,9 +99,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       if exists?(:delayed_job) && fetch(:delayed_job) == true
         delayed_job.restart
       end
-      if exists?(:robots_disallow) && fetch(:robots_disallow) == true
-        create.robots
-      end
+
 
     end
     task :prepare do
@@ -180,17 +163,6 @@ Capistrano::Configuration.instance(:must_exist).load do
 
 
   namespace :install do
-    desc 'cap install:app APP=htop'
-    task :app do
-      #capture("which apt-nyaa").strip
-
-      if ENV.has_key?('APP')
-        run %{apt-nyaa cat #{ENV['APP']} | sed "s/sudo/#{sudo}/g" | bash}
-      else
-        logger.important "Please run with APP="
-      end
-    end
-
     desc "Install apt-nyaa"
     task :aptnyaa do
       run "#{sudo} apt-get --assume-yes install wget > /dev/null 2>&1 && cd /usr/bin/ && #{sudo} wget -Nq https://raw.github.com/nyaa/UbuntuScript/master/apt-nyaa && #{sudo} chmod +x apt-nyaa"
@@ -206,7 +178,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "#{sudo} sysctl -w kernel.shmmax=#{bits}"
         run "echo 'kernel.shmmax=#{bits}' | #{sudo} tee -a /etc/sysctl.conf"
       else
-        logger.important "Please run with MAX="
+        puts "Please run with MAX="
       end
     end
   end

data/lib/capobvious/recipes/unicorn.rb

@@ -21,7 +21,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       puts command
 
       run "#{sudo} sed -i 's/exit 0//g' /etc/rc.local"
-      run "echo \"# #{application_env}\" | #{sudo} tee -a /etc/rc.local"
       run "echo \"#{command}\" | #{sudo} tee -a /etc/rc.local"
       run "echo \"exit 0\" | #{sudo} tee -a /etc/rc.local"
     end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = '0.3.pre24'
+  VERSION = '1.3.pre13'
 end

metadata

@@ -1,43 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.3.pre24
+  prerelease: 4
+  version: 1.3.pre13
 platform: ruby
 authors:
 - Dmitry Gruzd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.15.4
+        version: '0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rvm-capistrano
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.15.4
-- !ruby/object:Gem::Dependency
-  name: rvm-capistrano
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Capfile that we use every day
 email:
 - donotsendhere@gmail.com
@@ -70,25 +75,26 @@ files:
 - lib/capobvious/version.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cap recipes
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e5114a046ef025a47522a02f4203e2baaac5da4a
-  data.tar.gz: bd4fa13af1d9a4e0d77499c27aaffabaa3a10179
-SHA512:
-  metadata.gz: 4257acf601d8a6b5e6d531b3a3fbf002018f1db9c1d62035ead2a7854741f3aaac8aadcb9c267af525a4209c39ad429f893e8515137c0a651f1e9d3da582a020
-  data.tar.gz: 2a6d8ebbb61dd6133a8a546579da4a362458f0206eb0d80f4f12006f2ade7e1ab05ff14ea98e11207a21d6f31b8c8e9cca8f40976096f79047f9a5bddf874272