capobvious 0.0.8 → 0.0.9

data/lib/capistrano/ext/capobvious.rb

@@ -10,28 +10,28 @@ Capistrano::Configuration.instance.load do
 
   set :rails_env, "production" unless exists?(:rails_env)
   set :branch, "master" unless exists?(:branch)
-  set :dbconf, "database.yml" unless exists?(:dbconf)
   set :deploy_to, "/home/#{user}/www/#{application}" unless exists?(:deploy_to)
   set :deploy_via, :remote_cache unless exists?(:deploy_via)
   set :keep_releases, 5 unless exists?(:keep_releases)
   set :use_sudo, false unless exists?(:use_sudo)
   set :scm, :git unless exists?(:scm)
 
-  if `uname -a`.include?("Darwin")
-    run_local_psql = "psql -h localhost -U postgres"
+  run_local_psql = if `uname -a`.include?("Darwin")
+    "psql -h localhost -U postgres"
   else
-    run_local_psql = "#{sudo} -u postgres psql"
+    "#{sudo} -u postgres psql"
   end
 
-  config = YAML::load(File.open("config/#{dbconf}"))
+  database_yml_path = "config/database.yml"
+  config = YAML::load(capture("cat #{current_path}/#{database_yml_path}"))
   adapter = config[rails_env]["adapter"]
   database = config[rails_env]["database"]
   db_username = config[rails_env]["username"]
   db_password = config[rails_env]["password"]
 
 
+  config = YAML::load(File.open(database_yml_path))
   local_rails_env = 'development'
-  config = YAML::load(File.open("config/database.yml"))
   local_adapter = config[local_rails_env]["adapter"]
   local_database = config[local_rails_env]["database"]
   local_db_username = config[local_rails_env]["username"]
@@ -74,12 +74,6 @@ Capistrano::Configuration.instance.load do
   namespace :create do
     task :files do
       create.rvmrc
-      if fetch(:dbconf) != 'database.yml'
-        create.database_yml
-      end
-    end
-    task :database_yml do
-      run "ln -sfv #{current_path}/config/#{dbconf} #{current_path}/config/database.yml"
     end
     desc "Create .rvmrc & files"
     task :rvmrc do
@@ -217,7 +211,7 @@ Capistrano::Configuration.instance.load do
   namespace :assets do
     desc "Assets precompile"
     task :precompile do
-      system("bundle exec rake RAILS_ENV=development assets:precompile && cd public && tar czf assets.tar.gz assets/")
+      system("bundle exec rake assets:precompile && cd public && tar czf assets.tar.gz assets/")
       upload("public/assets.tar.gz","#{current_path}/public/assets.tar.gz")
       system("rm public/assets.tar.gz && rm -rf tmp/assets && mv public/assets tmp/assets")
       run("cd #{current_path}/public && rm -rf assets/ && tar xzf assets.tar.gz && rm assets.tar.gz")
@@ -225,18 +219,13 @@ Capistrano::Configuration.instance.load do
   end
 
   namespace :nginx do
-    task :restart do
-      run "#{sudo} /etc/init.d/nginx restart"
-    end
-    task :reload do
-      run "#{sudo} /etc/init.d/nginx reload"
-    end
-    task :start do
-      run "#{sudo} /etc/init.d/nginx start"
-    end
-    task :stop do
-      run "#{sudo} /etc/init.d/nginx stop"
+    [:stop, :start, :restart, :reload].each do |action|
+    desc "#{action.to_s} nginx"
+    task action, :roles => :web do
+      run "#{sudo} /etc/init.d/nginx #{action.to_s}"
     end
+  end
+
     desc "Add app nginx conf to server"
     task :conf do
   default_nginx_template = <<-EOF

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &16010080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16010080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capfile that we use every day
 email:
 - donotsendhere@gmail.com
@@ -58,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Cap recipes