csv2psql 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18591293889ef7109ae2bb0fa587ce87e85ea334
-  data.tar.gz: d34f8d623012e56f62af73f394975b2e8938c82c
+  metadata.gz: 764ba1f133551d811fce81b53bda7b9fa53c3f31
+  data.tar.gz: d5501dd56420a37048ec43c08a61bd6070bc054d
 SHA512:
-  metadata.gz: b649b2969b116054245eb4284e6d5a4a9290be40b7b19d7d2aa602d5badb89939ddcdbb25bba5e073b9ba635bee9e048960e4ec23ad6d766b2dbf11d3ea8a718
-  data.tar.gz: 5bdd371ba418aed540bea5b2578cd331770429853f54805e5c4a56bd75f448a585643fa52d61e7f071ff617f1e3e4b00291e250019fd97b4434868d54d0b92d5
+  metadata.gz: 33e26a12dbce605939c42199023a321da5e871ddd7664b6ad221dffacb5ad3cf7b557e12d40ae01647fc551f7a7bff89cdaa53fca29e66abb6f8a6877e4443b8
+  data.tar.gz: 78b0315b8a67a9add8eb58fd4ac62df82f731f37a796fe90cdbf968af1bf22ed3f46a5f41db02542dd0cca1a72e35f1f72e2f4b389704bf90c45404484f002a1

data/lib/csv2psql/analyzer/types/uuid.rb

@@ -14,6 +14,8 @@ module Csv2Psql
 
       class << self
         def analyze(val)
+          return false
+
           match = val && val.match(RE)
           !match.nil?
         end

data/lib/csv2psql/cli/cmd/analyze_cmd.rb

@@ -33,20 +33,13 @@ formats = {
   end
 }
 
-cmds = {
-  f: {
-    desc: 'Output format',
-    type: String,
-    default_value: formats.keys.first
-  }
-}
-
 desc 'Analyze csv file'
 command :analyze do |c|
-  c.flag [:f, :format], cmds[:f]
-
+  c.desc "Output format #{formats.keys.join(', ')}"
+  c.default_value(formats.keys.first)
+  c.flag [:f, :format]
   c.action do |global_options, options, args|
-    fail ArgumentError, 'No file to analyze specified' if args.empty?
+    help_now!('No file to analyze specified!') if args.empty?
 
     opts = {}.merge(global_options).merge(options)
 

data/lib/csv2psql/cli/cmd/convert_cmd.rb

@@ -3,44 +3,30 @@
 require_relative '../../convert/convert'
 require_relative '../../processor/processor'
 
-cmds = {
-  t: {
-    desc: 'Table to insert to',
-    type: String,
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:table]
-  },
-
-  transaction: {
-    desc: 'Import in transaction block',
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:transaction]
-  },
-
-  'create-table' => {
-    desc: 'Crate SQL Table before inserts',
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['create-table']
-  },
-
-  'drop-table' => {
-    desc: 'Drop SQL Table before inserts',
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['drop-table']
-  },
-
-  'truncate-table' => {
-    desc: 'Truncate SQL Table before inserts',
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['truncate-table']
-  }
-}
-
 desc 'Convert csv file'
 command :convert do |c|
-  c.flag [:t, :table], cmds[:t]
-  c.switch [:transaction], cmds[:transaction]
-  c.switch ['create-table'], cmds['create-table']
-  c.switch ['drop-table'], cmds['drop-table']
-  c.switch ['truncate-table'], cmds['truncate-table']
+  c.desc 'Table to insert to'
+  c.default_value Csv2Psql::Processor::DEFAULT_OPTIONS[:table]
+  c.flag [:t, :table]
+
+  c.desc 'Import in transaction block'
+  c.default_value Csv2Psql::Processor::DEFAULT_OPTIONS[:transaction]
+  c.switch [:transaction]
+
+  c.desc 'Crate SQL Table before inserts'
+  c.default_value Csv2Psql::Processor::DEFAULT_OPTIONS['create-table']
+  c.switch ['create-table']
+
+  c.desc 'Drop SQL Table before inserts'
+  c.default_value Csv2Psql::Processor::DEFAULT_OPTIONS['drop-table']
+  c.switch ['drop-table']
+
+  c.desc 'Truncate SQL Table before inserts'
+  c.default_value Csv2Psql::Processor::DEFAULT_OPTIONS['truncate-table']
+  c.switch ['truncate-table']
 
   c.action do |global_options, options, args|
-    fail ArgumentError, 'No file to convert specified' if args.empty?
+    help_now!('No file to convert specified!') if args.empty?
 
     opts = {}.merge(global_options).merge(options)
     Csv2Psql::Convert.convert(args, opts)

data/lib/csv2psql/cli/cmd/schema_cmd.rb

@@ -42,20 +42,13 @@ formats = {
   end
 }
 
-cmds = {
-  f: {
-    desc: 'Output format',
-    type: String,
-    default_value: formats.keys.first
-  }
-}
-
 desc 'Generate schema for file'
 command :schema do |c|
-  c.flag [:f, :format], cmds[:f]
-
+  c.desc "Output format - #{formats.keys.join(', ')}"
+  c.default_value(formats.keys.first)
+  c.flag [:f, :format]
   c.action do |global_options, options, args|
-    fail ArgumentError, 'No file to analyze specified' if args.empty?
+    help_now!('No file to analyze specified!') if args.empty?
 
     opts = {}.merge(global_options).merge(options)
 

data/lib/csv2psql/cli/cmd/version_cmd.rb

@@ -5,6 +5,6 @@ require_relative '../../version'
 desc 'Print version info'
 command :version do |c|
   c.action do |_global_options, _options, _args|
-    pp Csv2Psql::VERSION
+    puts Csv2Psql::VERSION
   end
 end

data/lib/csv2psql/version.rb

@@ -2,5 +2,5 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Tomas Korcak