csv2psql 0.0.12 → 0.0.13

data/lib/csv2psql/cli/app.rb

@@ -20,8 +20,6 @@ module Csv2Psql
   module Cli
     # CLI Application
     class App
-      extend Csv2Psql::Cli::Shared
-
       cmds = File.absolute_path(File.join(File.dirname(__FILE__), 'cmd'))
       Dir.glob(cmds + '/*.rb').each do |file|
         require file
@@ -34,4 +32,4 @@ module Csv2Psql
   end
 end
 
-launch if __FILE__ == $PROGRAM_NAME
+launch

data/lib/csv2psql/cli/cli.rb

@@ -1,31 +1,3 @@
 # encoding: UTF-8
 
-require 'gli'
-require 'pp'
-
-# Define Csv2Psql::Cli as GLI Wrapper
-module Csv2Psql
-  # CLI/GLI Wrapper
-  module Cli
-    include GLI::App
-
-    # Require shared part of GLI::App - flags, meta, etc
-    require_relative 'shared.rb'
-
-    # Require Hooks
-    # require_relative 'hooks.rb'
-
-    base = File.join(File.dirname(__FILE__), 'cmd')
-    Dir[base + '/**/*.rb'].each do |f|
-      require f
-    end
-
-    # GLI::App.commands_from(File.join(File.dirname(__FILE__), 'cmd'))
-
-    def self.main(args = ARGV)
-      run(args)
-    end
-  end
-end
-
-Csv2Psql::Cli.main(ARGV) if __FILE__ == $PROGRAM_NAME
+require_relative 'app'

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

@@ -1,76 +1,70 @@
 # encoding: utf-8
 
-require 'gli'
 require 'json'
 require 'pp'
 require 'terminal-table'
 
-include GLI::App
-
-require_relative '../shared'
 require_relative '../../convert/convert'
 require_relative '../../processor/processor'
 
-Csv2Psql::Cli.module_eval do
-  formats = {
-    'json' => lambda do |res|
-      res.files.each do |_fname, results|
-        results[:columns].each do |_k, v|
-          v.each do |d, det|
-            v[d] = det[:results]
-          end
+formats = {
+  'json' => lambda do |res|
+    res.files.each do |_fname, results|
+      results[:columns].each do |_k, v|
+        v.each do |d, det|
+          v[d] = det[:results]
         end
       end
+    end
 
-      JSON.pretty_generate(res.files)
-    end,
+    JSON.pretty_generate(res.files)
+  end,
 
-    'table' => lambda do |res|
-      res.files.map do |file, details|
-        header = ['column'] + res.analyzers.map { |a| a[:name] }
+  'table' => lambda do |res|
+    res.files.map do |file, details|
+      header = ['column'] + res.analyzers.map { |a| a[:name] }
 
-        rows = details[:columns].map do |k, v|
-          [k] + v.keys.map { |name| v[name][:results][:count] }
-        end
-
-        Terminal::Table.new title: file, headings: header, rows: rows
+      rows = details[:columns].map do |k, v|
+        [k] + v.keys.map { |name| v[name][:results][:count] }
       end
+
+      Terminal::Table.new title: file, headings: header, rows: rows
     end
-  }
+  end
+}
 
-  cmds = {
-    f: {
-      desc: 'Output format',
-      type: String,
-      default_value: formats.keys.first
-    }
+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]
+desc 'Analyze csv file'
+command :analyze do |c|
+  c.flag [:f, :format], cmds[:f]
 
-    c.action do |global_options, options, args|
-      fail ArgumentError, 'No file to analyze specified' if args.empty?
+  c.action do |global_options, options, args|
+    fail ArgumentError, 'No file to analyze specified' if args.empty?
 
-      opts = {}.merge(global_options).merge(options)
+    opts = {}.merge(global_options).merge(options)
 
-      formater = formats[opts[:format]]
-      if formater.nil?
-        fmters = formats.keys.join(', ')
-        fail ArgumentError, "Wrong formatter specified, can be: #{fmters}"
-      end
+    formater = formats[opts[:format]]
+    if formater.nil?
+      fmters = formats.keys.join(', ')
+      fail ArgumentError, "Wrong formatter specified, can be: #{fmters}"
+    end
 
-      res = Csv2Psql::Convert.analyze(args, opts)
+    res = Csv2Psql::Convert.analyze(args, opts)
 
-      output = formater.call(res)
-      if output.is_a?(Array)
-        output.each do |o|
-          puts o
-        end
-      else
-        puts output
+    output = formater.call(res)
+    if output.is_a?(Array)
+      output.each do |o|
+        puts o
       end
+    else
+      puts output
     end
   end
 end

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

@@ -1,55 +1,48 @@
 # encoding: utf-8
 
-require 'gli'
-
-include GLI::App
-
-require_relative '../shared'
 require_relative '../../convert/convert'
 require_relative '../../processor/processor'
 
-Csv2Psql::Cli.module_eval do
-  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']
-    }
+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']
+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.action do |global_options, options, args|
-      fail ArgumentError, 'No file to convert specified' if args.empty?
+  c.action do |global_options, options, args|
+    fail ArgumentError, 'No file to convert specified' if args.empty?
 
-      opts = {}.merge(global_options).merge(options)
-      Csv2Psql::Convert.convert(args, opts)
-    end
+    opts = {}.merge(global_options).merge(options)
+    Csv2Psql::Convert.convert(args, opts)
   end
 end

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

@@ -1,85 +1,79 @@
 # encoding: utf-8
 
-require 'gli'
 require 'json'
 require 'pp'
 require 'terminal-table'
 
-include GLI::App
-
-require_relative '../shared'
 require_relative '../../convert/convert'
 require_relative '../../helpers/erb_helper'
 require_relative '../../processor/processor'
 
-Csv2Psql::Cli.module_eval do
-  BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
-  TEMPLATE_DIR = File.join(BASE_DIR, 'templates')
-  SCHEMA_TEMPLATE = File.join(TEMPLATE_DIR, 'schema.sql.erb')
+BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+TEMPLATE_DIR = File.join(BASE_DIR, 'templates')
+SCHEMA_TEMPLATE = File.join(TEMPLATE_DIR, 'schema.sql.erb')
+
+formats = {
+  'json' => lambda do |res|
+    JSON.pretty_generate(res)
+  end,
+
+  'sql' => lambda do |data|
+    res = ''
+    data.each do |_k, v|
+      v[:table] = 'my_table'
+      ctx = v
+      erb = Csv2Psql::ErbHelper.new
+      res += "\n" unless res.empty?
+      res += erb.process(SCHEMA_TEMPLATE, ctx)
+    end
+    res
+  end,
 
-  formats = {
-    'json' => lambda do |res|
-      JSON.pretty_generate(res)
-    end,
+  'table' => lambda do |res|
+    res.map do |file, data|
+      header = %w(column type null)
 
-    'sql' => lambda do |data|
-      res = ''
-      data.each do |_k, v|
-        v[:table] = 'my_table'
-        ctx = v
-        erb = Csv2Psql::ErbHelper.new
-        res += "\n" unless res.empty?
-        res += erb.process(SCHEMA_TEMPLATE, ctx)
+      rows = data[:columns].map do |k, v|
+        [k, v[:type], v[:null]]
       end
-      res
-    end,
-
-    'table' => lambda do |res|
-      res.map do |file, data|
-        header = %w(column type null)
 
-        rows = data[:columns].map do |k, v|
-          [k, v[:type], v[:null]]
-        end
-
-        Terminal::Table.new title: file, headings: header, rows: rows
-      end
+      Terminal::Table.new title: file, headings: header, rows: rows
     end
-  }
+  end
+}
 
-  cmds = {
-    f: {
-      desc: 'Output format',
-      type: String,
-      default_value: formats.keys.first
-    }
+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]
+desc 'Generate schema for file'
+command :schema do |c|
+  c.flag [:f, :format], cmds[:f]
 
-    c.action do |global_options, options, args|
-      fail ArgumentError, 'No file to analyze specified' if args.empty?
+  c.action do |global_options, options, args|
+    fail ArgumentError, 'No file to analyze specified' if args.empty?
 
-      opts = {}.merge(global_options).merge(options)
+    opts = {}.merge(global_options).merge(options)
 
-      formater = formats[opts[:format]]
-      if formater.nil?
-        fmters = formats.keys.join(', ')
-        fail ArgumentError, "Wrong formatter specified, can be: #{fmters}"
-      end
+    formater = formats[opts[:format]]
+    if formater.nil?
+      fmters = formats.keys.join(', ')
+      fail ArgumentError, "Wrong formatter specified, can be: #{fmters}"
+    end
 
-      res = Csv2Psql::Convert.generate_schema(args, opts)
+    res = Csv2Psql::Convert.generate_schema(args, opts)
 
-      output = formater.call(res)
-      if output.is_a?(Array)
-        output.each do |o|
-          puts o
-        end
-      else
-        puts output
+    output = formater.call(res)
+    if output.is_a?(Array)
+      output.each do |o|
+        puts o
       end
+    else
+      puts output
     end
   end
 end

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

@@ -1,18 +1,10 @@
 # encoding: utf-8
 
-require 'gli'
-
-include GLI::App
-
 require_relative '../../version'
 
-require_relative '../shared'
-
-Csv2Psql::Cli.module_eval do
-  desc 'Print version info'
-  command :version do |c|
-    c.action do |_global_options, _options, _args|
-      pp Csv2Psql::VERSION
-    end
+desc 'Print version info'
+command :version do |c|
+  c.action do |_global_options, _options, _args|
+    pp Csv2Psql::VERSION
   end
 end

data/lib/csv2psql/cli/shared.rb

@@ -7,50 +7,48 @@ require_relative '../processor/processor'
 
 include GLI::App
 
-Csv2Psql::Cli.module_eval do
-  program_desc "csv2psql #{Csv2Psql::VERSION} (Codename: #{Csv2Psql::CODENAME})"
-
-  cmds = {
-    h: {
-      desc: 'Header row included',
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['header']
-    },
-
-    d: {
-      desc: 'Column delimiter',
-      type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['delimiter']
-    },
-
-    l: {
-      desc: 'How many rows process',
-      type: Integer,
-      default_value: -1
-    },
-
-    q: {
-      desc: 'Quoting character',
-      type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['quote']
-    },
-
-    s: {
-      desc: 'Line separator',
-      type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['separator']
-    },
-
-    'skip' => {
-      desc: 'How many rows skip',
-      type: Integer,
-      default_value: -1
-    }
+program_desc "csv2psql #{Csv2Psql::VERSION} (Codename: #{Csv2Psql::CODENAME})"
+
+cmds = {
+  h: {
+    desc: 'Header row included',
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['header']
+  },
+
+  d: {
+    desc: 'Column delimiter',
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['delimiter']
+  },
+
+  l: {
+    desc: 'How many rows process',
+    type: Integer,
+    default_value: -1
+  },
+
+  q: {
+    desc: 'Quoting character',
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['quote']
+  },
+
+  s: {
+    desc: 'Line separator',
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['separator']
+  },
+
+  'skip' => {
+    desc: 'How many rows skip',
+    type: Integer,
+    default_value: -1
   }
-
-  switch [:h, :header], cmds[:h]
-  flag [:d, :delimiter], cmds[:d]
-  flag [:l, :limit], cmds[:l]
-  flag [:q, :quote], cmds[:q]
-  flag [:s, :separator], cmds[:s]
-  flag [:skip], cmds['skip']
-end
+}
+
+switch [:h, :header], cmds[:h]
+flag [:d, :delimiter], cmds[:d]
+flag [:l, :limit], cmds[:l]
+flag [:q, :quote], cmds[:q]
+flag [:s, :separator], cmds[:s]
+flag [:skip], cmds['skip']

data/lib/csv2psql/version.rb

@@ -2,6 +2,6 @@
 
 # Csv2Psql module
 module Csv2Psql
-  CODENAME = 'Lazy dolphin'
-  VERSION = '0.0.12'
+  CODENAME = 'Reborn turtle'
+  VERSION = '0.0.13'
 end

data/lib/csv2psql.rb

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-require 'csv2psql/lib'
+require_relative 'csv2psql/lib'

data/templates/schema.sql.erb

@@ -1,7 +1,7 @@
 CREATE TABLE <%= ctx[:table] %>
 (
 <% ctx[:columns].each_with_index do |item, index| %>
-	"<%= Generator.sanitize_header(item[0]) %>" <%= item[1][:type] %> <% if !item[1][:null] %>NOT NULL<% end %><%= ", " if index < ctx[:columns].length - 1%>
+	"<%= Generator.sanitize_header(item[0]) %>" <%= item[1][:type].upcase %><% if !item[1][:null] %> NOT NULL<% end %><%= ', ' if index < ctx[:columns].length - 1%>
 
 <% end %>
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Tomas Korcak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -270,6 +270,7 @@ files:
 - data/sample.csv
 - data/sample_bool.csv
 - data/sample_semicolons.csv
+- data/sfpd_incident_2010_1k.csv
 - lib/csv2psql.rb
 - lib/csv2psql/analyzer/analyzer.rb
 - lib/csv2psql/analyzer/types/base_analyzer.rb
@@ -336,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Tool for converting CSV into SQL statements