cheeky-dreams 0.0.1 → 0.0.2

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-  gem "flt", ">= 1.3.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -2,7 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    flt (1.3.0)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -24,7 +23,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  flt (>= 1.3.0)
   jeweler (~> 1.6.4)
   rcov
   rspec (>= 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cheeky-dreams.gemspec

@@ -0,0 +1,65 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "cheeky-dreams"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["simon"]
+  s.date = "2011-11-02"
+  s.description = "For controlling dream cheeky usb light"
+  s.email = "simojenki@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "cheeky-dreams.gemspec",
+    "lib/cheeky-dreams.rb",
+    "spec/cheeky-dreams_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/collecting_auditor.rb",
+    "spec/support/stub_driver.rb",
+    "spec/support/stub_effect.rb",
+    "spec/support/within.rb",
+    "spec/test.rb"
+  ]
+  s.homepage = "http://github.com/simojenki/cheeky-dreams"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "For controlling dream cheeky usb light"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/cheeky-dreams.rb

@@ -1,5 +1,4 @@
 require 'thread'
-require 'flt'
 
 module CheekyDreams
 
@@ -18,13 +17,20 @@ module CheekyDreams
       position_between(a[2], b[2], ratio),
       ]
   end
+  def rgb_between a, b, ratio
+    CheekyDreams::rgb_between a, b, ratio
+  end
   
   def self.position_between a, b, ratio
     return b if ratio >= 1.0
