muzzy 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a3b80cd33bcfa32e44552ba5b0962a09a0ae2d
-  data.tar.gz: 87904057f8d81400101c6eeebc4a1aa94389bc30
+  metadata.gz: 9fafdd625f30a8271efa806cf9458bb8c1b61ef4
+  data.tar.gz: efc95b3c3c81c9d84b679b0adc4484588a191b62
 SHA512:
-  metadata.gz: d1fa5c4bcde95423887b42988f25354731e2a525b31a48968d031576cfd5114bff632f78e599124d00190b8c122d15bb76244d4f3caf9783b036729a31d73756
-  data.tar.gz: b99f6d1bc3d7535edbe0a12050be17f903726d7d0c3a35d127fca6cefb5898778c56c991356e89fdb4db38438074cfdec4bb4779fcaa688d4e33c1a6663b08ea
+  metadata.gz: cafee7cee7b9f4d1082d5459395d2f33b713f418108fc50b6409306cbc832f5f9abea1891185c79da4a61b3ba3411f72e2cbc80a5ccc9c1bfdfa333d3188b49b
+  data.tar.gz: 661f7617630ff85e2c8effa0ff0e10f67560213d6a0187a75723038fa3e2c0e139f3af40cbfe15da4373fca710d4a7fb567ff0549d00f1b89519e81b5e792c2a

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Guardfile

@@ -0,0 +1,70 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

data/README.md

@@ -9,7 +9,9 @@ TSV or CSV query program are exist(textql, q, and something like that), but I wa
 
 `$ gem install muzzy`
 
-and run muzzy_setup
+and run
+
+`$ muzzy_setup`
 
 ## Usage
 
@@ -19,10 +21,53 @@ or
 
 `$ muzzy -f filename`
 
-
 ## Examples
 
-### Case 1, You have Japanese tsv file
+### Case 1, trying tsv file.
+
+#### ok, Let's execute muzzy.
+
+```
+$ muzzy spec/fixtures/partial_surround_double_quote.tsv
+$ mysql -u root muzzy
+mysql> show create table partial_surround_double_quote;
+```
+
+```
++-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Table                         | Create Table                                                                                                                                                                                                                                                                                                                                                                               |
++-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| partial_surround_double_quote | CREATE TABLE `partial_surround_double_quote` (
+  `PassengerId` int(11) DEFAULT NULL,
+  `Survived` int(11) DEFAULT NULL,
+  `Pclass` int(11) DEFAULT NULL,
+  `Name` text,
+  `Sex` text,
+  `Age` int(11) DEFAULT NULL,
+  `SibSp` int(11) DEFAULT NULL,
+  `Parch` int(11) DEFAULT NULL,
+  `Ticket` text,
+  `Fare` text,
+  `Cabin` text,
+  `Embarked` text
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 |
++-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+```
+
+```
+mysql> select * from partial_surround_double_quote limit 3;
++-------------+----------+--------+-----------------------------------------------------+--------+------+-------+-------+------------------+---------+-------+----------+
+| PassengerId | Survived | Pclass | Name                                                | Sex    | Age  | SibSp | Parch | Ticket           | Fare    | Cabin | Embarked |
++-------------+----------+--------+-----------------------------------------------------+--------+------+-------+-------+------------------+---------+-------+----------+
+       |    1 |        0 |      3 | Braund	 Mr. Owen Harris                             | male   |   22 |     1 |     0 | A/5 21171        | 7.25    |       | S
+       |    2 |        1 |      1 | Cumings	 Mrs. John Bradley (Florence Briggs Thayer) | female |   38 |     1 |     0 | PC 17599         | 71.2833 | C85   | C
+       |    3 |        1 |      3 | Heikkinen	 Miss. Laina                              | female |   26 |     0 |     0 | STON/O2. 3101282 | 7.925   |       | S
++-------------+----------+--------+-----------------------------------------------------+--------+------+-------+-------+------------------+---------+-------+----------+
+3 rows in set (0.00 sec)
+```
+
+### Case 2, You have Japanese tsv file
 
 You have users.tsv and content is bellow.
 
@@ -84,6 +129,10 @@ mysql> select * from sample where seibetsu  = '男';
 
 Thats, it.
 
