bcdice 3.0.0.pre.alpha.2 → 3.0.0.pre.rc.1

data/lib/bcdice/randomizer.rb

@@ -4,6 +4,8 @@ module BCDice
     UPPER_LIMIT_DICE_TIMES = 200
     UPPER_LIMIT_DICE_SIDES = 1000
 
+    UPPER_LIMIT_RANDS = 10000
+
     def initialize
       @rand_results = []
       @detailed_rand_results = []
@@ -30,6 +32,10 @@ module BCDice
     # @param sides [Integer] ダイスの面数
     # @return [Array<Integer>] ダイスの出目一覧
     def roll_barabara(times, sides)
+      if @rand_results.size + times > UPPER_LIMIT_RANDS
+        raise TooManyRandsError
+      end
+
       if times <= 0 || times > UPPER_LIMIT_DICE_TIMES
         return []
       end
@@ -113,6 +119,10 @@ module BCDice
     # @param sides [Integer]
     # @return [Integer] 1以上sides以下の整数
     def rand_inner(sides)
+      if @rand_results.size >= UPPER_LIMIT_RANDS
+        raise TooManyRandsError
+      end
+
       dice = random(sides)
 
       @rand_results << [dice, sides]
@@ -134,4 +144,6 @@ module BCDice
       @detailed_rand_results.push(detail)
     end
   end
+
+  class TooManyRandsError < StandardError; end
 end

data/lib/bcdice/repl.rb

@@ -99,7 +99,7 @@ module BCDice
       if block
         instance_exec(*args, &block)
       else
-        eval_game_system(command)
+        eval_game_system(input)
       end
     end
 

data/lib/bcdice/result.rb

@@ -38,6 +38,8 @@ module BCDice
 
     def initialize(text = nil)
       @text = text
+      @rands = nil
+      @detailed_rands = nil
       @secret = false
       @success = false
       @failure = false

data/lib/bcdice/user_defined_dice_table.rb

@@ -14,25 +14,32 @@ module BCDice
   #   TEXT
   #   table = BCDice::UserDefinedDiceTable.new(text)
   #   table.valid?() #=> true
-  #   table.roll()   #=> "飲み物表(6) ＞ 選ばれし者の知的飲料"
+  #   table.roll().text #=> "飲み物表(6) ＞ 選ばれし者の知的飲料"
+  #   BCDice::UserDefinedDiceTable.eval(text) #=> #<BCDice::Result>
   #
   class UserDefinedDiceTable
+    class << self
+      # @param text [String]
+      # @return [Result nil]
+      def roll(text)
+        new(text).roll()
+      end
+    end
+
     # @param text [String] ダイス表のテキストデータ
     def initialize(text)
       @text = text
-      @randomizer = Randomizer.new
       @rows = nil
     end
 
-    # @return [Randomizer]
-    attr_accessor :randomizer
-
     # ダイス表をロールする
-    # @return [String, nil]
-    def roll
+    # @param randomizer [Randomizer]
+    # @return [Result, nil]
+    def roll(randomizer: Randomizer.new)
       parse()
-      index = roll_index()
-      unless index
+
+      index = roll_index(randomizer)
+      unless valid? && index
         return nil
       end
 
@@ -43,7 +50,11 @@ module BCDice
       end
 
       chosen = row.delete_prefix(key).gsub('\n', "\n").strip
-      return "#{@name}(#{index}) ＞ #{chosen}"
+      Result.new.tap do |r|
+        r.text = "#{@name}(#{index}) ＞ #{chosen}"
+        r.rands = randomizer.rand_results
+        r.detailed_rands = randomizer.detailed_rand_results
+      end
     end
 
     # 有効なダイス表かをチェックする。テキスト形式のミスだけではなく、抜けている出目や範囲外の出目がないか確認する。
@@ -75,20 +86,20 @@ module BCDice
     private
 
     # @return [Integer, nil]
-    def roll_index
+    def roll_index(randomizer)
       if (m = /^(\d+)D(\d+)$/.match(@type))
         times = m[1].to_i
         sides = m[2].to_i
-        return @randomizer.roll_sum(times, sides)
+        return randomizer.roll_sum(times, sides)
       end
 
       case @type
       when "D66", "D66N"
-        @randomizer.roll_d66(D66SortType::NO_SORT)
+        randomizer.roll_d66(D66SortType::NO_SORT)
       when "D66A", "D66S"
-        @randomizer.roll_d66(D66SortType::ASC)
+        randomizer.roll_d66(D66SortType::ASC)
       when "D66D"
-        @randomizer.roll_d66(D66SortType::DESC)
+        randomizer.roll_d66(D66SortType::DESC)
       end
     end
 

data/lib/bcdice/version.rb

@@ -1,3 +1,3 @@
 module BCDice
-  VERSION = "3.0.0-alpha.2".freeze
+  VERSION = "3.0.0-rc.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.2
+  version: 3.0.0.pre.rc.1
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -31,25 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".github/.codecov.yaml"
-- ".github/workflows/coverage.yaml"
-- ".github/workflows/lint.yaml"
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- ROADMAP.md
-- Rakefile
-- bcdice.gemspec
-- bin/repl.rb
-- docs/README.txt
-- docs/dicebot_sort_key.md
-- docs/how_to_make_dicebot.md
 - i18n/Amadeus/ja_jp.yml
 - i18n/Amadeus/ko_kr.yml
 - i18n/Cthulhu/ja_jp.yml
@@ -74,6 +58,7 @@ files:
 - i18n/LogHorizon/ja_jp.yml
 - i18n/LogHorizon/ko_kr.yml
 - i18n/MagicaLogia/ja_jp.yml
+- i18n/MagicaLogia/ko_kr.yml
 - i18n/MonotoneMuseum/ja_jp.yml
 - i18n/MonotoneMuseum/ko_kr.yml
 - i18n/Nechronica/ja_jp.yml
@@ -84,24 +69,26 @@ files:
 - i18n/ko_kr.yml
 - i18n/zh_hant.yml
 - lib/bcdice.rb
+- lib/bcdice/arithmetic.rb
 - lib/bcdice/arithmetic/node.rb
+- lib/bcdice/arithmetic/parser.rb
 - lib/bcdice/arithmetic_evaluator.rb
 - lib/bcdice/base.rb
-- lib/bcdice/command_parser.rb
+- lib/bcdice/command/lexer.rb
+- lib/bcdice/command/parsed.rb
+- lib/bcdice/command/parser.rb
 - lib/bcdice/common_command.rb
 - lib/bcdice/common_command/add_dice.rb
 - lib/bcdice/common_command/add_dice/node.rb
 - lib/bcdice/common_command/add_dice/parser.rb
-- lib/bcdice/common_command/add_dice/parser.y
 - lib/bcdice/common_command/add_dice/randomizer.rb
 - lib/bcdice/common_command/barabara_dice.rb
 - lib/bcdice/common_command/barabara_dice/node.rb
 - lib/bcdice/common_command/barabara_dice/parser.rb
-- lib/bcdice/common_command/barabara_dice/parser.y
+- lib/bcdice/common_command/barabara_dice/result.rb
 - lib/bcdice/common_command/calc.rb
 - lib/bcdice/common_command/calc/node.rb
 - lib/bcdice/common_command/calc/parser.rb
-- lib/bcdice/common_command/calc/parser.y
 - lib/bcdice/common_command/choice.rb
 - lib/bcdice/common_command/d66_dice.rb
 - lib/bcdice/common_command/lexer.rb
@@ -109,16 +96,15 @@ files:
 - lib/bcdice/common_command/reroll_dice.rb
 - lib/bcdice/common_command/reroll_dice/node.rb
 - lib/bcdice/common_command/reroll_dice/parser.rb
-- lib/bcdice/common_command/reroll_dice/parser.y
 - lib/bcdice/common_command/upper_dice.rb
 - lib/bcdice/common_command/upper_dice/node.rb
 - lib/bcdice/common_command/upper_dice/parser.rb
-- lib/bcdice/common_command/upper_dice/parser.y
 - lib/bcdice/common_command/version.rb
 - lib/bcdice/deprecated/checker.rb
 - lib/bcdice/dice_table.rb
 - lib/bcdice/dice_table/chain_table.rb
 - lib/bcdice/dice_table/d66_grid_table.rb
+- lib/bcdice/dice_table/d66_parity_table.rb
 - lib/bcdice/dice_table/d66_range_table.rb
 - lib/bcdice/dice_table/d66_table.rb
 - lib/bcdice/dice_table/range_table.rb
@@ -133,6 +119,7 @@ files:
 - lib/bcdice/game_system/AFF2e.rb
 - lib/bcdice/game_system/AceKillerGene.rb
 - lib/bcdice/game_system/Airgetlamh.rb
+- lib/bcdice/game_system/AlchemiaStruggle.rb
 - lib/bcdice/game_system/Alsetto.rb
 - lib/bcdice/game_system/Alshard.rb
 - lib/bcdice/game_system/AlterRaise.rb
@@ -222,6 +209,7 @@ files:
 - lib/bcdice/game_system/Insane_Korean.rb
 - lib/bcdice/game_system/IthaWenUa.rb
 - lib/bcdice/game_system/JamesBond.rb
+- lib/bcdice/game_system/JuinKansen.rb
 - lib/bcdice/game_system/Kamigakari.rb
 - lib/bcdice/game_system/Kamigakari_Korean.rb
 - lib/bcdice/game_system/KanColle.rb
@@ -235,6 +223,7 @@ files:
 - lib/bcdice/game_system/LostRecord.rb
 - lib/bcdice/game_system/LostRoyal.rb
 - lib/bcdice/game_system/MagicaLogia.rb
+- lib/bcdice/game_system/MagicaLogia_Korean.rb
 - lib/bcdice/game_system/MeikyuDays.rb
 - lib/bcdice/game_system/MeikyuKingdom.rb
 - lib/bcdice/game_system/MeikyuKingdomBasic.rb
@@ -351,7 +340,7 @@ files:
 - lib/bcdice/version.rb
 homepage: https://bcdice.org
 licenses:
-- MIT
+- BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://bcdice.org

data/.editorconfig

@@ -1,21 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.rb]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[Rakefile]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true

data/.github/.codecov.yaml

@@ -1,10 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 75
-        threshold: 5%
-    patch:
-      default:
-        target: 75
-        threshold: 5%

data/.github/workflows/coverage.yaml

@@ -1,21 +0,0 @@
-name: Coverage
-on: [push, pull_request]
-jobs:
-  coverage:
-    strategy:
-      fail-fast: false
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle install
-    - uses: paambaati/codeclimate-action@v2.6.0
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      with:
-        coverageCommand: bundle exec rake test
-        coverageLocations: |
-          ${{github.workspace}}/coverage/.resultset.json:simplecov

data/.github/workflows/lint.yaml

@@ -1,13 +0,0 @@
-name: Lint
-on: [push, pull_request]
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle install
-    - run: bundle exec rake rubocop

data/.github/workflows/test.yml

@@ -1,20 +0,0 @@
-name: Test
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.5, 2.6, 2.7]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: "Set CHECK_COVERAGE=true on Ruby 2.7"
-      run: echo "CHECK_COVERAGE=true" >> $GITHUB_ENV
-      if: matrix.ruby == '2.7'
-    - run: bundle install
-    - run: bundle exec rake test

data/.gitignore

@@ -1,14 +0,0 @@
-bcdice.exe
-*.rb~
-*.bak
-*.txt~
-*.html~
-tmp.txt
-.bundle/
-vendor/
-Gemfile.lock
-coverage/
-doc/
-.yardoc/
-bin/repl_history
-pkg/

data/.rubocop.yml

@@ -1,108 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  Exclude:
-    - 'node_modules/**/*'
-    - 'tmp/**/*'
-    - 'vendor/**/*'
-    - '.git/**/*'
-    - lib/bcdice/common_command/add_dice/parser.rb
-    - lib/bcdice/common_command/barabara_dice/parser.rb
-    - lib/bcdice/common_command/calc/parser.rb
-    - lib/bcdice/common_command/reroll_dice/parser.rb
-    - lib/bcdice/common_command/upper_dice/parser.rb
-
-# Due to old Ruby 1.8.x
-Style/Lambda:
-  EnforcedStyle: lambda
-
-# Due to old Ruby 1.8.x
-Style/SpecialGlobalVars:
-  EnforcedStyle: use_perl_names
-
-Layout/EndOfLine:
-  EnforcedStyle: lf
-
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Naming/VariableName:
-  Enabled: false
-
-Naming/VariableNumber:
-  Enabled: false
-
-Style/AsciiComments:
-  Enabled: false
-
-Style/CommentedKeyword:
-  Enabled: false
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Style/DefWithParentheses:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/NegatedWhile:
-  Enabled: false
-
-Style/NumericLiterals:
-  MinDigits: 6
-
-Style/WordArray:
-  Enabled: true
-  EnforcedStyle: brackets
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Style/RedundantReturn:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-  Exclude:
-    - 'lib/bcdice/game_system/*.rb'
-
-Style/SymbolProc:
-  Exclude:
-    - 'lib/bcdice/repl.rb' # DSLを実装しているため
-
-Style/SymbolArray:
-  Enabled: true
-  EnforcedStyle: brackets
-
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-
-Style/WhileUntilModifier:
-  Enabled: false
-
-Style/YodaCondition:
-  EnforcedStyle: forbid_for_equality_operators_only