bolt_train_runner 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f808a49cf3ef42710f71a26af756cfad964f9daaa7f836183d1942b090a448
-  data.tar.gz: f60aa528888c02cd384536dd5d22f01238ea24847120cf972614c7f1fe4b51c0
+  metadata.gz: 0e80ec83f70924cb436ed6b458742180e1427d50e749485f2e4dac40bd61b4e5
+  data.tar.gz: 8df15fb1607cfd47767ebe616e6bbc4742da7b5a20793962a4d7a49424fc94b2
 SHA512:
-  metadata.gz: 925a32c0daf73b6f07a95c9916662a3b3a162d153f4cceeb239e23f07a20c173579a5bbe9dc5f3698ff12ea8a8b2b764f200809fafe2868829778b291f7470a7
-  data.tar.gz: 207ed2b67aafae90d742b4bf801ae661059393e9aa18b74af9e8b81cc1fd2d21c3c2b10a9fc47e7aa8bb8f61aec8bd44dfbc510b9d63ab76d83e7e3b20251d59
+  metadata.gz: c0294c14f12dbec5b0e7889535c135ead63b426c2a72db2add19e495169d90c5a85e9c375d4c918dd34b4bbb96aaad03ed4514f8c859d8197275c3e34c01dc06
+  data.tar.gz: d1229742d9593cc036830cbf2bd089d3f1cbb99945bdc0e0e4853a5ea92cadd60d074d1060f0ac3708f62f00e1319bd16512e59c5effa8602cec8611d60808fc

data/lib/bolt_train_runner.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'colorize'
 require 'bolt_train_runner/comms'
 require 'bolt_train_runner/session_runner'
+require 'bolt_train_runner/log'
 
 # Load all commands
 Dir[File.join(File.absolute_path(__dir__) + '/bolt_train_runner/commands') + "/**/*.rb"].each do |file|
@@ -12,13 +13,11 @@ end
 
 # TODO:
 #   Add a lot more error handling
-#   Add thread for consuming session files and issuing commands
 #   Figure out best way to verify commands worked given that responses from JMRI are async
 #   Figure out why it gets multiple messages back each time
 #   Make debug output show what method/command the output is from
 #   Make debug output not screw with the console prompt
-#   Changing debug on or off and reconnecting doesn't actually seem to work to change debug level
-#   Add a way to log to a file in addition to the console
+#   Add more user control over logging (where it goes, log level, etc.)
 
 
 class BoltTrainRunner
@@ -26,59 +25,60 @@ class BoltTrainRunner
   def run
     comms = nil
     session_runner = nil
-    puts 'Welcome to the Bolty McBoltTrain Runner! Choo choo!'.cyan
-    puts 'To list all commands, enter "help"'.cyan
-    puts 'For help with a specific command, enter "<command> help"'.cyan
-    puts 'First order of business: run "connect" to connect to the JMRI server'.cyan
+    log = Log.new
+    log.help('Welcome to the Bolty McBoltTrain Runner! Choo choo!')
+    log.help('To list all commands, enter "help"')
+    log.help('For help with a specific command, enter "<command> help"')
+    log.help('First order of business: run "connect" to connect to the JMRI server')
+
     loop do
       print '> '
       input = gets.chomp
       args = input.split(' ')
       command = args.shift
+      log.info_file("Console command: #{input}")
 
       case command
       when /^help$/i
-        help
-      when Commands.respond_to?(command)
-        puts 'Commands can run this'
+        help(log)
       when /^connect$/i
-        newcomms = Commands.connect(args)
+        newcomms = Commands.connect(args, log)
         comms = newcomms if newcomms
       when /^disconnect$/i
         session_runner.stop if session_runner
         session_runner = nil
-        Commands.disconnect(comms)
+        Commands.disconnect(comms, log)
         comms = nil
       when /^sessions$/i
-        session_runner = Commands.sessions(args, comms, session_runner)
+        session_runner = Commands.sessions(args, comms, session_runner, log)
       when /^debug$/i
-        Commands.debug(args)
+        Commands.debug(args, log)
       when /^exit$/i
