capones_recipes 0.4.3 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/capones_recipes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capones_recipes}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Simecek"]

data/lib/recipes/database/sync.rb

@@ -46,13 +46,13 @@ Capistrano::Configuration.instance.load do
       DESC
       task :db, :roles => :db, :only => { :primary => true } do
         # Use production on non-multistage
-        stage ||= 'production'
+        set :stage, 'production' unless exists?(:stage)
 
         filename = "database.#{stage}.#{Time.now.strftime '%Y-%m-%d_%H:%M:%S'}.sql.bz2"
         on_rollback { delete "#{shared_path}/sync/#{filename}" }
 
         # Remote DB dump
-        username, password, database, host = database_config(stage)
+        username, password, database, host = remote_database_config(stage)
         host_option = host ? "--host='#{host}'" : ""
         run "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{shared_path}/sync/#{filename}" do |channel, stream, data|
           puts data
@@ -76,7 +76,7 @@ Capistrano::Configuration.instance.load do
       DESC
       task :fs, :roles => :web, :once => true do
         # Use production on non-multistage
-        stage ||= 'production'
+        set :stage, 'production' unless exists?(:stage)
 
         server, port = host_and_port
 
@@ -114,7 +114,7 @@ Capistrano::Configuration.instance.load do
       DESC
       task :db, :roles => :db, :only => { :primary => true } do
         # Use production on non-multistage
-        stage ||= 'production'
+        set :stage, 'production' unless exists?(:stage)
 
         filename = "database.#{stage}.#{Time.now.strftime '%Y-%m-%d_%H:%M:%S'}.sql.bz2"
 
@@ -124,7 +124,7 @@ Capistrano::Configuration.instance.load do
         end
 
         # Make a backup before importing
-        username, password, database, host = database_config(stage)
+        username, password, database, host = remote_database_config(stage)
         host_option = host ? "--host='#{host}'" : ""
         run "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{shared_path}/sync/#{filename}" do |channel, stream, data|
           puts data
@@ -139,7 +139,7 @@ Capistrano::Configuration.instance.load do
         system "rm -f #{filename}"
 
         # Remote DB import
-        username, password, database, host = database_config(stage)
+        username, password, database, host = remote_database_config(stage)
         host_option = host ? "--host='#{host}'" : ""
         run "bzip2 -d -c #{shared_path}/sync/#{filename} | mysql -u #{username} --password='#{password}' #{host_option} #{database}; rm -f #{shared_path}/sync/#{filename}"
         purge_old_backups "database"
@@ -154,7 +154,7 @@ Capistrano::Configuration.instance.load do
       DESC
       task :fs, :roles => :web, :once => true do
         # Use production on non-multistage
-        stage ||= 'production'
+        set :stage, 'production' unless exists?(:stage)
 
         server, port = host_and_port
         Array(fetch(:sync_directories, [])).each do |syncdir|
@@ -188,6 +188,18 @@ Capistrano::Configuration.instance.load do
       return database["#{db}"]['username'], database["#{db}"]['password'], database["#{db}"]['database'], database["#{db}"]['host']
     end
 
+    #
+    # Reads the database credentials from the remote config/database.yml file
+    # +db+ the name of the environment to get the credentials for
+    # Returns username, password, database
+    #
+    def remote_database_config(db)
+      env = rails_env || db
+      config = capture "cat #{deploy_to}/current/config/database.yml"
+      database = YAML::load(config)
+      return database["#{env}"]['username'], database["#{env}"]['password'], database["#{env}"]['database'], database["#{env}"]['host']
+    end
+
     #
     # Returns the actual host name to sync and port
     #
@@ -211,4 +223,4 @@ Capistrano::Configuration.instance.load do
     end
 
   end
-end
+end

data/lib/recipes/settings_logic/settings_logic.rb

@@ -1,6 +1,6 @@
 Capistrano::Configuration.instance.load do
   before "deploy:setup", :settings_logic
-  after "deploy:update_code", "settings_logic:symlink"
+  before "bundler:update", "settings_logic:symlink"
 
   namespace :settings_logic do
     desc "Create application yaml in capistrano shared path"

metadata

@@ -2,7 +2,7 @@
 name: capones_recipes
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3879717130479855336
+      hash: -2613591455120783238
       segments: 
       - 0
       version: "0"