traffic_light_controller 0.0.5 → 0.0.6

data/.gitignore

@@ -1,3 +1,4 @@
 coverage/
 pkg/
 spec/reports
+Gemfile.lock

data/Gemfile

@@ -3,19 +3,15 @@ source :rubygems
 gemspec
 
 group :development do
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-rspec"
-  gem "rb-fchange", :require => false
-  gem "rb-fsevent", :require => false
-  gem "rb-inotify", :require => false
-  gem "terminal-notifier-guard"
+  gem "rb-fchange", require: false
+  gem "rb-fsevent", require: false
+  gem "rb-inotify", require: false
 end
 
 group :test do
   gem "ci_reporter"
   gem "rake"
   gem "rspec"
-  gem "simplecov", :require => false
+  gem "simplecov", require: false
   gem "simplecov-rcov"
 end

data/lib/traffic_light_controller/cli.rb

@@ -1,7 +1,12 @@
+require 'command_line_helper'
+
 module TrafficLightController
   class CLI
+    include CommandLineHelper::HelpText
+
     class << self
       def run
+        change_program_name
         cli = self.new
         cli.process_command_line_options
         cli.run
@@ -13,15 +18,12 @@ module TrafficLightController
     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
+          show_version_info_and_exit
         end
       end
     end
@@ -34,6 +36,10 @@ module TrafficLightController
 
     attr_reader :server
 
+    def self.change_program_name
+      $0 = File.basename($0) << " (#{VERSION})"
+    end
+
     def options_possible
      [
         ['--help',    '-h', GetoptLong::NO_ARGUMENT],
@@ -46,57 +52,17 @@ module TrafficLightController
       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
+    def show_version_info_and_exit
+      STDOUT.puts version_info
+      exit
     end
 
     def version_info
       <<-EOV
-traffic_light_controller (#{version_number})
+#{program_name}
 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/version.rb

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

data/spec/lib/traffic_light_controller/cli_spec.rb

@@ -28,15 +28,4 @@ describe TrafficLightController::CLI do
       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/traffic_light_controller.gemspec

@@ -26,9 +26,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency("pry")
   s.add_development_dependency("pry-debugger")
   s.add_development_dependency("pry-stack_explorer")
+  s.add_development_dependency("guard")
+  s.add_development_dependency("guard-bundler")
+  s.add_development_dependency("guard-rspec")
+  s.add_development_dependency("terminal-notifier-guard")
 
   s.add_dependency("sinatra")
   s.add_dependency("arduino")
   s.add_dependency("json")
   s.add_dependency("hashie")
+  s.add_dependency("command_line_helper")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traffic_light_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,70 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: command_line_helper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: jcmuller@gmail.com
 executables:
@@ -149,7 +229,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.lock

@@ -1,108 +0,0 @@
-PATH
-  remote: .
-  specs:
-    traffic_light_controller (0.0.5)
-      arduino
-      hashie
-      json
-      sinatra
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    arduino (0.4)
-      serialport (>= 1.0.4)
-    binding_of_caller (0.6.8)
-    builder (3.1.4)
-    ci_reporter (1.7.3)
-      builder (>= 2.1.2)
-    coderay (1.0.8)
-    columnize (0.3.6)
-    debugger (1.1.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
-    diff-lcs (1.1.3)
-    ffi (1.1.5)
-    guard (1.5.4)
-      listen (>= 0.4.2)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-rspec (2.1.1)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    hashie (1.2.0)
-    json (1.7.5)
-    listen (0.5.3)
-    lumberjack (1.0.2)
-    method_source (0.8.1)
-    multi_json (1.3.7)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    pry-debugger (0.2.0)
-      debugger (~> 1.1.3)
-      pry (~> 0.9.9)
-    pry-stack_explorer (0.4.7)
-      binding_of_caller (~> 0.6.8)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (10.0.0)
-    rb-fchange (0.0.6)
-      ffi
-    rb-fsevent (0.9.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    serialport (1.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.3.3)
-    terminal-notifier-guard (1.5.3)
-    thor (0.16.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ci_reporter
-  guard
-  guard-bundler
-  guard-rspec
-  pry
-  pry-debugger
-  pry-stack_explorer
-  rake
-  rb-fchange
-  rb-fsevent
-  rb-inotify
-  rspec
-  simplecov
-  simplecov-rcov
-  terminal-notifier-guard
-  traffic_light_controller!