cureutils 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90d25e39bd4085788158a6cd882b3034d2e8f74307598ee4897fa5121f00dc8
-  data.tar.gz: 3ff1a7babf0e27cb7a1a80fed1cf75a54c412ff50a71bd206d83933d776faeb1
+  metadata.gz: ea50c9084370c1ef9a414d4addc85cdd1f073e42358358d61f4478b156be6eb0
+  data.tar.gz: 1233ec304e3fd160d41b4938bb6bd79a697dbd53ac34b0b20a5d7f2abaed56cd
 SHA512:
-  metadata.gz: 27447af338d7ae3c5f4ff764f5d1d95fb6e683ddbdb50fd595fc699d645d5bed5d4ac07f3c81ab4f885ae5a79a9e1888bb2431ec828eb65a1e5ae7fda393aa9a
-  data.tar.gz: bc11984f1da210d77fd1ff4d32c998f51258f15083f9f5f4e49eff9de598c651f5e5117e8ac35de408193c22d8b5bc30cac72b446e329a1c48d19d8594faed72
+  metadata.gz: 1e9f9bfa238ac3ba52a9097b59036d10a537db24064c55e7433c6042b287cc2a8e57414659889d1c1d369f3089d98acb96c68cf10b91206f8856df51a6d2a55f
+  data.tar.gz: d76a19cf974711921cd2007259672ad1fdf7df1d21c52053dfae618263100068b264bb1f3c1557d62fc2cba67dd2d6fc9565e7bcde03b5b3c3e317e57d4c1918

data/.github/workflows/test.yml

@@ -0,0 +1,61 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+      - 'bugfix/**'
+      - 'feature/**'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 0 * * 6"
+
+env:
+  RUBYOPT: -EUTF-8
+
+# Some configures are inspired by https://github.com/sue445/rubicure/blob/master/.github/workflows/test.yml
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container: ${{ matrix.ruby }}
+
+    strategy:
+      matrix:
+        ruby:
+          - ruby:2.4
+          - ruby:2.5
+          - ruby:2.6
+          - ruby:2.7
+          - ruby:3.0
+          - rubylang/ruby:master-nightly-bionic
+        include:
+          - ruby: rubylang/ruby:master-nightly-bionic
+            allow_failures: "true"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache vendor/bundle
+        uses: actions/cache@v1
+        id: cache_gem
+        with:
+          path: vendor/bundle
+          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ github.sha }}
+          restore-keys: |
+            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config path vendor/bundle
+          bundle update --jobs $(nproc) --retry 3
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - run: bundle exec rspec
+        timeout-minutes: 1
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /tags
 /.byebug_history
+/.ruby-version

data/.travis.yml

@@ -2,20 +2,27 @@ language: ruby
 
 rvm:
 - 2.2.2
-- 2.3.3
-- 2.4.0
-- 2.5.0
+- 2.3
+- 2.4
+- 2.5
+- 2.6
+- 2.7
 - ruby-head
 
 before_install:
-- gem update --system --no-document
-- gem install bundler -v 1.11.2
+- travis_retry gem update --system || travis_retry gem update --system 2.7.8
+
+install:
+- travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
 - bundle install
 
 branches:
-  only:
-  - master
-  - develop-1.0.0
+    only:
+        - master
+        - develop
+        - /^develop-.*/
+        - /^bugfix.*/
+        - /^feature.*/
 
 matrix:
   allow_failures:
@@ -24,4 +31,4 @@ matrix:
 sudo: false
 
 script:
-- bash test/test.sh
+- bundle exec rspec

data/Gemfile

@@ -2,7 +2,3 @@ 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

data/README.md

@@ -5,7 +5,7 @@
 
 <p align="center">
   <a href=https://badge.fury.io/rb/cureutils><img src="https://badge.fury.io/rb/cureutils.svg" alt="Gem Version" /></a>
-  <a href=https://travis-ci.org/greymd/cureutils><img src="https://travis-ci.org/greymd/cureutils.svg?branch=master" alt="Build Status" /></a>
+  <a href=https://github.com/greymd/cureutils/actions?query=workflow%3Atest><img src="https://github.com/greymd/cureutils/workflows/test/badge.svg?branch=master" alt="Build Status" /></a>
 </p>
 
 <p align="center">
@@ -306,5 +306,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/greymd
 
 ## License
 
+### Source code
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+### Logo
+<a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" /></a><br />The logo is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International License</a>.

data/cureutils.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'cureutils'
   spec.version       = Cureutils::Version
   spec.authors       = ['Yamada, Yasuhiro']
-  spec.email         = ['greengregson@gmail.com']
+  spec.email         = ['yamadagrep@gmail.com']
   spec.summary       = 'Useful commands for battle heroine Pretty Cure (Precure).'
   spec.description   = 'Useful command line tool for Japanese battle heroine Pretty Cure (Precure).'
   spec.homepage      = 'https://github.com/greymd/cureutils'
@@ -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.2.2'
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.required_ruby_version = '>= 2.4'
+  spec.add_development_dependency 'bundler', '>= 1.11'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_dependency 'thor', ['>= 0.19.1', '< 2']
-  spec.add_dependency 'rubicure', '~> 1.1.0'
+  spec.add_dependency 'rubicure', '~> 2.1.0'
   spec.add_dependency 'colorize', '~> 0.7.7'
   spec.add_dependency 'activesupport', '>= 5.0.0'
 end

data/lib/cureutils/cli.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/version'
 require 'cureutils/common'
 require 'cureutils/logic/janken_logic'
@@ -18,7 +18,7 @@ module Cureutils
   #
   # The class represents the cli interface
   #
-  class CLI < Thor
+  class CLI < Thor # rubocop:disable Metrics/ClassLength
     class << self
       def exit_on_failure?
         true
@@ -54,7 +54,7 @@ module Cureutils
     option 'movie',     aliases: 'm',
                         type: :boolean,
                         desc: 'Include who have only appeared in the movies.'
-    def girls
+    def girls # rubocop:disable Metrics/MethodLength
       girls = Precure.all_girls
       girls.delete(Cure.echo) unless options[:movie]
       if options['full-name'.to_sym]
@@ -88,7 +88,7 @@ module Cureutils
     option 'only-matching', aliases: 'o',
                             type: :boolean,
                             desc: 'Print only the matched parts.'
-    def grep(default_pat = '[:precure_name:]', filename = nil)
+    def grep(default_pat = '[:precure_name:]', filename = nil) # rubocop:disable Metrics/AbcSize, Metrics/LineLength
       logic = GrepLogic.new
       logic.source_input(filename)
       logic.pattern(default_pat.clone, options['extended-regexp'.to_sym])
@@ -123,7 +123,7 @@ module Cureutils
     option 'style',     aliases: 's',
                         type: :string,
                         desc: 'Choose style of the transformation.'
-    def echo
+    def echo # rubocop:disable Metrics/AbcSize
       logic = EchoLogic.new
       logic.precure(options[:precure])
       logic.msg_attack(options[:attack])
@@ -139,7 +139,7 @@ module Cureutils
                    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.'
+                   desc: '-f DATEFILE: Load each line of DATEFILE as STRING.'
     # 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')

data/lib/cureutils/logic/base_logic.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 #
 # Base class of logic class

data/lib/cureutils/logic/date_logic.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/logic/base_logic'
 require 'date'
 
@@ -20,6 +20,7 @@ class DateLogic < BaseLogic
 
   def opt_date(given_datetime)
     return if given_datetime.nil?
+
     @opt_date = true
     @in = []
     @in << given_datetime
@@ -27,6 +28,7 @@ class DateLogic < BaseLogic
 
   def opt_file(filename)
     return if filename.nil?
+
     @opt_file = true
     source_input(filename)
   end
@@ -35,6 +37,7 @@ class DateLogic < BaseLogic
 
   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
@@ -48,6 +51,7 @@ class DateLogic < BaseLogic
   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
@@ -58,7 +62,7 @@ cure date: the options to specify dates for printing are mutually exclusive.
     Date.parse(str)
   rescue ArgumentError => e
     @err.puts "cure date: #{e.message} '#{str.chomp}'"
-    return false
+    false
   end
 
   def natural_lang2time(time_str)

data/lib/cureutils/logic/echo_logic.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/logic/base_logic'
 
 # Singleton class for cure echo
@@ -39,9 +39,10 @@ class EchoLogic < BaseLogic
 
   def print_results
     return 1 unless existing_precure?
+
     precure = Cure.send(@cure_name.to_sym)
     if @message_mode == EchoMode::TRANSFORM
-      precure = original_transform(precure)
+      original_transform(precure)
     elsif @message_mode == EchoMode::ATTACK
       precure = original_transform(precure)
       precure.attack!
