bolt_train_runner 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48d2fd061df535be03f5583b85f96ea40e80fb7b59e9a585c8345e9312c8e169
-  data.tar.gz: 630d34c786a3e334363f3f4f35b554e25944c2452bd6e0155e0e88369facb47c
+  metadata.gz: 435c6852758e4d68c5e11abd028ba1f0cc823075046266a915127f9085c2810e
+  data.tar.gz: a4d6d656a704c7375ee271c305cb5c74018c91762e502b20b5af7f7a09a7c2dd
 SHA512:
-  metadata.gz: e56fcffbd4f44ad4ca73c1113278717559b78bcb70d3e43253eb0835b9961db03a7fd18cbf7d3d6063f89bcc7be6bf70e8c82f0e808265711f57d32fb3c5269d
-  data.tar.gz: 27762f3c6a3675f27da754514ac3d7d4ad3697375b64c8dd24a13a599fb2a6ac199c735eab4403766b1938e1d1ec297de66a389b81b042a1e69ed8e5aa028625
+  metadata.gz: e5b069eb579346addf1f56c271cf2e23fab609cd211b86d7ee4d71200915b1af2ac993e19ee4f445b676c91d9629179c4da47af574ed403159e7f8a1ca2fb1ff
+  data.tar.gz: 0f31dae99a45ebf77fbd7a0af0b02a987733f29ac5031add9d111936dd2bbb283607b3a6310ce86c9590bffc8e6e7b9ec9e3206dfd72e5244c159f2f4cd938a3

data/lib/bolt_train_runner.rb

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'colorize'
 require 'bolt_train_runner/comms'
+require 'bolt_train_runner/session_runner'
 
 # Load all commands
 Dir[File.join(File.absolute_path(__dir__) + '/bolt_train_runner/commands') + "/**/*.rb"].each do |file|
@@ -24,6 +25,7 @@ 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
@@ -33,27 +35,36 @@ class BoltTrainRunner
       input = gets.chomp
       args = input.split(' ')
       command = args.shift
+
       case command
       when /^help$/i
         help
+      when Commands.respond_to?(command)
+        puts 'Commands can run this'
       when /^connect$/i
         newcomms = Commands.connect(args)
         comms = newcomms if newcomms
       when /^disconnect$/i
+        session_runner.stop if session_runner
+        session_runner = nil
         Commands.disconnect(comms)
         comms = nil
+      when /^sessions$/i
+        session_runner = Commands.sessions(args, comms, session_runner)
       when /^debug$/i
         Commands.debug(args)
-      when /^power$/i
-        Commands.power(args, comms)
-      when /^throttle$/i
-        Commands.throttle(args, comms)
-      when /^move$/i
-        Commands.move(args, comms)
       when /^exit$/i
-        Commands.exit_program(comms)
+        Commands.exit_program(comms, session_runner)
       else
-        puts "Unknown command: #{command}".red
+        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)
+        else
+          puts "Unknown command: #{command}".red
+        end
       end
     end
   end
@@ -66,6 +77,7 @@ class BoltTrainRunner
     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
   end
 

data/lib/bolt_train_runner/commands/exit.rb

@@ -2,10 +2,9 @@ require 'colorize'
 require 'bolt_train_runner/comms'
 
 module Commands
-  def self.exit_program(comms)
-    if comms
-      comms.disconnect
-    end
+  def self.exit_program(comms, session_runner)
+    session_runner.stop if session_runner
+    comms.disconnect if comms
     puts 'Seeya later!'.green
     exit 0
   end

data/lib/bolt_train_runner/commands/move.rb

@@ -1,4 +1,6 @@
 require 'bolt_train_runner/comms'
+require 'bolt_train_runner/commands/throttle'
+require 'bolt_train_runner/commands/stop'
 require 'colorize'
 
 module Commands
@@ -15,13 +17,21 @@ module Commands
       return
     end
 
-    if args.length < 3
+
+    if args.is_a?(Hash)
+      direction = args['direction']
+      speed = args['speed']
+      time = args['time']
+    else
+      direction, speed, time = args
+    end
+  
+    unless direction && speed && time
       puts 'Please provide direction, speed, and time'.red
       return
     end
-    direction = args[0]
-    speed = args[1].to_i
-    time = args[2].to_i
+    speed = speed.to_i
+    time = time.to_i
     unless ['forward','reverse'].include?(direction)
       puts 'Please provide "forward" or "reverse" for direction'.red
       return
@@ -35,31 +45,10 @@ module Commands
       return
     end
 
-    message = {
-      'type'   => 'throttle',
-      'method' => 'put',
-      'data'   => {
-        'throttle' => 'bolttrain',
-        'address'  => '6871',
-        'speed'    => "#{speed/10.0}",
-        'forward'  => "#{direction == 'forward'}"
-      }
-    }
-    comms.send_message(message)
-    puts "Train moving #{direction} at speed #{speed}".green
-    puts "Waiting #{time} seconds".green
+    puts "Moving train #{direction} direction at speed #{speed} for #{time} seconds...".green
+    Commands.throttle([speed,direction],comms)
     sleep(time)
-    puts "Stopping train".green
-    message = {
-      'type'   => 'throttle',
-      'method' => 'post',
-      'data'   => {
-        'throttle' => 'bolttrain',
-        'address'  => '6871',
-        'speed'    => '0'
-      }
-    }
-    comms.send_message(message)
+    Commands.stop(nil, comms)
     puts 'Move complete'.green
   end
 end

data/lib/bolt_train_runner/commands/power.rb

