ssc.nob 0.1.0-java → 0.1.1-java

data/lib/ssc.nob/ssc_chat_log.rb

@@ -1,27 +1,15 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of SSC.Nob.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# SSC.Nob is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# SSC.Nob is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with SSC.Nob.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'attr_bool'
+require 'attr_bool/core_ext'
 
 require 'ssc.nob/ssc_chat_log/message'
 require 'ssc.nob/ssc_chat_log/message_parser'
@@ -29,7 +17,7 @@ require 'ssc.nob/ssc_chat_log/message_parser'
 
 module SSCNob
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class SSCChatLog
@@ -41,74 +29,74 @@ module SSCNob
     attr_reader? :running
     attr_accessor :sleep_time
     attr_reader :thread
-    
+
     def initialize(config,logname: 'nob.log',sleep_time: 0.2)
       @config = config
       @listeners = []
-      @log_file = File.join(config.build_ssc_log_dir(),logname)
+      @log_file = File.join(config.build_ssc_log_dir,logname)
       @logname = logname
       @messages = []
       @running = false
       @sleep_time = sleep_time
       @thread = nil
     end
-    
+
     def add_listener(proc=nil,&block)
       @listeners.push(block) if block
       @listeners.push(proc) if proc
-      
+
       return self
     end
-    
-    def run()
+
+    def run
       return if @running # Already running
-      
-      stop() # Justin Case
-      
+
+      stop # Justin Case
+
       if !File.exist?(@log_file)
         # Create the file.
         File.open(@log_file,'at') do |fout|
         end
       end
-      
-      @thread = Thread.new() do
-        File.open(@log_file,'rt') do |fin|
+
+      @thread = Thread.new do
+        File.open(@log_file,'rt',encoding: 'Windows-1252:UTF-8') do |fin|
           fin.seek(0,:END)
-          fin.gets() # Ignore most recent line
-          
+          fin.gets # Ignore most recent line
+
           parser = MessageParser.new(config: @config,fin: fin)
-          
+
           @running = true
-          
+
           while @running
-            while !(line = fin.gets()).nil?()
+            while !(line = fin.gets).nil?
               msg = parser.parse(line)
-              
+
               @messages.push(msg)
-              
-              @listeners.each() do |l|
+
+              @listeners.each do |l|
                 l.call(self,msg)
               end
             end
-            
+
             sleep(@sleep_time)
           end
         end
       end
     end
-    
-    def stop()
+
+    def stop
       @running = false
-      
-      if !@thread.nil?()
-        if @thread.alive?()
+
+      if !@thread.nil?
+        if @thread.alive?
           @thread.join(5)
-          @thread.kill() if @thread.alive?()
+          @thread.kill if @thread.alive?
         end
-        
+
         @thread = nil
       end
-      
+
       @messages = []
     end
   end

data/lib/ssc.nob/ssc_chat_log/message.rb

@@ -1,57 +1,45 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of SSC.Nob.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# SSC.Nob is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# SSC.Nob is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with SSC.Nob.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
 module SSCNob
 class SSCChatLog
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class Message
-    TYPES = [
-      :unknown,
-      :chat,:freq,:kill,:private,:pub,:team,
-      :q_chat,:q_kill,:q_namelen,:q_log,
-    ]
-    
+    TYPES = %i[
+      unknown
+      chat freq kill private pub team
+      q_chat q_kill q_namelen q_log
+    ].freeze
+
     attr_reader :lines
     attr_reader :meta
     attr_reader :type
-    
-    TYPES.each() do |type|
+
+    TYPES.each do |type|
       define_method(:"#{type}?") do
         return @type == type
       end
     end
-    
+
     def initialize(lines,meta: {},type: :unknown)
       super()
-      
+
       @lines = Array(lines)
       @meta = meta
       @type = type
     end
-    
+
     def [](key)
       return @meta[key]
     end

data/lib/ssc.nob/ssc_chat_log/message_parser.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of SSC.Nob.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# SSC.Nob is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# SSC.Nob is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with SSC.Nob.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -29,25 +17,25 @@ require 'ssc.nob/ssc_chat_log/message'
 module SSCNob
 class SSCChatLog
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class MessageParser
     attr_reader :config
     attr_reader :fin
     attr_accessor :namelen
-    
+
     def initialize(config: nil,fin: nil,namelen: nil)
       @config = config
       @fin = fin
       @namelen = namelen
     end
-    
+
     def parse(line)
-      line = Util.rstrip(line)
-      
+      line = line.sub(/[\r\n]+\z/,'')
+
       msg = nil
-      
+
       case line[0]
       when 'C'
         msg = parse_chat(line)
@@ -67,93 +55,93 @@ class SSCChatLog
           msg = parse_q_namelen(line)
         end
       end
-      
-      msg = Message.new(line) if msg.nil?()
-      
+
+      msg = Message.new(line) if msg.nil?
+
       return msg
     end
-    
+
     # 'T Name> Msg'
     def parse_basic(line,type:)