@@ -53,6 +54,7 @@ class EchoLogic < BaseLogic
 
   def original_transform(precure)
     return precure.transform! unless transformable?(precure)
+
     chosen_style = @style_priority.find do |s|
       precure.transform_styles.include?(s)
     end
@@ -66,7 +68,9 @@ class EchoLogic < BaseLogic
 
   def transformable?(precure)
     return false if precure.transform_calls.nil?
-    return true if precure.respond_to?(:transform_styles)
+
+    return true if precure.key?(:transform_styles)
+
     false
   end
 

data/lib/cureutils/logic/grep_logic.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/logic/base_logic'
 require 'colorize'
 
@@ -38,6 +38,7 @@ class GrepLogic < BaseLogic
     @in.each do |line|
       matched_strs = line.send(@match_method, @pattern)
       next unless matched_strs
+
       exit_status = 0
       if @only_matched
         matched_strs.each { |str| @out.puts str.send(@str_color) }

data/lib/cureutils/logic/janken_logic.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/logic/base_logic'
 
 #
@@ -15,8 +15,8 @@ class JankenLogic < BaseLogic
                      [1, 2, 0, 1],
                      [0, 1, 2, 1],
                      [0, 0, 0, 2]]
-    @result_idx = %w(あなたのかち あなたのまけ あいこ)
-    @te_idx = %w(グー チョキ パー グッチョッパー)
+    @result_idx = %w[あなたのかち あなたのまけ あいこ]
+    @te_idx = %w[グー チョキ パー グッチョッパー]
     @te_hash = Hash[[@te_idx, (0..3).map(&:to_s)].transpose]
     @buf = []
   end

data/lib/cureutils/logic/translate_logic.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+
 require 'cureutils/logic/base_logic'
 
 #

data/lib/cureutils/version.rb

@@ -2,7 +2,7 @@
 module Cureutils
   class Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 4
     PATCH = 0
     PRE = nil
 

data/zsh-completion/_cure

@@ -20,6 +20,7 @@ subcommands=(
 # ./bin/cure precures -m |./bin/cure tr '[:precure_name:]' '[:girl_name:]' | grep '[[:alnum:]]' | sort | uniq | sed "s/.*/\t'&'/"
 precure_girl_names=(
 	'cure_ace'
+	'cure_amour'
 	'cure_ange'
 	'cure_aqua'
 	'cure_beat'
@@ -29,31 +30,40 @@ precure_girl_names=(
 	'cure_bloom'
 	'cure_blossom'
 	'cure_chocolat'
+	'cure_coral'
+	'cure_cosmo'
 	'cure_custard'
 	'cure_diamond'
 	'cure_dream'
+	'cure_earth'
 	'cure_echo'
 	'cure_egret'
 	'cure_etoile'
 	'cure_felice'
+	'cure_flamingo'
 	'cure_flora'
+	'cure_fontaine'
 	'cure_fortune'
 	'cure_gelato'
+	'cure_grace'
 	'cure_happy'
 	'cure_heart'
 	'cure_honey'
 	'cure_lemonade'
 	'cure_lovely'
 	'cure_macaron'
+	'cure_macherie'
 	'cure_magical'
 	'cure_march'
 	'cure_marine'
 	'cure_melody'
 	'cure_mermaid'
+	'cure_milky'
 	'cure_mint'
 	'cure_miracle'
 	'cure_moonlight'
 	'cure_muse'
+	'cure_papaya'
 	'cure_parfait'
 	'cure_passion'
 	'cure_peace'
@@ -64,6 +74,11 @@ precure_girl_names=(
 	'cure_rosetta'
 	'cure_rouge'
 	'cure_scarlet'
+	'cure_selene'
+	'cure_soleil'
+	'cure_sparkle'
+	'cure_star'
+	'cure_summer'
 	'cure_sunny'
 	'cure_sunshine'
 	'cure_sword'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cureutils
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Yamada, Yasuhiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
         version: 5.0.0
 description: Useful command line tool for Japanese battle heroine Pretty Cure (Precure).
 email:
-- greengregson@gmail.com
+- yamadagrep@gmail.com
 executables:
 - cure
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
@@ -150,7 +150,7 @@ homepage: https://github.com/greymd/cureutils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,16 +158,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Useful commands for battle heroine Pretty Cure (Precure).
 test_files: []

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "test/shunit2"]
-	path = test/shunit2
-	url = https://github.com/zandev/shunit2.git