blinky 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in blinky.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: .
+  specs:
+    blinky (0.0.4)
+      libusb (~> 0.2.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    ffi (1.2.0)
+    libusb (0.2.2)
+      ffi (>= 1.0)
+    rake (10.0.2)
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  blinky!
+  rake (~> 10.0.2)
+  rspec (~> 2.11.0)

data/README.rdoc

@@ -51,36 +51,42 @@ Not sure which light is which?
 === Operating Systems
 * OSX
 * Linux
-* Windows (Theoretically)
-    
-NOTE: I haven't been able to test fully on Windows yet. Any assistance with doing so, and/or providing more complete installation instructions would be gratefully received.
+* Windows 
 
 == How Do I install blinky?
 
-=== 1) Install support for lib-usb-0.1 (http://www.libusb.org)
+=== 1) Install support for lib-usb-1.0 (http://www.libusb.org)
 
 ==== OSX and Linux
     
-Install lib-usb-1.0 and the lib-usb-compat-0.1 layer with your favourite package manager.
+Install lib-usb-1.0 with your favourite package manager.
     
-For example, on OSX
+For example, on OSX:
     
-  brew install libusb-compat
+  brew install libusb
+  
+on Debian or Ubuntu:
+
+  $ sudo apt-get install libusb-1.0-0-dev  
+
+and so on
     
 ==== Windows
-         
-install lib-usb-win32. See http://www.libusb.org/wiki/libusb-win32
-     
-(Despite the name, this apparently supports both win-32 and win-64)
      
+Windows can be a bit fiddly. The following is how I got a Delcomm II light to work on a Windows 7 laptop.
+Further experience reports/better instructions would be gratefully received.
+
+* installed Zadig (http://github.com/pbatard/libwdi/wiki#wiki-Downloads)
+* plugged in the USB light
+  * at this point windows 'helpfully' installed an incorrect 'USB Input device' driver
+* opened Zadig and selected 'Options -> List All Devices'
+* Selected 'USB Input Device' in the Zadig drop-down
+* Clicked on 'Replace Driver' and confirmed in the popup dialog
+              
 === 2) Install the blinky gem
 
   gem install blinky
-      
-NOTE: on OSX will probably need to provide your machine architecture. For example:
-      
-  ARCHFLAGS="-arch x86_64" gem install blinky
-      
+            
 === 3) Test your installation
 
 Plug in your light and then do this:

data/Rakefile

@@ -1,42 +1,7 @@
 require 'rubygems'
 require 'rake'
+require "bundler/gem_tasks"
 
-desc "Check if blinky is working with your USB device"
-task :check_device do
-  require 'manual_tests/device_checker'
-  DeviceChecker.new.check
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "blinky"
-    gem.summary = %Q{helps you see the light}
-    gem.description = %Q{plug and play support for USB build status indicators}
-    gem.email = "perryn.fowler@gmail.com"
-    gem.homepage = "http://github.com/perryn/blinky"
-    gem.authors = ["Perryn Fowler"]
-    gem.add_dependency "ruby-usb", ">= 0.2.1"
-    gem.add_development_dependency "rspec", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-
-Spec::Rake::SpecTask.new do |t|
-  t.warning = true
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "blinky #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/blinky.gemspec

@@ -1,70 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'blinky/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{blinky}
-  s.version = "0.0.3"
+Gem::Specification.new do |gem|
+  gem.name          = "blinky"
+  gem.version       = Blinky::VERSION
+  gem.summary = %q{helps you see the light}
+  gem.authors       = ["Perryn Fowler"]
+  gem.email         = ["perryn.fowler@gmail.com"]
+  gem.description   = %q{plug and play support for USB build status indicators}
+  gem.homepage      = "http://github.com/perryn/blinky"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Perryn Fowler"]
-  s.date = %q{2011-06-15}
-  s.description = %q{plug and play support for USB build status indicators}
-  s.email = %q{perryn.fowler@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "blinky.gemspec",
-    "lib/blinky.rb",
-    "lib/blinky/light.rb",
-    "lib/blinky/light_factory.rb",
-    "lib/blinky/no_supported_devices_found.rb",
-    "lib/ci_server_plugins/test_server_plugin.rb",
-    "lib/device_recipes/delcom_engineering/visual_indicator_gen_one.rb",
-    "lib/device_recipes/delcom_engineering/visual_indicator_gen_two.rb",
-    "lib/plugins.rb",
-    "lib/recipes.rb",
-    "notes.txt",
-    "spec/acceptance_spec.rb",
-    "spec/blinky_spec.rb",
-    "spec/ci_server_plugins/test_server_plugin_spec.rb",
-    "spec/fixtures/ci_server_plugins/mock_ci_server.rb",
-    "spec/fixtures/device_recipes/aenima_engineering/model_462.rb",
-    "spec/fixtures/device_recipes/aenima_engineering/model_eulogy.rb",
-    "spec/fixtures/device_recipes/fragile_engineering/wretched.rb",
-    "spec/fixtures/plugins.rb",
-    "spec/fixtures/recipes.rb",
-    "spec/light_factory_spec.rb",
-    "spec/light_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/perryn/blinky}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{helps you see the light}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-usb>, [">= 0.2.1"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<ruby-usb>, [">= 0.2.1"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ruby-usb>, [">= 0.2.1"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  
+  gem.add_dependency "libusb", "~> 0.2.2"
+  
+  gem.add_development_dependency "rspec", "~> 2.11.0"
+  gem.add_development_dependency "rake",  "~> 10.0.2"
 end
-

data/lib/blinky.rb

@@ -1,24 +1,24 @@
 $:.unshift(File.dirname(__FILE__))
 
-require 'usb'
+require 'libusb/compat'
 require 'blinky/no_supported_devices_found'
 require 'blinky/light'
 require 'blinky/light_factory'
 
 module Blinky
-  
+
   def self.new
     Blinky.new
   end
-  
+
   class Blinky
-       
+
     def initialize(path = File.dirname(__FILE__)) 
-         
+
       Dir["#{path}/device_recipes/**/*.rb"].each { |f| require(f) }
       @recipes = Hash.new({})
       instance_eval(File.read("#{path}/recipes.rb"))
-     
+
       Dir["#{path}/ci_server_plugins/**/*.rb"].each { |f| require(f) }
       @plugins = []
       instance_eval(File.read("#{path}/plugins.rb"))
@@ -29,7 +29,7 @@ module Blinky
     def lights
       @lights
     end
-    
+
     def light
       @lights.first
     end
@@ -41,11 +41,11 @@ module Blinky
         @recipes[details[:usb_vendor_id]][details[:usb_product_id]] = recipe_module
       end    
     end
-    
+
     def plugin plugin_module
       @plugins << plugin_module
     end
-        
+
   end
-    
+
 end

data/lib/blinky/light.rb

@@ -1,14 +1,14 @@
 module Blinky
   class Light
-    
+
     def initialize device_handle, recipe, plugins
-        @handle = device_handle
-        self.extend(recipe)   
-        plugins.each do |plugin|
-            self.extend(plugin)
-        end          
+      @handle = device_handle
+      self.extend(recipe)   
+      plugins.each do |plugin|
+        self.extend(plugin)
+      end          
     end
-    
+
     def where_are_you?
       5.times do
         failure!
@@ -18,6 +18,6 @@ module Blinky
       end
       off!      
     end
-    
+
   end
 end

data/lib/blinky/light_factory.rb

@@ -1,6 +1,6 @@
 module Blinky
   class LightFactory
-    
+
     def self.detect_lights plugins, recipes
       lights = []
       found_devices = [] 
@@ -8,12 +8,12 @@ module Blinky
         found_devices << device  
         matching_recipe = recipes[device.idVendor][device.idProduct] 
         if matching_recipe
-          lights << Light.new(device.usb_open, matching_recipe, plugins)
+          lights << Light.new(device.open, matching_recipe, plugins)
         end
       end
       raise NoSupportedDevicesFound.new found_devices if lights.empty?
       lights
     end
-   
+
   end
 end

data/lib/blinky/no_supported_devices_found.rb

@@ -5,13 +5,13 @@ module Blinky
     def initialize found_devices
       @found_devices = found_devices
     end
-    
+
     #TODO - this doesn't work with ribusb  - there is no nice inspect method
     def to_s  
       "Blinky was unable to find a supported device \n" +
       "The devices I did find were:\n" +     
       "#{@found_devices.pretty_inspect}\n"
     end
-    
+
   end
 end

data/lib/blinky/version.rb

@@ -0,0 +1,3 @@
+module Blinky
+  VERSION = "0.0.4"
+end

data/lib/ci_server_plugins/test_server_plugin.rb

@@ -5,35 +5,35 @@ module Blinky
       building!
       sleep(2)
       puts "-"
-      
+
       puts "BUILD FAILED!"
       failure!
       sleep(2)
       puts "-"
-      
+
       puts "BUILDING!\n"
       building!
       sleep(2)
       puts "-"
-            
+
       puts "WARNING!\n"
       warning!
       sleep(2)
       puts "-"
-      
+
       puts "BUILDING!\n"
       building!
       sleep(2)
       puts "-"
-      
+
       puts "BUILD PASSED!\n"
       success!
       sleep(2)
       puts "-"
-        
+
       puts "TEST OVER\n"
       off!
-      
+
     end
   end
 end

data/lib/device_recipes/delcom_engineering/visual_indicator_gen_one.rb

@@ -2,27 +2,27 @@ module Blinky
   module DelcomEngineering
     module VisualIndicator
       module GenerationI
-             
+
         def success! 
           set_colour(0xFF && ~0x01) 
         end
-      
+
         def failure!  
           set_colour(0xFF && ~0x02) 
         end
-      
+
         def building!  
           set_colour(0xFF && ~0x04)
         end
-      
+
         def warning!
           set_colour(0xFF && ~0x03)
         end
-      
+
         def off!
           set_colour(0xFF)  
         end
-      
+
         private
         def set_colour colour
           begin