-      i = @namelen.nil?() ? line.index('> ',2) : (@namelen + 2)
-      
+      i = @namelen.nil? ? line.index('> ',2) : (@namelen + 2)
+
       username = line[2...i]
-      username = Util.strip(username.to_s())
+      username = Util.strip(username.to_s)
       message = line[i + 1..-1]
-      message = Util.strip(message.to_s())
-      
+      message = Util.strip(message.to_s)
+
       return Message.new(line,type: type,meta: {
         username: username,
         message: message,
       })
     end
-    
+
     # 'C 1:Name> Msg'
     # - Not affected by namelen, always full name.
     def parse_chat(line)
       i = line.index(':',2)
       j = line.index('> ',i)
-      
+
       channel = line[2...i]
-      channel = Util.strip(channel.to_s()).to_i()
+      channel = Util.strip(channel.to_s).to_i
       username = line[i + 1...j]
-      username = Util.strip(username.to_s())
+      username = Util.strip(username.to_s)
       message = line[j + 1..-1]
-      message = Util.strip(message.to_s())
-      
+      message = Util.strip(message.to_s)
+
       return Message.new(line,type: :chat,meta: {
         channel: channel,
         username: username,
         message: message,
       })
     end
-    
+
     def parse_freq(line)
       return parse_basic(line,type: :freq)
     end
-    
+
     # '  Name(100) killed by: Name'
     def parse_kill(line)
       i = line.index(/\(\d+\)/,2)
       j = line.index(')',i)
       k = line.index(':',j)
-      
+
       killed = line[2...i]
-      killed = Util.strip(killed.to_s())
+      killed = Util.strip(killed.to_s)
       bounty = line[i + 1...j]
-      bounty = Util.strip(bounty.to_s()).to_i()
+      bounty = Util.strip(bounty.to_s).to_i
       killer = line[k + 1..-1]
-      killer = Util.strip(killer.to_s())
-      
+      killer = Util.strip(killer.to_s)
+
       return Message.new(line,type: :kill,meta: {
         killed: killed,
         bounty: bounty,
         killer: killer,
       })
     end
-    
+
     def parse_private(line)
       return parse_basic(line,type: :private)
     end
-    
+
     def parse_pub(line)
       return parse_basic(line,type: :pub)
     end
-    
+
     # '  Message Name Length: 24'
     def parse_q_namelen(line)
       i = line.index(':')
-      
+
       namelen = line[i + 1..-1]
-      namelen = Util.strip(namelen.to_s()).to_i()
-      
+      namelen = Util.strip(namelen.to_s).to_i
+
       @namelen = namelen
-      
+
       return Message.new(line,type: :q_namelen,meta: {
         namelen: namelen,
       })
     end
-    
+
     def parse_team(line)
       return parse_basic(line,type: :team)
     end

data/lib/ssc.nob/userface.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of SSC.Nob.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# SSC.Nob is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# SSC.Nob is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with SSC.Nob.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -30,94 +18,94 @@ require 'tty-spinner'
 
 module SSCNob
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class Userface
     extend Forwardable
     include Singleton
-    
+
     attr_reader :line
     attr_reader :rain
-    
+
     def_delegators :@line,:agree,:ask,:choose,:indent,:say
     def_delegator :@rain,:wrap,:color
-    
-    def initialize()
+
+    def initialize
       super()
-      
-      @line = HighLine.new()
-      @rain = Rainbow.new()
-      
+
+      @line = HighLine.new
+      @rain = Rainbow.new
+
       @line.use_color = true
       @rain.enabled = true
     end
-    
+
     def cmd(cmd)
       return color(cmd).yellow.bold
     end
-    
-    def coffee()
+
+    def coffee
       return color('C\_/').saddlebrown.bold
     end
-    
+
     def error(msg)
       return "#{color('Error:').red.bold} #{msg}"
     end
-    
+
     def gt(msg=nil)
       return "#{color('>').yellow.bold} #{msg}"
     end
-    
+
     def love(msg)
       return color(msg).red.bold
     end
-    
+
     def spin(msg,&block)
       spinner = TTY::Spinner.new("[:spinner] #{msg}...",
         interval: 4,frames: ['o_O','O_o']
       )
-      
-      if block_given?()
+
+      if block_given?
         spinner.run(&block)
       else
-        spinner.auto_spin()
+        spinner.auto_spin
       end
-      
+
       return spinner
     end
-    
-    def ssc()
+
+    def ssc
       return color('Subspace Continuum').purple.bold
     end
-    
+
     def title(title)
       return color(title).blue.bold
     end
-    
+
     def type(msg)
-      msg.each_char() do |c|
+      msg.each_char do |c|
         print c
         sleep(0.05)
       end
     end
-    
+
     def types(msg)
       type(msg)
       puts
     end
-    
+
     def user(user)
       return color(user).limegreen.bold
     end
   end
-  
+
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   module Uface
-    def uface()
+    def uface
       return Userface.instance
     end
   end