wpcap 0.2.1 → 0.2.2

data/lib/wpcap/recipes/mysql.rb

@@ -53,7 +53,7 @@ configuration.load do
       
         prepare_env
         run "mkdir -p #{backups_path}"
-        filename = "db_backup_#{Time.now.to_f}.sql.bz2"
+        filename = "db_backup.#{Time.now.to_f}.sql.bz2"
         filepath = "#{backups_path}/#{filename}"
         on_rollback { run "rm #{filepath}" }
         run "mysqldump --user=#{db_username} -p --host=#{db_host} #{db_database} | bzip2 -z9 > #{filepath}" do |ch, stream, out|
@@ -65,10 +65,7 @@ configuration.load do
       desc "Restores the database from the latest compressed dump"
       task :restore_most_recent, :roles => :db, :only => { :primary => true } do
         prepare_env
-        run "bzcat #{most_recent_backup} | mysql --user=#{db_username} -p --host=#{db_host} #{db_database}" do |ch, stream, out|
-          ch.send_data "#{db_password}\n" if out =~ /^Enter password:/
-          puts out
-        end
+        restore_dump(most_recent_backup)
       end
       
       desc "Restores the database from the latest compressed dump"
@@ -107,7 +104,7 @@ configuration.load do
         prepare_env(:development)
         run_locally "#{local_mysql_path}mysqldump --user #{db_username} --password=#{db_password} #{db_database} | bzip2 -z9 > #{local_dump}"
         run "mkdir -p #{backups_path}"
-        filename = "local_upload_#{Time.now.to_f}.sql.bz2"
+        filename = "local_upload.#{Time.now.to_f}.sql.bz2"
         filepath = "#{backups_path}/#{filename}"
         upload "#{local_dump}" , "#{filepath}"
       end
@@ -156,18 +153,19 @@ configuration.load do
       desc "Create database.yml in shared path with settings for current stage and test env"
       task :create_yaml do  
         #Create a new database enviroment unless it already exists in config.
-        unless db_config[stage]
-          template_path = "#{shared_path}/config/database.yml"
-          set :db_username, "#{application.split(".").first}_#{stage}"
-          set :db_database, "#{application.split(".").first}_#{stage}"
-          set :db_password, random_password(16)
-          set :db_prefix, db_config["development"]["prefix"]
-          run "mkdir -p #{shared_path}/config"
-          template "mysql.yml.erb", template_path
-          server_yaml = capture "cat #{template_path}"
-          server_mysql_config_yaml = YAML.load(server_yaml)
-          update_db_config(server_mysql_config_yaml)
-        end
+        return if db_config[stage]
+        
+        template_path = "#{shared_path}/config/database.yml"
+        set :db_username, "#{application.split(".").first}_#{stage}"
+        set :db_database, "#{application.split(".").first}_#{stage}"
+        set :db_password, random_password(16)
+        set :db_prefix, db_config["development"]["prefix"]
+        run "mkdir -p #{shared_path}/config"
+        template "mysql.yml.erb", template_path
+        server_yaml = capture "cat #{template_path}"
+        server_mysql_config_yaml = YAML.load(server_yaml)
+        update_db_config(server_mysql_config_yaml)
+        
       end
     
       def db_config

data/lib/wpcap/recipes/templates/mysql.yml.erb

@@ -3,6 +3,5 @@
   database: <%= db_database[0..15] %>
   username: <%= db_username[0..15] %>
   password: <%= db_password[0..15] %>
-  priv_username: root
-  priv_password: <%= db_priv_pass[0..15] %>
-  host: localhost
+  host: localhost
+  encoding: utf8

data/lib/wpcap/utility.rb

@@ -4,11 +4,16 @@ class Wpcap::Utility
     puts red("****#{text}****")
   end
   
+  def self.question(text)
+    puts blue("****#{text}****")
+  end
+  
   def self.colorize(text, color_code)
     "\e[#{color_code}m#{text}\e[0m"
   end
 
   def self.red(text); self.colorize(text, 31); end
   def self.green(text); self.colorize(text, 32); end
-
-end
+  def self.blue(text); self.colorize(text, 34); end
+  
+end

data/lib/wpcap/version.rb

@@ -1,3 +1,3 @@
 module Wpcap
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wpcap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: