capobvious 0.1.0 → 0.1.1

data/lib/capistrano/ext/capobvious.rb

@@ -23,7 +23,14 @@ Capistrano::Configuration.instance.load do
   end
 
   database_yml_path = "config/database.yml"
-  config = YAML::load(capture("cat #{current_path}/#{database_yml_path}"))
+
+  serv_path = "#{current_path}/#{database_yml_path}"
+  if capture("if [ -f #{serv_path} ]; then echo '1'; fi") == '1'
+    database_yml = capture("cat #{serv_path}")
+  else
+    database_yml = File.open(database_yml_path)
+  end
+  config = YAML::load(database_yml)
   adapter = config[rails_env]["adapter"]
   database = config[rails_env]["database"]
   db_username = config[rails_env]["username"]
@@ -53,6 +60,7 @@ Capistrano::Configuration.instance.load do
 #load 'deploy/assets'
   namespace :auto do
     task :run do
+      bundle.install
       if exists?(:assets) && fetch(:assets) == true
         assets.precompile
       end
@@ -60,7 +68,6 @@ Capistrano::Configuration.instance.load do
       if exists?(:sphinx) && fetch(:sphinx) == true
         sphinx.symlink
       end
-      bundle.install
       if exists?(:auto_migrate) && fetch(:auto_migrate) == true
         db.migrate
       end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70231015892560 !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: *70231015892560
+  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.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Cap recipes