-    ((b - a) * ratio) + a
+    (((b - a) * ratio) + a).floor
+  end
+  def position_between a, b, ratio
+    CheekyDreams::position_between a, b, ratio
   end
 
   COLOURS = { 
+    :off => rgb(0, 0, 0),
     :red => rgb(255, 0, 0),
     :green => rgb(0, 255, 0),
     :blue => rgb(0, 0, 255),
@@ -41,7 +47,8 @@ module CheekyDreams
       raise "Unknown colour '#{colour}'" unless COLOURS.has_key?(colour)
       COLOURS[colour]
     when Array
-      colour
+      raise "Invalid rgb #{colour}" unless colour.length == 3 && colour.all? { |c| c.is_a? Fixnum }
+      rgb(colour[0], colour[1], colour[2])
     else 
       raise "Unsupported colour type #{colour}"
     end
@@ -50,6 +57,15 @@ module CheekyDreams
     CheekyDreams::rgb_for colour
   end
   
+  def stderr_auditor
+    Class.new do
+      def unhandled_error e
+        STDERR.puts e.message
+        STDERR.puts e.backtrace.join("\n")
+      end
+    end.new
+  end
+  
   def stdout_driver
     Class.new do
       def go rgb
@@ -68,81 +84,157 @@ module CheekyDreams
     end.new
   end
   
-  def cycle colours, freq
-    Effect::Cycle.new colours, freq
-  end
-  
-  def solid colour
-    Effect::Solid.new colour
-  end
-  
-  def fade from, to, over_how_long
-    Effect::Fade.new from, to, over_how_long
+  def find_dream_cheeky_usb_device
+    Device::DreamCheeky.new(File.dirname(Dir.glob('/sys/devices/**/red').first))
   end
   
-  def func freq, &block
-    Effect::Func.new freq, block
+  module Device
+    class DreamCheeky
+      attr_reader :path
+      def initialize path, max_threshold = 50
+        @path, @max_threshold = path, max_threshold
+      end
+      
+      def go rgb
+        system "echo #{using_threshold(rgb[0])} > #{path}/red"
+        system "echo #{using_threshold(rgb[1])} > #{path}/green"
+        system "echo #{using_threshold(rgb[2])} > #{path}/blue"
+      end
+      
+      private 
+      def using_threshold colour
+        colour if @threshold == 255
+        ((colour / 255.to_f) * @max_threshold).floor
+      end 
+    end
   end
   
   module Effect
     class Effect
-      include Flt
       include CheekyDreams    
+      include Math
+      
+      attr_reader :freq
+      
+      def initialize freq
+        @freq = freq
+      end
     end
     
+    class Throb2 < Effect      
+      def initialize freq, amplitude, centre
+        super freq
+        @amplitude, @centre, @count = amplitude, centre, 1
+      end
+      
+      def next current_colour
+        x = freq * (@count += 1)
+        v = sin(x) * @amplitude + @centre
+        [v, 0, 0]
+      end
+    end
+
+    class Throb < Effect
+      attr_reader :r_amp, :r_centre, :g_amp, :g_centre, :b_amp, :b_centre
+            
+      def initialize freq, from, to
+        super freq
+        @r_centre, @r_amp = centre_and_amp from[0], to[0]
+        @g_centre, @g_amp = centre_and_amp from[1], to[1]
+        @b_centre, @b_amp = centre_and_amp from[2], to[2]
+        @count = 1
+      end
+      
+      def next current_colour
+        x = sin(freq * @count)
+        r = x * r_amp + r_centre
+        g = x * g_amp + g_centre
+        b = x * b_amp + b_centre
+        # x = freq * (@count += 1)
+        # v = sin(x) * @amplitude + @centre
+        # [v, 0, 0]
+        
+        @count += 1
+        [r, g, b]
+      end
+      
+      private 
+      def centre_and_amp from, to
+        amp = ((from - to).abs / 2.0).floor
+        centre = max(from, to) - amp
+        [centre, amp]
+      end
+      
+      def max a, b
+        a > b ? a : b
+      end
+    end
+
+    
     class Func < Effect
-      def initialize freq, block
-        @freq, @block, @last_change = freq, block, Time.at(0)
+      def initialize freq, &block
+        super freq
+        @block = block
       end
       
-      def next
-        now = Time.now
-        if (now - @last_change) >= (DecNum(1)/DecNum(@freq))
-          @last_change = now
-          @current = rgb_for(@block.yield)
-        end
-        @current
+      def next current_colour = nil
+        rgb_for(@block.yield(current_colour))
       end
     end
     
     class Solid < Effect
       def initialize colour
-        @rgb = CheekyDreams::rgb_for(colour)
+        super 1
+        @rgb = rgb_for(colour)
       end
-      def next
+      
+      def next current_colour = nil
         @rgb
       end
     end
     
     class Cycle < Effect
       def initialize colours, freq
-        @colours, @freq, @last_change = colours.cycle, freq, Time.at(0)
+        super freq
+        @cycle = colours.cycle
       end
       
-      def next
-        now = Time.now
-        if (now - @last_change) >= (DecNum(1)/DecNum(@freq))
-          @last_change = now
-          @current = rgb_for(@colours.next)
-        end
-        @current
+      def next current_colour = nil
+        rgb_for(@cycle.next)
       end
     end
     
     class Fade < Effect
-      def initialize from, to, over_how_long
-        @from, @to, @over_how_long = from, to, over_how_long
+      def initialize from, to, steps, freq
+        super freq
+        @rgb_from, @rgb_to = rgb_for(from), rgb_for(to)
+        @fade = [@rgb_from]
+        (1..(steps-1)).each { |i| @fade << rgb_between(@rgb_from, @rgb_to, i / steps.to_f) }
+        @fade << @rgb_to
+        @index = 0
       end
       
-      def next
-        now = Time.now
-        if @started_at == nil
-          @started_at = now
-          @from
-        else
-          ratio_done = (now - @started_at) / @over_how_long
-          CheekyDreams.rgb_between(rgb_for(@from), rgb_for(@to), ratio_done)
+      def next current_colour = nil
+        return @rgb_to if @index >= @fade.length
+        next_colour = @fade[@index]
+        @index += 1
+        next_colour
+      end
+    end
+    
+    class FadeTo < Effect
+      def initialize to, steps, freq
+        super freq
+        @to, @steps = to, steps
+        @fade = nil
+      end
+      
+      def next current_colour
+        unless @fade
+          @fade = Fade.new(current_colour, @to, @steps, freq)
+          @fade.next current_colour
         end
+        @fade.next current_colour
       end
     end
   end
@@ -151,53 +243,84 @@ end
 class Light
   
   include CheekyDreams
-  include Flt
   
-  def initialize driver, freq = 5
-    @driver = driver
+  attr_accessor :freq, :auditor
+  
+  def initialize driver
+    @driver, @freq, @auditor = driver, 100, stderr_auditor
     @lock = Mutex.new
     @effect = nil
     @on = false
-    @freq = freq
   end
   
-  def go colour
+  def cycle colours, freq = 1
+    go(Effect::Cycle.new(colours, freq))
+  end
+  
+  def solid colour
+    go(Effect::Solid.new(colour))
+  end
+  
+  def fade from, to, steps = 10, freq = 1
+    go Effect::Fade.new from, to, steps, freq
+  end
+
+  def fade_to to, steps = 10, freq = 1
+    go Effect::FadeTo.new to, steps, freq
+  end
+  
+  def func freq = 1, &block
+    go Effect::Func.new freq, &block
+  end
+  
+  def throb freq, amplitude, centre
+    go Effect::Throb.new freq, amplitude, centre
+  end
+  
+  def go effect
     @lock.synchronize {
-      case colour
+      case effect
         when Symbol
-          @effect = solid(colour)
+          @effect = Effect::Solid.new(effect)
         when Array
-          @effect = solid(colour)
+          @effect = Effect::Solid.new(effect)
         when Effect::Effect
-          @effect = colour
+          @effect = effect
         else
-          raise "Im sorry dave, I'm afraid I can't do that. #{colour}"
+          raise "Im sorry dave, I'm afraid I can't do that. #{effect}"
       end
     }
+    turn_on unless @on    
   end
   
-  def on
+  private
+  def turn_on
     @on = true
-    t = Thread.new do
+    Thread.new do
+      current_effect = nil
       last_colour = nil
+      next_colour_time = nil
       while @on
         begin
           @lock.synchronize {
-            if @effect
-              new_colour = @effect.next 
-              if new_colour != last_colour
-                @driver.go new_colour
-                last_colour = new_colour
-              end
+            if @effect && current_effect != @effect
+              current_effect = @effect
+              next_colour_time = Time.at(0)
             end
           }
+          if current_effect
+            if Time.now > next_colour_time
+              new_colour = current_effect.next(last_colour)
+              @driver.go new_colour
+              last_colour = new_colour
+              next_colour_time = Time.now + (1 / current_effect.freq.to_f)
+            end
+          end
         rescue => e
-          puts e.message
-          puts e.backtrace.join("\n")
+          auditor.unhandled_error e
         end
-        sleep (DecNum(1)/DecNum(@freq))
+        sleep (1 / freq.to_f)
       end
     end
   end
-  
 end

data/spec/cheeky-dreams_spec.rb

@@ -1,64 +1,401 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe CheekyDreams do
+  
+  include CheekyDreams
+  
+  describe "find_dream_cheeky_usb_device" do
+    it "should locate the rgb files and return the driver" do
+      Dir.should_receive(:glob).with('/sys/devices/**/red').and_return(["/sys/devices/some-crazy-pci-bus-stuff/red"])
+      driver = find_dream_cheeky_usb_device
+      driver.path.should == "/sys/devices/some-crazy-pci-bus-stuff"
+    end
+  end
+  
   describe "position_between" do
+    it "should calculate the position as hole numbers" do
+      position_between(100, 102, 0.25).should == 100
+      position_between(100, 102, 0.5).should == 101
+      position_between(100, 102, 0.75).should == 101
+      position_between(100, 102, 1).should == 102
+    end
+    
     it "should calculate the position" do
-      CheekyDreams.position_between(100, 110, 0.5).should == 105
-      CheekyDreams.position_between(110, 100, 0.5).should == 105
-      CheekyDreams.position_between(100, 0, 0.2).should == 80
-      CheekyDreams.position_between(100, 0, 0.25).should == 75
-      CheekyDreams.position_between(100, 0, 1).should == 0
+      position_between(100, 110, 0.5).should == 105
+      position_between(110, 100, 0.5).should == 105
+      position_between(100, 0, 0.2).should == 80
+      position_between(100, 0, 0.25).should == 75
+      position_between(100, 0, 1).should == 0
     end
     
     it "should return the end point when the ration goes above 1" do
-      CheekyDreams.position_between(100, 1, 1.01).should == 1
-      CheekyDreams.position_between(96, 99, 999).should == 99
+      position_between(100, 1, 1.01).should == 1
+      position_between(96, 99, 999).should == 99
     end
   end
   
   describe "rgb_between" do
     it "should calculate the position" do
-      CheekyDreams.rgb_between([100, 50, 0], [110, 20, 0], 0.1).should == [101, 47, 0]
+      rgb_between([100, 50, 0], [110, 20, 0], 0.1).should == [101, 47, 0]
+    end
+  end
+  
+  describe "rgb_for" do
+    it "should return rgb array for simple colours" do
+      rgb_for(:off).should == [0, 0, 0]
+      rgb_for(:red).should == [255, 0, 0]
+      rgb_for(:green).should == [0, 255, 0]
+      rgb_for(:blue).should == [0, 0, 255]
+    end
+    
+    it "should return an rgb array when given one" do
+      rgb_for([11, 34, 111]).should == [11, 34, 111]
+    end
+    
+    it "should blow up when given meaningless symbol" do
+      lambda { rgb_for(:purple_patch) }.should raise_error "Unknown colour 'purple_patch'"
+    end
+    
+    it "should blow up when given array that isnt rgb" do
+      lambda { rgb_for([1]) }.should raise_error "Invalid rgb [1]"
+      lambda { rgb_for([1, 2, 3, 4]) }.should raise_error "Invalid rgb [1, 2, 3, 4]"
+      lambda { rgb_for(["a", "b", "c"]) }.should raise_error 'Invalid rgb ["a", "b", "c"]'
+    end
+    
+    it "should blow up when given invalid rgb values" do
+      lambda { rgb_for([0, 256,   0]) }.should raise_error "Invalid rgb value 0, 256, 0"
+      lambda { rgb_for([-1,  0,   0]) }.should raise_error "Invalid rgb value -1, 0, 0"
+      lambda { rgb_for([0,   0, 256]) }.should raise_error "Invalid rgb value 0, 0, 256"
     end
   end
 end
 
-describe Light do
+module CheekyDreams::Device
+  
+  include CheekyDreams
+  
+  describe DreamCheeky do
+    before :each do
+      @device_path = "/device"
+    end
+    
+    describe "when the max threshold is 100" do
+      before :each do
+        @device = DreamCheeky.new @device_path, 100
+      end
+
+      describe "making it go 123,34,255" do
+        before :each do
+          @device.should_receive(:system).with("echo 48 > /device/red").and_return(true)
+          @device.should_receive(:system).with("echo 13 > /device/green").and_return(true)
+          @device.should_receive(:system).with("echo 100 > /device/blue").and_return(true)
+        end
+
+        it "should turn the light the correct colours" do
+          @device.go [123, 34, 255]
+        end
+      end
+      
+      describe "making it go 0,1,100" do
+        before :each do
+          @device.should_receive(:system).with("echo 0 > /device/red").and_return(true)
+          @device.should_receive(:system).with("echo 0 > /device/green").and_return(true)
+          @device.should_receive(:system).with("echo 39 > /device/blue").and_return(true)
+        end
+
+        it "should turn the light the correct colours" do
+          @device.go [0, 1, 100]
+        end
+      end
+    end
+    
+    describe "when the max threshold is 255" do
+      before :each do
+        @device = DreamCheeky.new @device_path, 255
+      end
+
+      describe "making it go 123,34,255" do
+        before :each do
+          @device.should_receive(:system).with("echo 123 > /device/red").and_return(true)
+          @device.should_receive(:system).with("echo 34 > /device/green").and_return(true)
+          @device.should_receive(:system).with("echo 255 > /device/blue").and_return(true)
+        end
+
+        it "should turn the light the correct colours" do
+          @device.go [123, 34, 255]
+        end
+      end
+    end
+  end
+end
+
+module CheekyDreams::Effect
   
   include CheekyDreams
   
-  class StubDriver
+  describe Solid do
+    describe "when is symbols" do
+      before :each do
+        @solid = Solid.new :purple
+      end
 
-    def initialize 
-      @lock = Mutex.new
+      it "should return rgb every time called" do
+        @solid.next.should == COLOURS[:purple]
+        @solid.next.should == COLOURS[:purple]
+        @solid.next.should == COLOURS[:purple]
+      end
+    end
+    
+    describe "when is random rgb value" do
+      before :each do
+        @solid = Solid.new [123, 123, 123]
+      end
+
+      it "should return rgb every time called" do
+        @solid.next.should == [123, 123, 123]
+        @solid.next.should == [123, 123, 123]
+        @solid.next.should == [123, 123, 123]
+      end
+    end
+  end
+  
+  describe Cycle do
+    before :each do
+      @cycle = Cycle.new [:red, :blue, [211, 192, 101]], 22
     end
+    
+    it "should have a frequency" do
+      @cycle.freq.should == 22
+    end
+    
+    it "should cycle through the colours as rgb" do
+      @cycle.next.should == [255,   0,  0]
+      @cycle.next.should == [  0,   0,255]
+      @cycle.next.should == [211, 192, 101]
+      
+      @cycle.next.should == [255,   0,  0]
+      @cycle.next.should == [  0,   0,255]
+      @cycle.next.should == [211, 192, 101]
+      
+      @cycle.next.should == [255,   0,  0]
+      @cycle.next.should == [  0,   0,255]
+      @cycle.next.should == [211, 192, 101]
+    end
+  end
+  
+  describe Fade do
+    describe "fading between two symbols" do
+      before :each do
+        @fade = Fade.new :blue, :green, 1, 5
+      end
 
-    def go colour
-      @lock.synchronize {
-        @colour = colour
-      }
+      it "should have a freq of 2" do
+        @fade.freq.should == 5
+      end
+
+      it "should be able to provide the steps when asked" do
+        @fade.next.should == [  0,   0, 255]
+        @fade.next.should == [  0, 255,   0]
+        @fade.next.should == [  0, 255,   0]
+        @fade.next.should == [  0, 255,   0]
+      end
     end
     
-    def should_become expected_colour
-      rgb = expected_colour.is_a?(Symbol) ? Light::COLOURS[expected_colour] : expected_colour
-      start, match = Time.now, false
-      while ((Time.now - start < 1) && !match) do
-        @lock.synchronize {
-          match = rgb == @colour
-        }
-        sleep 0.01
+    describe "fading between two arbitary rgb values" do
+      before :each do
+        @fade = Fade.new [100, 100, 100], [110, 90, 0], 10, 2
+      end
+
+      it "should have a freq of 2" do
+        @fade.freq.should == 2
       end
-      raise "Expected driver to become #{rgb}, and didn't, instead is #{@colour}" unless match
+
+      it "should be able to provide the steps when asked" do
+        @fade.next.should == [100, 100, 100]
+        @fade.next.should == [101,  99,  90]
+        @fade.next.should == [102,  98,  80]
+        @fade.next.should == [103,  97,  70]
+        @fade.next.should == [104,  96,  60]
+        @fade.next.should == [105,  95,  50]
+        @fade.next.should == [106,  94,  40]
+        @fade.next.should == [107,  93,  30]
+        @fade.next.should == [108,  92,  20]
+        @fade.next.should == [109,  91,  10]
+        @fade.next.should == [110,  90,   0]
+        # and then continue to provide the same colour
+        @fade.next.should == [110,  90,   0]
+        @fade.next.should == [110,  90,   0]
+      end  
     end
   end
   
-  describe "changing colour" do
+  describe FadeTo do
+    describe "fading to a symbol" do
+      before :each do
+        @fade_to = FadeTo.new :green, 11, 2
+      end
+      
+      it "should have a freq of 2" do
+        @fade_to.freq.should == 2
+      end
+      
+      it "should be able to gradually go to colour when asked" do
+        @fade_to.next([0, 145, 0]).should == [0, 155, 0]
+        @fade_to.next([0, 155, 0]).should == [0, 165, 0]
+        @fade_to.next([0, 165, 0]).should == [0, 175, 0]
+        @fade_to.next([0, 175, 0]).should == [0, 185, 0]
+        @fade_to.next([0, 185, 0]).should == [0, 195, 0]
+        @fade_to.next([0, 195, 0]).should == [0, 205, 0]
+        @fade_to.next([0, 205, 0]).should == [0, 215, 0]
+        @fade_to.next([0, 215, 0]).should == [0, 225, 0]
+        @fade_to.next([0, 225, 0]).should == [0, 235, 0]
+        @fade_to.next([0, 235, 0]).should == [0, 245, 0]
+        @fade_to.next([0, 245, 0]).should == [0, 255, 0]
+      end
+    end
+    
+    describe "fading to a random rgb" do
+      before :each do
+        @fade_to = FadeTo.new [130, 80, 170], 3, 20
+      end
+      
+      it "should have a freq of 20" do
+        @fade_to.freq.should == 20
+      end
+      
+      it "should be able to gradually go to colour when asked" do
+        @fade_to.next([190, 77, 140]).should == [170, 78, 150]
+        @fade_to.next([170, 78, 150]).should == [150, 79, 160]
+        @fade_to.next([150, 79, 160]).should == [130, 80, 170]
+      end
+    end
+  end
+  
+  describe Func do
+    describe "when the block return rgb values" do
+      before :each do
+        @func = Func.new(22) { |current_colour| [current_colour[0] + 1, current_colour[1] + 1, current_colour[2] + 1] }
+      end
+      
+      it "should have a freq of 22" do
+        @func.freq.should == 22
+      end
+      
+      it "should return the given rgb plus 1 to each of r, g, and b" do
+        @func.next([2, 5, 6]).should == [3, 6, 7]
+      end
+    end
+    
+    describe "when the block return symbol" do
+      before :each do
+        @func = Func.new(22) { |current_colour| :purple }
+      end
+      
+      it "should return the rgb for the symbol" do
+        @func.next([2, 5, 6]).should == COLOURS[:purple]
+      end
+    end
+  end
+  
+  describe Throb do
+    before :each do
+      @throb = Throb.new 10, [100, 100, 100], [250, 50, 0]
+    end
+    
+    it "should have r_amp" do
+      @throb.r_amp.should == 75
+    end
+    
+    it "should have r_centre" do
+      @throb.r_centre.should == 175
+    end
+    
+    it "should have g_amp" do
+      @throb.g_amp.should == 25
+    end
+    
+    it "should have g_centre" do
+      @throb.g_centre.should == 75
+    end
+    
+    it "should have b_amp" do
+      @throb.b_amp.should == 50
+    end
+    
+    it "should have b_centre" do
+      @throb.b_centre.should == 50
+    end
+  end
+end
+
+describe Light do
+  
+  include CheekyDreams
+  include Within
+  
+  before :each do
+    @driver = StubDriver.new
+    @light = Light.new @driver
+  end
+  
+  describe "unhandled errors" do
     before :each do
-      @driver = StubDriver.new
-      @light = Light.new @driver
-      @light.on
+      @error = RuntimeError.new "On purpose error"
+      @effect = StubEffect.new(20) { raise @error }
+      @auditor = CollectingAuditor.new
+      @light.auditor = @auditor
+    end
+    
+    it 'should notify the auditor' do
+      @light.go @effect
+      within(1, "auditor should have received '#{@error}'") { [@auditor.has_received?(@error), @auditor.errors] }
+    end
+  end
+  
+  describe "frequency of effect" do    
+    describe 'when frequency is 1' do
+      before :each do      
+        @effect = StubEffect.new 1
+      end
+      
+      it 'should call the effect almost immediately, and then about 1 second later' do
+        @light.go @effect
+        sleep 0.1
+        @effect.asked_for_colour_count.should be == 1
+        sleep 1
+        @effect.asked_for_colour_count.should be == 2
+      end
+    end
+    
+    describe 'when frequency is 10' do
+      before :each do      
+        @effect = StubEffect.new 10
+      end
+      
+      it 'should call the effect between 9 and 11 times in the next second' do
+        @light.go @effect
+        sleep 1
+        count = @effect.asked_for_colour_count  
+        count.should be <= 11
+        count.should be >= 9
+      end
     end
     
+    describe 'when frequency is 5' do
+      before :each do      
+        @effect = StubEffect.new 5
+      end
+      
+      it 'should call the effect 5 times in the next second' do
+        @light.go @effect
+        sleep 1
+        count = @effect.asked_for_colour_count  
+        count.should be == 5
+      end
+    end
+  end
+  
+  describe "changing colour" do
     it "should go red" do
       @light.go :red
       @driver.should_become [255,0,0]
@@ -89,7 +426,7 @@ describe Light do
     end
     
     it "should be able to cycle between colours when specified as rgb" do
-      @light.go cycle([[255, 255, 255], [200, 200, 200], [100, 100, 100]], 10)
+      @light.cycle([[255, 255, 255], [200, 200, 200], [100, 100, 100]], 10)
       @driver.should_become [255, 255, 255]
       @driver.should_become [200, 200, 200]
       @driver.should_become [100, 100, 100]
@@ -98,7 +435,7 @@ describe Light do
     end
     
     it "should be able to cycle between colours when specified as symbols" do
-      @light.go cycle([:red, :green, :blue], 10)
+      @light.cycle([:red, :green, :blue], 10)
       @driver.should_become :red
       @driver.should_become :green
       @driver.should_become :blue
@@ -106,6 +443,37 @@ describe Light do
       @driver.should_become :green
     end
     
+    it "should be able to fade from one colour to another" do
+      @light.fade([100, 100, 0], [105, 95, 0], 5, 2)
+      @driver.should_become [101, 99, 0]
+      @driver.should_become [102, 98, 0]      
+      @driver.should_become [103, 97, 0]      
+      @driver.should_become [104, 96, 0]      
+      @driver.should_become [105, 95, 0]      
+    end
+    
+    it "should be able to fade from current colour to a new colour" do
+      @light.go [100, 100, 0]
+      @driver.should_become [100, 100, 0]
+      
+      @light.fade_to([105, 95, 0], 5, 2)
+      @driver.should_become [101, 99, 0]
+      @driver.should_become [102, 98, 0]      
+      @driver.should_become [103, 97, 0]      
+      @driver.should_become [104, 96, 0]      
+      @driver.should_become [105, 95, 0]      
+    end
+    
+    it "should be able to go different colours based on a function" do
+      cycle = [:blue, :red, :green, :purple, :grey, :aqua].cycle
+      @light.func(10) { cycle.next }
+      @driver.should_become :blue
+      @driver.should_become :red
+      @driver.should_become :green
+      @driver.should_become :purple
+      @driver.should_become :grey
+      @driver.should_become :aqua
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
 require 'rspec'
 require 'cheeky-dreams'
 

data/spec/support/collecting_auditor.rb

@@ -0,0 +1,18 @@
+
+
+class CollectingAuditor
+  
+  attr_reader :errors
+  
+  def initialize
+    @errors = []
+  end
+  
+  def unhandled_error e
+    @errors << e
+  end
+  
+  def has_received? e
+    @errors.include? e
+  end
+end

data/spec/support/stub_driver.rb

@@ -0,0 +1,27 @@
+require 'within'
+
+class StubDriver
+
+  include Within
+
+  def initialize 
+    @lock = Mutex.new
+    @colours = []
+  end
+
+  def go colour
+    @lock.synchronize {
+      @colour = colour
+      @colours << colour
+    }
+  end
+  
+  def should_become expected_colour
+    rgb = expected_colour.is_a?(Symbol) ? CheekyDreams::COLOURS[expected_colour] : expected_colour
+    within 1, "driver to become #{rgb}" do
+      @lock.synchronize {
+        [rgb == @colour, @colour]
+      }
+    end
+  end
+end

data/spec/support/stub_effect.rb

@@ -0,0 +1,19 @@
+
+class StubEffect < CheekyDreams::Effect::Effect
+  
+  attr_reader :freq, :asked_for_colour_count
+  
+  def initialize freq, &block
+    @freq, @asked_for_colour_count = freq, 0
+    if block
+      @block = block
+    else
+      @block = lambda { [0,0,0] }
+    end
+  end
+  
+  def next last_colour
+    @asked_for_colour_count += 1
+    @block.yield
+  end
+end

data/spec/support/within.rb

@@ -0,0 +1,10 @@
+module Within
+  def within seconds, what
+    raise 'errm, was expected a block to perform condition on' unless block_given?
+    start, match, hint = Time.now, false, "[you didnt specify]"
+    while (((Time.now - start) < seconds) && !match) do
+      match, hint = yield
+    end
+    raise "Expected #{what}, within #{seconds} second, instead was #{hint}" unless match
+  end
+end

data/spec/test.rb

@@ -7,8 +7,15 @@ require 'rainbow'
 
 include CheekyDreams
 
-light = Light.new(ansi_driver, 10)
-light.on
+light = Light.new find_dream_cheeky_usb_device
+
+puts "throbbing"
+light.throb(2, [255,0,0],[0, 255, 0])
+sleep 10
+
+puts "is it red"
+light.go [255,0,0]
+sleep 1
 
 puts "colours"
 [:red, :green, :blue, CheekyDreams::rgb(155, 155, 155)].each do |colour|
@@ -17,25 +24,31 @@ puts "colours"
 end
 
 puts "cycle"
-light.go(cycle(CheekyDreams::COLOURS.keys, 2))
+light.cycle(CheekyDreams::COLOURS.keys, 2)
 sleep 5
 
 puts "fade"
-light.go(fade(:green, :red, 2))
+light.fade(:green, :red, 20, 2)
 sleep 3
-light.go(fade(:red, :green, 2))
+light.fade(:red, :green, 20, 2)
 sleep 3
 
 puts "fade from current to somewhere"
+light.go :red
+sleep 2
+light.fade_to :green, 20, 2
+sleep 2
+light.fade_to :red, 20, 2
+sleep 2
 
 puts "colour on block"
 cycle = [:blue, :purple].cycle
-light.go(func(2) { cycle.next })
+light.func(2) { cycle.next }
 sleep 3
 
 puts "fake cpu cycles"
 green = 100
-light.go(func(2) { [0, green+=20, 0] })
+light.func(2) { [0, green+=20, 0] }
 sleep 3
 
 puts "done"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheeky-dreams
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: flt
-  requirement: &2158506720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158506720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158503320 !ruby/object:Gem::Requirement
+  requirement: &2168510760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2158503320
+  version_requirements: *2168510760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158502820 !ruby/object:Gem::Requirement
+  requirement: &2168510280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158502820
+  version_requirements: *2168510280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158502260 !ruby/object:Gem::Requirement
+  requirement: &2168509720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158502260
+  version_requirements: *2168509720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2158501660 !ruby/object:Gem::Requirement
+  requirement: &2160044460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158501660
+  version_requirements: *2160044460
 description: For controlling dream cheeky usb light
 email: simojenki@gmail.com
 executables: []
@@ -82,9 +71,14 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- cheeky-dreams.gemspec
 - lib/cheeky-dreams.rb
 - spec/cheeky-dreams_spec.rb
 - spec/spec_helper.rb
+- spec/support/collecting_auditor.rb
+- spec/support/stub_driver.rb
+- spec/support/stub_effect.rb
+- spec/support/within.rb
 - spec/test.rb
 homepage: http://github.com/simojenki/cheeky-dreams
 licenses:
@@ -101,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1122224430567929941
+      hash: -1596020986901995182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: