knipper 0.0.1.dev3 → 0.0.1

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/knipper.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = Knipper::VERSION
   gem.authors       = ["Erwin Boskma"]
   gem.email         = ["erwin@datarift.nl"]
-  gem.description   = %q{Ruby wrapper for the blink(1) library}
+  gem.description   = %q{Ruby wrapper for the blink(1) C-library}
   gem.summary       = %q{Wraps the C-library that is available for the blink(1) USB status lights}
   gem.homepage      = "http://github.com/eboskma/knipper"
   
@@ -17,5 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "ffi", ['>= 1.2.0']
+  gem.add_runtime_dependency "ffi", ['~> 1.2.0']
+  
+  gem.add_development_dependency "rspec", ['~> 2.12.0']
+  gem.add_development_dependency "knipper", ['>= 0.0.1.dev3']
 end

data/lib/knipper/blink1_lib.rb

@@ -17,8 +17,13 @@ module Knipper
     attach_function :blink1_open, [], :pointer
     attach_function :blink1_openByPath, [:string], :pointer
     attach_function :blink1_close, [:pointer], :void
+    attach_function :blink1_play, [:pointer, :uchar, :uchar], :int
+    attach_function :blink1_writePatternLine, [:pointer, :ushort, :uchar, :uchar, :uchar, :uchar], :int
+    attach_function :blink1_readPatternLine, [:pointer, :pointer, :pointer, :pointer, :pointer, :uchar], :int
+    attach_function :blink1_degamma, [:int], :int
     
     attach_function :blink1_setRGB, [:pointer, :uchar, :uchar, :uchar], :int
     attach_function :blink1_fadeToRGB, [:pointer, :ushort, :uchar, :uchar, :uchar], :int
+    
   end
 end

data/lib/knipper/device.rb

@@ -8,7 +8,6 @@ module Knipper
       
       num_devices = @@lib.blink1_enumerate
       devices = []
-      puts "#{num_devices} blink(1) devices found"
       num_devices.times do |i|
         devices << @@lib.blink1_getCachedPath(i)
       end unless num_devices < 1
@@ -16,8 +15,8 @@ module Knipper
       devices
     end
     
-    def self.finalize
-      proc { @@lib.blink1_close @device }
+    def self.device_present?
+      devices.length > 0
     end
     
     def initialize(path = nil, &block)
@@ -32,8 +31,10 @@ module Knipper
         @@lib.blink1_close @device
         return
       end
-      
-      ObjectSpace.define_finalizer(self, self.class.finalize())
+    end
+    
+    def close
+      @@lib.blink1_close @device
     end
     
     def fade_to_rgb(millis, red, green, blue)
@@ -43,5 +44,52 @@ module Knipper
     def set_rgb(red, green, blue)
       @@lib.blink1_setRGB(@device, red, green, blue)
     end
+    
+    def write_pattern_line(millis, red, green, blue, pos)
+      @@lib.blink1_writePatternLine(@device, millis, red, green, blue, pos)
+    end
+    
+    def read_pattern_line(pos)
+      millis = FFI::MemoryPointer.new(:ushort)
+      r = FFI::MemoryPointer.new(:uchar)
+      g = FFI::MemoryPointer.new(:uchar)
+      b = FFI::MemoryPointer.new(:uchar)
+      @@lib.blink1_readPatternLine(@device, millis, r, g, b, pos)
+      
+      Knipper::Pattern::PatternLine.new({
+        millis: millis.read_uint16, 
+        red: r.read_uint8,
+        green: g.read_uint8,
+        blue: b.read_uint8
+      })
+    end
+    
+    def clear_pattern
+      12.times do |i|
+        write_pattern_line 0, 0, 0, 0, i
+      end
+    end
+    
+    def write_pattern(pattern, clear=true)
+      if pattern.is_a? String
+        pattern = Knipper::Pattern::Pattern.parse(pattern)
+      end
+      
+      if pattern.is_a? Knipper::Pattern::Pattern
+        clear_pattern if clear
+        
+        pattern.pattern.each do |pattern_line|
+          write_pattern_line pattern_line.millis, pattern_line.red, pattern_line.green, pattern_line.blue, pattern.pattern.index(pattern_line)
+        end
+      end
+    end
+    
+    def start_pattern(pos)
+      @@lib.blink1_play(@device, 1, pos)
+    end
+    
+    def stop_pattern
+      @@lib.blink1_play(@device, 0, 0)
+    end
   end
 end

data/lib/knipper/pattern/pattern.rb

@@ -0,0 +1,28 @@
+module Knipper
+  module Pattern
+    class Pattern
+      attr_accessor :lines
+    
+      def self.parse(s)
+        pattern = Pattern.new
+        s.lines do |l|
+          pattern.lines << PatternLine.parse(l.chomp)
+        end
+      
+        pattern
+      end
+    
+      def initialize
+        @lines = []
+      end
+    
+      def <<(pattern_line)
+        if pattern_line.is_a? PatternLine
+          lines << pattern_line
+        elsif pattern_line.is_a? String
+          lines << PatternLine.parse(pattern_line)
+        end
+      end
+    end
+  end
+end

data/lib/knipper/pattern/pattern_line.rb

@@ -0,0 +1,29 @@
+module Knipper
+  module Pattern
+    class PatternLine
+      attr_accessor :millis, :red, :green, :blue
+      
+      PATTERN = /\A(\d+),(\d+),(\d+),(\d+)\z/
+      
+      def self.parse(s)
+        parts = PATTERN.match(s)
+        raise "Unrecognized pattern -- #{s}" unless parts
+
+        pattern_line = PatternLine.new
+        pattern_line.millis = parts[1].to_i
+        pattern_line.red = parts[2].to_i
+        pattern_line.green = parts[3].to_i
+        pattern_line.blue = parts[4].to_i
+        
+        pattern_line
+      end
+      
+      def initialize(attributes = {})
+        attributes.each do |name, value|
+          send("#{name}=", value)
+        end
+      end
+  
+    end
+  end
+end

data/lib/knipper/pattern.rb

@@ -0,0 +1,2 @@
+require 'knipper/pattern/pattern_line'
+require 'knipper/pattern/pattern'

data/lib/knipper/version.rb

@@ -1,3 +1,3 @@
 module Knipper
-  VERSION = "0.0.1.dev3"
+  VERSION = "0.0.1"
 end

data/lib/knipper.rb

@@ -1,3 +1,4 @@
-require "knipper/version"
+require 'knipper/version'
 require 'knipper/blink1_lib'
-require 'knipper/device'
+require 'knipper/device'
+require 'knipper/pattern'

data/spec/device_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe Knipper::Device do
+  it "opens a device" do
+    d = Knipper::Device.new
+    d.should_not be_nil
+    d.close
+    d = nil
+  end
+  
+  it "sets a color" do
+    device = Knipper::Device.new
+    result = device.set_rgb(255, 0, 0)
+    result.should be >= 0
+    device.close
+  end
+  
+  it "fades to a color" do
+    device = Knipper::Device.new
+    result = device.fade_to_rgb(100, 0, 255, 0)
+    result.should be >= 0
+    device.close
+  end
+  
+  it "writes a pattern" do
+    device = Knipper::Device.new
+    lib = Knipper::Blink1Lib.new
+    device.clear_pattern
+    result = device.write_pattern_line 500, 100, 150, 200, 0
+    result.should be >= 0
+    pattern = device.read_pattern_line 0
+    pattern.millis.should eq 500
+    pattern.red.should eq lib.blink1_degamma(100)
+    pattern.green.should eq lib.blink1_degamma(150)
+    pattern.blue.should eq lib.blink1_degamma(200)
+    device.close
+  end
+end

data/spec/pattern_line_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Knipper::Pattern::PatternLine do
+  it "parses a valid string" do
+    pattern_str = "500,128,65,233"
+    pattern = Knipper::Pattern::PatternLine.parse(pattern_str)
+    
+    pattern.should_not be_nil
+    pattern.millis.should eq 500
+    pattern.red.should eq 128
+    pattern.green.should eq 65
+    pattern.blue.should eq 233
+  end
+  
+  it "raises an error when parsing an invalid string" do
+    pattern_str = "asdf"
+    expect { Knipper::Pattern::PatternLine.parse(pattern_str) }.to raise_error("Unrecognized pattern -- #{pattern_str}")
+  end
+end

data/spec/pattern_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Knipper::Pattern::Pattern do
+  it "parses a series of pattern lines" do
+    pattern_str = <<EOF
+0,1,2,3
+1,2,3,4
+2,3,4,5
+3,4,5,6
+4,5,6,7
+EOF
+    pattern = Knipper::Pattern::Pattern.parse(pattern_str)
+    
+    pattern.lines.should_not be_nil
+    pattern.lines.length.should eq 5
+    pattern.lines.length.times do |i|
+      pattern.lines[i].millis.should eq i
+      pattern.lines[i].red.should eq i + 1
+      pattern.lines[i].green.should eq i + 2
+      pattern.lines[i].blue.should eq i + 3
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+require 'knipper'
+
+class BlinkFormatter < RSpec::Core::Formatters::BaseFormatter
+  def initialize(output)
+    super(output)
+  end
+  
+  # def start(count)
+  #   super(count)
+  #   Knipper::Device.new { |d| d.fade_to_rgb 100, 0, 0, 0 }
+  # end
+  
+  def stop
+    return unless Knipper::Device.device_present?
+    
+    if @failed_examples.length > 0
+      Knipper::Device.new { |d| d.fade_to_rgb 500, 255, 0, 0 }
+    else
+      Knipper::Device.new { |d| d.fade_to_rgb 500, 0, 255, 0 }      
+    end
+  end
+end
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.filter_run_excluding :skip
+  
+  config.add_formatter BlinkFormatter
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: knipper
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev3
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Erwin Boskma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
@@ -24,10 +24,42 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-description: Ruby wrapper for the blink(1) library
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: knipper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.dev3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.dev3
+description: Ruby wrapper for the blink(1) C-library
 email:
 - erwin@datarift.nl
 executables: []
@@ -35,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -43,7 +76,14 @@ files:
 - lib/knipper.rb
 - lib/knipper/blink1_lib.rb
 - lib/knipper/device.rb
+- lib/knipper/pattern.rb
+- lib/knipper/pattern/pattern.rb
+- lib/knipper/pattern/pattern_line.rb
 - lib/knipper/version.rb
+- spec/device_spec.rb
+- spec/pattern_line_spec.rb
+- spec/pattern_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/eboskma/knipper
 licenses: []
 post_install_message: 
@@ -58,17 +98,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2441054257148417000
+      hash: -2175147279034420234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2175147279034420234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wraps the C-library that is available for the blink(1) USB status lights
-test_files: []
+test_files:
+- spec/device_spec.rb
+- spec/pattern_line_spec.rb
+- spec/pattern_spec.rb
+- spec/spec_helper.rb