aro 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a276927c911f1781041e6d5c274c1611f0a23a948edb9b0fb6bc17518d22eee5
-  data.tar.gz: 415a4ad29297c5c8815127fb4bae7c5dc97f4f8eb12cda4aacf2235997cb895e
+  metadata.gz: 2d38dfc3076510642fc060178b2de03eb366c527ac6e88c2bfeb746f85b0e6b9
+  data.tar.gz: c58bdbb118b84d1bd05709cf19942cf7ac69c1ab66cbdb91b916fe42fb7b0ab0
 SHA512:
-  metadata.gz: a91cb814964c27d4aa6c53aea311dc530ecd897d4534f19b3295ad8954c7611268102b8113dc4ecaea52d23fb975dbf890bcfbcfc575727741c497942f3ea36f
-  data.tar.gz: b8270db12a879b8738d014f748929641d234234f61cbba5cc351907319d5616bfef2ae1f58616827930673703258841c2ee6c70d732ab247ae87941cf1bf0073
+  metadata.gz: 4cf670b3a0bfefd708c9a6286218a4474394eb10b9669e359f3eec157052e0f6762a88e9f93ee31299bea09f9d0a41e51dbbf5019e42f1870ece83093dad00fe
+  data.tar.gz: 9ca02e7c6b8f772ae6ff92b4f392c32c4d8fa830611af35d8ddd3b1b455536d2b1af37e4ea4ed2a1e3ab1f0ec49d930b30a3e2c0c1f1498e841feb05ead09549

data/.release

@@ -4,7 +4,7 @@
 
 # 1) update version and release notes (manually)
 # 2) test and build
-#     $ rake make
+#     $ rake make && gem build
 # 3) build checksum
 #     $ rake build:checksum 
 # 4) create a commit
@@ -12,9 +12,9 @@
 #     tag message format:
 #       vx.x.x
 #       <release_note_text>
-#     $ gitaga vx.x.x && gush tag vx.x.x
+#     $ gitaga vx.x.x && gutaga vx.x.x
 # 6) push develop
 # 7) pull request develop -> master & merge
 # 8) checkout and pull master
-# 9) publish to rubygems
+# 9) publish to rubygems (warning, must version up after this)
 #     $ gem push pkg/aro-x.x.x.gem

data/aro.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/i2097i/aro"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split("\n").reject{|f| f.match(%r{^(spec)/})}
+  spec.files         = `git ls-files`.split("\n").reject{|f| f.match(%r{^(spec|pkg)/})}
   spec.bindir        = "bin"
   spec.executables   = ["aro"]
   spec.require_paths = ["lib", "bin/cli"]

data/bin/cli/config.rb

@@ -53,7 +53,7 @@ module CLI
         description: I18n.t("cli.config.type_values_description"),
         validator: Proc.new{|unvalid, deff, key|
           CLI::Config.def_valid?(deff, key) &&
-          deff[:possible_values].keys.include?(unvalid.to_sym)
+          deff[:possible_values].keys.include?(unvalid&.to_sym)
         }
       },
     }
@@ -197,11 +197,19 @@ module CLI
     end
 
     def source_config
-      invalid_defs = validate_config
       Aro::P.say(I18n.t("cli.config.sourcing_config", name: CLI::Config::CONFIG_FILE_PATH))
-      system("source #{CLI::Config::CONFIG_FILE_PATH}")
+      File.read(CLI::Config::CONFIG_FILE_PATH).split("\n").select{|line|
+        line.match?("export #{CLI::Config::VAR_PREFIX}")
+      }.map{|line| 
+        line.gsub("export ", "").split("=")
+      }.each{|kv|
+        ENV[kv[0]] = kv[1]
+      }
+      
+      # todo: implement
+      # invalid_defs = validate_config
       CLI::Config::DEF.keys.each{|dfk|
-        next if invalid_defs.include?(dfk)
+        # next if invalid_defs.include?(dfk)
         Aro::P.say("$#{CLI::Config.var_key_with_suffix(dfk)}=#{CLI::Config.var_value_with_suffix(dfk)}")
       }
 

