rubicure 3.2.0.rc1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f960e22397fab77402b4de0432f121cf2aed74b5c4ebbfe1e3e9535931e046
-  data.tar.gz: 611f5c8028245d26352bf3d742062b6883ce47814badf8ce83ab065fda62b5a2
+  metadata.gz: 1edc9ba2b4e44364be98363803a5f6e7b4f57bd1c28073fc09f2a1bccd228577
+  data.tar.gz: 3749db8846101224ef468791dcea4f4b6652dc631b9d3540634bf923394afd9d
 SHA512:
-  metadata.gz: 7a60f8b0633974ea9c867aae39c030e682fb337ae83723bbeaef4b3e750c7a1162410859e65b0245819a98f0c72b8ec579fafba035e4fd266967afff16b4bc05
-  data.tar.gz: 20e9e1605519dadea4df5e63b3ef9f5e2c7956f4f850ac6442006b3b1d719162361efa8013e061da69ba767239083d15519b9f13ef1292240c181b43c0379120
+  metadata.gz: d513e5da71cc2a5da2176e5a64ea380c34124240333ad934c6b9bb5f478806ab34c2ee605a0c5628d68892e99c2bc5495f5491dfe63397ecba9f610cf6ad99bd
+  data.tar.gz: e04b4846dc29463093c028ee2b1a5f8b42e9cbf2b35f462fd78098b1d5a2e0b7627a72c356185657a9f996c2ece5d6e6dcaeb6d45f6d670d6a3d55eda61c52e1

data/.rubocop.yml

