build_status_server 0.15 → 0.17

data/.gitignore

@@ -1,2 +1,3 @@
 coverage/
 pkg/
+Gemfile.lock

data/Gemfile

@@ -10,12 +10,3 @@ group :test do
   gem "simplecov", :require => false
   gem "simplecov-rcov"
 end
-
-group :development do
-  gem "sinatra"
-  gem "ruby-debug19"
-end
-
-group :development, :test do
-  gem "rake"
-end

data/README.md

@@ -1,6 +1,7 @@
 # Build Notifier
 [![Build Status](https://secure.travis-ci.org/jcmuller/build_status_server.png?branch=master)](http://travis-ci.org/jcmuller/build_status_server)
-[![Dependency Status](https://gemnasium.com/pluginaweek/state_machine.png "Dependency Status")](https://gemnasium.com/jcmuller/build_status_server)
+[![Dependency Status](https://gemnasium.com/jcmuller/build_status_server.png "Dependency Status")](https://gemnasium.com/jcmuller/build_status_server)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jcmuller/build_status_server)
 
 This utility is part of an XFD (eXtreme Feedback Device) solution designed and
 built for my employer [ChallengePost](http://challengepost.com). It works in

data/build_status_server.gemspec

@@ -28,9 +28,10 @@ Notification Plugin)) and an Arduino powered Traffic Light controller
   s.test_files = Dir["spec/**/*_spec.rb"]
 
   s.add_development_dependency("rake")
-  s.add_development_dependency("ruby-debug19")
+  s.add_development_dependency("pry-debugger")
   s.add_development_dependency("sinatra")
 
   s.add_dependency("json")
+  s.add_dependency("command_line_helper")
 end
 

data/lib/build_status_server/cli.rb

@@ -1,10 +1,14 @@
 require 'getoptlong'
+require 'command_line_helper'
 
 module BuildStatusServer
   class CLI
+    include CommandLineHelper::HelpText
+
     attr_reader :options
 
     def initialize
+      set_program_name
       begin
         process_command_line_options
       rescue GetoptLong::MissingArgument
@@ -17,17 +21,19 @@ module BuildStatusServer
 
     private
 
+    def options_possible
+      [
+        ['--config',  '-c', GetoptLong::REQUIRED_ARGUMENT, 'Override the configuration file location'],
+        ['--help',    '-h', GetoptLong::NO_ARGUMENT, 'Show this text'],
+        ['--verbose', '-v', GetoptLong::NO_ARGUMENT, ''],
+        ['--version', '-V', GetoptLong::NO_ARGUMENT, 'Show version info'],
+      ]
+    end
+
     def process_command_line_options
       @options = {}
 
-      possible_arguments = [
-        ['--config',      '-c', GetoptLong::REQUIRED_ARGUMENT],
-        ['--help',        '-h', GetoptLong::NO_ARGUMENT],
-        ['--verbose',     '-v', GetoptLong::NO_ARGUMENT],
-        ['--version',     '-V', GetoptLong::NO_ARGUMENT],
-      ]
-
-      GetoptLong.new(*possible_arguments).each do |opt, arg|
+      cli_options.each do |opt, arg|
         case opt
         when '--help'
           show_help_and_exit
@@ -36,15 +42,19 @@ module BuildStatusServer
         when '--verbose'
           options[:verbose] = true
         when '--version'
-          puts get_version
+          puts version_info
           exit
         end
       end
     end
 
-    def get_version
+    def cli_options
+      @cli_options ||= GetoptLong.new(*options_possible.map{ |o| o.first(3) })
+    end
+
+    def version_info
       <<-EOV
-#{get_program_name}, version #{BuildStatusServer::VERSION}
+#{program_name}, version #{VERSION}
 
 (c) Juan C. Muller, 2012
 http://github.com/jcmuller/build_status_server
@@ -52,22 +62,12 @@ http://github.com/jcmuller/build_status_server
     end
 
     def show_help_and_exit
-      puts <<-EOT
-Usage: #{get_program_name} [options]
-
-Options:
-  -c, --config CONFIGURATION  Specify what configuration file to load
-  -h, --help                  Display this very helpful text
-  -v, --verbose               Be more informative about what's going on
-  -V, --version               Print out current version info
-
-#{get_version}
-      EOT
+      STDOUT.puts help_info
       exit
     end
 
-    def get_program_name
-      File.basename($0)
+    def set_program_name
+      $0 = "#{File.basename($0)} (#{VERSION})"
     end
   end
 end

data/lib/build_status_server/config.rb

@@ -68,7 +68,7 @@ strongly recommended to create one in any of the following locations:
 #{get_example_config}
 
 Also, you can specify what configuration file to load by passing --config as an
-argument (see "#{File.basename($0)} --help")
+argument (see "build_status_server --help")
 
           EOT
 

data/lib/build_status_server/server.rb

@@ -24,7 +24,7 @@ module BuildStatusServer
     private
 
     def process_loop
-      data, addr = udp_server.recvfrom(2048)
+      data, _ = udp_server.recvfrom(2048)
 
       if process_job(data)
         status = process_all_statuses
@@ -69,7 +69,7 @@ The address configured is not available (#{address})
     def process_job(data = "{}")
       job = begin
               JSON.parse(data)
-            rescue JSON::ParserError => ex
+            rescue JSON::ParserError
               STDERR.puts "Invalid JSON! (Or at least JSON wasn't able to parse it...)\nReceived: #{data}"
               return false
             end
@@ -144,7 +144,7 @@ The address configured is not available (#{address})
         timeout(5) do
           attempts += 1
           client = TCPSocket.new(tcp_client["host"], tcp_client["port"])
-          client.print "GET #{light} HTTP/1.0\n\n"
+          client.print "GET #{light} HTTP/1.0\r\n\r\n"
           answer = client.gets(nil)
           STDOUT.puts answer if config.verbose
         end

data/lib/build_status_server/version.rb

@@ -1,3 +1,3 @@
 module BuildStatusServer
-  VERSION = "0.15"
+  VERSION = "0.17"
 end

data/spec/lib/build_status_server/config_spec.rb

@@ -55,7 +55,7 @@ describe BuildStatusServer::Config do
 
     it "should throw an exception if the config file doesn't exist" do
       file_name = "/tmp/i_dont_exist.yml"
-      expect { config.send(:load_config_file, file_name) }.should raise_error RuntimeError, "Supplied config file (#{file_name}) doesn't seem to exist"
+      expect { config.send(:load_config_file, file_name) }.to raise_error RuntimeError, "Supplied config file (#{file_name}) doesn't seem to exist"
     end
 
     it "should throw an exception if the config file isn't a hash" do
@@ -64,7 +64,7 @@ describe BuildStatusServer::Config do
         f.puts "YADDA YADDA"
         file_name = f.path
       end
-      expect { config.send(:load_config_file, file_name) }.should raise_error RuntimeError, "This is an invalid configuration file!"
+      expect { config.send(:load_config_file, file_name) }.to raise_error RuntimeError, "This is an invalid configuration file!"
     end
 
     it "should return the default options if no default location is found" do
@@ -94,7 +94,7 @@ describe BuildStatusServer::Config do
     end
 
     it "should not respond to methods named after elements that don't exist" do
-      expect { config.blah }.should raise_error NoMethodError
+      expect{ config.blah }.to raise_error NoMethodError
     end
   end
 end

data/spec/lib/build_status_server/server_spec.rb

@@ -228,7 +228,7 @@ describe BuildStatusServer::Server do
 
       it "doesn't die if invalid JSON is passed in" do
         STDERR.should_receive(:puts).with("Invalid JSON! (Or at least JSON wasn't able to parse it...)\nReceived: {b => \"123\"}")
-        expect { server.send(:process_job, '{b => "123"}') }.should_not raise_error(JSON::ParserError)
+        expect { server.send(:process_job, '{b => "123"}') }.to_not raise_error(JSON::ParserError)
       end
 
       it "returns false and says so on stderr if payload doesn't have a hash for build" do
@@ -319,12 +319,12 @@ describe BuildStatusServer::Server do
         end
 
         it "should send passing packet to tcp socket when status is true" do
-          client.should_receive(:print).with("GET pass HTTP/1.0\n\n")
+          client.should_receive(:print).with("GET pass HTTP/1.0\r\n\r\n")
           server.send(:notify, true)
         end
 
         it "should send failing packet to tcp socket when status is false" do
-          client.should_receive(:print).with("GET fail HTTP/1.0\n\n")
+          client.should_receive(:print).with("GET fail HTTP/1.0\r\n\r\n")
           server.send(:notify, false)
         end
       end
@@ -350,8 +350,8 @@ describe BuildStatusServer::Server do
         it "should time out and retry 2 times" do
           TCPSocket.should_receive(:new).exactly(3).with("host", "port").and_return(client)
           STDERR.should_receive(:puts).exactly(2).with("Error: Timeout::Error while trying to send fail")
-          client.should_receive(:print).exactly(2).with("GET fail HTTP/1.0\n\n").and_raise(Timeout::Error)
-          client.should_receive(:print).with("GET fail HTTP/1.0\n\n")
+          client.should_receive(:print).exactly(2).with("GET fail HTTP/1.0\r\n\r\n").and_raise(Timeout::Error)
+          client.should_receive(:print).with("GET fail HTTP/1.0\r\n\r\n")
 
           server.send(:notify, false)
         end
@@ -373,7 +373,7 @@ describe BuildStatusServer::Server do
           server.should_receive(:sleep).with(4)
           server.should_receive(:sleep).with(8)
 
-          client.should_receive(:print).with("GET fail HTTP/1.0\n\n")
+          client.should_receive(:print).with("GET fail HTTP/1.0\r\n\r\n")
 
           server.send(:notify, false)
         end
@@ -396,8 +396,8 @@ describe BuildStatusServer::Server do
         client.should_receive(:gets).and_return("answer")
         TCPSocket.should_receive(:new).exactly(3).with("host", "port").and_return(client)
         STDERR.should_receive(:puts).exactly(2).with("Error: Timeout::Error while trying to send fail")
-        client.should_receive(:print).exactly(2).with("GET fail HTTP/1.0\n\n").and_raise(Timeout::Error)
-        client.should_receive(:print).with("GET fail HTTP/1.0\n\n")
+        client.should_receive(:print).exactly(2).with("GET fail HTTP/1.0\r\n\r\n").and_raise(Timeout::Error)
+        client.should_receive(:print).with("GET fail HTTP/1.0\r\n\r\n")
 
         server.send(:notify, false)
       end

data/spec/spec_helper.rb

@@ -8,7 +8,9 @@
 require "simplecov"
 require 'simplecov-rcov'
 SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-SimpleCov.start
+SimpleCov.start do
+  add_filter "vendor/bundler_gems" # Ignore gems
+end
 
 require "rspec/core"
 require "rspec/mocks"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build_status_server
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.17'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,6 +75,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: A build notifier server for Jenkins CI that controls an XFD over HTTP
 email: jcmuller@gmail.com
 executables:
@@ -85,7 +101,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -127,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This utility is part of an XFD (eXtreeme Feedback Device) solution designed

data/Gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: .
-  specs:
-    build_status_server (0.15)
-      json
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    archive-tar-minitar (0.5.2)
-    builder (3.0.0)
-    ci_reporter (1.7.0)
-      builder (>= 2.1.2)
-    columnize (0.3.6)
-    diff-lcs (1.1.3)
-    json (1.7.0)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    multi_json (1.3.4)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    simplecov (0.6.2)
-      multi_json (~> 1.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  build_status_server!
-  ci_reporter
-  json
-  rake
-  rspec
-  ruby-debug19
-  simplecov
-  simplecov-rcov
-  sinatra