sqlite2dbf 0.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff3c85738ba063a8b74ca3729e4f4d34fd0310f
-  data.tar.gz: abfe59914da80f1118822e0a3ebf91a93c5f5a40
+  metadata.gz: 1b3185c1faa5124f320a012e00126f27bf98959f
+  data.tar.gz: 916a050f7b7cf55108f73f2871aff56ab6149fd1
 SHA512:
-  metadata.gz: ef5cbc10c43925b74b319b9049d81ccd9c04e95d2158ddb0954f7232377eff0c2a3323cd4b333193e3947bd7599bdbe0081baa6f8d59752fc77c432bb682048e
-  data.tar.gz: 48b7629bcf6b490f3f1396d61991a48134a1b6dc05be084136bd49cd0bafbbac7b77714e84a344adb3a50f7d0c1fc1d7211231ba12d1879ba40ce02494807544
+  metadata.gz: '00850c4fe8bf96a5e21f0d8fb4c809cb9909ab30ef3c132b20166a9ac6eaf726f28018d47f486e244039e537729e20a4b00b13b4b066327a00ac1f985d0eb194'
+  data.tar.gz: 8a8a6fda0faef19b4be0ba93927ce2066a1589b99c64381b3549253b0c5f14ba6f84ec174399593a70c741622032d0e20d64d3ff1465b199cae17ddb6c65a6a4

data/lib/argparser.rb

@@ -33,13 +33,15 @@ class ArgParser
   self.extend(Logging)
   self.extend(Translating)
   @@log = init_logger()
-  
+
   # Returns a structure describing the options.
   #
   def self.parse(args)
-    # The options specified on the command line will be collected in <b>options</b>.
-    # We set default values here.
-
+    # The options specified on the command line will be collected in
+    # <b>options</b>.  No defaults. Most options are optional and do not
+    # have to be set at all.
+    # The others must be named for each transformation or be set in the
+    # configuration-file.
     options = OpenStruct.new
 
     op = OptionParser.new do |opts|
@@ -49,36 +51,36 @@ class ArgParser
       opts.separator trl("Specific options") << ':'
 
       opts.on('-' << trl("s"), '--' << trl("source [PATH]"), trl( "SQLite-file to read.")) do |source|
-	options.source = source
+        options.source = source
       end
 
       opts.on('-' << trl('c'), '--' << trl("config [PATH]"), trl('Configuration file for this transformation')) do |config|
-              options.config = config
+        options.config = config
       end
 
       opts.on('-' << trl('n'), '--' << trl("name [TABLE]"), trl('The name of the table from the SQLite-database to convert')) do |name|
-	options.name = name
+        options.name = name
       end
 
       opts.on('-' << trl("t"), '--' << trl("target [PATH]"), trl( "Path to the dBase-file to be written.")) do |target|
-	options.target = target
+        options.target = target
       end
 
       opts.on('-' << trl("l"), '--' << trl("list"), trl( "Show the list of available tables and exit")) do |target|
-	options.list = true
+        options.list = true
       end
 
       opts.on('-' << trl('o'), '--' << trl("out [PATH]"), trl('Use the table-name as file-name for the DBF-result, store output in PATH')) do |path|
-	options.name_like_table = true
-	options.out = path
+        options.name_like_table = true
+        options.out = path
       end
 
       opts.on('--' << trl("time [list]"), trl( "Fields (table-columns) which shall be handled as timestamp values.")) do |list|
-	options.time = list.gsub(/[,;]/, '').split
+        options.time = list.gsub(/[,;]/, '').split
       end
 
       opts.on('--' << trl("date [list]"), trl( "Fields (table-columns) which shall be handled as date-time values.")) do |list|
-	options.datetime = list.gsub(/[,;]/, '').split
+        options.datetime = list.gsub(/[,;]/, '').split
       end
 
 =begin
@@ -88,13 +90,13 @@ class ArgParser
 # much management.
 
 opts.on("-c", "--config [CONFIG FILE]",
-	"Read alternative configuration from this file") do |conf|
-	$LOG.debug("config-file should be #{conf}") if $LOG
-	options.config = File.expand_path(conf )
+        "Read alternative configuration from this file") do |conf|
+        $LOG.debug("config-file should be #{conf}") if $LOG
+        options.config = File.expand_path(conf )
 end
 opts.on("-g", "--generic [CONFIG FILE]",
-	"Write generic configuration options to this file") do |file|
-	options.generic = File.expand_path(file )
+        "Write generic configuration options to this file") do |file|
+        options.generic = File.expand_path(file )
 end
 =end
       opts.separator ""
@@ -103,20 +105,20 @@ end
       # No argument, shows at tail.  This will print an options summary.
       #
       opts.on_tail(trl("-d"), trl("--debug"), trl("Show debug-messages") ) do
-	options.debug = true
-	@@log.level = Logger::DEBUG
+        options.debug = true
+        @@log.level = Logger::DEBUG
       end
 
 
       opts.on_tail(trl("-h"), trl("--help"), trl("Show this message") ) do
-	puts opts
-	exit true
+        puts opts
+        exit true
       end
 
       opts.on_tail(trl("-v"), trl("--version"), trl("Show version and program information") ) do
-	puts "\t#{$APPNAME}"
-	puts "\t© #{$YEARS}, <#{$AUTHORS.join(', ')}>"
-	exit true
+        puts "\t#{$APPNAME}"
+        puts "\t© #{$YEARS}, <#{$AUTHORS.join(', ')}>"
+        exit true
       end
     end
     begin

data/lib/config

@@ -84,7 +84,7 @@ time:
 # Example: joined
 #          "expires since last_update"
 # Default: empty (NOT required)
-date: last_visit_date
+date: 
 
 # Shall the dBase-file be named after the table?  Is set by specifying a
 # target-directory as value to this option.

data/lib/constants.rb

@@ -1,5 +1,5 @@
 $APPNAME = 'sqlite2dbf'
-$VERSION = '0.2'
+$VERSION = '0.2.2'
 $DATE = '2016-11-24'
 $AUTHORS = ["Michael Uplawski <michael.uplawski@uplawski.eu>"]
 $EMAIL = 'michael.uplawski@uplawski.eu'

data/lib/log.conf

@@ -35,7 +35,6 @@ warn = Logger::WARN
 unknown = Logger::UNKNOWN
 {
 # <---------------- to here !
-
 # Enter your settings here, but take into consideration that not all 
 # the named classes will really produce readable output. Well, you can 
 # always try... Either name just the log-level or make the log-level

data/lib/mapping.rb

@@ -52,8 +52,8 @@ class Mapping
   } 
 
   # Constructor
-  # Creates a mapping for the table of name 'table'
-  # and basedon the table_info.
+  # Creates a mapping for the table of name config.name and basedon the
+  # table_info.
   def initialize config, table_info, content
     init_logger()
 

data/lib/sqlite2dbf.rb

@@ -73,24 +73,28 @@ class SQLite2DBF
           exit false
         end
 
+        # dbf_file is eather named explicitly
         dbf_file = @config.target if @config.target
-        if(@config.out)
-          dbf_file = @config.out << File::Separator << @config.name
-        end
-        dbf_file ||= File.dirname(sqlite_file) << File::Separator << File.basename(sqlite_file, '.*')
+        # .., derived from the table-name
+        dbf_file = @config.out << File::Separator << @config.name if(@config.out)
+        # .., or identical with the original sqlite-file, minus extension, plus dbf
+        dbf_file ||= File.dirname(sqlite_file) << File::Separator << File.basename(sqlite_file, '.*') << '.dbf'
 
         msg = nil
 
+        # check if dbf_file can be used
         if(File.exist?(dbf_file))
           msg = File_Checking.file_check(dbf_file, :file, :writable)
         elsif(File.exist?(File.dirname(dbf_file))) 
           msg = File_Checking.file_check(File.dirname(dbf_file), :directory, :writable)
         end
 
+        # then do it
         if(!msg)
-          @log.debug('will transform ' << sqlite_file << ' to  ' << dbf_file.to_s << '.dbf')
+          @log.debug('will transform ' << sqlite_file << ' to  ' << dbf_file.to_s)
           transform(db, dbf_file)
         else
+          # or not
           msg = trl("ERROR! Unsuitable file") << " : %s" %msg
           @log.error(msg)
           exit false
@@ -124,20 +128,20 @@ class SQLite2DBF
     end
   end
 
+  # create a date-value from value
   def date(db, value)
     dbf_value = db.execute("select strftime('%Y-%m-%d %H:%M:%S', " << value.to_s << ", 'unixepoch')").join
+    # ... or not.
     @log.warn(trl("ATTN! SQLite2DBF cannot convert the date-value %s into DBF-compatible format.") %value.to_s) if dbf_value.start_with?('-')
     dbf_value = db.execute("select strftime('%s', " << value.to_s << ")").join if dbf_value.start_with?('-')
   end
 
+  # create a time-vaue from value
   def time(db, value)
     db.execute("select strftime('%s', " << value.to_s << ", 'unixepoch')").join
   end
 
-
-
   def transform(db, dbf_file)
-
     begin
       tname = @config.name
       table_info = db.table_info(tname) 

data/lib/translating.rb

@@ -35,15 +35,23 @@ require_relative 'logging'
 =end
 module Translating
   self.extend(Logging)
+
+  # intitialize class variabes (static attributes)
+  
   @@log = init_logger(STDOUT)
   # There are better ways to extend a translated 
   # string, but I keep the 'wild-card' for 
   # historical reasons.
+  # TODO: get rid of this crap!
   @@awild = 'XX'
 
   @@lang = nil 
+  # TODO: reflect about this. The possibility to write a LANG-file is
+  # okay, sometimes. Most of the time it is not.
   @@lang_file = format("%s%s", RD, 'LANG')  
+
   @@tr = YAML::load_file("#{RD}translations")
+  
   # find the current language-setting and return it.
   def self.language()
     if @@lang == nil
@@ -62,6 +70,9 @@ module Translating
   # The args parameter may contain replacement-text which 
   # will appear at the positions indicated by wildcard-characters
   # in the original string.
+  #
+  # TODO: Come on! sprintf-syntax is far better than the awkward 'wildcard'.
+  # Just remove this crap.
   def self.trl(t, *args)
     
   @@log.debug('@tr is ' << @@tr.to_s) 

data/lib/translations

@@ -29,7 +29,7 @@ Usage:
 
 or %s [Common options]:
  de: oder %s [Allgemeine Optionen]
- fr: ou %s [Options généraux]
+ fr: ou %s [Options générales]
 
 Specific options:
  de: Spezielle Optionen
@@ -134,7 +134,7 @@ out [PATH]:
 
 Common options:
  de: Allgemeine Optionen
- fr: Options généraux
+ fr: Options générales
 
 # program option -d (debug)
 -d:

data/sqlite2dbf.gemspec

@@ -3,13 +3,16 @@ Gem::Specification.new do |s|
   s.name        = $APPNAME
   s.version     = $VERSION
   s.date        = $DATE
-  s.summary     = "Rewrite of the main-class SQLite2DBF, mappings in the new class Mappings, the configuration can be persisted. New program-options. New translations."
+  s.summary     = "Runtime-requirements added. Rewrite of the main-class SQLite2DBF, mappings in the new class Mappings, the configuration can be persisted. New program-options. New translations."
   s.description = "converts SQLite to DBase"
   s.authors     = $AUTHORS
   s.email       = $EMAIL
   s.files  	=  %w~sqlite2dbf~.collect{|f| 'bin/' << f} + %w~constants.rb mapping.rb argparser.rb sqlite2dbf.rb file_checking.rb log.conf logging.rb mapping.rb configuration.rb config translating.rb translations ~.collect{|f| 'lib/' << f} + %w~sqlite2dbf.gemspec~.collect{|f|f}
   s.requirements = 'shp, sqlite3'
+  s.add_runtime_dependency 'shp', '~> 0.0', '>= 0.0.3'
+  s.add_runtime_dependency 'sqlite3', '~> 1.3', '>= 1.3.12'
   s.executables = 'sqlite2dbf'
   s.license     = $LICENSE
+  s.homepage    = 'https://rubygems.org/gems/sqlite2dbf'
   s.required_ruby_version = '>= 2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite2dbf
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Uplawski <michael.uplawski@uplawski.eu>
@@ -9,7 +9,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-11-24 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.12
 description: converts SQLite to DBase
 email: michael.uplawski@uplawski.eu
 executables:
@@ -30,7 +70,7 @@ files:
 - lib/translating.rb
 - lib/translations
 - sqlite2dbf.gemspec
-homepage: 
+homepage: https://rubygems.org/gems/sqlite2dbf
 licenses:
 - GPL-3.0
 metadata: {}
@@ -54,6 +94,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Rewrite of the main-class SQLite2DBF, mappings in the new class Mappings,
-  the configuration can be persisted. New program-options. New translations.
+summary: Runtime-requirements added. Rewrite of the main-class SQLite2DBF, mappings
+  in the new class Mappings, the configuration can be persisted. New program-options.
+  New translations.
 test_files: []