gemwarrior 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1697e1d764121074f811ef07f649cc4420f13cc6
-  data.tar.gz: 556ea5a82a3d6fc851fc0fcf31d763e5614b6502
+  metadata.gz: bea60182b8599a491537d816df34ed5d590bbe07
+  data.tar.gz: fac354917d7dd23fec734909ecdd2ec842874f59
 SHA512:
-  metadata.gz: 68d56bd71a1a8b4f37ba352d3074fedbec91a1e10e559f490675064d0cc0ff2c0928138c0847350a83cf421c131df4520040c985043c97d068ceb0226ae5dc31
-  data.tar.gz: 5131706a624149a4e61b370d7372248605be282eb293fecd8472aad8a49881090309c9fd05ba9121b1b9e0207205f2634afd04b332e5e34fbcc3b8fe9bef3c6e
+  metadata.gz: 59175723350eca718f71c27d823a53d3cb45fae16e470bd477d09e08ab5eb39a4924d821c9461cb177d677b501d817b1cd05c32b25356a800268b2321785ec57
+  data.tar.gz: de53018e24010e6390f72ff32d644f1211a5d847fef28684280997ebeb8bb358ae187b44429228acb7e84ade2e9e75f38bae32c42b61e1563ec040e554bbc2db

data/bin/gemwarrior

@@ -17,7 +17,7 @@ GW_OPTS_FILE          = "#{GW_HOME}/gw_opts"
 GW_LOG_FILE           = "#{GW_HOME}/gw_log"
 GW_DEFAULT_WORLD_YAML = File.expand_path('../../data/default_world.yaml', __FILE__)
 GW_DEFAULT_WORLD_BIN  = File.expand_path('../../data/default_world.bin', __FILE__)
-GW_WRAP_WIDTH         = 80
+GW_DEFAULT_WRAP_WIDTH = 80
 
 def parse_options_cli
   options = {
@@ -127,7 +127,7 @@ def init_config
   GameOptions.add 'save_file_bin_path',       GW_SAVE_FILE_BIN
   GameOptions.add 'log_file_path',            GW_LOG_FILE
   GameOptions.add 'options_file_path',        GW_OPTS_FILE
-  GameOptions.add 'wrap_width',               GW_WRAP_WIDTH
+  GameOptions.add 'wrap_width',               GW_DEFAULT_WRAP_WIDTH
 end
 
 begin

data/lib/gemwarrior/misc/hr.rb

@@ -2,6 +2,8 @@
 # Standardized, cross-platform horizontal rule
 # Cribbed extensively from https://github.com/ivantsepp/hr
 
+require_relative '../game_options'
+
 module Gemwarrior
   module Hr
     extend self
@@ -12,43 +14,19 @@ module Gemwarrior
 
     def string(*patterns)
       options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      column_width = get_column_width
+      screen_width = GameOptions.data['wrap_width']
       output = patterns.map do |pattern|
         pattern = pattern.to_s
-        times = (column_width / pattern.length) + 1
-        (pattern * times)[0..column_width - 1]
+        times = (screen_width / pattern.length) + 1
+        (pattern * times)[0..screen_width - 1]
       end.join
+      output << "\n"
       options = options.inject({}){|tmp,(k,v)| tmp[k.to_sym] = v.to_sym; tmp}
       options.any? ? output.colorize(options) : output
     end
-    
-    private
-    
-    def get_column_width
-      column_width = 0
 
-      begin
-        require 'io/console'
-        column_width = IO.console.winsize[1]
-      rescue
-        if command_exists?('tput')
-          column_width = `tput cols`.to_i
-        elsif command_exists?('stty')
-          column_width = `stty size`.split.last.to_i
-        elsif command_exists?('mode')
-          mode_output = `mode`.split
-          column_width = mode_output[mode_output.index('Columns:')+1].to_i
-        end
-      end
+    private
 
-      case
-      when column_width.nil?, column_width <= 0
-        return 80
-      else
-        return column_width
-      end
-    end
-    
     def command_exists?(command)
       ENV['PATH'].split(File::PATH_SEPARATOR).any? { |path|
         (File.exist? File.join(path, "#{command}")) || (File.exist? File.join(path, "#{command}.com")) || (File.exist? File.join(path, "#{command}.exe"))

data/lib/gemwarrior/repl.rb

@@ -16,6 +16,8 @@ require_relative 'version'
 module Gemwarrior
   class Repl
     # CONSTANTS
+    SCREEN_WIDTH_MIN        = 80
+    SCREEN_WIDTH_MAX        = 120
     QUIT_MESSAGE            = 'Temporal flux detected. Shutting down...'.colorize(:red)
     MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:red)
     SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
@@ -28,8 +30,35 @@ module Gemwarrior
       self.game         = game
       self.world        = world
       self.evaluator    = evaluator
+
+      GameOptions.data['wrap_width'] = get_screen_width
     end
 
+    def get_screen_width
+      screen_width = SCREEN_WIDTH_MIN
+
+      begin
+        require 'io/console'
+        screen_width = IO.console.winsize[1]
+      rescue
+        if command_exists?('tput')
+          screen_width = `tput cols`.to_i
+        elsif command_exists?('stty')
+          screen_width = `stty size`.split.last.to_i
+        elsif command_exists?('mode')
+          mode_output = `mode`.split
+          screen_width = mode_output[mode_output.index('Columns:')+1].to_i
+        end
+      end
+
+      case
+      when screen_width.nil?, screen_width <= 0
+        return SCREEN_WIDTH_MIN
+      else
+        return [screen_width, SCREEN_WIDTH_MAX].min
+      end
+    end
+    
     def start(initial_command, extra_command, new_skip, resume_skip)
       setup_screen(initial_command, extra_command, new_skip, resume_skip)
 

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.12.3'
+  VERSION = '0.12.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Michael Chadwick