flattendb 0.0.4 → 0.0.5

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to flattendb version 0.0.4
+This documentation refers to flattendb version 0.0.5
 
 
 == DESCRIPTION
@@ -26,7 +26,7 @@ Rubyforge project:: <http://rubyforge.org/projects/prometheus>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007 University of Cologne,
+Copyright (C) 2007-2010 University of Cologne,
 Albertus-Magnus-Platz, 50932 Cologne, Germany
 
 flattendb is free software: you can redistribute it and/or modify it under the

data/Rakefile

@@ -8,7 +8,8 @@ require 'lib/flattendb/version'
 
 Hen.lay! {{
   :rubyforge => {
-    :package => 'flattendb'
+    :project => %q{prometheus},
+    :package => %q{flattendb}
   },
 
   :gem => {

data/bin/flattendb.mdb

@@ -1,7 +1,5 @@
 #! /usr/bin/ruby
 
-# vi:ft=ruby
-
 #--
 ###############################################################################
 #                                                                             #
@@ -53,3 +51,5 @@ else
       }
   end
 end
+
+# vim:ft=ruby

data/bin/flattendb.mysql

@@ -1,7 +1,5 @@
 #! /usr/bin/ruby
 
-# vi:ft=ruby
-
 #--
 ###############################################################################
 #                                                                             #
@@ -42,7 +40,7 @@ else
         abort "Input file doesn't seem to be a valid XML file, XML declaration missing"
       end
     when :sql
-      $dump_file = $infile.sub(/\.(?:sql|dump)$/i, '') << '.xml'
+      $dump_file = $infile.sub(/\.(?:sql|dump)(?:\.gz)?\z/i, '') << '.xml'
       abort "Dump file and output file are the same: #{$dump_file} = #{$outfile}" \
         if File.expand_path($dump_file) == File.expand_path($outfile)
 
@@ -54,34 +52,35 @@ else
 
       mysql_user = ask('Please enter the MySQL user name: ')              \
         { |q| q.default = ENV['USER'] }
-      mysql_pass = ask("Please enter the MySQL password for that user: ") \
+      mysql_pass = ask('Please enter the MySQL password for that user: ') \
         { |q| q.echo    = false       }
 
-      # according to <http://www.adamspiers.org/computing/mysqldiff/#how> MySQL
-      # default permissions allow anyone to create databases beginning with the
-      # prefix 'test_'
-      temp_db   = 'flattendb_temp_%d_%d' % [Time.now, $$]
-      temp_user = 'flattendb_user'
-      temp_pass = 'flattendb_pass'
+      is_root = mysql_user == 'root'
+
+      temp_db   = ENV['FLATTEN_DB']   || 'flattendb_temp'
+      temp_db << '_%d_%d' % [Time.now, $$] if is_root
+
+      temp_user = ENV['FLATTEN_USER'] || 'flattendb_user'
+      temp_pass = ENV['FLATTEN_PASS'] || 'flattendb_pass'
 
-      mysql_args = "--one-database -u#{temp_user} -p#{temp_pass} #{temp_db} < #{$infile}"
+      input = $infile =~ /\.gz\z/i ? "<(zcat #{$infile})" : "< #{$infile}"
+      mysql_args = "--one-database -u#{temp_user} -p#{temp_pass} #{temp_db} #{input}"
       dump_args  = "--xml -u#{temp_user} -p#{temp_pass} #{temp_db} > #{$dump_file}"
 
       begin
         mysql = Mysql.real_connect('localhost', mysql_user, mysql_pass)
 
         mysql.query("CREATE DATABASE #{temp_db}")
-        mysql.query("GRANT ALL ON #{temp_db}.* TO '#{temp_user}'@'localhost' IDENTIFIED BY '#{temp_pass}'")
+        mysql.query("GRANT ALL ON #{temp_db}.* TO '#{temp_user}'@'localhost' IDENTIFIED BY '#{temp_pass}'") if is_root
 
         system("#{mysql_cmd} #{mysql_args} && #{dump_cmd} #{dump_args}")
       rescue Mysql::Error => err
         abort "ERROR #{err.errno} (#{err.sqlstate}): #{err.error}"
       ensure
         if mysql
-          mysql.query("REVOKE ALL ON #{temp_db}.* FROM '#{temp_user}'@'localhost'") \
-            if mysql_user == 'root'
-
+          mysql.query("REVOKE ALL ON #{temp_db}.* FROM '#{temp_user}'@'localhost'") if is_root
           mysql.query("DROP DATABASE IF EXISTS #{temp_db}")
+
           mysql.close
         end
       end
@@ -89,3 +88,5 @@ else
       $infile = $dump_file
   end
 end
+
+# vim:ft=ruby

data/lib/flattendb/base.rb

@@ -106,7 +106,7 @@ module FlattenDB
     def flatten!(*args)
       raise NotImplementedError, 'must be defined by sub-class'
     end
-    
+
     def to_xml(*args)
       raise NotImplementedError, 'must be defined by sub-class'
     end

data/lib/flattendb/version.rb

@@ -3,9 +3,9 @@
 #                                                                             #
 # A component of flattendb, the relational database flattener.                #
 #                                                                             #
-# Copyright (C) 2007 University of Cologne,                                   #
-#                    Albertus-Magnus-Platz,                                   #
-#                    50932 Cologne, Germany                                   #
+# Copyright (C) 2007-2010 University of Cologne,                              #
+#                         Albertus-Magnus-Platz,                              #
+#                         50932 Cologne, Germany                              #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -32,7 +32,7 @@ module FlattenDB
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flattendb
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 +01:00
+date: 2010-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,16 +84,18 @@ files:
 - example/mysql-sample.sql
 has_rdoc: true
 homepage: http://prometheus.rubyforge.org/flattendb
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
+- --charset
+- UTF-8
 - --title
 - flattendb Application documentation
 - --main
 - README
-- --charset
-- UTF-8
+- --line-numbers
+- --inline-source
 - --all
 require_paths: 
 - lib
@@ -112,9 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Flatten relational databases.
 test_files: []