Merge pull request #67 from paazmaya/configuration

paazmaya · paazmaya · commit 084519061f48 · 2014-11-28T15:11:54.000+02:00
Default port for MySQL and next patch release
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ git clone https://github.com/maxlapshin/mysql2postgres.git
 cd mysql2postgres
 bundle install
 gem build mysqltopostgres.gemspec
-sudo gem install mysqltopostgres-0.2.19.gem
+sudo gem install mysqltopostgres-0.2.20.gem
 ```
 
 ## Sample Configuration
@@ -66,7 +66,7 @@ mysql2psql:
   destination:
     production:
       <<: *production
-    test: 
+    test:
       <<: *test
     development:
       <<: *development
diff --git a/Rakefile b/Rakefile
@@ -57,7 +57,7 @@ end
 desc 'Run all tests'
 task :test do
   Rake::Task['test:units'].invoke
-  Rake::Task['test:integration'].invoke
+  #Rake::Task['test:integration'].invoke
 end
 
 begin
diff --git a/lib/mysql2psql/config_base.rb b/lib/mysql2psql/config_base.rb
@@ -3,11 +3,10 @@
 
 class Mysql2psql
   class ConfigBase
-    attr_reader :config, :filepath
+    attr_reader :config
 
     def initialize(yaml)
-      @filepath = nil
-      @config = yaml # YAML::load(File.read(filepath))
+      @config = yaml
     end
 
     def [](key)
diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
@@ -180,8 +180,8 @@ def initialize(options)
       @host, @user, @passwd, @db, @port, @sock, @flag =
         options.mysqlhost('localhost'), options.mysqlusername,
         options.mysqlpassword, options.mysqldatabase,
-        options.mysqlport, options.mysqlsocket
-      @port = 3306 if @port == ''  # for things like Amazon's RDS you don't have a port and connect fails with "" for a value
+        options.mysqlport(3306), options.mysqlsocket,
+        options.mysqlflag
       @sock = nil if @sock == ''
       @flag = nil if @flag == ''
       connect
diff --git a/lib/mysql2psql/version.rb b/lib/mysql2psql/version.rb
@@ -2,7 +2,7 @@ class Mysql2psql
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 0
+    PATCH = 20
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
diff --git a/mysqltopostgres.gemspec b/mysqltopostgres.gemspec
@@ -1,11 +1,28 @@
 
 Gem::Specification.new do |s|
   s.name = 'mysqltopostgres'
-  s.version = '0.2.19'
+  s.version = '0.2.20'
   s.licenses = ['MIT']
 
-  s.authors = ['Max Lapshin <max@maxidoors.ru>', 'Anton Ageev <anton@ageev.name>', 'Samuel Tribehou <cracoucax@gmail.com>', 'Marco Nenciarini <marco.nenciarini@devise.it>', 'James Nobis <jnobis@jnobis.controldocs.com>', 'quel <github@quelrod.net>', 'Holger Amann <keeney@fehu.org>', 'Maxim Dobriakov <closer.main@gmail.com>', 'Michael Kimsal <mgkimsal@gmail.com>', 'Jacob Coby <jcoby@portallabs.com>', 'Neszt Tibor <neszt@tvnetwork.hu>', 'Miroslav Kratochvil <exa.exa@gmail.com>', 'Paul Gallagher <gallagher.paul@gmail.com>', 'Alex C Jokela <ajokela@umn.edu>', 'Peter Clark <pclark@umn.edu>']
-  s.date = '2012-09-21'
+  s.authors = [
+    'Max Lapshin <max@maxidoors.ru>',
+    'Anton Ageev <anton@ageev.name>',
+    'Samuel Tribehou <cracoucax@gmail.com>',
+    'Marco Nenciarini <marco.nenciarini@devise.it>',
+    'James Nobis <jnobis@jnobis.controldocs.com>',
+    'quel <github@quelrod.net>',
+    'Holger Amann <keeney@fehu.org>',
+    'Maxim Dobriakov <closer.main@gmail.com>',
+    'Michael Kimsal <mgkimsal@gmail.com>',
+    'Jacob Coby <jcoby@portallabs.com>',
+    'Neszt Tibor <neszt@tvnetwork.hu>',
+    'Miroslav Kratochvil <exa.exa@gmail.com>',
+    'Paul Gallagher <gallagher.paul@gmail.com>',
+    'Alex C Jokela <ajokela@umn.edu>',
+    'Peter Clark <pclark@umn.edu>',
+    'Juga Paazmaya <olavic@gmail.com>'
+  ]
+  s.date = '2014-11-19'
   s.default_executable = 'mysqltopostgres'
   s.description = 'Translates MySQL -> PostgreSQL'
   s.email = 'ajokela@umn.edu'
@@ -45,7 +62,7 @@ Gem::Specification.new do |s|
     'test/units/config_test.rb',
     'test/units/postgres_file_writer_test.rb'
   ]
-  s.homepage = 'https://github.com/ajokela/mysqltopostgres'
+  s.homepage = 'https://github.com/maxlapshin/mysql2postgres'
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']
   s.rubygems_version = '1.3.7'
diff --git a/test/integration/convert_to_db_test.rb b/test/integration/convert_to_db_test.rb
@@ -7,14 +7,13 @@ class << self
     def startup
       seed_test_database
       @@options = get_test_config_by_label(:localmysql_to_db_convert_all)
-      @@mysql2psql = Mysql2psql.new([@@options.filepath])
+      @@mysql2psql = Mysql2psql.new(@@options)
       @@mysql2psql.convert
       @@mysql2psql.writer.open
     end
 
     def shutdown
       @@mysql2psql.writer.close
-      delete_files_for_test_config(@@options)
     end
   end
   def setup
diff --git a/test/integration/convert_to_file_test.rb b/test/integration/convert_to_file_test.rb
@@ -7,14 +7,11 @@ class << self
     def startup
       seed_test_database
       @@options = get_test_config_by_label(:localmysql_to_file_convert_all)
-      @@mysql2psql = Mysql2psql.new([@@options.filepath])
+      @@mysql2psql = Mysql2psql.new(@@options)
       @@mysql2psql.convert
       @@content = IO.read(@@mysql2psql.options.destfile)
     end
 
-    def shutdown
-      delete_files_for_test_config(@@options)
-    end
   end
   def setup
   end
diff --git a/test/integration/converter_test.rb b/test/integration/converter_test.rb
@@ -9,9 +9,6 @@ def startup
       @@options = get_test_config_by_label(:localmysql_to_file_convert_nothing)
     end
 
-    def shutdown
-      delete_files_for_test_config(@@options)
-    end
   end
   def setup
   end
diff --git a/test/integration/mysql_reader_base_test.rb b/test/integration/mysql_reader_base_test.rb
@@ -9,9 +9,6 @@ def startup
       @@options = get_test_config_by_label(:localmysql_to_file_convert_nothing)
     end
 
-    def shutdown
-      delete_files_for_test_config(@@options)
-    end
   end
   def setup
   end
diff --git a/test/integration/mysql_reader_test.rb b/test/integration/mysql_reader_test.rb
@@ -8,9 +8,6 @@ def startup
       @@reader = get_test_reader(@@options)
     end
 
-    def shutdown
-      delete_files_for_test_config(@@options)
-    end
   end
   def setup
   end
diff --git a/test/integration/postgres_db_writer_base_test.rb b/test/integration/postgres_db_writer_base_test.rb
@@ -9,9 +9,6 @@ def startup
       @@options = get_test_config_by_label(:localmysql_to_db_convert_nothing)
     end
 
-    def shutdown
-      delete_files_for_test_config(@@options)
-    end
   end
   def setup
   end
diff --git a/test/lib/test_helper.rb b/test/lib/test_helper.rb
@@ -17,8 +17,6 @@ def seed_test_database
   return true
 rescue
   raise StandardError.new('Failed to seed integration test db. See README for setup requirements.')
-ensure
-  delete_files_for_test_config(options)
 end
 
 def get_test_reader(options)
@@ -60,7 +58,8 @@ def get_new_test_config(to_file = true, include_tables = [], exclude_tables = []
   configtext = Mysql2psql::Config.template(to_filename, include_tables, exclude_tables, suppress_data, suppress_ddl, force_truncate)
   configfile = get_temp_file('mysql2psql_tmp_config')
   File.open(configfile, 'w:UTF-8') { |f| f.write(configtext) }
-  Mysql2psql::ConfigBase.new(configfile)
+  yaml = YAML.load_file configfile
+  Mysql2psql::ConfigBase.new(yaml)
 rescue
   raise StandardError.new("Failed to initialize options from #{configfile}. See README for setup requirements.")
 end
@@ -80,8 +79,3 @@ def get_test_config_by_label(name)
   end
 end
 
-def delete_files_for_test_config(config)
-  File.delete(config.destfile) if File.exist?(config.destfile)
-  File.delete(config.filepath) if File.exist?(config.filepath)
-rescue
-end
diff --git a/test/units/config_base_test.rb b/test/units/config_base_test.rb
@@ -4,10 +4,10 @@
 #
 #
 class ConfigBaseTest < Test::Unit::TestCase
-  attr_reader :config, :configfilepath
+  attr_reader :config, :yaml
   def setup
-    @configfilepath = "#{File.dirname(__FILE__)}/../fixtures/config_all_options.yml"
-    @config = Mysql2psql::ConfigBase.new(configfilepath)
+    @yaml = YAML.load_file "#{File.dirname(__FILE__)}/../fixtures/config_all_options.yml"
+    @config = Mysql2psql::ConfigBase.new(yaml)
   end
 
   def teardown
@@ -16,7 +16,7 @@ def teardown
 
   def test_config_loaded
     assert_not_nil config.config
-    assert_equal configfilepath, config.filepath
+    assert_equal yaml, config.config
   end
 
   def test_uninitialized_error_when_not_found_and_no_default
diff --git a/test/units/config_test.rb b/test/units/config_test.rb
@@ -3,31 +3,14 @@
 require 'mysql2psql/config'
 
 class ConfigTest < Test::Unit::TestCase
-  attr_reader :configfile_new, :configfile_all_opts, :configfile_not_found
+  attr_reader :config_all_opts
   def setup
-    @configfile_all_opts = "#{File.dirname(__FILE__)}/../fixtures/config_all_options.yml"
-    @configfile_not_found = "#{File.dirname(__FILE__)}/../fixtures/config_not_found.yml.do_not_create_this_file"
-    @configfile_new = get_temp_file('mysql2psql_test_config')
-  end
-
-  def teardown
-    File.delete(configfile_new) if File.exist?(configfile_new)
+    @config_all_opts = YAML.load_file "#{File.dirname(__FILE__)}/../fixtures/config_all_options.yml"
   end
 
   def test_config_loaded
-    value = Mysql2psql::Config.new(configfile_all_opts, false)
+    value = Mysql2psql::Config.new(config_all_opts)
     assert_not_nil value
   end
 
-  def test_config_file_not_found
-    assert_raise(Mysql2psql::ConfigurationFileNotFound) do
-      value = Mysql2psql::Config.new(configfile_not_found, false)
-    end
-  end
-
-  def test_initialize_new_config_file
-    assert_raise(Mysql2psql::ConfigurationFileInitialized) do
-      value = Mysql2psql::Config.new(configfile_new, true)
-    end
-  end
 end
diff --git a/test/units/postgres_file_writer_test.rb b/test/units/postgres_file_writer_test.rb
@@ -5,9 +5,7 @@
 class PostgresFileWriterTest < Test::Unit::TestCase
   attr_accessor :destfile
   def setup
-    f = Tempfile.new('mysql2psql_test_destfile')
-    @destfile = f.path
-    f.close!
+    @destfile = get_temp_file('mysql2psql_test_destfile')
   rescue => e
     raise StandardError.new('Failed to initialize integration test db. See README for setup requirements.')
   end
