capobvious 0.2.93 → 0.2.94

data/bin/capobvious

@@ -36,6 +36,8 @@ def unindent(string)
   string.strip.gsub(/^#{indentation}/, "")
 end
 
+repository=`git remote -v`.split("\n").first.split("\t").last.split(/\s+/).first rescue nil
+
 files = {
   "Capfile" => <<FILE,
 load 'deploy'
@@ -51,7 +53,7 @@ set :application, "appname"
 set :user, "USER_NAME_HERE"
 set :serv, "IP_ADDRESS_HERE"
 
-set :repository,  "REPOSITORY_HERE"
+set :repository,  "#{repository||'REPOSITORY_HERE'}"
 set :branch, "master"
 set :server_name, "example.com"
 set :server_redirect, "www.example.com"

data/lib/capistrano/ext/capobvious.rb

@@ -10,7 +10,7 @@ Capistrano::Configuration.instance.load do
 
   set :rails_env, "production" unless exists?(:rails_env)
   set :branch, "master" unless exists?(:branch)
-  set :deploy_to, "/home/#{user}/www/#{application}" unless exists?(:deploy_to)
+  set :deploy_to, "/home/#{user}/www/#{application}" unless exists?(:deploy_folder)
   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)
@@ -29,20 +29,21 @@ Capistrano::Configuration.instance.load do
   #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)
+  database_yml = File.open(database_yml_path) rescue nil
   #end
-  config = YAML::load(database_yml)
-  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'
-  local_adapter = config[local_rails_env]["adapter"]
-  local_database = config[local_rails_env]["database"]
-  local_db_username = config[local_rails_env]["username"]||`whoami`.chop
-  local_db_password = config[local_rails_env]["password"]
+  if database_yml
+    config = YAML::load(database_yml)
+    adapter = config[rails_env]["adapter"]
+    database = config[rails_env]["database"]
+    db_username = config[rails_env]["username"]
+    db_password = config[rails_env]["password"]
+
+    local_rails_env = 'development'
+    local_adapter = config[local_rails_env]["adapter"]
+    local_database = config[local_rails_env]["database"]
+    local_db_username = config[local_rails_env]["username"]||`whoami`.chop
+    local_db_password = config[local_rails_env]["password"]
+  end
 
   set :local_folder_path, "tmp/backup"
   set :timestamp, Time.new.to_i.to_s

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.2.93"
+  VERSION = "0.2.94"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.2.93
+  version: 0.2.94
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano