georgia_recipes 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16213f5c7060bbd035be7076e9d42a599f2e732
-  data.tar.gz: 8e0528af4e1c100dbf30c1ab8865cf9d67593561
+  metadata.gz: a7dadcca0da277b0841dd2a08fd7f75f64fa11ac
+  data.tar.gz: 7f7efe5507f0974ab67fc70c583b5cd58f9532fd
 SHA512:
-  metadata.gz: 8e8c1f410092f0c794430dfbd194301a0ab30f845f2c1d5be338e180e2a59165daa41e82683aa0e59dd02444e981bf4fe8b6873a71f798f6007b0634f527480a
-  data.tar.gz: ad2049f9cdafd734c4b6ba89de97f314b6779dff19889341b2e87aa3ee6844c9d67ecdd9c91835e600eed03e711ef518582c7fe482457814af639d7491dcd171
+  metadata.gz: 3cf1d5c8acb4a4da341e0f7b8436f4a427ce189ea828b884c7cbb88dd43adb11bdbddc3a12a2cb33e6b80cff95fad59c63fcb815c092b313081227adb71ff338
+  data.tar.gz: eee2a29383b01d2345b18db9b7588cf69ca03d037267ce74808c40c6e37462ffcc416ead8f27cf289d4346fdf6eac6b7e9c7eed55ee7391e425d4237953653eb

data/lib/georgia_recipes.rb

@@ -1,5 +1,4 @@
 require "georgia_recipes/version"
-require "georgia_recipes/helper_methods"
 
 module GeorgiaRecipes
 end

data/lib/georgia_recipes/base.rb

@@ -1,15 +1,10 @@
 require 'capistrano'
 require 'capistrano/cli'
+require 'georgia_recipes/helper_methods'
 
 Capistrano::Configuration.instance.load do
 
   set_default(:host) { ask("What is the fully qualified domain name?") }
-  set_default(:remote_db_user) { db_config_file["#{rails_env}"]["username"] rescue ask("Remote database user: ") }
-  set_default(:remote_db_user) { db_config_file["#{rails_env}"]["database"] rescue ask("Remote database name: ") }
-  set_default(:remote_db_user) { db_config_file["#{rails_env}"]["password"] rescue ask("Remote database password: ") }
-  set_default(:local_db_user) { db_config_file["development"]["username"] rescue ask("Local database user: ") }
-  set_default(:local_db_user) { db_config_file["development"]["database"] rescue ask("Local database name: ") }
-  set_default(:local_db_user) { db_config_file["development"]["password"] rescue ask("Local database password: ") }
 
   namespace :deploy do
 

data/lib/georgia_recipes/helper_methods.rb

@@ -83,8 +83,4 @@ end
 def close_sessions
   sessions.values.each { |session| session.close }
   sessions.clear
-end
-
-def db_config_file
-  @db_config_file ||= YAML.load(File.read('config/database.yml'))
 end

data/lib/georgia_recipes/postgresql.rb

@@ -1,9 +1,5 @@
 Capistrano::Configuration.instance.load do
 
-  set_default(:db_host, "localhost")
-  set_default(:db_user) { (app_var rescue application) }
-  set_default(:db_password) { Capistrano::CLI.password_prompt "PostgreSQL Password: " }
-  set_default(:db_database) { "#{db_user}_production" }
   set_default(:postgresql_pid) { "/var/run/postgresql/9.1-main.pid" }
 
   namespace :pg do
@@ -42,20 +38,20 @@ Capistrano::Configuration.instance.load do
     desc "Pull database from remote server"
     task :pull, roles: :db do
       run "mkdir -p #{shared_path}/backups"