data/bin/cli/deck.rb

@@ -39,9 +39,9 @@ module CLI
         Aro::Mancy.game.shuffle
       when CLI::LOAD_DECK_ACTIONS[:DRAW]
         Aro::P.say(I18n.t("cli.messages.drawing", name: Aro::Mancy.game.name))
-        Aro::P.p.say(I18n.t("cli.messages.drawing_from_dimension", dimension: "#{CLI::Config.var_value_with_suffix(:DIMENSION)}"))
+        Aro::P.say(I18n.t("cli.messages.drawing_from_dimension", dimension: "#{CLI::Config.var_value_with_suffix(:DIMENSION)}"))
         Aro::Mancy.game.draw(
-          is_dt_dimension: CLI::Config.var_value_with_suffix(:DIMENSION).to_sym == CLI::Config::DMS[:DEV_TAROT],
+          is_dt_dimension: CLI::Config.var_value_with_suffix(:DIMENSION)&.to_sym == CLI::Config::DMS[:DEV_TAROT],
           z_max: CLI::Config.var_value_with_suffix(:Z_MAX).to_i,
           z: CLI::Config.var_value_with_suffix(:Z)
         )
@@ -49,7 +49,7 @@ module CLI
         Aro::P.say(I18n.t("cli.messages.replacing_drawn", name: Aro::Mancy.game.name))
         Aro::Mancy.game.replace
       when CLI::LOAD_DECK_ACTIONS[:RESET]
-        if Aro::AROYES != Aro::P.p.ask(I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.game.name))
+        if Aro::AROYES.to_s != Aro::P.p.ask(I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.game.name))
           Aro::P.say(I18n.t("cli.messages.understood", name: Aro::Mancy.game.name))
           exit(CLI::EXIT_CODES[:SUCCESS])
         end

data/checksums/aro-0.1.4.gem.sha512

@@ -1 +1 @@
-5a6af41ca8e0e2eee62a129aca162bc709d5c3ded0c4ec7b6326fa6768d949313f320bd659cf00d5a0056c1adced4898fdd6d9c91c2a79f7d06018cc9cc61ad7
+5ef49535f30fa0fe1c89b806541f7e3c21f38311281264eb1b848a021f73711d8f3d429a4d26acf95c112c231dc824a391db863fbf79776c7dbd43fc54a1e7bf

data/checksums/aro-0.1.5.gem.sha512

@@ -0,0 +1 @@
+50df50a772a0a3c6d43f6427072c29c1f218b21fadda5029a17ed5ad44e2f06cce05596bf855e6028467f1dbc1932954f008bdddc2c76ddb39dc065980d4b1fb

data/lib/aro/c.rb

@@ -3,7 +3,7 @@ module Aro
     ARO: Proc.new{Aro::IS_TEST.call ? ".aro_test" : ".aro"},
   }
 
-  AROYES = "aroyes"
+  AROYES = :aroyes
 
   NUMERALS = {
     O:    0,

data/lib/aro/version.rb

@@ -1,4 +1,4 @@
 module Aro
-  VERSION = :"0.1.4"
-  RELEASE_NOTES = :"add multiple config variables, add much improved randomness"
+  VERSION = :"0.1.6"
+  RELEASE_NOTES = :"fix issue with corrupt card data."
 end

data/lib/aro.rb

@@ -16,6 +16,9 @@ module Aro
 
     attr_accessor :game
 
+    O = 0
+    S = 1
+    N = 4
     OS = 2
     PS1 = Aro::Mancy.name
     NAME_FILE = :".name".to_s

data/lib/models/deck.rb

@@ -196,7 +196,7 @@ class Aro::Deck < ActiveRecord::Base
     dt = nil
     return dt unless File.exist?(Aro::Deck::DEV_TAROT_FILE)
 
-    File.open(Aro::Deck::DEV_TAROT_FILE, "r"){|dtf| dt = dtf.read(4)}
+    File.open(Aro::Deck::DEV_TAROT_FILE, "r"){|dtf| dt = dtf.read(Aro::Mancy::N)}
     
     # VERY IMPORTANT!
     Aro::P.say(I18n.t("cli.very_important", dev_tarot: dt))
@@ -244,31 +244,38 @@ class Aro::Deck < ActiveRecord::Base
     # get drawn
     drawn_arr = drawn&.split(Aro::Deck::CARD_DELIM) || []
 
-    # use fallback randomness if /dev/tarot unavailable
-    if !is_dt_dimension || !File.exist?(Aro::Deck::DEV_TAROT_FILE)
-      dev_tarot = summon_ruby_facot(cards_arr)
-      abs_dev_tarot = Aro::Deck.card_strip(dev_tarot)
-    end
-
     sleeps = 0
     sleeps_max = z_max
 
     # find a card that is not already drawn
     while sleeps <= sleeps_max && dev_tarot.nil? do
-      # preferred randomness
-      dev_tarot = Aro::Deck.read_dev_tarot&.strip&.split("")
-      if dev_tarot.present?
-        abs_dev_tarot = dev_tarot[1] + Aro::NUMERALS.key(
-          dev_tarot.select{|c| !dev_tarot.first(2).include?(c)}.join("").to_i
+      # use fallback randomness if /dev/tarot unavailable
+      if !is_dt_dimension || !File.exist?(Aro::Deck::DEV_TAROT_FILE)
+        dev_tarot = summon_ruby_facot(cards_arr).split("")
+      else
+        # preferred randomness
+        read_value = Aro::Deck.read_dev_tarot&.strip&.split("")
+        if read_value.count >= Aro::Mancy::N - 1
+          dev_tarot = read_value
+        end
+      end
+      
+      unless dev_tarot.nil?
+        abs_dev_tarot = dev_tarot[Aro::Mancy::S] + Aro::NUMERALS.key(
+          dev_tarot.join("")[Aro::Mancy::OS..].to_i
         ).to_s
         if abs_cards_arr.include?(abs_dev_tarot)
           # dev_tarot is valid
-          dev_tarot = dev_tarot[0] + abs_dev_tarot
+          dev_tarot = dev_tarot[Aro::Mancy::O] + abs_dev_tarot
+        else
+          dev_tarot = nil
         end
-      else
+      end
+
+      if dev_tarot.nil?
         # dev_tarot is invalid
         sleeps += 1
-        sleep(z)
+        sleep(z.to_i)
       end
     end
 

data/locale/en.usage.yml

@@ -28,7 +28,7 @@ en:
             $ aro create <name>
 
         config
-          manage your aro config - not yet implemented
+          todo: manage your aro config - not yet implemented
 
         deck
           perform operations on the deck(s) in current aro instance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aro
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - i2097i
@@ -174,6 +174,7 @@ files:
 - bin/cli/deck.rb
 - bin/cli/usage.rb
 - checksums/aro-0.1.4.gem.sha512
+- checksums/aro-0.1.5.gem.sha512
 - db/migrate/1763374647_create_decks.rb
 - db/migrate/1763432541_create_logs.rb
 - lib/aro.rb
@@ -189,11 +190,6 @@ files:
 - locale/en.cards.yml
 - locale/en.usage.yml
 - locale/en.yml
-- pkg/aro-0.1.0.gem
-- pkg/aro-0.1.1.gem
-- pkg/aro-0.1.2.gem
-- pkg/aro-0.1.3.gem
-- pkg/aro-0.1.4.gem
 - tasks/console.rake
 - tasks/make.rake
 homepage: https://github.com/i2097i/aro