+## Do you want to test now?
+https://raw.githubusercontent.com/rebeccabilbro/titanic/master/data/train.csv
+
+
 ## Dependency
 muzzy uses [kakasi](http://kakasi.namazu.org/index.html.ja) for create table column name.
 

data/bin/setup

@@ -4,13 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here
-
-### install kakasi
-cd vendor
-dir=`ruby -e 'puts Dir.pwd'`
-gzip -dc kakasi-2.3.6.tar.gz | tar xvf -
-cd kakasi-2.3.6
-./configure --prefix=$dir
-make && make install

data/bin/setup_kakasi

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+### install kakasi
+cd vendor
+dir=`ruby -e 'puts Dir.pwd'`
+gzip -dc kakasi-2.3.6.tar.gz | tar xvf -
+cd kakasi-2.3.6
+./configure --prefix=$dir
+make && make install

data/exe/muzzy

@@ -56,6 +56,7 @@ def check_file(file)
   end
 end
 
+## parse arguments
 ARGV.options do |opt|
   opt.banner = "Usage: muzzy [filepath] [options]"
   begin
@@ -105,7 +106,7 @@ if options[:mysql_config][:database] !~ /\A(\w)+\z/
   exit 1
 end
 
-# confirm database
+## confirm database, if not, create it.
 mysql_cmd_list = [mysql_cmd, '-u', options[:mysql_config][:user], '-h', options[:mysql_config][:host]]
 if options[:mysql_config][:use_password]
   mysql_cmd_list.push('-p')
@@ -125,72 +126,61 @@ if confirm_database_res == ''
   end
 end
 
-def fetch_header_and_first_row(filepath, col_sep)
-  i = 0
-  header_row, first_row = nil, nil
-  CSV.foreach(filepath, col_sep: col_sep) do |row|
-    if i == 0
-      header_row = row
-    elsif i == 1
-      first_row = row
-    else
-      break
-    end
-    i += 1
-  end
-  return [header_row, first_row]
-end
-
-
 ## get first and second rows
-
 header_row = []
 first_row = [] # first row means first data row
 fields_terminated_by = ","
-fields_enclosed_by = ''
 
-File.open(options[:file], mode="rt") do |f|
-  f.each_char do |c|
-    if c == '"'
-      fields_enclosed_by = '"'
-    end
-    break
-  end
-end
 
 if options[:file] =~ /\.tsv\z/
   # tsv
-  header_row, first_row = fetch_header_and_first_row(options[:file], "\t")
+  header_row, first_row = Muzzy::Util.fetch_header_and_first_row(options[:file], "\t")
   fields_terminated_by = "\t"
 else
   # csv(,) or csv(\t) or something
 
   # trying to csv
-  csv_header_row, csv_first_row = fetch_header_and_first_row(options[:file], ",")
+  csv_header_row, csv_first_row = Muzzy::Util.fetch_header_and_first_row(options[:file], ",")
   # trying to tsv
-  tsv_header_row, tsv_first_row = fetch_header_and_first_row(options[:file], "\t")
+  tsv_header_row, tsv_first_row = Muzzy::Util.fetch_header_and_first_row(options[:file], "\t")
 
-  if csv_header_row.length == tsv_header_row.length
-    if csv_header_row.length == 1 && tsv_first_row.length == 1
-      # single col file
-      header_row, first_row = csv_header_row, csv_first_row
-    else
-      puts "illegal file"
-      exit 1
-    end
+  if csv_header_row == -1 && tsv_header_row == -1
+    puts "illegal csv file."
+    exit 1
   end
 
-  if csv_header_row.length > tsv_header_row.length
-    # csv
-    header_row, first_row = csv_header_row, csv_first_row
+  if csv_header_row == -1 || tsv_header_row == -1
+    if csv_header_row == -1
+      # tsv
+      header_row, first_row = tsv_header_row, tsv_first_row
+      fields_terminated_by = "\t"
+    else
+      # csv
+      header_row, first_row = csv_header_row, csv_first_row
+    end
   else
-    # tsv
-    header_row, first_row = tsv_header_row, tsv_first_row
-    fields_terminated_by = "\t"
+    if csv_header_row.length > tsv_header_row.length
+      # csv
+      header_row, first_row = csv_header_row, csv_first_row
+    else
+      # tsv
+      header_row, first_row = tsv_header_row, tsv_first_row
+      fields_terminated_by = "\t"
+    end
+    if csv_header_row.length == tsv_header_row.length
+      if csv_header_row.length == 1 && tsv_first_row.length == 1
+        # single col file
+        header_row, first_row = csv_header_row, csv_first_row
+      else
+        puts "illegal file"
+        exit 1
+      end
+    end
   end
 end
 header_row = header_row.map(&:to_s)
 
+
 # guess header_row is data row or not
 header_row_is_header = nil
 
@@ -198,6 +188,8 @@ if header_row.any?{|str| str.match(/_id/) }
   header_row_is_header = true
 elsif header_row.any?{|str| str.match(/NULL/) }
   header_row_is_header = false
+elsif header_row.any?{|str| str.nil? || str == '' }
+  header_row_is_header = false
 elsif header_row.map(&:to_i).select{|x| x <= 0}.count != first_row.map(&:to_i).select{|x| x <= 0}.count
   # i guess number col count is different, header_row is header.
   header_row_is_header = true
@@ -233,7 +225,7 @@ end
 Cell = Struct.new(:type, :name)
 if header_row_is_header
   row_data_types = first_row.map.with_index do |str, i|
-    if str.match(/\A[\d,]+\z/)
+    if str.to_s.match(/\A[\d,]+\z/)
       # number
       Cell.new('integer', header_row[i])
     else
@@ -243,7 +235,7 @@ if header_row_is_header
 else
   # header row is data
   row_data_types = header_row.map.with_index do |str, i|
-    if str.match(/\A[\d,]+\z/)
+    if str.to_s.match(/\A[\d,]+\z/)
       # number
       Cell.new('integer', "col#{i}")
     else
@@ -288,9 +280,7 @@ end
 if options[:mysqlimport_config][:delete]
   cmds.push('--delete')
 end
-if fields_enclosed_by != ''
-  cmds.push("--fields_enclosed_by=#{fields_enclosed_by}")
-end
+cmds.push('--fields_enclosed_by="')
 
 if options[:verbose]
   puts cmds.join(' ')

data/exe/muzzy_setup

@@ -1,3 +1,3 @@
 lib_root_path = File.absolute_path(File.expand_path('.', __FILE__) + "/../../")
-setup_path = "#{lib_root_path}/bin/setup"
+setup_path = "#{lib_root_path}/bin/setup_kakasi"
 `cd #{lib_root_path} && #{setup_path}`

data/lib/muzzy/filetype_detector.rb

@@ -0,0 +1,4 @@
+module Muzzy
+  class FiletypeDetector
+  end
+end

data/lib/muzzy/util.rb

@@ -0,0 +1,24 @@
+require 'csv'
+module Muzzy
+  class Util
+    def self.fetch_header_and_first_row(filepath, col_sep)
+      raise ArgumentError, "filepath required"  if filepath.nil?
+      raise ArgumentError, "not found file" unless File.exists?(filepath)
+      header_row, first_row = nil, nil
+      CSV.foreach(filepath, col_sep: col_sep).each_with_index do |row, i|
+        if i == 0
+          header_row = row
+        elsif i == 1
+          first_row = row
+        else
+          break
+        end
+      end
+      return [header_row, first_row]
+    rescue ArgumentError => e
+      raise e
+    rescue => e
+      return [-1, -1]
+    end
+  end
+end

data/lib/muzzy/version.rb

@@ -1,3 +1,3 @@
 module Muzzy
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

data/lib/muzzy.rb

@@ -1,5 +1,5 @@
-require "muzzy/version"
+require 'muzzy/version'
+require_relative 'muzzy/util'
 
 module Muzzy
-  # Your code goes here...
 end

data/muzzy.gemspec

@@ -31,5 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "guard-rspec", "~> 4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzzy
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - vimtaku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 description: muzzy is tsv importer mysql client
 email:
 - vimtaku@gmail.com
@@ -62,17 +76,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- bin/setup_kakasi
 - exe/muzzy
 - exe/muzzy_setup
 - lib/muzzy.rb
+- lib/muzzy/filetype_detector.rb
+- lib/muzzy/util.rb
 - lib/muzzy/version.rb
 - muzzy.gemspec
 - vendor/kakasi-2.3.6.tar.gz