-      run %Q{#{sudo} -u postgres pg_dump #{db_database} --format=tar > #{shared_path}/backups/#{database_filename}}
+      run %Q{#{sudo} -u postgres pg_dump #{remote_db_name} --format=tar > #{shared_path}/backups/#{database_filename}}
       get "#{shared_path}/backups/#{database_filename}", "/tmp/#{database_filename}"
       run "rm #{shared_path}/backups/#{database_filename}"
-      run_locally "#{sudo} -u postgres pg_restore /tmp/#{database_filename} --clean --format=tar --dbname=#{db_user}_development"
+      run_locally "#{sudo} -u postgres pg_restore /tmp/#{database_filename} --clean --format=tar --dbname=#{local_db_user}"
       run_locally "rm /tmp/#{database_filename}"
     end
 
     desc "Push database to remote server"
     task :push, roles: :db do
       if are_you_sure?
-        run_locally %Q{#{sudo} -u postgres pg_dump #{db_user}_development --format=tar > /tmp/#{database_filename}}
+        run_locally %Q{#{sudo} -u postgres pg_dump #{local_db_user} --format=tar > /tmp/#{database_filename}}
         upload "/tmp/#{database_filename}", "/tmp/#{database_filename}"
         run_locally "rm /tmp/#{database_filename}"
-        run "#{sudo} -u postgres pg_restore /tmp/#{database_filename} --clean --format=tar --dbname=#{db_database}"
+        run "#{sudo} -u postgres pg_restore /tmp/#{database_filename} --clean --format=tar --dbname=#{remote_db_name}"
         run "rm /tmp/#{database_filename}"
         deploy.restart
       end
@@ -69,11 +65,11 @@ Capistrano::Configuration.instance.load do
     ### Helpers
 
     def database_filename
-      @database_filename ||= "#{db_user}_#{timestamp}.sql"
+      @database_filename ||= "#{application}_#{timestamp}.sql"
     end
 
     def database_table_filename
-      @database_table_filename ||= "#{db_user}_#{table_name}_#{timestamp}.sql"
+      @database_table_filename ||= "#{application}_#{table_name}_#{timestamp}.sql"
     end
 
     def table_name
@@ -81,12 +77,50 @@ Capistrano::Configuration.instance.load do
     end
 
     def create_user
-      run %Q{#{sudo} -u postgres psql -c "create user #{db_user} with password '#{db_password}';"}
+      run %Q{#{sudo} -u postgres psql -c "create user #{remote_db_user} with password '#{remote_db_password}';"}
     end
 
     def create_db
-      run %Q{#{sudo} -u postgres psql -c "create database #{db_database} owner #{db_user} ENCODING = 'UTF-8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' TEMPLATE template0;"}
+      run %Q{#{sudo} -u postgres psql -c "create database #{remote_db_name} owner #{remote_db_user} ENCODING = 'UTF-8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' TEMPLATE template0;"}
     end
+
+    def local_db_config(key)
+      begin
+        config = File.read('config/database.yml')
+        YAML.load(config)["development"][key]
+      rescue
+        request_from_prompt(key)
+      end
+    end
+
+    def remote_db_config(key)
+      begin
+        config = capture("cat #{shared_path}/config/database.yml")
+        YAML.load(config)[rails_env][key]
+      rescue
+        request_from_prompt(key, env: rails_env)
+      end
+    end
+
+    def request_from_prompt key, env='Development'
+      case key
+      when :database
+        ask("#{env} database name: ")
+      when :password
+        Capistrano::CLI.password_prompt("#{env} database password: ")
+      else
+        ask("#{env} database #{key}: ")
+      end
+    end
+
+    set_default(:remote_db_user) { remote_db_config(:username) }
+    set_default(:remote_db_name) { remote_db_config(:database) }
+    set_default(:remote_db_password) { remote_db_config(:password) }
+
+    set_default(:local_db_user) { local_db_config(:username) }
+    set_default(:local_db_name) { local_db_config(:database) }
+    set_default(:local_db_password) { local_db_config(:password)  }
+
   end
 
 end

data/lib/georgia_recipes/templates/postgresql.yml.erb

@@ -1,8 +1,8 @@
 production:
   adapter: postgresql
   encoding: unicode
-  database: <%= db_database %>
+  database: <%= remote_db_config(:database) %>
   pool: 5
-  username: <%= db_user %>
-  password: <%= db_password %>
-  host: <%= db_host %>
+  username: <%= remote_db_config(:username) %>
+  password: <%= remote_db_config(:password) %>
+  host: localhost

data/lib/georgia_recipes/version.rb

@@ -1,3 +1,3 @@
 module GeorgiaRecipes
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georgia_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mathieu Gagne