traffic_light_controller 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    traffic_light_controller (0.0.3)
+    traffic_light_controller (0.0.5)
       arduino
       hashie
       json

data/bin/traffic_light_controller

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'traffic_light_controller'
-TrafficLightController::CLI.new
+TrafficLightController::CLI.run

data/lib/traffic_light_controller/cli.rb

@@ -1,7 +1,102 @@
 module TrafficLightController
   class CLI
+    class << self
+      def run
+        cli = self.new
+        cli.process_command_line_options
+        cli.run
+      end
+    end
+
     def initialize
-      TrafficLightController::Server.new.work
+      @server = Server.new
+    end
+
+    def process_command_line_options
+      @options = {}
+
+      GetoptLong.new(*options_possible).each do |opt, arg|
+        case opt
+        when '--help'
+          show_help_and_exit
+        when '--version'
+          puts version_info
+          exit
+        end
+      end
+    end
+
+    def run
+      server.work
+    end
+
+    private
+
+    attr_reader :server
+
+    def options_possible
+     [
+        ['--help',    '-h', GetoptLong::NO_ARGUMENT],
+        ['--version', '-V', GetoptLong::NO_ARGUMENT],
+      ]
+    end
+
+    def show_help_and_exit
+      STDOUT.puts help_info
+      exit
+    end
+
+    def help_info
+      <<-EOH
+Usage: #{prog_name} [options]
+  #{short_hand_options}
+
+  Options:
+#{option_details}
+#{version_info}
+      EOH
+    end
+
+    def prog_name
+      File.basename($0)
+    end
+
+    def short_hand_options
+      "[#{options_possible.map{ |o| short_hand_option(o)}.join('], [')}]"
+    end
+
+    def short_hand_option(option)
+      if option[2] == GetoptLong::REQUIRED_ARGUMENT
+        [option[0], option[1]].join('|') << " argument"
+      else
+        [option[0], option[1]].join('|')
+      end
+    end
+
+    def option_details
+      <<-EOO
+#{options_possible.map{ |o| expand_option(o) }.join("\n")}
+      EOO
+    end
+
+    def version_info
+      <<-EOV
+traffic_light_controller (#{version_number})
+https://github.com/jcmuller/traffic_light_controller
+(c) 2012 Juan C. Muller
+      EOV
+    end
+
+    def version_number
+      VERSION
+    end
+
+    def longest_width
+      @max_width ||= options_possible.map{ |o| o[0] }.max{ |a, b| a.length <=> b.length }.length
+    end
+
+    def expand_option(option)
+      sprintf("    %-#{longest_width + 6}s %s", option.first(2).join(', '), option[3])
     end
   end
 end

data/lib/traffic_light_controller/server.rb

@@ -5,6 +5,7 @@ module TrafficLightController
       Thread.abort_on_exception = true
       @config = Config.new
       @server = TCPServer.new(config.server.address, config.server.port)
+      @current_path = ""
     rescue Errno::EADDRINUSE
       address_in_use_error(config.server)
     rescue Errno::EADDRNOTAVAIL, SocketError
@@ -19,28 +20,43 @@ module TrafficLightController
 
     private
 
-    attr_reader :server, :config, :board
+    attr_reader :server, :config, :board, :current_path
 
     def start_thread_and_do_work
-      Thread.start(server.accept) do |client|
-        work_with_client(client)
+      Thread.start(server.accept) do |request|
+        accept_request(request)
       end
     end
 
-    def work_with_client(client)
-      puts "work_with_client"
-      process_path(process_request(client))
+    def accept_request(request)
+      process_request(request)
     rescue => e
-      puts "Got #{e.class}: #{e}!"
+      STDERR.puts "Got #{e.class}: #{e}!
+
+#{e.backtrace.join($/)}"
     ensure
-      client.close
+      request.close
     end
 
-    def process_request(client)
-      puts "process_request"
-      path = nil
+    def process_request(request)
+      path = path_from_request(request)
 
-      while(line = client.readline) do
+      if config.arduino.lights.has_key?(path)
+        if path != current_path
+          @current_path = path
+          change_pins(path)
+          respond_200(request, path)
+        else
+          respond_304(request, path)
+        end
+      else
+        respond_404(request, path)
+      end
+    end
+
+    def path_from_request(request)
+      path = ""
+      while(line = request.readline) do
         break if line == "\r\n"
         if match = line.match(%r{GET /+(?<path>\w*) HTTP/1\.})
           path = match[:path]
@@ -50,28 +66,28 @@ module TrafficLightController
       path
     end
 
-    def process_path(path)
-      puts "process_path"
-      if config.arduino.lights.has_key?(path)
-        change_pins(path)
-        client.print "HTTP/1.1 200 OK\r\nContent-type:text/plain\r\n\r\n"
-        client.puts path
-      else
-        client.print "HTTP/1.1 404 Not Found\r\nContent-type:text/plain\r\n\r\n"
-        client.puts "The requested path doesn't exist"
-      end
-    end
-
     def change_pins(path)
-      puts "change_pins"
       init_board
       board.turnOff
       board.setHigh(config.arduino.lights[path]) unless path == "off"
       board.close
     end
 
+    def respond_200(request, path)
+      request.print "HTTP/1.1 200 OK\r\nContent-type:text/plain\r\n\r\n"
+      request.puts path
+    end
+
+    def respond_304(request, path)
+      request.puts "HTTP/1.1 304 Not Modified\r\nContent-type:text/plain\r\n\r\n"
+    end
+
+    def respond_404(request, path)
+      request.print "HTTP/1.1 404 Not Found\r\nContent-type:text/plain\r\n\r\n"
+      request.puts "The requested path doesn't exist"
+    end
+
     def init_board
-      puts "board"
       @board = Arduino.new(config.arduino.port)
     rescue Errno::ENOENT
       STDERR.puts "The port #{config.arduino.port} doesn't exist"

data/lib/traffic_light_controller/version.rb

@@ -1,3 +1,3 @@
 module TrafficLightController
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/traffic_light_controller.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "arduino"
+require "getoptlong"
 require "hashie"
 require "socket"
 require "yaml"
@@ -8,5 +9,5 @@ module TrafficLightController
   autoload :Config, "traffic_light_controller/config"
   autoload :CLI, "traffic_light_controller/cli"
   autoload :Server, "traffic_light_controller/server"
-  autoload :VERION, "traffic_light_controller/version"
+  autoload :VERSION, "traffic_light_controller/version"
 end

data/spec/lib/traffic_light_controller/cli_spec.rb

@@ -1,12 +1,42 @@
 require 'spec_helper'
 
 describe TrafficLightController::CLI do
-  describe "#work" do
+  let(:config) { mock }
+  let(:server) { mock }
+
+  before do
+    TrafficLightController::Config.stub(:new).and_return(config)
+    TrafficLightController::Server.stub(:new).and_return(server)
+
+    config.stub_chain(:server, :address).and_return("127.0.0.1")
+    config.stub_chain(:server, :port).and_return(5678)
+  end
+
+  describe ".run" do
     it "should initialize server and call work on it" do
       server = mock
       TrafficLightController::Server.should_receive(:new).and_return(server)
       server.should_receive(:work)
-      described_class.new
+      described_class.run
+    end
+  end
+
+  describe "show_help_and_exit" do
+    it "should show help" do
+      STDOUT.stub(:puts)
+      subject.should_receive(:help_info)
+      expect{ subject.send(:show_help_and_exit) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#help_info" do
+    it "should return the nice string" do
+      subject.should_receive(:prog_name)
+      subject.should_receive(:short_hand_options)
+      subject.should_receive(:option_details)
+      subject.should_receive(:version_info)
+
+      subject.send(:help_info)
     end
   end
 end

data/spec/lib/traffic_light_controller/server_spec.rb

@@ -69,28 +69,25 @@ describe TrafficLightController::Server do
   describe "#start_thread_and_do_work" do
     it "should start a thread" do
       Thread.should_receive(:start).and_yield(client)
-      subject.should_receive(:work_with_client).with(client)
+      subject.should_receive(:accept_request).with(client)
       subject.send(:start_thread_and_do_work)
     end
   end
 
-  describe "#work_with_client" do
+  describe "#accept_request" do
     it "should call process path" do
       subject.should_receive(:process_request).with(client).and_return(:processed)
-      subject.should_receive(:process_path).with(:processed)
       client.should_receive(:close)
 
-      subject.send(:work_with_client, client)
+      subject.send(:accept_request, client)
     end
 
-    it "should rescue from all exceptions and log them to STDOUT" do
+    it "should rescue from all exceptions and log them to STDERR" do
       subject.should_receive(:process_request).and_raise RuntimeError
-
-      STDOUT.should_receive(:puts).with("Got RuntimeError: RuntimeError!")
-
+      STDERR.should_receive(:puts)
       client.should_receive(:close)
 
-      subject.send(:work_with_client, client)
+      subject.send(:accept_request, client)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traffic_light_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: