route_c 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I5ZjBmZjIyNDVkZTU0NjViNDI0MjFlOTY1YTc1M2VkNDQzZWM5MQ==
+    ZDkwYTg0Y2YwMjNkNTM3NjI0NTQ1NDU1YWM1MDQyZTU4ODIzMjc4Yw==
   data.tar.gz: !binary |-
-    YmU3MTljMDk2MGZkZTg2Y2Q4Nzc1MjljMTE2YmEzZTE1NTNkZGIwZA==
+    MWRlMzZjNGE4YjFiZWM0ZDg5ZjZjNjNkZjU5ZTM4NGZlZTQ2MTI4Yg==
 SHA512:
   metadata.gz: !binary |-
-    ODNiNDQxOGY0MjgyMDNlNWI4YmQ2MmJkYmE0ZDFhODc3NTdkZjdjMGI1Mjgz
-    YTdlMTljZjY1YWIxYWM5MjJmODM4OGQyNTRhOTI3MWRmYzEwNjEyMTIzYjdk
-    NDViYTc2OTU0NDgwOWE5YWVlN2NiODQ2ZTRhMTk3NjQ0YzJhZjg=
+    OThhZDFhYmM4Njg3MmIwNjE4YTIwN2FmMDdmYzk4ZTc5YWNjNzJiZWI2ZTM4
+    MjRjYzMwNTc3MGRmNzc4YjM5YzFkYmNlYTM3YWM1ODhkMmIzZWNiNDYwNjM5
+    NGQ4NjA5NTQwZTZkNGUyNWYzNTFmZGI4ODdjMmQwODRhZDNhNzg=
   data.tar.gz: !binary |-
-    ZTJkODg1NjY3ZmRlYzVkZTQ1OGJmMTgxOTQ1YTcxZDE4N2VlOThhOGIyZGI3
-    YjE5NzdjNTJmN2VjMmZlNjgyZjRmNDllYWU0ZmJhMDYzOWYwMThhODcwNjlk
-    Zjk4MjhhMDAzOTA1YWE5MjExMzBmNzA3MDFjMzVhN2I2NzBlYjQ=
+    MTQ1MTFmYzIzOWQ0ZTU3YzM4ZjIyYTkzMjY5ZmY5NzYwZTlkOTI3YzVmMmRi
+    ZDE2MzNiM2U5ZTJiODRiODNkZmVhYWE5ZjY4ZmU4ZTIxMzUxODRmZjY1OTkx
+    NjAyNTVmYmI1NDU3OTYxM2JhMjRmYTAzNGNlZThlY2RjNWM1M2Y=

data/README.md

