xipai 0.0.1a → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3897adf29572f68ed753e543f6a657c80e8d9f0aa9204c01431e548ab6f2d13
-  data.tar.gz: fd2df5a5a0144900a2b641f045120da82ab6c030cf2097434f825755b2203f31
+  metadata.gz: 3aa59e4bc8e489eaeeb14e86540c01ca05f23dcc1aea61159874e382b20ea41b
+  data.tar.gz: 37e82b54443848a72472cd7389af8db116177f37dea87f78cee243e43a00cef6
 SHA512:
-  metadata.gz: 20c3bcf1519f376c7c0597f8bb2bb852ceb5e641b870a46eecb0636bbcb383d20126088433aaf39fe72ebedd7d8921caab0842c2bb97877386cfcdbeee3002ec
-  data.tar.gz: cc26e97198f66e15efc5c33e5dced3ff9114b5b95e3517a12cf2bb8aa0109d05ee03ecccf01b542785e3fbfd6ee5a21313af3633a0588f8352f68807264dd311
+  metadata.gz: c330bdfb0d5fcb61d47e9304b93fdc7b8798faeb1e0d25a52cffb51873da395fa0056f31d92bc36de84ac187769adc522b79b2483a0bf54b4598b2f2e731dd77
+  data.tar.gz: df9c2b748527bac6972075f502dfa3607269e6dce44503e5c6904c1bd38cd54a8c648407cca6ce6b7941b230a28a6f326a9e78fca5c863603c9c1a20a7651561

data/README.md

@@ -1,4 +1,4 @@
-# [WIP] Xipai
+# Xipai
 
 Reproducible based on seeds or random shuffling tool.
 
@@ -27,7 +27,7 @@ Commands:
   xipai lottery -A, --items=ITEMS -m, --number-of-winners=N           # Reproducible based on seeds or random shuffling, then extruct lottery winner.
   xipai pair -K, --key-items=KEY_ITEMS -V, --value-items=VALUE_ITEMS  # Reproducible based on seeds or random shuffling, then pairing key-items and value-items.
   xipai replay -c, --replay-yaml=REPLAY_YAML                          # Replay shuffling with xipai-replay yaml
-  xipai order -A, --items=ITEMS                                      # Reproducible based on seeds or random shuffling.
+  xipai order -A, --items=ITEMS                                       # Reproducible based on seeds or random shuffling.
   xipai team -A, --items=ITEMS -m, --number-of-members=N              # Reproducible based on seeds or random shuffling, then create teams
   xipai version                                                       # Show xipai version
 ```

data/lib/xipai/arrangement/base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../xipai", File.dirname(__FILE__))
 require "yaml"
 require "optional"
 

data/lib/xipai/arrangement/lottery.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../xipai", File.dirname(__FILE__))
+require File.expand_path("../../xipai/core", File.dirname(__FILE__))
+require File.expand_path("../../xipai/result", File.dirname(__FILE__))
+require File.expand_path("../../xipai/arrangement/base", File.dirname(__FILE__))
 require "optional"
+require "json"
 
 module Xipai
   module Arrangement
@@ -21,9 +24,12 @@ module Xipai
 
       def lottery(_items, _number_of_winners)
         return Some[_number_of_winners].match do |m|
-          m.some(->(x){x == 1}) {[_items[0]]}
-          m.some(->(x){x > 0}) {|x|_items[0..(x-1)]}
-          m.some() {raise "error: number_of_winners"}
+          m.some(->(x){x > 0}) {|x|
+            _items.sample(x, random: Random.new(
+              JSON.generate(_items).bytes.reduce(:*)
+            ))
+          }
+          m.some() {raise "Error: number_of_winners"}
         end
       end
 

data/lib/xipai/arrangement/order.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../xipai", File.dirname(__FILE__))
+require File.expand_path("../../xipai/core", File.dirname(__FILE__))
+require File.expand_path("../../xipai/result", File.dirname(__FILE__))
+require File.expand_path("../../xipai/arrangement/base", File.dirname(__FILE__))
 
 module Xipai
   module Arrangement

data/lib/xipai/arrangement/pair.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../xipai", File.dirname(__FILE__))
+require File.expand_path("../../xipai/core", File.dirname(__FILE__))
+require File.expand_path("../../xipai/result", File.dirname(__FILE__))
+require File.expand_path("../../xipai/arrangement/base", File.dirname(__FILE__))
 require "optional"
 
 module Xipai
@@ -25,7 +27,7 @@ module Xipai
       end
 
       def pair(_keys, _values)
-        return Hash[Some[{a:_keys.size, b: _values.size}].match { |m|
+        return Hash[Some[{a: _keys.size, b: _values.size}].match { |m|
           m.some(->(x){x[:a] > x[:b]}) {
             result = [].tap {|me|
               _keys.each.with_index do |key, index|
@@ -47,9 +49,11 @@ module Xipai
             }
           }
           m.some(->(x){x[:a] == x[:b]}) { |x|
-            [*0..x[:a].to_i].map do |index|
-              result.push([_keys[index], _values[index]])
-            end
+            result = [].tap {|me|
+              [*0..(x[:a].to_i-1)].each do |index|
+                me.push([_keys[index], _values[index]])
+              end
+            }
           }
         }]
       end

data/lib/xipai/arrangement/team.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../xipai", File.dirname(__FILE__))
+require File.expand_path("../../xipai/core", File.dirname(__FILE__))
+require File.expand_path("../../xipai/result", File.dirname(__FILE__))
+require File.expand_path("../../xipai/arrangement/base", File.dirname(__FILE__))
 
 module Xipai
   module Arrangement

data/lib/xipai/core.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-require File.expand_path("../xipai", File.dirname(__FILE__))
+require File.expand_path("../xipai/hashcode_generator", File.dirname(__FILE__))
 
 module Xipai
   module Core
@@ -11,8 +11,13 @@ module Xipai
         seed, hashcode = spinkle_hashcode_bytes(generate_seed(words), hashcode, opt)
 
         random = seed == 0 ? Random.new : Random.new(seed)
-
-        shuffled = normalize_items(items).shuffle!(random: random)
+        normalized_items = normalize_items(items)
+        shuffled =
+          normalized_items.shuffle!(
+            random: Random.new(JSON.generate(
+              normalized_items.shuffle!(random: random)
+            ).bytes.reduce(:+) + seed.to_i
+          ))
         return {
           hashcode: hashcode,
           shuffled: shuffled

data/lib/xipai/result.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require File.expand_path("../xipai", File.dirname(__FILE__))
 require "json"
 require "time"
 require "optional"

data/lib/xipai/table_set.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require File.expand_path("../xipai", File.dirname(__FILE__))
+Dir.glob(
+  "arrangement/*.rb", base: File.dirname(__FILE__)
+).each do |mode_name|
+  require "#{File.dirname(__FILE__)}/#{mode_name}"
+end
+
 require "yaml"
 require "optional"
 

data/lib/xipai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xipai
-  VERSION = "0.0.1a"
+  VERSION = "0.0.1"
 end

data/lib/xipai.rb

@@ -3,10 +3,9 @@
 Dir.glob(
   File.expand_path("xipai/**/*.rb", File.dirname(__FILE__)
 )).each do |mod_name|
-  require_relative "#{mod_name}"
+  require "#{mod_name}"
 end
 
-require "ostruct"
 
 module Xipai
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xipai
 version: !ruby/object:Gem::Version
-  version: 0.0.1a
+  version: 0.0.1
 platform: ruby
 authors:
 - Hiroshi IKEGAMI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,6 @@ files:
 - lib/xipai/result.rb
 - lib/xipai/table_set.rb
 - lib/xipai/version.rb
-- xipai.gemspec
 homepage: https://github.com/magicdrive/xipai
 licenses:
 - MIT
@@ -86,11 +85,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Reproducible based on seeds or random shuffling tool.

data/xipai.gemspec

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/xipai/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "xipai"
-  spec.version       = Xipai::VERSION
-  spec.authors       = ["Hiroshi IKEGAMI"]
-  spec.email         = ["hiroshi.ikegami@magicdrive.jp"]
-
-  spec.summary       = "Reproducible based on seeds or random shuffling tool."
-  spec.description   = "Reproducible based on seeds or random shuffling tool."
-  spec.homepage      = "https://github.com/magicdrive/xipai"
-  spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.5.0"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-
-  spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'thor', '>= 1.0'
-  spec.add_runtime_dependency 'optional', '>= 0.0.7'
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end