tsp_runner 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de20bb835ad9abb7ca9b8200d3900881d9445d9
-  data.tar.gz: 4b8b15b499659263bf014641bc2f8b855cc2572d
+  metadata.gz: b3b74d923c3314308b08c1e20305017d452b7730
+  data.tar.gz: 060ae82a558dca144846542b7b483f0234751f93
 SHA512:
-  metadata.gz: deba5646b3df24fca5c236dd821e766ac71b84a64522d622157299b59b64bbdc416f36df6c2bddffb4603b567cc2d3da309db9164e1f9a53138d6600a2113fa0
-  data.tar.gz: 5667cf34f1385ad59ddb692270ad743af61b569462949cedec938231750436e1083222e8e6714ccc91da3db8a2780b77039946ac6c2892014c6d4cce929e3545
+  metadata.gz: 854ef5741aba85fe543bacb7bbb4dda18c0749bd68f1b0154b0d02054df65d49fa885d1872aa0ef219cf296f9bea3d751ab351200e598fb615e7b147640dd4a5
+  data.tar.gz: 4aebefcea41fc014b37075278a20f32dbf34e7876546855dcb68c3ce2a4d84841ee1b5fcf2e52450bae488a5ebaab678f8f6d74a70247b124b67c41d0c749f0f

data/.gitignore

@@ -1,3 +1,4 @@
+/tsp_runner-*.gem
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/exe/tsp_runner

@@ -2,14 +2,5 @@
 require 'bundler/setup'
 require 'tsp_runner'
 
-filename = File.join(File.dirname(__FILE__), '..', 'data', 'input', 'sample_10.csv')
-
-begin
-  runner = TspRunner::Runner.new(ARGV.join(' '), filename)
-  runner.run(5)
-  distance = runner.validate!('San Francisco')
-  $stdout.puts("Success: #{distance} km")
-rescue TspRunner::Runner::BaseError => error
-  $stderr.puts error.message
-  exit(1)
-end
+runner = TspRunner::Runner.new(ARGV[0], ARGV[1], *ARGV[2..-1])
+runner.run

data/lib/tsp_runner/runner.rb

@@ -2,35 +2,68 @@ require 'timeout'
 
 module TspRunner
   class Runner
-    class BaseError < StandardError; end
-    class TimeoutError < BaseError; end
-    class InvalidError < BaseError; end
+    class InvalidError < StandardError; end
 
-    attr_reader :cmd, :input_filename, :output
+    attr_reader :cmd, :filename, :time_limit
 
-    def initialize(cmd, input_filename)
-      @cmd, @input_filename  = cmd, input_filename
+    def self.usage
+      puts "Usage: #{$0} <time limit> <input file> <command> [command arg 1]..."
+      puts ''
+      puts ' time limit    - maximum duration the executable can run in seconds'
+      puts ' input file    - input file with location names and lat/lons'
+      puts ' command       - command line executable that calculates the path'
+      puts ' command arg n - optional args for the command line executable'
     end
 
-    def run(time_limit)
-      @output = Timeout.timeout(time_limit) { `#{cmd} #{input_filename}` }
+    def initialize(time_limit, filename, *cmd_and_opts)
+      @time_limit = time_limit
+      @filename = filename
+      @cmd = cmd_and_opts.join(' ')
+    end
+
+    def validate_input
+      return false if time_limit.nil? || filename.nil? || cmd.to_s.length == 0
+      Integer(time_limit.to_s, 10)
+      unless File.exists?(filename.to_s)
+        puts "Input file does not exist: #{filename}"
+        return false
+      end
+      true
+    rescue ArgumentError
+      puts "Invalid time limit: #{time_limit}"
+      false
+    end
+
+    def run
+      unless validate_input
+        self.class.usage
+        return
+      end
+
+      output = Timeout.timeout(time_limit.to_i) { `#{cmd} #{filename}` }
+      distance = validate!(output, 'San Francisco')
+      puts("Success: #{distance} km")
+    rescue InvalidError => error
+      $stderr.puts error
+      exit(1)
     rescue Timeout::Error
-      raise TimeoutError, 'Failed: timeout'
+      $stderr.puts 'Failed: timeout'
+      exit(1)
     end
 
-    def validate!(initial_location_name = nil)
+    def validate!(output, initial_location_name = nil)
       solution = TspRunner::Solution.from_string(output, location_hash)
       if solution.valid?(initial_location_name)
         solution.total_distance / 1000.0
       else
-        raise InvalidError, ['Failed: invalid', output].join("\n")
+        raise InvalidError, ['Failed: invalid, program output:', output].join("\n")
       end
     end
 
     private
 
     def location_hash
-      @location_hash ||= TspRunner::LocationHash.from_file(input_filename)
+      @location_hash ||= TspRunner::LocationHash.from_file(filename)
     end
   end
 end

data/lib/tsp_runner/version.rb

@@ -1,3 +1,3 @@
 module TspRunner
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tsp_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tom Collier