-        Commands.exit_program(comms, session_runner)
+        Commands.exit_program(comms, session_runner, log)
       else
         if Commands.respond_to?(command)
           # The commands for directly manipulating the train should all
           # accept "args" and "comms" parameters. Because the CLI will pass
           # in args as an array and the session runner will pass in a hash,
           # these commands must be able to handle both.
-          Commands.send(command.to_sym, args, comms)
+          Commands.send(command.to_sym, args, comms, log)
         else
-          puts "Unknown command: #{command}".red
+          log.warn("Unknown command: #{command}")
         end
       end
     end
   end
 
-  def help
-    puts 'Available commands:'.cyan
-    puts 'help - This help text'.cyan
-    puts 'connect - Connect to the Bolt Train JMRI JSON server'.cyan
-    puts 'disconnect - Disconnect from the JMRI server'.cyan
-    puts 'power - Turn power on or off to the train'.cyan
-    puts 'throttle - Set throttle to a value between 0 and 10'.cyan
-    puts 'move - Move the train in the given direction at the given speed for a certain length of time'.cyan
-    puts 'stop - Stop the train'.cyan
-    puts 'exit - Exit program'.cyan
+  def help(log)
+    log.help('Available commands:')
+    log.help('help - This help text')
+    log.help('connect - Connect to the Bolt Train JMRI JSON server')
+    log.help('disconnect - Disconnect from the JMRI server')
+    log.help('power - Turn power on or off to the train')
+    log.help('throttle - Set throttle to a value between 0 and 10')
+    log.help('move - Move the train in the given direction at the given speed for a certain length of time')
+    log.help('stop - Stop the train')
+    log.help('exit - Exit program')
   end
 
 end

data/lib/bolt_train_runner/commands/connect.rb

@@ -1,23 +1,25 @@
 require 'bolt_train_runner/conf'
 require 'bolt_train_runner/comms'
-require 'colorize'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.connect(args)
+  def self.connect(args, log)
     conf = Conf.load_conf
     if !args.empty? && args[0] =~ /help/i
-      puts 'Command: connect'.cyan
-      puts 'Syntax: connect [server:port]'.cyan
-      puts 'If called with no argument, it will attempt to use the last specified server:port'.cyan
-      puts 'If this is the first time connect was called with no arguments, it will prompt you for the server and port'.cyan
+      log.help('Command: connect')
+      log.help('Syntax: connect [server:port]')
+      log.help('If called with no argument, it will attempt to use the last specified server:port')
+      log.help('If this is the first time connect was called with no arguments, it will prompt you for the server and port')
       return
     end
     if args.empty?
       server = conf['server']
       unless server
-        print 'Please enter server:port [10.0.7.82:12080] > '
+        prompt = 'Please enter server:port [10.0.7.82:12080] > '
+        print prompt
         server = gets.chomp
         server = '10.0.7.82:12080' if server.empty?
+        log.info_file("#{prompt} #{server}")
       end
     else
       server = args[0]
@@ -25,9 +27,9 @@ module Commands
     conf['server'] = server
     Conf.save_conf(conf)
 
-    puts "Connecting to ws://#{server}/json/".green
-    comms = Comms.new(server)
-    puts "Connected".green
+    log.info("Connecting to ws://#{server}/json/")
+    comms = Comms.new(server, log)
+    log.info("Connected")
     return comms
   end
 end

data/lib/bolt_train_runner/commands/debug.rb

@@ -1,24 +1,24 @@
-require 'colorize'
 require 'bolt_train_runner/conf'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.debug(args)
+  def self.debug(args, log)
     if args.empty? || args[0] =~ /help/i
-      puts 'Command: debug'.cyan
-      puts 'Syntax: debug <on|off>'.cyan
+      log.help('Command: debug')
+      log.help('Syntax: debug <on|off>')
       #Should fix this at some point 
-      puts 'Turns debug logging on or off. Will require disconnecting and reconnecting to take effect.'.cyan
-      puts 'Choice will be persistent across program invocations.'.cyan
+      log.help('Turns debug logging on or off. Choice will be persistent across program invocations.')
       return
     end
     state = args[0]
     if !['on','off'].include?(state)
-      puts 'Debug must be called with either "on" or "off"'.red
+      log.error('Debug must be called with either "on" or "off"')
       return
     end
     conf = Conf.load_conf
     conf['debug'] = state == 'on'
     Conf.save_conf(conf)
-    puts "Debug mode #{state}".green
+    state == 'on' ? log.set_console_level('DEBUG') : log.set_console_level('INFO')
+    log.info("Debug mode #{state}")
   end
 end

data/lib/bolt_train_runner/commands/disconnect.rb

@@ -1,13 +1,13 @@
 require 'bolt_train_runner/comms'
-require 'colorize'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.disconnect(comms)
+  def self.disconnect(comms, log)
     if comms.nil?
-      puts 'Not currently connected'.red
+      log.error('Not currently connected')
       return
     end
     comms.disconnect
-    puts 'Disconnected'.green
+    log.info('Disconnected')
   end
 end

data/lib/bolt_train_runner/commands/exit.rb

@@ -1,11 +1,12 @@
-require 'colorize'
 require 'bolt_train_runner/comms'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.exit_program(comms, session_runner)
+  def self.exit_program(comms, session_runner, log)
     session_runner.stop if session_runner
     comms.disconnect if comms
-    puts 'Seeya later!'.green
+    log.info('Seeya later!')
+    log.close
     exit 0
   end
 end

data/lib/bolt_train_runner/commands/move.rb

@@ -1,19 +1,19 @@
 require 'bolt_train_runner/comms'
 require 'bolt_train_runner/commands/throttle'
 require 'bolt_train_runner/commands/stop'
-require 'colorize'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.move(args, comms)
+  def self.move(args, comms, log)
     unless comms
-      puts 'Please connect first'.red
+      log.error('Please connect first')
       return
     end
     if args.empty? || args[0] =~ /help/i
-      puts 'Command: move'.cyan
-      puts 'Syntax: move <forward|reverse> <speed 0-10> <time 1-60>'.cyan
-      puts 'Move the train the given direction at the given speed for the given number of seconds'.cyan
-      puts 'Note that the power must be on first'.cyan
+      log.help('Command: move')
+      log.help('Syntax: move <forward|reverse> <speed 0-10> <time 1-60>')
+      log.help('Move the train the given direction at the given speed for the given number of seconds')
+      log.help('Note that the power must be on first')
       return
     end
 
@@ -27,28 +27,29 @@ module Commands
     end
   
     unless direction && speed && time
-      puts 'Please provide direction, speed, and time'.red
+      log.error('Please provide direction, speed, and time')
       return
     end
     speed = speed.to_i
     time = time.to_i
+    direction = direction == 'f' ? 'forward' : direction == 'r' ? 'reverse' : direction
     unless ['forward','reverse'].include?(direction)
-      puts 'Please provide "forward" or "reverse" for direction'.red
+      log.error('Please provide "forward" or "reverse" for direction')
       return
     end
     if speed < 0 or speed > 10
-      puts 'Please select a speed between 0 and 10'.red
+      log.error('Please select a speed between 0 and 10')
       return
     end
     if time < 1 or time > 60
-      puts 'Please select a time between 1 and 60 seconds'.red
+      log.error('Please select a time between 1 and 60 seconds')
       return
     end
 
-    puts "Moving train #{direction} direction at speed #{speed} for #{time} seconds...".green
-    Commands.throttle([speed,direction],comms)
+    log.info("Moving train #{direction} direction at speed #{speed} for #{time} seconds...")
+    Commands.throttle([speed, direction], comms, log)
     sleep(time)
-    Commands.stop(nil, comms)
-    puts 'Move complete'.green
+    Commands.stop(nil, comms, log)
+    log.info('Move complete')
   end
 end

data/lib/bolt_train_runner/commands/power.rb

@@ -1,16 +1,16 @@
 require 'bolt_train_runner/comms'
-require 'colorize'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.power(args, comms)
+  def self.power(args, comms, log)
     unless comms