@@ -16,6 +16,9 @@ Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## master
-[full changelog](http://github.com/sue445/rubicure/compare/v3.2.0.rc1...master)
+[full changelog](http://github.com/sue445/rubicure/compare/v3.2.1...master)
+
+## v3.2.1
+[full changelog](http://github.com/sue445/rubicure/compare/v3.2.0...v3.2.1)
+
+* Remove hacks for testing
+  * https://github.com/sue445/rubicure/pull/282
+
+## v3.2.0
+[full changelog](http://github.com/sue445/rubicure/compare/v3.2.0.rc1...v3.2.0)
+
+* Add Cure Butterfly :butterfly:
+  * https://github.com/sue445/rubicure/pull/281
 
 ## v3.2.0.rc1
 [full changelog](http://github.com/sue445/rubicure/compare/v3.1.5...v3.2.0.rc1)

data/README.md

@@ -118,7 +118,7 @@ and [more aliases!](config/series.yml)
 
 ```ruby
 >> Precure.now
-=> {:series_name=>"hirogaru_sky", :title=>"ひろがるスカイ！プリキュア", :started_date=>#<Date: 2023-02-05 ((2459981j,0s,0n),+0s,-Infj)>, :girls=>["cure_sky", "cure_prism", "cure_wing"]}
+=> {:series_name=>"hirogaru_sky", :title=>"ひろがるスカイ！プリキュア", :started_date=>#<Date: 2023-02-05 ((2459981j,0s,0n),+0s,-Infj)>, :girls=>["cure_sky", "cure_prism", "cure_wing", "cure_butterfly"]}
 
 # -2013/1/27  : smile precure
 #  2013/2/5 - : dokidoki precure
@@ -621,7 +621,7 @@ Go!プリンセスプリキュア
 => [:unmarked, :max_heart, :splash_star, :yes, :yes_gogo, :fresh, :heart_catch, :suite, :smile, :dokidoki, :happiness_charge, :go_princess, :maho_girls, :a_la_mode, :hugtto, :star_twinkle, :healingood, :tropical_rouge, :delicious_party, :hirogaru_sky]
 
 >> Precure.inject([]){|girl_count_of_series, series| girl_count_of_series << series.girls.count; girl_count_of_series  }
-=> [2, 3, 2, 5, 6, 4, 4, 4, 5, 5, 4, 4, 3, 6, 5, 5, 4, 5, 4, 3]
+=> [2, 3, 2, 5, 6, 4, 4, 4, 5, 5, 4, 4, 3, 6, 5, 5, 4, 5, 4, 4]
 
 >> Precure.map(&:title)
 => ["ふたりはプリキュア", "ふたりはプリキュア Max Heart", "ふたりはプリキュア Splash☆Star", "Yes！ プリキュア5", "Yes！ プリキュア5 Go Go！", "フレッシュプリキュア！", "ハートキャッチプリキュア！", "スイートプリキュア♪", "スマイルプリキュア！", "ドキドキ！プリキュア", "ハピネスチャージプリキュア！", "Go!プリンセスプリキュア", "魔法つかいプリキュア！", "キラキラ☆プリキュアアラモード", "ＨＵＧっと！プリキュア", "スター☆トゥインクルプリキュア", "ヒーリングっど♥プリキュア", "トロピカル～ジュ！プリキュア", "デリシャスパーティ♡プリキュア", "ひろがるスカイ！プリキュア"]
@@ -630,7 +630,7 @@ Go!プリンセスプリキュア
 => ["キュアラブリー", "キュアプリンセス", "キュアハニー", "キュアフォーチュン"]
 
 >> Precure.map{|series| series.map(&:precure_name) }
-=> [["キュアブラック", "キュアホワイト"], ["キュアブラック", "キュアホワイト", "シャイニールミナス"], ["キュアブルーム", "キュアイーグレット"], ["キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア"], ["キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア", "ミルキィローズ"], ["キュアピーチ", "キュアベリー", "キュアパイン", "キュアパッション"], ["キュアブロッサム", "キュアマリン", "キュアサンシャイン", "キュアムーンライト"], ["キュアメロディ", "キュアリズム", "キュアビート", "キュアミューズ"], ["キュアハッピー", "キュアサニー", "キュアピース", "キュアマーチ", "キュアビューティ"], ["キュアハート", "キュアダイヤモンド", "キュアロゼッタ", "キュアソード", "キュアエース"], ["キュアラブリー", "キュアプリンセス", "キュアハニー", "キュアフォーチュン"], ["キュアフローラ", "キュアマーメイド", "キュアトゥインクル", "キュアスカーレット"], ["キュアミラクル", "キュアマジカル", "キュアフェリーチェ"], ["キュアホイップ", "キュアカスタード", "キュアジェラート", "キュアマカロン", "キュアショコラ", "キュアパルフェ"], ["キュアエール", "キュアアンジュ", "キュアエトワール", "キュアマシェリ", "キュアアムール"], ["キュアスター", "キュアミルキー", "キュアソレイユ", "キュアセレーネ", "キュアコスモ"], ["キュアグレース", "キュアフォンテーヌ", "キュアスパークル", "キュアアース"], ["キュアサマー", "キュアコーラル", "キュアパパイア", "キュアフラミンゴ", "キュアラメール"], ["キュアプレシャス", "キュアスパイシー", "キュアヤムヤム", "キュアフィナーレ"], ["キュアスカイ", "キュアプリズム", "キュアウィング"]]
+=> [["キュアブラック", "キュアホワイト"], ["キュアブラック", "キュアホワイト", "シャイニールミナス"], ["キュアブルーム", "キュアイーグレット"], ["キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア"], ["キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア", "ミルキィローズ"], ["キュアピーチ", "キュアベリー", "キュアパイン", "キュアパッション"], ["キュアブロッサム", "キュアマリン", "キュアサンシャイン", "キュアムーンライト"], ["キュアメロディ", "キュアリズム", "キュアビート", "キュアミューズ"], ["キュアハッピー", "キュアサニー", "キュアピース", "キュアマーチ", "キュアビューティ"], ["キュアハート", "キュアダイヤモンド", "キュアロゼッタ", "キュアソード", "キュアエース"], ["キュアラブリー", "キュアプリンセス", "キュアハニー", "キュアフォーチュン"], ["キュアフローラ", "キュアマーメイド", "キュアトゥインクル", "キュアスカーレット"], ["キュアミラクル", "キュアマジカル", "キュアフェリーチェ"], ["キュアホイップ", "キュアカスタード", "キュアジェラート", "キュアマカロン", "キュアショコラ", "キュアパルフェ"], ["キュアエール", "キュアアンジュ", "キュアエトワール", "キュアマシェリ", "キュアアムール"], ["キュアスター", "キュアミルキー", "キュアソレイユ", "キュアセレーネ", "キュアコスモ"], ["キュアグレース", "キュアフォンテーヌ", "キュアスパークル", "キュアアース"], ["キュアサマー", "キュアコーラル", "キュアパパイア", "キュアフラミンゴ", "キュアラメール"], ["キュアプレシャス", "キュアスパイシー", "キュアヤムヤム", "キュアフィナーレ"], ["キュアスカイ", "キュアプリズム", "キュアウィング", "キュアバタフライ"]]
 ```
 
 ### Not operator
@@ -713,13 +713,13 @@ Cure.cosmo.name
 => [:black, :blue, :gold, :green, :orange, :pink, :purple, :rainbow, :red, :white, :yellow]
 
 >> Precure.all_girls.select(&:pink?).map(&:precure_name)
-=> ["キュアブルーム", "キュアドリーム", "キュアピーチ", "キュアブロッサム", "キュアメロディ", "キュアハッピー", "キュアハート", "キュアラブリー", "キュアフローラ", "キュアミラクル", "キュアホイップ", "キュアエール", "キュアスター", "キュアグレース", "キュアプレシャス"]
+=> ["キュアブルーム", "キュアドリーム", "キュアピーチ", "キュアブロッサム", "キュアメロディ", "キュアハッピー", "キュアハート", "キュアラブリー", "キュアフローラ", "キュアミラクル", "キュアホイップ", "キュアエール", "キュアスター", "キュアグレース", "キュアプレシャス", "キュアバタフライ"]
 
 >> Precure.all_girls.select(&:yellow?).map(&:precure_name)
 => ["シャイニールミナス", "キュアレモネード", "キュアパイン", "キュアサンシャイン", "キュアミューズ", "キュアピース", "キュアロゼッタ", "キュアハニー", "キュアトゥインクル", "キュアカスタード", "キュアエトワール", "キュアソレイユ", "キュアスパークル", "キュアパパイア", "キュアヤムヤム"]
 
 >> Precure.all_girls.group_by{ |girl| girl.color }.map{ |color, girls| [color, girls.count] }.sort_by{ |color, girl_count| [girl_count, color] }.reverse
-=> [["yellow", 15], ["pink", 15], ["blue", 14], ["purple", 10], ["red", 8], ["white", 6], ["green", 4], ["rainbow", 2], ["orange", 1], ["gold", 1], ["black", 1]]
+=> [["pink", 16], ["yellow", 15], ["blue", 14], ["purple", 10], ["red", 8], ["white", 6], ["green", 4], ["rainbow", 2], ["orange", 1], ["gold", 1], ["black", 1]]
 ```
 
 ### birthday methods
@@ -745,12 +745,12 @@ Cure.cosmo.name
 => true
 
 >> Precure.all_girls.select(&:have_birthday?).map(&:human_name)
-=> ["美墨なぎさ", "雪城ほのか", "九条ひかり", "日向咲", "美翔舞", "相田マナ", "菱川六花", "四葉ありす", "剣崎真琴", "春野はるか", "海藤みなみ", "天ノ川きらら", "紅城トワ", "朝日奈みらい", "十六夜リコ", "宇佐美いちか", "有栖川ひまり", "立神あおい", "琴爪ゆかり", "剣城あきら", "キラ星シエル", "野乃はな", "薬師寺さあや", "輝木ほまれ", "愛崎えみる", "ルールー・アムール", "星奈ひかる", "羽衣ララ", "天宮えれな", "香久矢まどか", "ユニ", "花寺のどか", "沢泉ちゆ", "平光ひなた", "風鈴アスミ", "夏海まなつ", "涼村さんご", "一ノ瀬みのり", "滝沢あすか", "ローラ・ラメール", "和実ゆい", "芙羽ここね", "華満らん", "菓彩あまね", "ソラ・ハレワタール", "虹ヶ丘ましろ", "夕凪ツバサ"]
+=> ["美墨なぎさ", "雪城ほのか", "九条ひかり", "日向咲", "美翔舞", "相田マナ", "菱川六花", "四葉ありす", "剣崎真琴", "春野はるか", "海藤みなみ", "天ノ川きらら", "紅城トワ", "朝日奈みらい", "十六夜リコ", "宇佐美いちか", "有栖川ひまり", "立神あおい", "琴爪ゆかり", "剣城あきら", "キラ星シエル", "野乃はな", "薬師寺さあや", "輝木ほまれ", "愛崎えみる", "ルールー・アムール", "星奈ひかる", "羽衣ララ", "天宮えれな", "香久矢まどか", "ユニ", "花寺のどか", "沢泉ちゆ", "平光ひなた", "風鈴アスミ", "夏海まなつ", "涼村さんご", "一ノ瀬みのり", "滝沢あすか", "ローラ・ラメール", "和実ゆい", "芙羽ここね", "華満らん", "菓彩あまね", "ソラ・ハレワタール", "虹ヶ丘ましろ", "夕凪ツバサ", "聖あげは"]
 >> Precure.all_girls.select(&:have_birthday?).sort_by { |girl| Date.parse(girl.birthday) }.map{ |girl| [girl.birthday, girl.human_name]  }
-=> [["1/7", "宇佐美いちか"], ["1/20", "野乃はな"], ["3/9", "花寺のどか"], ["3/13", "芙羽ここね"], ["4/4", "雪城ほのか"], ["4/8", "輝木ほまれ"], ["4/10", "春野はるか"], ["4/12", "星奈ひかる"], ["4/16", "有栖川ひまり"], ["5/9", "涼村さんご"], ["5/21", "夕凪ツバサ"], ["5/28", "四葉ありす"], ["6/10", "薬師寺さあや"], ["6/11", "琴爪ゆかり"], ["6/12", "朝日奈みらい"], ["6/30", "ローラ・ラメール"], ["7/7", "羽衣ララ"], ["7/11", "華満らん"], ["7/15", "愛崎えみる"], ["7/16", "虹ヶ丘ましろ"], ["7/20", "海藤みなみ"], ["7/30", "キラ星シエル"], ["8/1", "夏海まなつ"], ["8/4", "相田マナ"], ["8/7", "日向咲"], ["8/16", "風鈴アスミ"], ["8/21", "沢泉ちゆ"], ["8/27", "立神あおい"], ["8/31", "和実ゆい"], ["9/8", "天宮えれな"], ["9/9", "九条ひかり"], ["9/12", "天ノ川きらら"], ["9/17", "菱川六花"], ["9/20", "ソラ・ハレワタール"], ["9/23", "ルールー・アムール"], ["9/24", "剣城あきら"], ["10/4", "平光ひなた"], ["10/10", "美墨なぎさ"], ["10/11", "ユニ"], ["10/15", "滝沢あすか"], ["11/4", "剣崎真琴"], ["11/12", "十六夜リコ"], ["11/20", "美翔舞"], ["11/21", "一ノ瀬みのり"], ["11/23", "香久矢まどか"], ["11/24", "菓彩あまね"], ["12/15", "紅城トワ"]]
+=> [["1/7", "宇佐美いちか"], ["1/20", "野乃はな"], ["3/9", "花寺のどか"], ["3/13", "芙羽ここね"], ["4/4", "雪城ほのか"], ["4/8", "輝木ほまれ"], ["4/10", "春野はるか"], ["4/12", "星奈ひかる"], ["4/16", "有栖川ひまり"], ["5/9", "涼村さんご"], ["5/21", "夕凪ツバサ"], ["5/28", "四葉ありす"], ["6/10", "薬師寺さあや"], ["6/11", "琴爪ゆかり"], ["6/12", "朝日奈みらい"], ["6/30", "ローラ・ラメール"], ["7/7", "羽衣ララ"], ["7/11", "華満らん"], ["7/15", "愛崎えみる"], ["7/16", "虹ヶ丘ましろ"], ["7/20", "海藤みなみ"], ["7/30", "キラ星シエル"], ["8/1", "夏海まなつ"], ["8/4", "相田マナ"], ["8/7", "日向咲"], ["8/8", "聖あげは"], ["8/16", "風鈴アスミ"], ["8/21", "沢泉ちゆ"], ["8/27", "立神あおい"], ["8/31", "和実ゆい"], ["9/8", "天宮えれな"], ["9/9", "九条ひかり"], ["9/12", "天ノ川きらら"], ["9/17", "菱川六花"], ["9/20", "ソラ・ハレワタール"], ["9/23", "ルールー・アムール"], ["9/24", "剣城あきら"], ["10/4", "平光ひなた"], ["10/10", "美墨なぎさ"], ["10/11", "ユニ"], ["10/15", "滝沢あすか"], ["11/4", "剣崎真琴"], ["11/12", "十六夜リコ"], ["11/20", "美翔舞"], ["11/21", "一ノ瀬みのり"], ["11/23", "香久矢まどか"], ["11/24", "菓彩あまね"], ["12/15", "紅城トワ"]]
 
 >> Precure.all_girls.select(&:have_birthday?).map(&:human_name).count
-=> 47
+=> 48
 ```
 
 * `has_birthday?` is alias to `have_birthday?`

data/config/girls/020_hirogaru_sky.yml

@@ -84,3 +84,31 @@ cure_wing: &cure_wing
     - sky_mirage_tone_connect
 wing:
   <<: *cure_wing
+
+cure_butterfly: &cure_butterfly
+  girl_name:    cure_butterfly
+  human_name:   聖あげは
+  precure_name: キュアバタフライ
+  cast_name:    七瀬彩夏
+  color:        pink
+  created_date: 2023-06-04 # episode 18
+  birthday:     8/8
+  transform_message: |-
+    スカイミラージュ！
+    トーンコネクト！
+    ひろがるチェンジ！
+    バタフライ！
+    きらめきHOP
+    さわやかSTEP
+    はればれJUMP
+    アゲてひろがるワンダホー！キュアバタフライ！
+    Ready…Go!
+    ひろがるスカイ！プリキュア！
+  # extra_names:
+  attack_messages:
+    - |-
+      ひろがる！バタフライプレス！
+  transform_calls:
+    - sky_mirage_tone_connect
+butterfly:
+  <<: *cure_butterfly

data/config/series.yml

@@ -267,5 +267,6 @@ hirogaru_sky: &hirogaru_sky
     - cure_sky
     - cure_prism
     - cure_wing
+    - cure_butterfly
 hirogaru_sky_precure:
   <<: *hirogaru_sky

data/lib/rubicure/girl.rb

@@ -25,8 +25,6 @@ module Rubicure
       :random_transform_words,
     ].freeze
 
-    attr_accessor :io
-
     # @return [Integer]
     def current_state
       @current_state ||= 0
@@ -203,7 +201,7 @@ module Rubicure
         @cache ||= {}
         unless @cache[girl_name]
           girl_config = config[girl_name] || {}
-          @cache[girl_name] = Rubicure::Girl[girl_config].tap {|girl| girl.io = $stdout }
+          @cache[girl_name] = Rubicure::Girl[girl_config]
         end
 
         @cache[girl_name]
@@ -284,7 +282,7 @@ module Rubicure
         index = 0
         message.each_line do |line|
           sleep(self.class.sleep_sec) if index > 0
-          io.puts line
+          puts line
           index += 1
         end
       end

data/lib/rubicure/version.rb

@@ -1,3 +1,3 @@
 module Rubicure
-  VERSION = "3.2.0.rc1".freeze
+  VERSION = "3.2.1".freeze
 end

data/spec/rubicure/core_spec.rb

@@ -86,7 +86,7 @@ describe Rubicure::Core do
     context "Without arg" do
       subject { instance.all_girls }
 
-      let(:precure_count) { 77 }
+      let(:precure_count) { 78 }
 
       its(:count) { should == precure_count }
       it { should include Cure.echo }

data/spec/rubicure/girl_spec.rb

@@ -1,22 +1,19 @@
 describe Rubicure::Girl do
   let(:girl) do
-    girl = Rubicure::Girl[
-        girl_name:              girl_name,
-        human_name:             human_name,
-        precure_name:           precure_name,
-        cast_name:              cast_name,
-        created_date:           created_date,
-        extra_names:            extra_names,
-        transform_message:      transform_message,
-        attack_messages:        attack_messages,
-        transform_calls:        transform_calls,
-        color:                  color,
-        random_transform_words: random_transform_words,
+    Rubicure::Girl[
+      girl_name:              girl_name,
+      human_name:             human_name,
+      precure_name:           precure_name,
+      cast_name:              cast_name,
+      created_date:           created_date,
+      extra_names:            extra_names,
+      transform_message:      transform_message,
+      attack_messages:        attack_messages,
+      transform_calls:        transform_calls,
+      color:                  color,
+      random_transform_words: random_transform_words,
     ]
-    girl.io = mock_io
-    girl
   end
-  let(:mock_io) { StringIO.new }
 
   let(:girl_name)      { "cure_peace" }
   let(:human_name)     { "黄瀬やよい" }
@@ -47,12 +44,10 @@ describe Rubicure::Girl do
     end
 
     context "when after 1st transform" do
-      before do
-        girl.transform!
+      it "transform to Precure" do
+        expect { girl.transform! }.to output(transform_message).to_stdout
+        expect(girl.name).to eq precure_name
       end
-
-      it { expect(girl.name).to eq precure_name }
-      it { expect(mock_io.string).to eq transform_message }
     end
 
     context "when after 2nd transform" do
@@ -90,7 +85,7 @@ describe Rubicure::Girl do
   describe "transform!" do
     context "when Cure miracle" do
       let(:girl) do
-        girl = Rubicure::Girl[
+        Rubicure::Girl[
           girl_name:         "cure_miracle",
           human_name:        "朝日奈みらい",
           precure_name:      "キュアミラクル",
@@ -113,9 +108,6 @@ describe Rubicure::Girl do
             },
           },
         ]
-
-        girl.io = mock_io
-        girl
       end
 
       context "transform! with diamond" do
@@ -179,9 +171,7 @@ describe Rubicure::Girl do
       end
 
       it "stdout includes one of random_transform_words" do
-        girl.transform!
-
-        expect(mock_io.string).to include("4人揃って！").or include("今日も元気だ！")
+        expect { girl.transform! }.to output(/4人揃って！/).to_stdout.or output(/今日も元気だ！/).to_stdout
       end
     end
   end
@@ -254,7 +244,6 @@ describe Rubicure::Girl do
     subject { girl.send(transform_call) }
 
     before do
-      girl.io = mock_io
       girl.humanize!
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubicure
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
+  version: 3.2.1
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -400,9 +400,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: