cureutils 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c94e405b6e4fed704753438ad76eaeca68d1f22
-  data.tar.gz: eb001cd954852d147ac6af02646e00cb35ce4a66
+  metadata.gz: c34da5a7a9fce98a5f8314e7d61cad556629c6f0
+  data.tar.gz: ed11bee62896aa13fac07861429e124a59c97f9d
 SHA512:
-  metadata.gz: 761291e67ac30982fd63fc64af936b26579a2bf4f3fc753ecaa44231437ee458e895d44fd40c5cc2444fdf7959c3fd98597d6b70a441ec51f24caf521bafa348
-  data.tar.gz: 3ed00dbb643d140ae100ebf32cc55a11b93b4ae6db0c11a66d14d28adc942398859bef12d0297d02ef868537eacd1db50d11c58517bba415d1993b4457719349
+  metadata.gz: 943b29cfd42f50375593689d021eb89778d627bc27292128e8a5098b2982d12e274adfd1fbd955b9f1540655cf023915dfbbcfe3bb090b07c4ed989f0f0028e4
+  data.tar.gz: 880578332edaf71257b36eb70ef5f1812ff4af600791188a307f928361bce2f2a1dd800c13f37b097f09d2f2a1875e5858f6a4246d41fa8d3885138525991737

data/.travis.yml

@@ -1,4 +1,26 @@
 language: ruby
+
 rvm:
-  - 2.2.0
-before_install: gem install bundler -v 1.11.2
+- 2.2.2
+- 2.3.3
+- 2.4.0
+- ruby-head
+
+before_install:
+- gem update --system --no-document
+- gem install bundler -v 1.11.2
+- bundle install
+
+branches:
+  only:
+  - master
+  - develop-1.0.0
+
+matrix:
+  allow_failures:
+  - rvm: ruby-head
+
+sudo: false
+
+script:
+- bash test/test.sh

data/Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cureutils.gemspec
 gemspec
 
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
-  gem "backport_dig"
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
-  gem "activesupport", ">= 4.0.0", "< 5.0.0"
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create('2.3.0')
+  gem 'backport_dig'
 end

data/README.md

@@ -4,14 +4,27 @@
 
 # Cureutils
 [![Gem Version](https://badge.fury.io/rb/cureutils.svg)](https://badge.fury.io/rb/cureutils)
+[![Build Status](https://travis-ci.org/greymd/cureutils.svg?branch=master)](https://travis-ci.org/greymd/cureutils)
 
 Useful command line tool for Japanese battle heroine Pretty Cure (Precure).
 
+![completion_image](./img/cure_echo_demo.gif)
+
+## Requirements
+
+* ruby >= 2.2.2
+  + more: [.travis.yml](./.travis.yml)
+
 ## Installation
 
 Install:
 
-    $ gem install cureutils
+```
+$ gem install cureutils
+
+# for 2.2
+$ gem install 'backport_dig'
+```
 
 
 After that, `cure` command is available.
@@ -61,15 +74,32 @@ And other general date formats are usable.
 
 ### Options
 
-| Option | Description                                           |
-| ------ | ---------                                             |
-| -d     | cure date -d STRING: display time described by STRING |
+| Option | Description                                                               |
+| ------ | ---------                                                                 |
+| -d     | cure date -d STRING: display time described by STRING                     |
+| -f     | cure date -f DATEFILE: Load each line of DATEFILE as STRING of -d option. |
 
 ```sh
 $ cure date -d '3 years ago' '+%Y/%m @P'
 2013/06 ドキドキ！プリキュア放映期間
 ```
 
+Standard input can be loaded by giving `-` as DATEFILE.
+
+```sh
+$ echo 2016{01..12}{01..31}| xargs -n 1 | cure date -f - '+%F @P' 2>/dev/null | grep 誕生日 | head
+2016-01-07 宇佐美いちか(キュアホイップ)誕生日/Go!プリンセスプリキュア放映期間
+2016-04-04 雪城ほのか(キュアホワイト)誕生日/魔法つかいプリキュア！放映期間
+2016-04-10 春野はるか(キュアフローラ)誕生日/魔法つかいプリキュア！放映期間
+2016-04-16 有栖川ひまり(キュアカスタード)誕生日/魔法つかいプリキュア！放映期間
+2016-05-28 四葉ありす(キュアロゼッタ)誕生日/魔法つかいプリキュア！放映期間
+2016-06-11 琴爪ゆかり(キュアマカロン)誕生日/魔法つかいプリキュア！放映期間
+2016-06-12 朝日奈みらい(キュアミラクル)誕生日/魔法つかいプリキュア！放映期間
+2016-07-20 海藤みなみ(キュアマーメイド)誕生日/魔法つかいプリキュア！放映期間
+2016-08-04 相田マナ(キュアハート)誕生日/魔法つかいプリキュア！放映期間
+2016-08-07 日向咲(キュアブルーム)誕生日/魔法つかいプリキュア！放映期間
+```
+
 ## `cure echo`
 Print messages of Precure.
 
@@ -90,15 +120,23 @@ $ cure echo -p happy
 キラキラ輝く未来の光！ キュアハッピー！
 5つの光が導く未来！
 輝け！スマイルプリキュア！
+
+# Choose style for MAHO GIRLS PRECURE!
+$ cure echo -p cure_magical -s ruby
+キュアップ・ラパパ！　ルビー！
+ミラクル・マジカル・ジュエリーレ！
+ふたりの魔法！キュアマジカル！
+魔法つかいプリキュア！！
 ```
 
 ### Options
 
-| Option | Description                        |
-| ------ | -----------                        |
-| -a     | Print attack message.              |
-| -q     | Print messages immediately.        |
-| -p     | Print the given PRECURE's message. |
+| Option | Description                         |
+| ------ | -----------                         |
+| -a     | Print attack message.               |
+| -q     | Print messages immediately.         |
+| -p     | Print the given PRECURE's message.  |
+| -s     | Choose style of the transformation. |
 
 
 ## `cure girls`
@@ -121,7 +159,7 @@ $ cure girls
 
 | Option | Description                                   |
 | ------ | -----------                                   |
-| -v     | Include particular girl's full name.          |
+| -f     | Show girl's full name if it exists.           |
 | -m     | Include who have only appeared in the movies. |
 
 
@@ -246,10 +284,19 @@ $ cure precures
 
 [zsh-completion/_cure](zsh-completion/_cure) is the file for `cure` command completion.
 With [zplug](https://github.com/zplug/zplug), it can be installed like this.
+
+```sh
+zplug "greymd/cureutils"
+```
+
+And update like this.
+
 ```sh
-zplug "greymd/cureutils", use:cureutils.plugin.zsh
+$ zplug update greymd/cureutils
 ```
 
+![completion_image](./img/cure_echo_demo.gif)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/greymd/cureutils. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/cureutils.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.2'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_dependency 'thor', ['>= 0.19.1', '< 2']
-  spec.add_dependency 'rubicure', '~> 0.4'
+  spec.add_dependency 'rubicure', '~> 1.0.0'
   spec.add_dependency 'colorize', '~> 0.7.7'
-  spec.add_dependency 'activesupport', '~> 4.2.6'
+  spec.add_dependency 'activesupport', '>= 5.0.0'
 end

data/cureutils.plugin.zsh

@@ -1 +1,3 @@
-fpath+="`dirname $0`/zsh-completion"
+_CURE_DIR="$(dirname $0:A)"
+# Import completion
+fpath+="${_CURE_DIR}/zsh-completion"

data/lib/cureutils.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require 'cureutils/version'
 require 'cureutils/cli'

data/lib/cureutils/cli.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 # coding: utf-8
 require 'cureutils/version'
 require 'cureutils/common'
-require 'cureutils/cure_janken_manager'
-require 'cureutils/cure_date_manager'
-require 'cureutils/cure_grep_manager'
-require 'cureutils/cure_echo_manager'
-require 'cureutils/cure_translate_manager'
+require 'cureutils/logic/janken_logic'
+require 'cureutils/logic/date_logic'
+require 'cureutils/logic/grep_logic'
+require 'cureutils/logic/echo_logic'
+require 'cureutils/logic/translate_logic'
 require 'active_support'
 require 'active_support/time'
 require 'time'
@@ -31,38 +32,38 @@ module Cureutils
 
     desc 'transform', 'Change human_name to precure_name.'
     def transform
-      manager = CureTranslateManager.new
-      manager.translate_from_to('[:human_name:]', '[:precure_name:]')
-      manager.in = $stdin
-      exit(manager.print_results)
+      logic = TranslateLogic.new
+      logic.translate_from_to('[:human_name:]', '[:precure_name:]')
+      logic.in = $stdin
+      exit(logic.print_results)
     end
 
     desc 'humanize', 'Change precure_name to human_name.'
     def humanize
-      manager = CureTranslateManager.new
-      manager.translate_from_to('[:precure_name:]', '[:human_name:]')
-      manager.in = $stdin
-      exit(manager.print_results)
+      logic = TranslateLogic.new
+      logic.translate_from_to('[:precure_name:]', '[:human_name:]')
+      logic.in = $stdin
+      exit(logic.print_results)
     end
 
     desc 'girls [OPTIONS]', "Print girls' name."
-    option 'verbose',   aliases: 'v',
+    # In order to keep backward compatibility, v option is still remaining.
+    option 'full-name', aliases: 'f',
                         type: :boolean,
-                        desc: "Include particular girl's full name."
+                        desc: "Show girl's full name if it exists."
     option 'movie',     aliases: 'm',
                         type: :boolean,
                         desc: 'Include who have only appeared in the movies.'
     def girls
-      girls = Precure.all_stars
-      girls = girls << Cure.echo if options[:movie]
-      girls.map!(&:human_name)
-      if options[:verbose]
+      girls = Precure.all_girls
+      girls.delete(Cure.echo) unless options[:movie]
+      if options['full-name'.to_sym]
         girls.each do |v|
-          puts v
+          puts v.full_name
         end
       else
         girls.each do |v|
-          puts v.gsub(/\([^\)]+\)$/, '')
+          puts v.human_name
         end
       end
     end
@@ -72,8 +73,8 @@ module Cureutils
                         type: :boolean,
                         desc: 'Include who have only appeared in the movies.'
     def precures
-      cures = Precure.all_stars
-      cures = cures << Cure.echo if options[:movie]
+      cures = Precure.all_girls
+      cures.delete(Cure.echo) unless options[:movie]
       cures.map!(&:precure_name)
       cures.each do |v|
         puts v
@@ -88,22 +89,22 @@ module Cureutils
                             type: :boolean,
                             desc: 'Print only the matched parts.'
     def grep(default_pat = '[:precure_name:]', filename = nil)
-      manager = CureGrepManager.new
-      manager.source_input(filename)
-      manager.pattern(default_pat.clone, options['extended-regexp'.to_sym])
+      logic = GrepLogic.new
+      logic.source_input(filename)
+      logic.pattern(default_pat.clone, options['extended-regexp'.to_sym])
       # Check the file discriptor to check the pipe exists or not.
-      manager.option_colorize($stdout.isatty)
-      manager.option_only(options['only-matching'.to_sym])
+      logic.option_colorize($stdout.isatty)
+      logic.option_only(options['only-matching'.to_sym])
       # Print matched lines.
-      exit(manager.print_results)
+      exit(logic.print_results)
     end
 
     desc 'tr PATTERN REPLACE', 'Translate Precure related parameters.'
     def tr(pat_from = '[:precure_name:]', pat_to = '[:human_name:]')
-      manager = CureTranslateManager.new
-      manager.in = $stdin
-      manager.translate_from_to(pat_from, pat_to)
-      exit(manager.print_results)
+      logic = TranslateLogic.new
+      logic.in = $stdin
+      logic.translate_from_to(pat_from, pat_to)
+      exit(logic.print_results)
     end
 
     desc 'echo [OPTIONS] PATTERN', 'Print messages of Precure.'
@@ -123,30 +124,36 @@ module Cureutils
                         type: :string,
                         desc: 'Choose style of the transformation.'
     def echo
-      manager = CureEchoManager.new
-      manager.precure(options[:precure])
-      manager.msg_attack(options[:attack])
-      manager.nosleep(options[:quick])
-      manager.style(options[:style])
-      exit(manager.print_results)
+      logic = EchoLogic.new
+      logic.precure(options[:precure])
+      logic.msg_attack(options[:attack])
+      logic.nosleep(options[:quick])
+      logic.style(options[:style])
+      exit(logic.print_results)
     end
 
     desc 'date [OPTIONS] [+FORMAT]',
          'Display date, time and Precure related events.'
-    option 'date', aliases: 'd'
+    option 'date', aliases: 'd',
+                   type: :string,
+                   desc: '-d STRING: Display time described by STRING.'
+    option 'file', aliases: 'f',
+                   type: :string,
+                   desc: '-f DATEFILE: Load each line of DATEFILE as STRING of -d option.'
     # Original date command's default is '+%a %b %e %H:%M:%S %Z %Y @P'
     # However, I would like to adopt this setting.
     def date(fmt = '+%F %H:%M:%S @P')
-      manager = CureDateManager.new
-      manager.datetime(options[:date])
-      manager.format = fmt
-      exit(manager.print_results)
+      logic = DateLogic.new
+      logic.opt_date(options[:date])
+      logic.opt_file(options[:file])
+      logic.format = fmt
+      exit(logic.print_results)
     end
 
     desc 'janken', %q(Let's play "Pikarin Janken" !)
     def janken
-      manager = CureJankenManager.new
-      exit(manager.janken.to_i)
+      logic = JankenLogic.new
+      exit(logic.janken.to_i)
     end
   end
 end

data/lib/cureutils/common.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 #
 # Class includes common methos which are refered from multiple commands.
@@ -18,7 +19,7 @@ class Common
     end
 
     def cure_list(sym)
-      list = Precure.all_stars.map(&sym)
+      list = Precure.all_girls.map(&sym)
       list << Cure.echo[sym]
       # Regulate cure princes human name
       list.map do |str|

data/lib/cureutils/logic/base_logic.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+# coding: utf-8
+
+#
+# Base class of logic class
+#
+class BaseLogic
+  def initialize
+    @in  = $stdin
+    @out = $stdout
+    @err = $stderr
+  end
+
+  def source_output(source = $stdout)
+    @out = source
+  end
+
+  def source_input(source = $stdin)
+    @in = source
+    if source.nil? || source =~ /^-$/
+      # If the file name is "-", use STDIN.
+      @in = $stdin
+    else
+      file(source)
+    end
+  end
+
+  def source_err(source = $stderr)
+    @err = source
+  end
+
+  private
+
+  def file(filename)
+    @in = File.open(filename)
+  rescue SystemCallError => e
+    @err.puts e.message.to_s
+    # TODO: Define error codes as enum.
+    exit(2)
+  rescue IOError => e
+    @err.puts e.message.to_s
+    exit(2)
+  end
+end

data/lib/cureutils/logic/date_logic.rb

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+# coding: utf-8
+require 'cureutils/logic/base_logic'
+require 'date'
+
+#
+# Date class supports the precure format
+#
+class DateLogic < BaseLogic
+  def initialize
+    super
+    hashize_cure_date
+    hashize_movie_date
+    @in = []
+    @in << nil
+    @opt_date = false
+    @opt_file = false
+    @format = '+%F %H:%M:%S @P'
+  end
+
+  def opt_date(given_datetime)
+    return if given_datetime.nil?
+    @opt_date = true
+    @in = []
+    @in << given_datetime
+  end
+
+  def opt_file(filename)
+    return if filename.nil?
+    @opt_file = true
+    source_input(filename)
+  end
+
+  attr_writer :format
+
+  def print_results
+    return 1 unless check_opts
+    @in.each do |line|
+      given_date = line ? natural_lang2time(line) : Time.now
+      updated_fmt = update_fmt(given_date, @format) if given_date
+      @out.puts given_date.strftime(updated_fmt) if updated_fmt
+    end
+    0
+  end
+
+  private
+
+  def check_opts
+    # Either option must be true, but both must NOT be same.
+    return true unless @opt_date && @opt_file
+    @err.puts <<-EOS
+cure date: the options to specify dates for printing are mutually exclusive.
+    EOS
+    false
+  end
+
+  def validate_date_str(str)
+    Date.parse(str)
+  rescue ArgumentError => e
+    @err.puts "cure date: #{e.message} '#{str.chomp}'"
+    return false
+  end
+
+  def natural_lang2time(time_str)
+    updated_fmt = time_str.dup
+    updated_fmt.gsub!(/yesterday/, '1 day ago')
+    updated_fmt.gsub!(/tomorrow/, '-1 day ago')
+    units = 'second|minute|hour|day|week|month|year'
+    regulated_format = /(-?[0-9]+) *(#{units})s? *(ago)?/
+    if updated_fmt =~ regulated_format
+      diff_value = Regexp.last_match(1).to_i
+      unit = Regexp.last_match(2).to_sym
+      minus_flg = Regexp.last_match(3)
+      return Time.now + diff_value.send(unit) if minus_flg.nil?
+      return Time.now - diff_value.send(unit)
+    elsif validate_date_str(updated_fmt)
+      # Format like "yyyy-mm-dd", "yyyy/mm/dd" and "yyyymmdd"
+      return Time.parse(updated_fmt)
+    end
+    false
+  end
+
+  def update_fmt(datetime, fmt)
+    # Find precure related events
+    date4check_event = time2date(datetime)
+    found_event = events(date4check_event)
+    checked_fmt = fmt
+    if fmt =~ /^\+(.*)$/
+      checked_fmt = Regexp.last_match(1)
+    else
+      @err.puts "cure date: invalid date format '#{fmt}'"
+      exit 1
+    end
+    # Find precure related events
+    checked_fmt.gsub(/@P/, found_event)
+  end
+
+  def events(date)
+    event_list = [birth_date?(date),
+                  created_date?(date),
+                  movie_date?(date),
+                  series_between(date)].compact
+    event_list.flatten.join('/')
+  end
+
+  def time2date(time_obj)
+    Date.parse(time_obj.strftime('%Y-%m-%d'))
+  end
+
+  def birth_date?(date)
+    date_str = date.strftime('%-m/%-d')
+    result = @birth_date[date_str.to_sym]
+    return if result.nil?
+    result.map { |v| "#{v[:human_name]}(#{v[:precure_name]})誕生日" }
+  end
+
+  def created_date?(date)
+    date_str = date.strftime('%Y-%m-%d')
+    result = @created_date[date_str.to_sym]
+    return if result.nil?
+    result.map { |v| v[:precure_name] + '登場日' }
+  end
+
+  def movie_date?(date)
+    date_str = date.strftime('%Y-%m-%d')
+    result = @movie_started_date[date_str.to_sym]
+    # format
+    "#{result[:title]}映画公開日" unless result.nil?
+  end
+
+  def series_between(date)
+    event_name = nil
+    Rubicure::Series.config.each do |_k, v|
+      if v[:started_date] == date
+        event_name = "#{v[:title]}初放映"
+        break
+      end
+      if v[:ended_date] == date
+        event_name = "#{v[:title]}最終回"
+        break
+      end
+      # Nobody expects the future. Precure series may be abolished today.
+      v[:ended_date] = Date.today + 1 if v[:ended_date].nil?
+      if v[:started_date] < date && date < v[:ended_date]
+        event_name = "#{v[:title]}放映期間"
+        break
+      end
+    end
+    event_name
+  end
+
+  def hashize_cure_date
+    @birth_date = {}
+    @created_date = {}
+    Precure.all_girls.each do |precure|
+      # Create birthday table
+      birthday_key = precure.birthday.to_s.to_sym
+      @birth_date =
+        create_array_on_hash(@birth_date, birthday_key, precure)
+      # Create table for the first appeared date .
+      created_date_key = precure.created_date.strftime('%Y-%m-%d').to_sym
+      @created_date =
+        create_array_on_hash(@created_date, created_date_key, precure)
+    end
+  end
+
+  def create_array_on_hash(arr_hash, key, value)
+    arr_hash[key] = [] unless arr_hash.key?(key)
+    arr_hash[key] << value
+    arr_hash
+  end
+
+  def hashize_movie_date
+    @movie_started_date = {}
+    Rubicure::Movie.config.map do |_k, v|
+      next if v[:started_date].nil?
+      @movie_started_date[v[:started_date].strftime('%Y-%m-%d').to_sym] = v
+    end
+  end
+end

data/lib/cureutils/{cure_echo_manager.rb → logic/echo_logic.rb}

@@ -1,33 +1,21 @@
+# frozen_string_literal: true
 # coding: utf-8
+require 'cureutils/logic/base_logic'
 
 # Singleton class for cure echo
-class CureEchoManager
+class EchoLogic < BaseLogic
   module EchoMode
     TRANSFORM = 1
     ATTACK = 2
   end
 
   def initialize
-    @in  = $stdin
-    @out = $stdout
-    @err = $stderr
+    super
     @cure_name = 'echo'
     @message_mode = EchoMode::TRANSFORM
     @style_priority = []
   end
 
-  def source_output(source = $stdout)
-    @out = source
-  end
-
-  def source_input(source = $stdin)
-    @in = source
-  end
-
-  def source_err(source = $stderr)
-    @err = source
-  end
-
   def precure(cure_name = false)
     @cure_name = cure_name || 'echo'
   end

data/lib/cureutils/{cure_grep_manager.rb → logic/grep_logic.rb}

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
 # coding: utf-8
+require 'cureutils/logic/base_logic'
 require 'colorize'
 
 # Singleton class for cure grep
 # Managing the method for matching and printing.
-class CureGrepManager
+class GrepLogic < BaseLogic
   module ColorMode
     NONE = :to_s
     RED = :red
   end
 
   def initialize
-    @in = $stdin
-    @out = $stdout
-    @err = $stderr
+    super
     @match_method = 'match'
   end
 
@@ -25,21 +25,6 @@ class CureGrepManager
     @str_color = (colorize ? ColorMode::RED : ColorMode::NONE)
   end
 
-  def source_output(source = $stdout)
-    @out = source
-  end
-
-  def source_input(source = nil)
-    if source.nil? || source.empty?
-      @in = $stdin
-    elsif source =~ /^-$/
-      # If the file name is "-", use STDIN.
-      @in = $stdin
-    else
-      file(source)
-    end
-  end
-
   def pattern(pat, is_exregex = false)
     if is_exregex
       @pattern = /#{pat}/
@@ -62,14 +47,4 @@ class CureGrepManager
     end
     exit_status
   end
-
-  private
-
-  def file(filename)
-    @in = File.open(filename)
-  rescue SystemCallError => e
-    puts %(class=[#{e.class}] message=[#{e.message}])
-  rescue IOError => e
-    puts %(class=[#{e.class}] message=[#{e.message}])
-  end
 end

data/lib/cureutils/{cure_janken_manager.rb → logic/janken_logic.rb}

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 # coding: utf-8
+require 'cureutils/logic/base_logic'
+
 #
 # Class of Pikarin Janken
 #
-class CureJankenManager
+class JankenLogic < BaseLogic
   def initialize
+    super
     # Set the sleep time 0
     Rubicure::Girl.sleep_sec = 0
     # 0: win, 1: lose, 2: aiko
@@ -15,15 +19,10 @@ class CureJankenManager
     @te_idx = %w(グー チョキ パー グッチョッパー)
     @te_hash = Hash[[@te_idx, (0..3).map(&:to_s)].transpose]
     @buf = []
-    @out = $stdout
   end
 
   attr_writer :io
 
-  def source_output(output = $stdout)
-    @out = output
-  end
-
   def puts(input)
     @buf << input
   end
@@ -43,7 +42,7 @@ class CureJankenManager
   end
 
   def input_te
-    @out.print("1...グー, 2...チョキ, 3...パー : ")
+    @out.print('1...グー, 2...チョキ, 3...パー : ')
     # TODO: Check input and raise the error.
     player_te = $stdin.gets
     player_te.to_i - 1

data/lib/cureutils/{cure_translate_manager.rb → logic/translate_logic.rb}

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
 # coding: utf-8
+require 'cureutils/logic/base_logic'
+
 #
 # Class for managing cure tr (translate).
 #
-class CureTranslateManager
+class TranslateLogic < BaseLogic
   def initialize
+    super
     @translate_from = :human_name
     @translate_to = :precure_name
-    @out = $stdout
-    @in = $stdin
   end
 
-  attr_writer :out, :in
+  attr_writer :in
 
   def translate_from_to(from, to)
     @translate_from = pregex2str(from).to_sym
@@ -37,7 +39,7 @@ class CureTranslateManager
       line.scan(/#{cure_pattern}/).each do |pat|
         updated_line.gsub!(/#{pat[0]}/, table[pat[0]])
       end
-      puts updated_line
+      @out.puts updated_line
     end
     0
   end

data/lib/cureutils/version.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module Cureutils
   class Version
-    MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
     PRE = nil
 
     class << self

data/zsh-completion/_cure

@@ -17,7 +17,7 @@ subcommands=(
 	"transform: Replace human_name to precure_name"
 )
 
-# cure precures | cure tr [:precure_name:] [:girl_name:] | grep '[[:alnum:]]' | sort | uniq | sed 's/^cure_//'
+# bundle exec cure precures -m |bundle exec cure tr [:precure_name:] [:girl_name:] | grep '[[:alnum:]]' | sort | uniq
 precure_girl_names=(
 	'cure_ace'
 	'cure_aqua'
@@ -27,6 +27,8 @@ precure_girl_names=(
 	'cure_black'
 	'cure_bloom'
 	'cure_blossom'
+	'cure_chocolat'
+	'cure_custard'
 	'cure_diamond'
 	'cure_dream'
 	'cure_echo'
@@ -34,11 +36,13 @@ precure_girl_names=(
 	'cure_felice'
 	'cure_flora'
 	'cure_fortune'
+	'cure_gelato'
 	'cure_happy'
 	'cure_heart'
 	'cure_honey'
 	'cure_lemonade'
 	'cure_lovely'
+	'cure_macaroon'
 	'cure_magical'
 	'cure_march'
 	'cure_marine'
@@ -61,6 +65,7 @@ precure_girl_names=(
 	'cure_sunshine'
 	'cure_sword'
 	'cure_twinkle'
+	'cure_whip'
 	'cure_white'
 	'milky_rose'
 	'shiny_luminous'
@@ -115,7 +120,7 @@ function _cure-echo () {
 function _cure-date () {
 	local -a args
 	args=(
-		'-d: cure date -d STRING: display time described by STRING'
+		'-d: cure date -d STRING: Display time described by STRING.'
 		'+%Y/%m/%d_%H\:%M\:%S_@P: Example date string 1.'
 		'+%Y/%m/%d_@P: Example date string 2.'
 	)
@@ -139,7 +144,7 @@ function _cure-precures () {
 function _cure-girls () {
 	local -a args
 	if (( CURRENT>=3 )) ; then
-		echo $words | grep -w -- '-v' 1> /dev/null || args=($args "-v:Include particular girl's full name.")
+		echo $words | grep -w -- '-f' 1> /dev/null || args=($args "-f:Show girl's full name if it exists.")
 		echo $words | grep -w -- '-m' 1> /dev/null || args=($args '-m:Include who have only appeared in the movies.')
 		_describe -t args 'args' args
 	fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cureutils
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Yamada, Yasuhiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +104,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
 description: Useful command line tool for Japanese battle heroine Pretty Cure (Precure).
 email:
 - greengregson@gmail.com
@@ -133,15 +133,17 @@ files:
 - bin/cure
 - cureutils.gemspec
 - cureutils.plugin.zsh
+- img/cure_echo_demo.gif
 - img/cureutils_logo.png
 - lib/cureutils.rb
 - lib/cureutils/cli.rb
 - lib/cureutils/common.rb
-- lib/cureutils/cure_date_manager.rb
-- lib/cureutils/cure_echo_manager.rb
-- lib/cureutils/cure_grep_manager.rb
-- lib/cureutils/cure_janken_manager.rb
-- lib/cureutils/cure_translate_manager.rb
+- lib/cureutils/logic/base_logic.rb
+- lib/cureutils/logic/date_logic.rb
+- lib/cureutils/logic/echo_logic.rb
+- lib/cureutils/logic/grep_logic.rb
+- lib/cureutils/logic/janken_logic.rb
+- lib/cureutils/logic/translate_logic.rb
 - lib/cureutils/version.rb
 - zsh-completion/_cure
 homepage: https://github.com/greymd/cureutils
@@ -156,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Useful commands for battle heroine Pretty Cure (Precure).

data/lib/cureutils/cure_date_manager.rb

@@ -1,137 +0,0 @@
-# coding: utf-8
-require 'date'
-
-#
-# Date class supports the precure format
-#
-class CureDateManager
-  def initialize
-    hashize_cure_date unless @birth_date || @created_date
-    hashize_movie_date unless @movie_started_date
-    @datetime = Time.now
-    @format = '+%F %H:%M:%S @P'
-    @out = $stdout
-  end
-
-  def source_output(output = $stdout)
-    @out = output
-  end
-
-  def datetime(datetime_str)
-    @datetime = datetime_str ? natural_lang2time(datetime_str) : Time.now
-  end
-
-  attr_writer :format
-
-  def print_results
-    updated_fmt = update_fmt(@datetime, @format)
-    @out.puts @datetime.strftime(updated_fmt)
-    0
-  end
-
-  private
-
-  def natural_lang2time(time_str)
-    updated_fmt = time_str.dup
-    updated_fmt.gsub!(/yesterday/, '1 day ago')
-    updated_fmt.gsub!(/tomorrow/, '-1 day ago')
-    units = 'second|minute|hour|day|week|month|year'
-    regulated_format = /(-?[0-9]+) *(#{units})s? *(ago)?/
-    if updated_fmt =~ regulated_format
-      diff_value = Regexp.last_match(1).to_i
-      unit = Regexp.last_match(2).to_sym
-      minus_flg = Regexp.last_match(3)
-      if minus_flg.nil?
-        Time.now + diff_value.send(unit)
-      else
-        Time.now - diff_value.send(unit)
-      end
-    else
-      Time.parse(updated_fmt)
-    end
-  end
-
-  def update_fmt(datetime, fmt)
-    # Find precure related events
-    date4check_event = time2date(datetime)
-    found_event = events(date4check_event)
-    checked_fmt = fmt
-    if fmt =~ /^\+(.*)$/
-      checked_fmt = Regexp.last_match(1)
-    else
-      puts "cure date: invalid date format '#{fmt}'"
-      exit 1
-    end
-    # Find precure related events
-    checked_fmt.gsub(/@P/, found_event)
-  end
-
-  def events(date)
-    event_list = [birth_date?(date),
-                  created_date?(date),
-                  movie_date?(date),
-                  series_between(date)].compact
-    event_list.join('/')
-  end
-
-  def time2date(time_obj)
-    Date.parse(time_obj.strftime('%Y-%m-%d'))
-  end
-
-  def birth_date?(date)
-    date_str = date.strftime('%m/%d')
-    result = @birth_date[date_str]
-    # format
-    result.nil? ? nil : "#{result[:human_name]}(#{result[:precure_name]})誕生日"
-  end
-
-  def created_date?(date)
-    date_str = date.strftime('%m/%d')
-    result = @created_date[date_str]
-    # format
-    result.nil? ? nil : "#{result[:precure_name]}初登場日"
-  end
-
-  def movie_date?(date)
-    result = @created_date[date]
-    # format
-    result.nil? ? nil : "#{result[:title]}映画公開日"
-  end
-
-  def series_between(date)
-    event_name = nil
-    Rubicure::Series.config.each do |_k, v|
-      if v[:started_date] == date
-        event_name = "#{v[:title]}初放映"
-        break
-      end
-      if v[:ended_date] == date
-        event_name = "#{v[:title]}最終回"
-        break
-      end
-      # Nobody expects the future. Precure series may be abolished today.
-      v[:ended_date] = Date.today + 1 if v[:ended_date].nil?
-      if v[:started_date] < date && date < v[:ended_date]
-        event_name = "#{v[:title]}放映期間"
-        break
-      end
-    end
-    event_name
-  end
-
-  def hashize_cure_date
-    @birth_date = {}
-    @created_date = {}
-    Rubicure::Girl.config.map do |_k, v|
-      v[:birthday].nil? || @birth_date[v[:birthday]] = v
-      v[:created_date].nil? || @created_date[v[:created_date]] = v
-    end
-  end
-
-  def hashize_movie_date
-    @movie_started_date = {}
-    Rubicure::Movie.config.map do |_k, v|
-      v[:started_date].nil? || @movie_started_date[v[:started_date]] = v
-    end
-  end
-end