mschuerig-branch_db 0.0.3 → 0.0.5

data/README.rdoc

@@ -39,7 +39,7 @@ databases specific to current branch
 
 To your Rakefile or a file in lib/tasks add
 
-  require 'tasks/db_branches.rb'
+  require 'tasks/db_branches'
 
 Then you can use these rake tasks to manage your databases.
 

data/branch_db.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{branch_db}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Schuerig"]

data/lib/branch_db/mysql_switcher.rb

@@ -23,6 +23,7 @@ module BranchDb # :nodoc:
     end
 
     def create_database(branch)
+      ### TODO when copying a database, determine charset and collation from original
       config = branch_config(branch)
       charset   = ENV['CHARSET']   || 'utf8'
       collation = ENV['COLLATION'] || 'utf8_general_ci'
@@ -42,7 +43,7 @@ module BranchDb # :nodoc:
     def existing_databases
       @existing_databases ||=
         begin
-          raw_dbs = `mysql -e 'SHOW DATABASES'`
+          raw_dbs = `mysql #{command_options(@config)} -e 'SHOW DATABASES'`
           if $? == 0
             existing_dbs = raw_dbs.split("\n").drop(1)
             existing_dbs -= %w( information_schema )
@@ -53,11 +54,19 @@ module BranchDb # :nodoc:
     end
     
     def dump_command(config, dump_file)
-      %{mysqldump --user "#{config["username"]}" --host "#{config["host"]}" #{config["database"]} > #{dump_file}}
+      %{mysqldump #{command_options(config)} #{config["database"]} > #{dump_file}}
     end
     
     def load_command(config, dump_file)
-      %{mysql --user "#{config["username"]}" --host "#{config["host"]}" #{config["database"]} < #{dump_file}}
+      %{mysql #{command_options(config)} #{config["database"]} < #{dump_file}}
+    end
+    
+    def command_options(config)
+      returning opts = '' do
+        %w( user username password password host host).each_slice(2) do |o, k|
+          opts << " --#{o} #{config[k]}" if config[k]
+        end
+      end
     end
   end
 end

data/lib/branch_db/postgresql_switcher.rb

@@ -53,11 +53,19 @@ module BranchDb # :nodoc:
     end
     
     def dump_command(config, dump_file)
-      %{pg_dump --clean -U "#{config['username']}" --host="#{config['host']}" --port=#{config['port']} #{config['database']} > #{dump_file}}
+      %{pg_dump #{command_options(config)} --clean #{config['database']} > #{dump_file}}
     end
     
     def load_command(config, dump_file)
-      %{psql -U "#{config['username']}" -f "#{dump_file}" --host="#{config['host']}" --port=#{config['port']} #{config['database']}}
+      %{psql #{command_options(config)} -f "#{dump_file}" #{config['database']}}
+    end
+
+    def command_options(config)
+      returning opts = '' do
+        %w( username host port ).each do |o|
+          opts << " --#{o}=#{config[o]}" if config[o]
+        end
+      end
     end
   end
 end

data/lib/branch_db/real_db_switchers_common.rb

@@ -25,7 +25,9 @@ module BranchDb # :nodoc:
       config = branch_config(branch)
       old_umask = File.umask(0077) # make created files readable only to the user
       dump_file = Tempfile.new('branchdb')
-      %x{#{dump_command(config, dump_file.path)}}
+      cmd = dump_command(config, dump_file.path)
+      puts cmd if verbose?
+      %x{#{cmd}}
       raise Error, "Unable to dump database #{config['database']}." unless $? == 0
       dump_file.path
     ensure
@@ -34,8 +36,10 @@ module BranchDb # :nodoc:
     
     def load_branch_db(branch, dump_file)
       config = branch_config(branch)
+      cmd = load_command(config, dump_file)
+      puts cmd if verbose?
       silence_stderr do
-        %x{{load_command(config, dump_file)}}
+        %x{#{cmd}}
       end
       raise Error, "Unable to load database #{config['database']}." unless $? == 0
     end

data/lib/branch_db/switcher.rb

@@ -26,6 +26,7 @@ module BranchDb # :nodoc:
     def initialize(rails_env, config, branch, options = {})
       @rails_env, @config, @branch = rails_env, config, branch
       @overwrite = options[:overwrite]
+      @verbose = options[:verbose]
     end
 
     def current
@@ -87,6 +88,10 @@ module BranchDb # :nodoc:
       end
     end
 
+    def verbose?
+      @verbose
+    end
+    
     def branch_config(branch)
       @config.merge('database' => branch_db(branch))
     end

data/lib/branch_db/task_helper.rb

@@ -9,9 +9,11 @@ module BranchDb # :nodoc:
     end
     
     def environment_options
-      { 
-        :overwrite => (ENV['OVERWRITE'] =~ /^(true|1)$/i) == 0
-      }
+      returning options = {} do
+        [:overwrite, :verbose].each do |opt|
+          options[opt] = (ENV[opt.to_s.upcase] =~ /\A(true|1)\Z/i) == 0
+        end
+      end
     end
     
     def target_branch

data/lib/branch_db.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BranchDb
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
   DEFAULT_BRANCH = 'master'
   
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mschuerig-branch_db
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Michael Schuerig