-      puts 'Please connect first'.red
+      log.error('Please connect first')
       return
     end
     if args.empty? || args[0] =~ /help/i
-      puts 'Command: power'.cyan
-      puts 'Syntax: power <on|off>'.cyan
-      puts 'Turns power to the train on or off. Must first be connected.'.cyan
+      log.help('Command: power')
+      log.help('Syntax: power <on|off>')
+      log.help('Turns power to the train on or off. Must first be connected.')
       return
     end
 
@@ -21,7 +21,7 @@ module Commands
     end
     
     unless ['on','off'].include?(state)
-      puts 'Please provide either "on" or "off"'.red
+      log.error('Please provide either "on" or "off"')
       return
     end
 
@@ -36,6 +36,6 @@ module Commands
       }
     }
     comms.send_message(message)
-    puts "Power #{state}".green
+    log.info("Power #{state}")
   end
 end

data/lib/bolt_train_runner/commands/sessions.rb

@@ -1,37 +1,37 @@
-require 'colorize'
 require 'bolt_train_runner/conf'
 require 'bolt_train_runner/session_runner'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.sessions(args, comms, session_runner)
+  def self.sessions(args, comms, session_runner, log)
     if args.empty? || args[0] =~ /help/i
-      puts 'Command: sessions'.cyan
-      puts 'Syntax: sessions <start|stop>'.cyan
-      puts 'Start or stop the thread that monitors the sessions folder for sessions files. When running, this thread'.cyan
-      puts 'will automatically execute the commands contained in sessions files generated by the bolt-train-api server'.cyan
-      puts 'as they appear in the folder.'.cyan
+      log.help('Command: sessions')
+      log.help('Syntax: sessions <start|stop>')
+      log.help('Start or stop the thread that monitors the sessions folder for sessions files. When running, this thread')
+      log.help('will automatically execute the commands contained in sessions files generated by the bolt-train-api server')
+      log.help('as they appear in the folder.')
       return
     end
     
     state = args[0]
     starting = state == 'start'
     if !['start','stop'].include?(state)
-      puts 'Please provide either "start" or "stop"'.red
+      log.error('Please provide either "start" or "stop"')
       return
     end
 
     unless comms
-      puts 'Please connect first'.red
+      log.error('Please connect first')
       return
     end
 
     if starting and session_runner
-      puts 'Session runner thread already started'.yellow
+      log.warn('Session runner thread already started')
       return session_runner
     end
 
     if !starting and !session_runner
-      puts 'No session runner thread currently running'.yellow
+      log.warn('No session runner thread currently running')
       return nil
     end
 
@@ -45,15 +45,17 @@ module Commands
         session_dir = conf['session_dir']
         unless session_dir
           # This should be changed to pick up BOLT_TRAIN_QUEUE_DIR automatically
-          print 'Please enter directory for session files [/tmp/bolt-train-queue] > '
+          prompt = 'Please enter directory for session files [/tmp/bolt-train-queue] > '
+          print prompt
           session_dir = gets.chomp
           session_dir = '/tmp/bolt-train-queue' if session_dir.empty?
           conf['session_dir'] = session_dir
           Conf.save_conf(conf)
+          log.info_file("#{prompt} #{session_dir}")
         end
       end
       
-      runner = SessionRunner.new(comms, session_dir)
+      runner = SessionRunner.new(comms, session_dir, log)
       runner.start
       return runner
     else

data/lib/bolt_train_runner/commands/stop.rb

@@ -1,12 +1,12 @@
-require 'colorize'
 require 'bolt_train_runner/commands/throttle'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.stop(_args, comms)
+  def self.stop(_args, comms, log)
     unless comms
-      puts 'Please connect first'.red
+      log.error('Please connect first')
       return
     end
-    Commands.throttle([0],comms)
+    Commands.throttle([0], comms, log)
   end
 end

data/lib/bolt_train_runner/commands/throttle.rb

@@ -1,17 +1,17 @@
 require 'bolt_train_runner/comms'
-require 'colorize'
+require 'bolt_train_runner/log'
 
 module Commands
-  def self.throttle(args, comms)
+  def self.throttle(args, comms, log)
     unless comms
-      puts 'Please connect first'.red
+      log.error('Please connect first')
       return
     end
     if args.empty? || args[0] =~ /help/i
-      puts 'Command: throttle'.cyan
-      puts 'Syntax: throttle <0-10> [forward|reverse]'.cyan
-      puts 'Sets the throttle to the given level, between 0 and 10. May optionally provide a direction.'.cyan
-      puts 'Note that power must be on first for this to take effect.'.cyan
+      log.help('Command: throttle')
+      log.help('Syntax: throttle <0-10> [forward|reverse]')
+      log.help('Sets the throttle to the given level, between 0 and 10. May optionally provide a direction.')
+      log.help('Note that power must be on first for this to take effect.')
       return
     end
 
@@ -24,12 +24,12 @@ module Commands
     
     speed = speed.to_i
     if speed < 0 or speed > 10
-      puts 'Please select a speed between 0 and 10'.red
+      log.error('Please select a speed between 0 and 10')
       return
     end
 
     unless direction.nil? || ['forward','reverse'].include?(direction)
-      puts 'Direction must be either "forward" or "reverse"'.red
+      log.error('Direction must be either "forward" or "reverse"')
       return
     end
 
@@ -45,6 +45,6 @@ module Commands
     message['data']['forward'] = direction == 'forward' if direction
     comms.send_message(message)
     direction_string = direction.nil? ? '' : " with direction #{direction}"
-    puts "Throttle set to #{speed}#{direction_string}".green
+    log.info("Throttle set to #{speed}#{direction_string}")
   end
 end

data/lib/bolt_train_runner/comms.rb

@@ -1,7 +1,8 @@
 require 'websocket-client-simple'
 require 'json'
-require 'colorize'
 require 'bolt_train_runner/conf'
+require 'bolt_train_runner/log'
+require 'pry-byebug'
 
 # Sending and receiving responses is a little bit funky
 # Since we have to receive messages asynchronously, and because
@@ -17,16 +18,17 @@ class Comms
   @heartbeat_thread = nil
   @consumer_thread = nil
   @kill_threads = false
+  @log = nil
 
-  def initialize(server)
-    debug = Conf.debug
-    @ws = WebSocket::Client::Simple.connect("ws://#{server}/json/")
-    @ws.on :message do |msg|
+  def initialize(server, log)
+    @log = log
+    @ws = WebSocket::Client::Simple.connect("ws://#{server}/json/", @log)
+    @ws.on :message do |msg, logger|
       data = JSON.parse(msg.data)
-      puts "Received #{data}" if (data['type'] != 'hello') if debug
+      logger.debug("Received #{data}\n> ")
     end
-    @ws.on :error do |e|
-      puts "Error from Websocket: #{e}".red
+    @ws.on :error do |e, logger|
+      logger.error("Error from Websocket: #{e}")
     end
 
     @heartbeat_thread = Thread.new { run_heartbeat }
@@ -54,9 +56,8 @@ class Comms
   # Expects a hash with the correctly formed message, which
   # will get transformed to a JSON string by this function
   def send_message(message)
-    debug = Conf.debug
     message = JSON.generate(message)
-    puts "Sending #{message}" if debug
+    @log.debug("Sending #{message}")
     @ws.send(message)
   end
 

data/lib/bolt_train_runner/conf.rb

@@ -3,7 +3,9 @@ require 'yaml'
 class Conf
   attr_reader :CONFFILE
 
-  CONFFILE = File.expand_path('~/.bolttrain.conf')
+  CONFFILE = File.expand_path('~/.bolttrain/config')
+  CONFDIR = File.split(CONFFILE)[0]
+  Dir.mkdir(CONFDIR) unless File.exist?(CONFDIR)
   File.write(CONFFILE, "---\n{}") unless File.exist?(CONFFILE)
 
   def self.load_conf

data/lib/bolt_train_runner/log.rb

@@ -0,0 +1,99 @@
+require 'logger'
+require 'colorize'
+class Log
+
+  @loggers = []
+
+  def initialize(file='~/.bolttrain/runner.log', console_level='INFO', file_level='DEBUG')
+    file = File.expand_path(file)
+    dir = File.split(file)[0]
+    Dir.mkdir(dir) unless File.exist?(dir)
+    @console = Logger.new(STDOUT, 
+      level: console_level,
+      formatter: proc { |sev, datetime, progname, msg| "#{msg}\n" })
+    @file = Logger.new(file, 'daily', level: file_level)
+  end
+
+  def set_console_level(level)
+    @console.level = level
+  end
+
+  def set_file_level(level)
+    @file.level = level
+  end
+
+  def debug(msg, console=true, file=true)
+    @console.debug(msg) if console
+    @file.debug(msg) if file
+  end
+
+  def debug_console(msg)
+    debug(msg, true, false)
+  end
+
+  def debug_file(msg)
+    debug(msg, false, true)
+  end
+
+  # Just for printing help text to the console. Doesn't need to be logged.
+  def help(msg)
+    @console.info(msg.cyan)
+  end
+
+  def info(msg, console=true, file=true)
+    @console.info(msg.green) if console
+    @file.info(msg) if file
+  end
+
+  def info_console(msg)
+    info(msg, true, false)
+  end
+
+  def info_file(msg)
+    info(msg, false, true)
+  end
+
+  def warn(msg, console=true, file=true)
+    @console.warn(msg.yellow) if console
+    @file.warn(msg) if file
+  end
+
+  def warn_console(msg)
+    warn(msg, true, false)
+  end
+
+  def warn_file(msg)
+    warn(msg, false, true)
+  end
+
+  def error(msg, console=true, file=true)
+    @console.error(msg.red) if console
+    @file.error(msg) if file
+  end
+
+  def error_console(msg)
+    error(msg, true, false)
+  end
+
+  def error_file(msg)
+    error(msg, false, true)
+  end
+
+  def fatal(msg, console=true, file=true)
+    @console.fatal(msg.red) if console
+    @file.fatal(msg) if file
+  end
+
+  def fatal_console(msg)
+    fatal(msg, true, false)
+  end
+
+  def fatal_file(msg)
+    fatal(msg, false, true)
+  end
+
+  def close
+    @console.close
+    @file.close
+  end
+end

data/lib/bolt_train_runner/session_runner.rb

@@ -13,14 +13,16 @@ class SessionRunner
 
   @session_thread = nil
   @kill_thread = false
+  @log = nil
 
-  def initialize(comms, session_dir)
+  def initialize(comms, session_dir, log)
     raise 'comms must not be nil' if comms.nil?
     raise 'session_dir must not be nil' if session_dir.nil?
     raise 'session_dir does not exist' unless File.exist?(session_dir)
 
     @session_dir = session_dir
     @comms = comms
+    @log = log
   end
 
   def start
@@ -29,7 +31,7 @@ class SessionRunner
 
   def stop
     @kill_thread = true
-    puts 'Stopping Session Runner'.magenta
+    @log.info('Stopping Session Runner')
     @session_thread.join if @session_thread
   end
 
@@ -44,17 +46,17 @@ class SessionRunner
         end
         session = data['session']
         email = session['email']
-        puts "[Session Runner] Starting session for #{email}".magenta
+        @log.info("[Session Runner] Starting session for #{email}")
         commands = session['commands']
         commands.each do |args|
           c = args['command']
           args.delete('command')
-          puts "[Session Runner] Sending command #{c}".magenta
-          puts "[Session Runner] Arguments = #{args}".magenta
-          Commands.send(c, args, @comms)
+          @log.info("[Session Runner] Sending command #{c}")
+          @log.info("[Session Runner] Arguments = #{args}")
+          Commands.send(c, args, @comms, @log)
         end
         File.delete(f)
-        puts "[Session Runner] Session for #{email} complete".magenta
+        @log.info("[Session Runner] Session for #{email} complete")
       end
     end
   end

data/lib/bolt_train_runner/version.rb

@@ -1,3 +1,3 @@
 module BoltTrainRunner
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/websocket-client-simple.rb

@@ -0,0 +1,17 @@
+# Forked from https://github.com/shokai/websocket-client-simple
+# Credit to Sho Hashimoto
+
+require 'event_emitter'
+require 'websocket'
+require 'socket'
+require 'openssl'
+require 'uri'
+
+require 'websocket-client-simple/client'
+
+module WebSocket
+  module Client
+    module Simple
+    end
+  end
+end

data/lib/websocket-client-simple/client.rb

@@ -0,0 +1,107 @@
+# Forked from https://github.com/shokai/websocket-client-simple
+# Credit to Sho Hashimoto
+
+module WebSocket
+  module Client
+    module Simple
+
+      def self.connect(url, options={}, logger)
+        client = ::WebSocket::Client::Simple::Client.new
+        yield client if block_given?
+        client.connect url, options, logger
+        return client
+      end
+
+      class Client
+        include EventEmitter
+        attr_reader :url, :handshake
+        attr_accessor :logger
+
+        def connect(url, options={}, logger)
+          return if @socket
+          @logger = logger
+          @url = url
+          uri = URI.parse url
+          @socket = TCPSocket.new(uri.host,
+                                  uri.port || (uri.scheme == 'wss' ? 443 : 80))
+          if ['https', 'wss'].include? uri.scheme
+            ctx = OpenSSL::SSL::SSLContext.new
+            ctx.ssl_version = options[:ssl_version] || 'SSLv23'
+            ctx.verify_mode = options[:verify_mode] || OpenSSL::SSL::VERIFY_NONE #use VERIFY_PEER for verification
+            cert_store = OpenSSL::X509::Store.new
+            cert_store.set_default_paths
+            ctx.cert_store = cert_store
+            @socket = ::OpenSSL::SSL::SSLSocket.new(@socket, ctx)
+            @socket.connect
+          end
+          @handshake = ::WebSocket::Handshake::Client.new :url => url, :headers => options[:headers]
+          @handshaked = false
+          @pipe_broken = false
+          frame = ::WebSocket::Frame::Incoming::Client.new
+          @closed = false
+          once :__close do |err|
+            close
+            emit :close, err
+          end
+
+          @thread = Thread.new do
+            while !@closed do
+              begin
+                unless recv_data = @socket.getc
+                  sleep 1
+                  next
+                end
+                unless @handshaked
+                  @handshake << recv_data
+                  if @handshake.finished?
+                    @handshaked = true
+                    emit :open, @logger
+                  end
+                else
+                  frame << recv_data
+                  while msg = frame.next
+                    emit :message, msg, @logger
+                  end
+                end
+              rescue => e
+                emit :error, e, @logger
+              end
+            end
+          end
+
+          @socket.write @handshake.to_s
+        end
+
+        def send(data, opt={:type => :text})
+          return if !@handshaked or @closed
+          type = opt[:type]
+          frame = ::WebSocket::Frame::Outgoing::Client.new(:data => data, :type => type, :version => @handshake.version)
+          begin
+            @socket.write frame.to_s
+          rescue Errno::EPIPE => e
+            @pipe_broken = true
+            emit :__close, e
+          end
+        end
+
+        def close
+          return if @closed
+          if !@pipe_broken
+            send nil, :type => :close
+          end
+          @closed = true
+          @socket.close if @socket
+          @socket = nil
+          emit :__close
+          Thread.kill @thread if @thread
+        end
+
+        def open?
+          @handshake.finished? and !@closed
+        end
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt_train_runner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Burgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -91,8 +105,11 @@ files:
 - lib/bolt_train_runner/commands/throttle.rb
 - lib/bolt_train_runner/comms.rb
 - lib/bolt_train_runner/conf.rb
+- lib/bolt_train_runner/log.rb
 - lib/bolt_train_runner/session_runner.rb
 - lib/bolt_train_runner/version.rb
+- lib/websocket-client-simple.rb
+- lib/websocket-client-simple/client.rb
 homepage: https://github.com/puppetlabs/bolt-train-runner
 licenses:
 - MIT