@@ -13,7 +13,13 @@ module Commands
       puts 'Turns power to the train on or off. Must first be connected.'.cyan
       return
     end
-    state = args[0]
+
+    if args.is_a?(Hash)
+      state = args['state']
+    else
+      state = args[0]
+    end
+    
     unless ['on','off'].include?(state)
       puts 'Please provide either "on" or "off"'.red
       return
@@ -30,5 +36,6 @@ module Commands
       }
     }
     comms.send_message(message)
+    puts "Power #{state}".green
   end
 end

data/lib/bolt_train_runner/commands/sessions.rb

@@ -0,0 +1,64 @@
+require 'colorize'
+require 'bolt_train_runner/conf'
+require 'bolt_train_runner/session_runner'
+
+module Commands
+  def self.sessions(args, comms, session_runner)
+    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
+      return
+    end
+    
+    state = args[0]
+    starting = state == 'start'
+    if !['start','stop'].include?(state)
+      puts 'Please provide either "start" or "stop"'.red
+      return
+    end
+
+    unless comms
+      puts 'Please connect first'.red
+      return
+    end
+
+    if starting and session_runner
+      puts 'Session runner thread already started'.yellow
+      return session_runner
+    end
+
+    if !starting and !session_runner
+      puts 'No session runner thread currently running'.yellow
+      return nil
+    end
+
+    if starting
+      conf = Conf.load_conf
+      if args[1]
+        session_dir = args[1]
+        conf['session_dir'] = session_dir
+        Conf.save_conf(conf)
+      else
+        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] > '
+          session_dir = gets.chomp
+          session_dir = '/tmp/bolt-train-queue' if session_dir.empty?
+          conf['session_dir'] = session_dir
+          Conf.save_conf(conf)
+        end
+      end
+      
+      runner = SessionRunner.new(comms, session_dir)
+      runner.start
+      return runner
+    else
+      session_runner.stop
+      return nil
+    end
+  end
+end

data/lib/bolt_train_runner/commands/stop.rb

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

data/lib/bolt_train_runner/commands/throttle.rb

@@ -15,18 +15,22 @@ module Commands
       return
     end
 
-    speed = args[0].to_i
+    if args.is_a?(Hash)
+      speed = args['speed']
+      direction = args['direction']
+    else
+      speed, direction = args
+    end
+    
+    speed = speed.to_i
     if speed < 0 or speed > 10
       puts 'Please select a speed between 0 and 10'.red
       return
     end
-    direction = nil
-    if args.length > 1
-      direction = args[1]
-      unless ['forward','reverse'].include?(direction)
-        puts 'Direction must be either "forward" or "reverse"'.red
-        return
-      end
+
+    unless direction.nil? || ['forward','reverse'].include?(direction)
+      puts 'Direction must be either "forward" or "reverse"'.red
+      return
     end
 
     message = {

data/lib/bolt_train_runner/comms.rb

@@ -2,7 +2,6 @@ require 'websocket-client-simple'
 require 'json'
 require 'colorize'
 require 'bolt_train_runner/conf'
-require 'pry-byebug'
 
 # Sending and receiving responses is a little bit funky
 # Since we have to receive messages asynchronously, and because
@@ -18,7 +17,6 @@ class Comms
   @heartbeat_thread = nil
   @consumer_thread = nil
   @kill_threads = false
-  @queue = []
 
   def initialize(server)
     debug = Conf.debug

data/lib/bolt_train_runner/session_runner.rb

@@ -0,0 +1,58 @@
+require 'json'
+
+# Load all commands
+Dir[File.join(File.absolute_path(__dir__) + '/bolt_train_runner/commands') + "/**/*.rb"].each do |file|
+  require file
+end
+
+# This class manages a thread which monitors a directory that the bolt-train-api will
+# place session files in.  As these files show up, the thread should read them and
+# issue the commands, delete the session file, then move to the next oldest file in the directory.
+
+class SessionRunner
+
+  @session_thread = nil
+  @kill_thread = false
+
+  def initialize(comms, session_dir)
+    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
+  end
+
+  def start
+    @session_thread = Thread.new { run_thread }
+  end
+
+  def stop
+    @kill_thread = true
+    puts 'Stopping Session Runner'.magenta
+    @session_thread.join if @session_thread
+  end
+
+  def run_thread
+    while !@kill_thread
+      files = Dir["#{@session_dir}/*.json"].sort_by { |f| File.mtime(f) }
+      files.each do |f|
+        data = JSON.parse(File.read(f))
+        session = data['session']
+        email = session['email']
+        puts "[Session Runner] Starting session for #{email}".magenta
+        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)
+        end
+        File.delete(f)
+        puts "[Session Runner] Session for #{email} complete".magenta
+      end
+    end
+  end
+
+end

data/lib/bolt_train_runner/version.rb

@@ -1,3 +1,3 @@
 module BoltTrainRunner
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt_train_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Burgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,9 +86,12 @@ files:
 - lib/bolt_train_runner/commands/exit.rb
 - lib/bolt_train_runner/commands/move.rb
 - lib/bolt_train_runner/commands/power.rb
+- lib/bolt_train_runner/commands/sessions.rb
+- lib/bolt_train_runner/commands/stop.rb
 - lib/bolt_train_runner/commands/throttle.rb
 - lib/bolt_train_runner/comms.rb
 - lib/bolt_train_runner/conf.rb
+- lib/bolt_train_runner/session_runner.rb
 - lib/bolt_train_runner/version.rb
 homepage: https://github.com/puppetlabs/bolt-train-runner
 licenses: