Merge pull request #224 from bcdice/remove-irc

IRC関連のファイルを削除する

.rubocop_todo.yml

@@ -13,35 +13,18 @@ Bundler/DuplicatedGem:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'src/irc/ircLib.rb'
-
 # Offense count: 1
 Lint/EmptyWhen:
   Exclude:
     - 'src/test.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
-  Exclude:
-    - 'src/irc/ircLib.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Bug?
 Lint/LiteralInInterpolation:
   Exclude:
     - 'src/diceBot/GurpsFW.rb'
 
-# Offense count: 3
-Lint/RescueException:
-  Exclude:
-    - 'src/irc/ircLib.rb'
-
 # Offense count: 177
 Lint/UselessAssignment:
   Enabled: false
@@ -130,7 +113,6 @@ Naming/UncommunicativeMethodParamName:
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
   Exclude:
-    - 'src/irc/encode.rb'
     - 'src/test/DiceBotTest.rb'
 
 Style/BlockDelimiters:
@@ -146,8 +128,6 @@ Style/CaseEquality:
     - src/bcdice.rb
     - src/TableFileData.rb
     - src/test/DiceBotTest.rb
-    - src/irc/ircLib.rb
-    - src/irc/encode.rb
     - src/diceBot/Kamigakari_Korean.rb
     - src/diceBot/HouraiGakuen.rb
     - src/diceBot/FilledWith.rb
@@ -220,7 +200,6 @@ Style/GlobalVars:
     - src/test/others/testSecretDice.rb
     - src/test/others/testArgs.rb
     - src/test/others/testCard.rb
-    - src/irc/ircBot.rb
     - src/dice/AddDice.rb
     - src/dice/RerollDice.rb
     - src/diceBot/RecordOfSteam.rb

Gemfile

@@ -1,13 +1,5 @@
 source 'https://rubygems.org'
 
-unless ENV['CI'] == 'true'
-  gem 'net-irc'
-  if RUBY_VERSION < '2.0'
-    gem 'wxruby-ruby19', '2.0.0'
-  end
-  gem 'ocra'
-end
-
 group :development, :test do
   if RUBY_VERSION < '1.9'
     gem 'rake', '~> 10.5'

Rakefile

@@ -64,7 +64,6 @@ namespace :test do
     t.libs = [
       'src/test',
       'src/',
-      'src/irc'
     ]
 
     unless RUBY_VERSION < '1.9'

src/CardTrader.rb

@@ -6,6 +6,9 @@
 $ircNickRegExp = '[A-Za-z\d\-\[\]\\\'^{}_]+'
 
 class CardTrader
+  OK_RESULT = '_OK_'.freeze
+  NG_RESULT = '_NG_'.freeze
+
   # カード置き場数。0なら無し。
   # @return [Integer]
   attr_accessor :card_place
@@ -401,7 +404,7 @@ def pickupCardByCards(cards)
 
     cards.each do |card|
       string = pickupOneCard(card)
-      if string == $okResult
+      if string == OK_RESULT
         okCount += 1
       else
         ngCardList << string
@@ -424,7 +427,7 @@ def pickupOneCard(card)
     if isDelete
       @deal_cards[destination] ||= []
       @deal_cards[destination] << targetCard
-      return $okResult
+      return OK_RESULT
     else
       return targetCard; # 無かったカードを返す
     end
@@ -467,7 +470,7 @@ def backCardByCommandSetAndPlace(commandset, place)
 
       cards.each do |card|
         string = backOneCard(card, destination, place)
-        if string == $okResult
+        if string == OK_RESULT
           okCount += 1
         else
           ngCards << string
@@ -487,7 +490,7 @@ def backOneCard(targetCard, destination, place)
 
     if @card_place > 0 # 場があるときのみ処理
       string = transferOneCard(targetCard, "#{place}#{destination}", destination); # 場から手札への移動
-      return $okResult if string == $okResult
+      return OK_RESULT if string == OK_RESULT
     end
 
     @deal_cards['card_played'] ||= []
@@ -496,7 +499,7 @@ def backOneCard(targetCard, destination, place)
 
     if isDelete
       @deal_cards[destination] << targetCard
-      return $okResult
+      return OK_RESULT
     end
 
     return "${targetCard}"; # 戻せるカードが無かったらNGのカードを返す
@@ -628,7 +631,7 @@ def playCardByCardAndPlaceNo(card, place)
     result = playOneCard(card, place)
     debug("playOneCard result", result)
 
-    if result == $okResult
+    if result == OK_RESULT
       okList << card
     else
       ngList << result
@@ -651,7 +654,7 @@ def playOneCard(card, place)
       result = discardOneCard(card, place, destination); # 場を使わないときは捨て札扱い
     end
 
-    if result == $okResult
+    if result == OK_RESULT
       return result
     else
       return card
@@ -699,7 +702,7 @@ def discardCardsByCardsAndPlace(cards, place, destination)
     cards.each do |card|
       result = discardOneCard(card, place, destination)
 
-      if result == $okResult
+      if result == OK_RESULT
         okList << card
       else
         ngList << result
@@ -737,7 +740,7 @@ def discardOneCard(card, place, destination)
       @deal_cards['card_played'] += this_cards
       debug("@deal_cards", @deal_cards)
 
-      return $okResult
+      return OK_RESULT
     else
       return card; # 指定のカードが無いので、無いカードを返す
     end
@@ -847,9 +850,9 @@ def transferCardsByCards(cards, destination, nick_e)
       debug('transferOneCard result', result)
 
       case result
-      when $ngResult
+      when NG_RESULT
         return -1, ['渡す相手が登録されていません']
-      when $okResult
+      when OK_RESULT
         okCount += 1
       else
         ngCardList << result
@@ -903,13 +906,13 @@ def transferOneCard(card, from, toSend)
       # debug('相手は未登録済み')
       isSuccess = transferTargetCardToNewMember(toSend, thisCard)
       debug('isSuccess', isSuccess)
-      return $ngResult unless isSuccess
+      return NG_RESULT unless isSuccess
     end
 
     @deal_cards[from] = restCards
     debug("transferOneCard @deal_cards", @deal_cards)
 
-    return $okResult
+    return OK_RESULT
   end
 
   def ejectOneCardRandomFromCards(cards)
@@ -1043,9 +1046,9 @@ def getSendCardToTargetNickPlaceByCards(cards, destination, toSend)
       result = transferOneCard(card, destination, toSend)
 
       case result
-      when $ngResult
+      when NG_RESULT
         return -1, '渡す相手が登録されていません'
-      when $okResult
+      when OK_RESULT
         okCardList << card
       else
         ngCardList << result
@@ -1145,7 +1148,7 @@ def tapOneCardByCardAndPlace(card, place, isUntap)
 
     @nick_e = nick_e_original
 
-    if result == $okResult
+    if result == OK_RESULT
       return card, nil
     else
       return nil, card

src/TableFileData.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require 'kconv'
 require 'fileutils'
-require 'configBcDice.rb'
 
 # extratables ディレクトリに置かれたテーブル定義ファイルを読み込む。
 # 詳細はREADME.txtの「７．オリジナルの表追加」を参照。