flattendb 0.1.0 → 0.1.1

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to flattendb version 0.1.0
+This documentation refers to flattendb version 0.1.1
 
 
 == DESCRIPTION

data/Rakefile

@@ -14,7 +14,7 @@ begin
       :summary      => %q{Flatten relational databases.},
       :author       => %q{Jens Wille},
       :email        => %q{jens.wille@uni-koeln.de},
-      :dependencies => %w[libxml-ruby builder ruby-nuggets] << ['athena', '>= 0.1.5']
+      :dependencies => %w[libxml-ruby builder] << ['ruby-nuggets', '>= 0.7.3'] << ['athena', '>= 0.1.5']
     }
   }}
 rescue LoadError => err

data/bin/flattendb

@@ -29,9 +29,4 @@
 #++
 
 require 'flattendb/cli'
-
-begin
-  FlattenDB::CLI.execute($flattendb_type, ARGV, STDIN, STDOUT, STDERR)
-rescue ArgumentError => err
-  abort err
-end
+FlattenDB::CLI.execute($flattendb)

data/bin/flattendb.mdb

@@ -1,7 +1,6 @@
 #! /usr/bin/ruby
 
-ext = File.extname(__FILE__)
-$flattendb_type = ext.sub(/\A\./, '')
+$flattendb = (ext = File.extname(__FILE__)).sub(/\A\./, '')
 load __FILE__.sub(/#{Regexp.escape(ext)}\z/, '')
 
 # vim:ft=ruby

data/bin/flattendb.mysql

@@ -1,7 +1,6 @@
 #! /usr/bin/ruby
 
-ext = File.extname(__FILE__)
-$flattendb_type = ext.sub(/\A\./, '')
+$flattendb = (ext = File.extname(__FILE__)).sub(/\A\./, '')
 load __FILE__.sub(/#{Regexp.escape(ext)}\z/, '')
 
 # vim:ft=ruby

data/lib/flattendb/cli.rb

@@ -26,23 +26,12 @@
 ###############################################################################
 #++
 
-require 'optparse'
-require 'yaml'
-require 'zlib'
+require 'nuggets/util/cli'
 require 'flattendb'
 
 module FlattenDB
 
-  class CLI
-
-    USAGE = "Usage: #{$0} [-h|--help] [options]"
-
-    DEFAULTS = {
-      :input  => '-',
-      :inputs => [],
-      :output => '-',
-      :config => 'config.yaml'
-    }
+  class CLI < ::Util::CLI
 
     TYPES = {
       :mysql => {
@@ -64,31 +53,30 @@ module FlattenDB
       }
     }
 
-    def self.execute(type = nil, *args)
-      new(type).execute(*args)
-    end
-
-    attr_reader :type, :options, :config, :defaults
-    attr_reader :stdin, :stdout, :stderr
+    class << self
 
-    def initialize(type = nil, defaults = DEFAULTS)
-      @defaults = defaults
+      def defaults
+        super.merge(
+          :input  => '-',
+          :inputs => [],
+          :output => '-',
+          :config => 'config.yaml'
+        )
+      end
 
-      reset(type)
+      def execute(type = nil, *args)
+        new(nil, type).execute(*args)
+      end
 
-      # prevent backtrace on ^C
-      trap(:INT) { exit 130 }
     end
 
-    def execute(arguments = [], *inouterr)
-      reset(type, *inouterr)
-
-      parse_options(arguments, defaults)
+    attr_reader :type
 
+    def run(arguments)
       if type
         require "flattendb/types/#{type}"
       else
-        abort 'Database type is required!'
+        quit 'Database type is required!'
       end
 
       options[:input] = if type == :mdb
@@ -108,78 +96,44 @@ module FlattenDB
         )
       end
 
-      abort USAGE unless arguments.empty?
+      quit unless arguments.empty?
 
       options[:output] = open_file_or_std(options[:output], true)
 
       FlattenDB[type].to_flat!(options)
-    ensure
-      options[:output].close if options[:output].is_a?(Zlib::GzipWriter)
-    end
-
-    def reset(type = nil, stdin = STDIN, stdout = STDOUT, stderr = STDERR)
-      @stdin, @stdout, @stderr = stdin, stdout, stderr
-      self.type, @options, @config = type, {}, {}
     end
 
     private
 
+    def init(type)
+      super()
+      self.type = type
+    end
+
     def type=(type)
       if type
         @type = type.to_s.downcase.to_sym
-        abort "Database type not supported: #{type}" unless TYPES.has_key?(@type)
+        quit "Database type not supported: #{type}" unless TYPES.has_key?(@type)
       else
         @type = nil
       end
     end
 
-    def open_file_or_std(file, write = false)
-      if file == '-'
-        write ? stdout : stdin
-      else
-        gz = file =~ /\.gz\z/i
-
-        if write
-          gz ? Zlib::GzipWriter.open(file) : File.open(file, 'w')
-        else
-          abort "No such file: #{file}" unless File.readable?(file)
-          (gz ? Zlib::GzipReader : File).open(file)
-        end
-      end
-    end
-
-    def warn(msg, output = stderr)
-      output.puts(msg)
-    end
-
-    def abort(msg = nil, status = 1, output = stderr)
-      warn(msg, output) if msg
-      exit(status)
-    end
-
-    def parse_options(arguments, defaults)
-      option_parser(defaults).parse!(arguments)
-
-      config_file = options[:config] || defaults[:config]
-      @config = YAML.load_file(config_file) if File.readable?(config_file)
-
-      [config, defaults].each { |hash| hash.each { |key, value| options[key] ||= value } }
+    def option_parser
+      @sorted_types = TYPES.keys.sort_by { |t| t.to_s }
+      super
+    ensure
+      remove_instance_variable(:@sorted_types)
     end
 
-    def option_parser(defaults)
-      sorted_types = TYPES.keys.sort_by { |t| t.to_s }
-
-      OptionParser.new { |opts|
-        opts.banner = USAGE
-
+    def pre_opts(opts)
       if type
         opts.separator ''
         opts.separator "TYPE = #{type} (#{TYPES[type][:title]})"
       end
+    end
 
-        opts.separator ''
-        opts.separator 'Options:'
-
+    def opts(opts)
       unless type
         opts.on('-t', '--type TYPE', 'Type of database [REQUIRED]') { |type|
           self.type = type
@@ -188,39 +142,29 @@ module FlattenDB
         opts.separator ''
       end
 
-        opts.on('-i', '--input FILE', 'Input file(s) [Default: STDIN]') { |input|
-          (options[:inputs] ||= []) << input
-        }
-
-        opts.on('-o', '--output FILE', 'Output file (flat XML) [Default: STDOUT]') { |output|
-          options[:output] = output
-        }
-
-        opts.on('-c', '--config FILE', "Configuration file (YAML) [Default: #{defaults[:config]}#{' (currently not present)' unless File.readable?(defaults[:config])}]") { |config|
-          options[:config] = config
-        }
-
-        opts.separator ''
-        opts.separator 'Database-specific options:'
+      opts.on('-i', '--input FILE', 'Input file(s) [Default: STDIN]') { |input|
+        (options[:inputs] ||= []) << input
+      }
 
-        type ? type_options(opts) : sorted_types.each { |t| type_options(opts, true, t) }
+      opts.on('-o', '--output FILE', 'Output file (flat XML) [Default: STDOUT]') { |output|
+        options[:output] = output
+      }
 
-        opts.separator ''
-        opts.separator 'Generic options:'
+      opts.on('-c', '--config FILE', "Configuration file (YAML) [Default: #{defaults[:config]}#{' (currently not present)' unless File.readable?(defaults[:config])}]") { |config|
+        options[:config] = config
+      }
 
-        opts.on('-h', '--help', 'Print this help message and exit') {
-          abort opts.to_s
-        }
+      opts.separator ''
+      opts.separator 'Database-specific options:'
 
-        opts.on('--version', 'Print program version and exit') {
-          abort "#{File.basename($0)} v#{FlattenDB::VERSION}"
-        }
+      type ? type_options(opts) : @sorted_types.each { |t| type_options(opts, true, t) }
+    end
 
+    def post_opts(opts)
       unless type
         opts.separator ''
-        opts.separator "Supported database types: #{sorted_types.map { |t| "#{t} (#{TYPES[t][:title]})" }.join(', ')}."
+        opts.separator "Supported database types: #{@sorted_types.map { |t| "#{t} (#{TYPES[t][:title]})" }.join(', ')}."
       end
-      }
     end
 
     def type_options(opts, heading = false, type = type)

data/lib/flattendb/types/mdb.rb

@@ -47,7 +47,11 @@ module FlattenDB
         abort "Command not found: #{cmd}! Please install `mdbtools' first."
       }
 
-      # ...
+      databases.each { |database|
+        %x{mdb-tables -1 #{database}}.split($/).each { |table|
+          FasterCSV.parse(%x{mdb-export #{database} #{table}}, :headers => true)
+        }
+      }
     end
 
     def flatten!(options = {}, builder_options = {})

data/lib/flattendb/version.rb

@@ -4,7 +4,7 @@ module FlattenDB
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flattendb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 Z
+date: 2011-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
@@ -53,10 +53,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 3
+        version: 0.7.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -113,10 +115,10 @@ post_install_message:
 rdoc_options: 
 - --charset
 - UTF-8
-- --title
-- flattendb Application documentation (v0.1.0)
 - --main
 - README
+- --title
+- flattendb Application documentation (v0.1.1)
 - --line-numbers
 - --all
 require_paths: