mschuerig-branch_db 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,6 @@
+== 0.0.3 2009-04-09
+* Added support for MySQL.
+
 == 0.0.1 2009-04-08
 
 * 1 major enhancement:

data/Manifest.txt

@@ -6,7 +6,9 @@ Rakefile
 branch_db.gemspec
 lib/branch_db.rb
 lib/branch_db/configuration_twiddler.rb
+lib/branch_db/mysql_switcher.rb
 lib/branch_db/postgresql_switcher.rb
+lib/branch_db/real_db_switchers_common.rb
 lib/branch_db/sqlite_switcher.rb
 lib/branch_db/switcher.rb
 lib/branch_db/task_helper.rb

data/README.rdoc

@@ -9,8 +9,6 @@ Give each git branch its own databases for ActiveRecord.
 == FEATURES/PROBLEMS:
 
 * alpha quality
-* only PostgreSQL and SQLite(3) are supported yet
-  (adding MySQL is trivial, I'll do it when I need it)
 * create, delete, copy git branch-specific databases using rake tasks
 * automatic switching based on currently checked out branch
 

data/branch_db.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{branch_db}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Schuerig"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Give each git branch its own databases for ActiveRecord.}
   s.email = ["michael@schuerig.de"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "branch_db.gemspec", "lib/branch_db.rb", "lib/branch_db/configuration_twiddler.rb", "lib/branch_db/postgresql_switcher.rb", "lib/branch_db/sqlite_switcher.rb", "lib/branch_db/switcher.rb", "lib/branch_db/task_helper.rb", "lib/tasks/db_branches.rb", "test/mocks.rb", "test/test_configuration_twiddler.rb", "test/test_helper.rb", "test/test_postgresql_switcher.rb", "test/test_sqlite_switcher.rb", "test/test_switcher.rb"]
+  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "branch_db.gemspec", "lib/branch_db.rb", "lib/branch_db/configuration_twiddler.rb", "lib/branch_db/mysql_switcher.rb", "lib/branch_db/postgresql_switcher.rb", "lib/branch_db/real_db_switchers_common.rb", "lib/branch_db/sqlite_switcher.rb", "lib/branch_db/switcher.rb", "lib/branch_db/task_helper.rb", "lib/tasks/db_branches.rb", "test/mocks.rb", "test/test_configuration_twiddler.rb", "test/test_helper.rb", "test/test_postgresql_switcher.rb", "test/test_sqlite_switcher.rb", "test/test_switcher.rb"]
   s.has_rdoc = false
   s.homepage = %q{http://github.com/mschuerig/branch_db}
   s.rdoc_options = ["--main", "README.rdoc"]

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.2'
+  VERSION = '0.0.3'
   DEFAULT_BRANCH = 'master'
   
   class Error < StandardError; end
@@ -25,5 +25,6 @@ module BranchDb
 end
 
 require 'branch_db/switcher'
+require 'branch_db/mysql_switcher'
 require 'branch_db/postgresql_switcher'
 require 'branch_db/sqlite_switcher'

data/lib/branch_db/mysql_switcher.rb

@@ -0,0 +1,63 @@
+
+require 'branch_db/switcher'
+require 'branch_db/real_db_switchers_common'
+
+module BranchDb # :nodoc:
+
+  class MysqlSwitcher < Switcher
+    include RealDbSwitchersCommon
+    
+    def self.can_handle?(config)
+      config['adapter'] == 'mysql'
+    end
+    
+    def current
+      current_branch = branch_db_exists?(@branch) ? @branch : 'master'
+      puts "#{@rails_env}: #{branch_db(current_branch)} (MySQL)"
+    end
+    
+    protected
+    
+    def self.show_branches(rails_env, config)
+      super
+    end
+
+    def create_database(branch)
+      config = branch_config(branch)
+      charset   = ENV['CHARSET']   || 'utf8'
+      collation = ENV['COLLATION'] || 'utf8_general_ci'
+      ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+      ActiveRecord::Base.connection.create_database(config['database'], :charset => (config['charset'] || charset), :collation => (config['collation'] || collation))
+      ActiveRecord::Base.establish_connection(config)
+    end
+    
+    def drop_database(branch)
+      config = branch_config(branch)
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.drop_database config['database']
+      @existing_databases = nil
+      nil
+    end
+    
+    def existing_databases
+      @existing_databases ||=
+        begin
+          raw_dbs = `mysql -e 'SHOW DATABASES'`
+          if $? == 0
+            existing_dbs = raw_dbs.split("\n").drop(1)
+            existing_dbs -= %w( information_schema )
+          else
+            raise Error, "Cannot determine existing databases."
+          end
+        end
+    end
+    
+    def dump_command(config, dump_file)
+      %{mysqldump --user "#{config["username"]}" --host "#{config["host"]}" #{config["database"]} > #{dump_file}}
+    end
+    
+    def load_command(config, dump_file)
+      %{mysql --user "#{config["username"]}" --host "#{config["host"]}" #{config["database"]} < #{dump_file}}
+    end
+  end
+end

data/lib/branch_db/postgresql_switcher.rb

@@ -1,9 +1,12 @@
 
 require 'branch_db/switcher'
+require 'branch_db/real_db_switchers_common'
 
 module BranchDb # :nodoc:
 
   class PostgresqlSwitcher < Switcher
+    include RealDbSwitchersCommon
+    
     def self.can_handle?(config)
       config['adapter'] == 'postgresql'
     end
@@ -19,21 +22,9 @@ module BranchDb # :nodoc:
       super
     end
 
-    def branch_db(branch)
-      if branch == 'master'
-        @config['database']
-      else
-        @config['database'].sub(/(_.+?)??(_?(#{@rails_env}))?$/, "_#{branch}\\2")
-      end
-    end
-
-    def branch_db_exists?(branch)
-      existing_databases.include?(branch_db(branch))
-    end
-    
     def create_database(branch)
       config = branch_config(branch).merge(
-        'encoding' => @config[:encoding] || ENV['CHARSET'] || 'utf8')
+        'encoding' => @config['encoding'] || ENV['CHARSET'] || 'utf8')
       ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
       ActiveRecord::Base.connection.create_database(config['database'], config)
       ActiveRecord::Base.establish_connection(config)
@@ -48,13 +39,6 @@ module BranchDb # :nodoc:
       nil
     end
     
-    def copy_database(from_branch, to_branch)
-      dump_file = dump_branch_db(from_branch)
-      load_branch_db(to_branch, dump_file)
-    end
-    
-    private
-    
     def existing_databases
       @existing_databases ||=
         begin
@@ -68,24 +52,12 @@ module BranchDb # :nodoc:
         end
     end
     
-    def dump_branch_db(branch)
-      require 'tempfile'
-      config = branch_config(branch)
-      old_umask = File.umask(0077) # make created files readable only to the user
-      dump_file = Tempfile.new('branchdb')
-      `pg_dump --clean -U "#{config['username']}" --host="#{config['host']}" --port=#{config['port']} #{config['database']} > #{dump_file.path}`
-      raise Error, "Unable to dump database #{config['database']}." unless $? == 0
-      dump_file.path
-    ensure
-      File.umask(old_umask)
+    def dump_command(config, dump_file)
+      %{pg_dump --clean -U "#{config['username']}" --host="#{config['host']}" --port=#{config['port']} #{config['database']} > #{dump_file}}
     end
     
-    def load_branch_db(branch, dump_file)
-      config = branch_config(branch)
-      silence_stderr do
-        `psql -U "#{config['username']}" -f "#{dump_file}" --host="#{config['host']}" --port=#{config['port']} #{config['database']}`
-      end
-      raise Error, "Unable to load database #{config['database']}." unless $? == 0
+    def load_command(config, dump_file)
+      %{psql -U "#{config['username']}" -f "#{dump_file}" --host="#{config['host']}" --port=#{config['port']} #{config['database']}}
     end
   end
 end

data/lib/branch_db/real_db_switchers_common.rb

@@ -0,0 +1,43 @@
+module BranchDb # :nodoc:
+
+  module RealDbSwitchersCommon
+    protected
+    
+    def branch_db(branch)
+      if branch == 'master'
+        @config['database']
+      else
+        @config['database'].sub(/(_.+?)??(_?(#{@rails_env}))?$/, "_#{branch}\\2")
+      end
+    end
+
+    def branch_db_exists?(branch)
+      existing_databases.include?(branch_db(branch))
+    end
+    
+    def copy_database(from_branch, to_branch)
+      dump_file = dump_branch_db(from_branch)
+      load_branch_db(to_branch, dump_file)
+    end
+    
+    def dump_branch_db(branch)
+      require 'tempfile'
+      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)}}
+      raise Error, "Unable to dump database #{config['database']}." unless $? == 0
+      dump_file.path
+    ensure
+      File.umask(old_umask)
+    end
+    
+    def load_branch_db(branch, dump_file)
+      config = branch_config(branch)
+      silence_stderr do
+        %x{{load_command(config, dump_file)}}
+      end
+      raise Error, "Unable to load database #{config['database']}." unless $? == 0
+    end
+  end
+end

data/test/mocks.rb

@@ -30,7 +30,7 @@ module BranchDb
     @branch
   end
   
-  class PostgresqlSwitcher < Switcher
+  class MysqlSwitcher < Switcher
     include Recorder
     record :create_database, :drop_database, :load_branch_db
     record(:dump_branch_db) { 'the-dump-file' }
@@ -38,8 +38,16 @@ module BranchDb
     def existing_databases
       %w( testit_development testit_feature_development testit_test )
     end
-    def operations
-      @ops
+  end
+
+  ### FIXME this repetition is dumb
+  class PostgresqlSwitcher < Switcher
+    include Recorder
+    record :create_database, :drop_database, :load_branch_db
+    record(:dump_branch_db) { 'the-dump-file' }
+
+    def existing_databases
+      %w( testit_development testit_feature_development testit_test )
     end
   end
 

data/test/test_configuration_twiddler.rb

@@ -57,8 +57,6 @@ class TestConfigurationTwiddlerPostgreSQL < Test::Unit::TestCase
   include RealDatabaseTests
 end
 
-=begin
-### TODO
 class TestConfigurationTwiddlerMysql < Test::Unit::TestCase
   def setup
     @mock = MockConfiguration.new({
@@ -76,7 +74,6 @@ class TestConfigurationTwiddlerMysql < Test::Unit::TestCase
   
   include RealDatabaseTests
 end
-=end
 
 class TestConfigurationTwiddlerSQLite < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mschuerig-branch_db
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Schuerig
@@ -62,7 +62,9 @@ files:
 - branch_db.gemspec
 - lib/branch_db.rb
 - lib/branch_db/configuration_twiddler.rb
+- lib/branch_db/mysql_switcher.rb
 - lib/branch_db/postgresql_switcher.rb
+- lib/branch_db/real_db_switchers_common.rb
 - lib/branch_db/sqlite_switcher.rb
 - lib/branch_db/switcher.rb
 - lib/branch_db/task_helper.rb