route_c 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDkwYTg0Y2YwMjNkNTM3NjI0NTQ1NDU1YWM1MDQyZTU4ODIzMjc4Yw==
+    MThmMDFmN2QyYjc2YWNkZDc4Nzg0ZjIyNTExMTM3ODMzMGY5NTg4Yg==
   data.tar.gz: !binary |-
-    MWRlMzZjNGE4YjFiZWM0ZDg5ZjZjNjNkZjU5ZTM4NGZlZTQ2MTI4Yg==
+    NDc2OTNjMTRiOGNkZjBmYzFjODA3NmExMGNjYTkyYzdjNzdkNTA3NQ==
 SHA512:
   metadata.gz: !binary |-
-    OThhZDFhYmM4Njg3MmIwNjE4YTIwN2FmMDdmYzk4ZTc5YWNjNzJiZWI2ZTM4
-    MjRjYzMwNTc3MGRmNzc4YjM5YzFkYmNlYTM3YWM1ODhkMmIzZWNiNDYwNjM5
-    NGQ4NjA5NTQwZTZkNGUyNWYzNTFmZGI4ODdjMmQwODRhZDNhNzg=
+    NjJhNGRhNGFkMGJkMjBkYTczMTllZjhlMGVhM2IwNDZhOTViOGUxMjNiOTE1
+    NjA2MDgyZTVhMTVmYTEwZjhiNWU0NGQzNTQ5NzU3ZmM1YTQzZmIxNzEwYzBm
+    MGIyYzIzNWY5MWQ0MmNiY2Y4NzU0MDkxMzc1YWI1NWU0NjQ0MmU=
   data.tar.gz: !binary |-
-    MTQ1MTFmYzIzOWQ0ZTU3YzM4ZjIyYTkzMjY5ZmY5NzYwZTlkOTI3YzVmMmRi
-    ZDE2MzNiM2U5ZTJiODRiODNkZmVhYWE5ZjY4ZmU4ZTIxMzUxODRmZjY1OTkx
-    NjAyNTVmYmI1NDU3OTYxM2JhMjRmYTAzNGNlZThlY2RjNWM1M2Y=
+    MjIwOGZlNGQwOWQwMmM2ZjY4ZmUwNTM4NjIyNTBlN2NhYzE4MDAzMmE3Yzkw
+    NjlmYzMyYjFkMmY5OTM5NmE0Nzg1MTRhZTJiZThjOTdiNjRmNTMwNTJiZDAz
+    NTljZGFmYzk0Nzg1OTk1YWYxOWQyZDk2NzJiODcyODdiMGFhNjQ=

data/config/config.yaml

@@ -14,3 +14,23 @@ lights:
 button: 21
 station: euston
 direction: southbound
+
+valid_stations:
+
+stations:
+  - walthamstow_central
+  - blackhorse_road
+  - tottenham_hale
+  - seven_sisters
+  - finsbury_park
+  - highbury_and_islington
+  - kings_cross_st_pancras
+  - euston
+  - warren_street
+  - oxford_circus
+  - green_park
+  - victoria
+  - pimlico
+  - vauxhall
+  - stockwell
+  - brixton

data/lib/route_c/cli.rb

@@ -9,7 +9,7 @@ module RouteC
     end
     map %w(-v --version) => :version
 
-    desc 'lights', 'Show lights for station and direction'
+    desc 'lights <STATION> <DIRECTION> [--datetime]', 'Show lights for station and direction'
     method_option :time,
                   type: :string,
                   default: '2015-09-23T18:00',
@@ -21,7 +21,13 @@ module RouteC
                   desc: 'Dump output to console (instead of LEDs)'
 
     def lights station, direction
-      routec = RouteC::Query.new station, direction, options[:time]
+      begin
+        routec = RouteC::Query.new station, direction, options[:time]
+      rescue RouteCException => rce
+        puts rce.status
+        exit 1
+      end
+
       if options['console']
         puts routec.to_a.inspect
       else

data/lib/route_c/query.rb

@@ -1,7 +1,10 @@
 module RouteC
   class Query
     def initialize(station, direction, datetime = nil)
-      @station, @direction, @datetime, @config = station, direction, set_datetime(datetime), Config.new
+      @station = Query.validate_station(station)
+      @direction = Query.boundify(direction)
+      @datetime = set_datetime(datetime)
+      @config = Config.new
     end
 
     def set_datetime(datetime)
@@ -48,5 +51,30 @@ module RouteC
     def lights
       @lights ||= Lights.new(to_a)
     end
+
+    def self.boundify direction
+      case direction
+        when /^n/
+          'northbound'
+        when /^s/
+          'southbound'
+        else
+          raise RouteCException.new "Invalid direction '#{direction}'"
+      end
+    end
+
+    def self.validate_station station
+      s = station.downcase.gsub(' ', '_')
+      return s if Config.new.stations.include? s
+      raise RouteCException.new "Unknown station '#{station}'"
+    end
+  end
+
+  class RouteCException < Exception
+    attr_reader :status
+
+    def initialize status
+      @status = status
+    end
   end
 end

data/lib/route_c/version.rb

@@ -1,3 +1,3 @@
 module RouteC
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/route_c.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 1.22'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'curacao' #, '~> 0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_c
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - pikesley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -165,6 +165,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: curacao
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: words
 email:
 - ops@theodi.org