kamome 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ffe91d4c66bc1f179e7db9980ecbf6800633de1af8f3de76645dffb926d423
-  data.tar.gz: 5e373d056502af1d4f6b1ca51d0ca44d2adf26daaef07d706e79ca115472fd9a
+  metadata.gz: 543759c4f572e9af3e2d98b374bfda5b71b048a873850ae13be1fe2915a783f4
+  data.tar.gz: cf3ccc4d1dd1e416f52df2376b5fae4337effa18426344fa7f35856d034a3997
 SHA512:
-  metadata.gz: 4b41f5d5424612e149377fd3deff5b29e5cfe5e88addca51f89c49deeabe3a0e50111686a429f1ce0b314239fe5508222fc06f8277fd5adb10095961c8bc9c52
-  data.tar.gz: 759139eb2ce52cd217b576f814fae768e78af52f330a6d78bafee4502270157a34e1a058e438411a227bfd8035276b16ac9a2ce1ee80f6540a67bb8faa6d6c5d
+  metadata.gz: c91d7646c2bc4f5aaad10382dde10d93a694eaf32d8af543648d48ebd1ea4528cbdc65ea846c705206661e88414cc5d7bdde17a513959dce1c83cafc4e5ad8c7
+  data.tar.gz: 268e34ed33d3dddca66a184385d5d1dd07803e34f862b8ba82a45557dd38ee2a0822bcbeaa6ad2bf62c7dbae725e9126911fd194efccf105a4754851b2247644

data/.rubocop.yml

@@ -26,3 +26,6 @@ RSpec/NestedGroups:
 
 RSpec/MessageSpies:
   EnforcedStyle: receive
+
+RSpec/MultipleExpectations:
+  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelogs
 
-## v0.9.0
+## 1.0.0
+
+* Add executable command: `kamome`
+  * kamome generate_csv
+  * kamome generate_diff_csv [--date=1810]
+  * kamome generate_json
+  * kamome generate_diff_json [--date=1810]
+
+## 0.9.0
 
 * Fixed [Unexpected town value](https://github.com/kengos/kamome/issues/1)
   * Skip `block.call` in the case of `#ambisous_town` is true and is not a first appearance　model

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    kamome (0.9.0)
+    kamome (1.0.0)
       rubyzip (~> 1.2)
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -48,6 +49,7 @@ GEM
     ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
+    thor (0.20.3)
     unicode-display_width (1.4.0)
     vcr (4.0.0)
     webmock (3.4.2)

data/README.md

@@ -81,6 +81,22 @@ Kamome.import_jigyosho_diff(date: date) do |model, lineno|
 end
 ```
 
+## Cli commands
+
+```bash
+$ kamome generate_csv all.csv
+$ kamome generate_diff_csv diff.csv --date=1810
+$ kamome generate_json all.json
+$ kamome generate_diff_json diff.json
+```
+
+For more informations:
+
+```bash
+$ kamome -h
+$ kamome help [command]
+```
+
 ## FAQ
 
 ### `Kamome.import_xxx` の model の型を変換したい

data/exe/kamome

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'kamome'
+require 'kamome/cli'
+
+Kamome::Cli.start(ARGV)

data/kamome.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.60'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.30'
   spec.add_dependency 'rubyzip', '~> 1.2'
+  spec.add_dependency 'thor', '~> 0.19'
 end

data/lib/kamome.rb

@@ -61,14 +61,14 @@ module Kamome
       loader.call(operation: operation, &block)
     end
 
+    def loader
+      Kamome::Loader.new(config: configuration)
+    end
+
     private
 
     def configuration
       @configuration ||= Kamome::Configuration.new
     end
-
-    def loader
-      Kamome::Loader.new(config: configuration)
-    end
   end
 end

data/lib/kamome/cli.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'thor'
+require 'kamome'
+require 'pathname'
+
+module Kamome
+  class Cli < ::Thor
+    option :header, type: :boolean, default: true, desc: 'Include headers'
+    desc 'generate_csv', 'Genrate CSV from KEN_ALL.CSV and JIGYOSHO.CSV'
+    def generate_csv(filepath)
+      path = ::Pathname.new(filepath)
+      do_generate_csv(operation_all, path, options[:header])
+      $stdout.puts "Generated csv: #{path}"
+    rescue StandardError => e
+      path.delete if path&.exist?
+      raise e
+    end
+
+    option :header, type: :boolean, default: true, desc: 'Include headers'
+    option :date, type: :string, default: nil, desc: 'Target date'
+    desc 'generate_diff_csv', 'Genrate diff CSV from ADD_YYMM.CSV/DEL_YYMM.CSV/JADDYYMM.CSV/JDELYYMM.CSV'
+    def generate_diff_csv(filepath)
+      path = ::Pathname.new(filepath)
+      do_generate_csv(operation_diff(options[:date]), path, options[:header])
+      $stdout.puts "Generated diff csv: #{path}"
+    rescue StandardError => e
+      path.delete if path&.exist?
+      raise e
+    end
+
+    desc 'generate_json', 'Genrate JSON from KEN_ALL.CSV and JIGYOSHO.CSV'
+    def generate_json(filepath)
+      path = ::Pathname.new(filepath)
+      do_generate_json(operation_all, path)
+      $stdout.puts "Generated json: #{path}"
+    end
+
+    option :date, type: :string, default: nil, desc: 'Target date'
+    desc 'generate_diff_json', 'Genrate diff JSON from ADD_YYMM.CSV/DEL_YYMM.CSV/JADDYYMM.CSV/JDELYYMM.CSV'
+    def generate_diff_json(filepath)
+      path = ::Pathname.new(filepath)
+      do_generate_json(operation_diff(options[:date]), path)
+      $stdout.puts "Generated diff json: #{path}"
+    rescue StandardError => e
+      path.delete if path&.exist?
+      raise e
+    end
+
+    private
+
+    def operation_all
+      [
+        ::Kamome::Operation.general_all,
+        ::Kamome::Operation.jigyosho_all
+      ]
+    end
+
+    def operation_diff(date)
+      require 'date'
+      date ||= Date.today << 1
+      [
+        ::Kamome::Operation.general_diff(date: date),
+        ::Kamome::Operation.jigyosho_diff(date: date)
+      ]
+    end
+
+    def do_generate_csv(operations, path, header)
+      require 'csv'
+      ::CSV.open(path, 'w') do |csv|
+        csv << csv_headers if header
+        operations.each do |operation|
+          Kamome.loader.call(operation: operation) do |model|
+            csv << build_pretty_attributes(model).values
+          end
+        end
+      end
+    end
+
+    def do_generate_json(operations, path)
+      require 'json'
+      json = {}
+      operations.each do |operation|
+        Kamome.loader.call(operation: operation) do |model|
+          json[model.zipcode] ||= []
+          json[model.zipcode] << build_pretty_attributes(model)
+        end
+      end
+      ::File.write(path, ::JSON.pretty_generate(json))
+    end
+
+    REJECT_KEYS = [:ambiguous_town].freeze
+    def csv_headers
+      Kamome::Models::Address.new.attributes.keys.reject { |o| REJECT_KEYS.include?(o) }
+    end
+
+    def build_pretty_attributes(model)
+      model.attributes.reject { |key, _| REJECT_KEYS.include?(key) }
+    end
+  end
+end

data/lib/kamome/downloader.rb

@@ -19,7 +19,7 @@ module Kamome
       zip_path.delete
       csv_path
     rescue StandardError => e
-      raise Kamome::DownloadError, "#{e.class}: #{e.message}"
+      raise Kamome::DownloadError, "#{url}, #{e.class}: #{e.message}"
     end
 
     private

data/lib/kamome/operation.rb

@@ -36,7 +36,7 @@ module Kamome
 
       private
 
-      YYMM_FORMAT = /\d{2}(0[1-9]|1[0-2])/.freeze
+      YYMM_FORMAT = /\A\d{2}(0[1-9]|1[0-2])\z/.freeze
       def format_yymm(date)
         yymm = date.respond_to?(:strftime) ? date.strftime('%y%m') : date.to_s
         return yymm if yymm =~ YYMM_FORMAT

data/lib/kamome/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kamome
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamome
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - kengos
@@ -122,10 +122,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 description: the Japanese postcode loading interface
 email:
 - kengo@kengos.jp
-executables: []
+executables:
+- kamome
 extensions: []
 extra_rdoc_files: []
 files:
@@ -143,8 +158,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/kamome
 - kamome.gemspec
 - lib/kamome.rb
+- lib/kamome/cli.rb
 - lib/kamome/configuration.rb
 - lib/kamome/csv_handler.rb
 - lib/kamome/downloader.rb
@@ -184,5 +201,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: kamome-0.9.0
+summary: kamome-1.0.0
 test_files: []