@@ -4,3 +4,9 @@
 [![Code Climate](http://img.shields.io/codeclimate/github/TheODI-UD2D/route_c.svg?style=flat-square)](https://codeclimate.com/github/TheODI-UD2D/route_c)
 [![Gem Version](http://img.shields.io/gem/v/route_c.svg?style=flat-square)](https://rubygems.org/gems/route_c)
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://TheODI-UD2D.mit-license.org)
+
+# Crudely-drawn circuit
+
+![How to Pi](http://i.imgur.com/35a4myB.png)
+
+You might also need the [Treasure Map](http://pinout.xyz/)

data/config/config.yaml

@@ -1,4 +1,16 @@
 base_url: http://goingunderground.herokuapp.com/stations/arriving/
 interval: 0.1
 pause: 1
+lights:
+  - 15
+  - 18
+  - 23
+  - 24
+  - 25
+  - 8
+  - 7
+  - 12
 
+button: 21
+station: euston
+direction: southbound

data/lib/route_c/cli.rb

@@ -43,7 +43,7 @@ module RouteC
       end
 
       print 'Waiting for you to push the button... '
-      PiPiper.watch pin: Lights.button do
+      PiPiper.watch pin: config.button do
         RouteC::CLI.new.watching
       end
 
@@ -54,7 +54,7 @@ module RouteC
       def watching
         puts 'done'
         print 'Getting data... '
-        routec = RouteC::Query.new 'euston', 'southbound'
+        routec = RouteC::Query.new config.station, config.direction
         puts 'done'
 
         print 'Lighting lights... '
@@ -67,6 +67,10 @@ module RouteC
 
         print 'Waiting for you to push the button... '
       end
+
+      def config
+        @config ||= Config.new
+      end
     end
   end
 end

data/lib/route_c/config.rb

@@ -0,0 +1,30 @@
+module RouteC
+  class Config
+
+    def initialize
+      @config = fetch_yaml "#{gem_dir}/config.yaml"
+
+      if File.exists? "#{user_dir}/config.yaml"
+        @local = fetch_yaml "#{user_dir}/config.yaml"
+        @config.merge! @local
+      end
+
+      @config.each do |k,v|
+        self.class.send(:define_method, k.to_sym, Proc.new { return v })
+      end
+    end
+
+    def fetch_yaml file
+      YAML.load_file file
+    end
+
+    def user_dir
+      File.join(ENV['HOME'], '.routec')
+    end
+
+    def gem_dir
+      File.join(File.dirname(__FILE__), '..', '..', 'config')
+    end
+
+  end
+end

data/lib/route_c/lights.rb

@@ -2,34 +2,26 @@ module RouteC
   class Lights
 
     def initialize(array)
-      @array = array
+      @array, @config = array, Config.new
     end
 
     def turn_on
       @array.each_with_index do |b, i|
         if b == 1
           lights[i].on
-          sleep Query.config['interval']
+          sleep @config.interval
         end
       end
-      sleep Query.config['pause']
-      lights.reverse.each { |l| l.off ; sleep Query.config['interval'] }
+      sleep @config.pause
+      lights.reverse.each { |l| l.off ; sleep @config.interval }
     end
 
     def lights
-      @lights ||= Lights.pins.map { |p| PiPiper::Pin.new(pin: p, direction: :out) }
+      @lights ||= @config.lights.map { |p| PiPiper::Pin.new(pin: p, direction: :out) }
     end
 
     def release
       lights.map { |l| l.release }
     end
-
-    def self.pins
-      YAML.load_file('config/pins.yaml')['lights']
-    end
-
-    def self.button
-      YAML.load_file('config/pins.yaml')['button']
-    end
   end
 end

data/lib/route_c/query.rb

@@ -1,7 +1,7 @@
 module RouteC
   class Query
     def initialize(station, direction, datetime = nil)
-      @station, @direction, @datetime = station, direction, set_datetime(datetime)
+      @station, @direction, @datetime, @config = station, direction, set_datetime(datetime), Config.new
     end
 
     def set_datetime(datetime)
@@ -15,11 +15,7 @@ module RouteC
     end
 
     def url
-      "#{Query.config['base_url']}#{@direction}/#{@station}/#{@datetime}.json"
-    end
-
-    def self.config
-      YAML.load_file 'config/config.yaml'
+      "#{@config.base_url}#{@direction}/#{@station}/#{@datetime}.json"
     end
 
     def json
@@ -36,13 +32,13 @@ module RouteC
       average.round
     end
 
-    def self.num_elements average, elements = Lights.pins.count
+    def self.num_elements average, elements = Config.new.lights.count
       (elements * (average / 100.0)).round
     end
 
     def to_a
       num = Query.num_elements average_occupancy
-      Array.new(Lights.pins.count).each_with_index.map { |k,v| v + 1 <= num ? 1 : 0 }
+      Array.new(@config.lights.count).each_with_index.map { |k,v| v + 1 <= num ? 1 : 0 }
     end
 
     def to_lights

data/lib/route_c/version.rb

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

data/lib/route_c.rb

@@ -7,6 +7,7 @@ require 'pi_piper'
 Dotenv.load
 
 require "route_c/version"
+require "route_c/config"
 require "route_c/lights"
 require "route_c/query"
 require "route_c/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_c
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - pikesley
@@ -183,7 +183,6 @@ files:
 - bin/console
 - bin/setup
 - config/config.yaml
-- config/pins.yaml
 - exe/routec
 - fixtures/rspec/vcr/RouteC_CLI/lights_lights_on_button_press.yml
 - fixtures/rspec/vcr/RouteC_CLI/lights_the_lights.yml
@@ -194,6 +193,7 @@ files:
 - fixtures/rspec/vcr/RouteC_Query/lights_the_lights.yml
 - lib/route_c.rb
 - lib/route_c/cli.rb
+- lib/route_c/config.rb
 - lib/route_c/lights.rb
 - lib/route_c/query.rb
 - lib/route_c/version.rb

data/config/pins.yaml

@@ -1,11 +0,0 @@
-lights:
-  - 15
-  - 18
-  - 23
-  - 24
-  - 25
-  - 8
-  - 7
-  - 12
-
-button: 21