x10-cm17a 0.9.0 → 1.0.0

data/Rakefile

@@ -1,189 +1,195 @@
-# -*- ruby -*-
-
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rbconfig'
-
-begin
-  require 'rubygems'
-  require 'rake/gempackagetask'
-rescue Exception
-  nil
-end
-
-ARCH = Config::CONFIG['arch']
-SO_FILE = "lib/#{ARCH}/cm17a_api.so"
-
-MAKE = (ARCH =~ /win32/) ? 'nmake' : 'make'
-
-CLOBBER.include(
-  SO_FILE,
-  'ext/cm17a_api/*.o',
-  'ext/cm17a_api/*.obj',
-  'ext/cm17a_api/*.def',
-  'ext/cm17a_api/*.exp',
-  'ext/cm17a_api/*.lib',
-  'ext/cm17a_api/*.pdb',
-  'ext/cm17a_api/*.so',
-  'ext/cm17a_api/Makefile',
-  'ext/cm17a_api/MANIFEST',
-  'lib/*-*',
-  '**/*.log'
-  )
-
-desc "Default task (run tests)"
-task :default => :test
-
-desc "Run the unit tests"
-task :test => [SO_FILE] do
-  test_files = FileList['test/test_*.rb']
-  ruby "-Ilib", "-Ilib/#{ARCH}",  '-e0',  *test_files.collect { |fn| "-r#{fn}" }
-end
-
-task :compile => [SO_FILE]
-
-directory File.dirname(SO_FILE)
-
-file SO_FILE => ["ext/cm17a_api/cm17a_api.so", File.dirname(SO_FILE)] do |t|
-  cp t.prerequisites.first, SO_FILE
-end
-
-file "ext/cm17a_api/Makefile" => ["ext/cm17a_api/extconf.rb"] do
-  Dir.chdir("ext/cm17a_api") do ruby "extconf.rb" end
-end
-
-CM17A_FILES = FileList[
-  'ext/cm17a_api/*.c',
-  'ext/cm17a_api/*.h',
-  'ext/cm17a_api/extconf.rb',
-  'ext/cm17a_api/Makefile',
-  'ext/cm17a_api/MANIFEST',
-] 
-
-file "ext/cm17a_api/cm17a_api.so" => CM17A_FILES do
-  Dir.chdir("ext/cm17a_api") do
-    sh MAKE
-  end
-end
-
-# RDoc Documentation -------------------------------------------------
-
-# Choose template, prefer the jamis template if it is available
-
-def choose_rdoc_template
-  libdir = Config::CONFIG['rubylibdir']
-  templates = Dir[File.join(libdir, 'rdoc/**/jamis.rb')]
-  templates.empty? ? 'html': 'jamis'
-end
-
-rd = Rake::RDocTask.new("rdoc") { |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.template = choose_rdoc_template
-  rdoc.title    = "Ruby X10 Software"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include(
-    'lib/**/*.rb',
-    'doc/*.rdoc',
-    'ext/**/cm17a_api.c',
-    'README',
-    'MIT-LICENSE')
-  rdoc.rdoc_files.exclude('lib/**/other.rb', 'lib/**/bottlerocket.rb')
-}
-
-
-# Packaging Tasks ----------------------------------------------------
-
-file "ext/cm17a_api/MANIFEST" do |t|
-  open(t.name, "w") do |f|
-    f.puts Dir["ext/cm17a_api/*"].select { |fn|
-      fn =~ /\.(h|c|rb)$/
-    }.collect { |fn|
-      File.basename(fn)
-    }
-  end
-end
-
-PKG_VERSION = '0.9.0'
-PKG_FILES = FileList[
-  'Rakefile',
-  'setup.rb',
-  'test/*.rb',
-  'lib/**/*.rb',
-  'ext/cm17a_api/MANIFEST',
-  'ext/cm17a_api/*.h',
-  'ext/cm17a_api/*.c',
-  'ext/cm17a_api/*.rb',
-]
-
-if ! defined?(Gem)
-  puts "Package Target requires RubyGEMs"
-else
-  spec = Gem::Specification.new do |s|
-    
-    #### Basic information.
-
-    s.name = 'x10-cm17a'
-    s.version = PKG_VERSION
-    s.summary = "Ruby based X10 CM17A Firecracker Controller"
-    s.description = <<-EOF
-    EOF
-
-    s.files = PKG_FILES.to_a
-
-    #### C code extensions.
-
-    s.extensions << "ext/cm17a_api/extconf.rb"
-
-    #### Load-time details: library and application (you will need one or both).
-
-    s.require_path = 'lib'                         # Use these for libraries.
-
-    #### Documentation and testing.
-
-    s.has_rdoc = true
-#    s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-#     s.rdoc_options <<
-#       '--title' <<  'Rake -- Ruby Make' <<
-#       '--main' << 'README' <<
-#       '--line-numbers'
-
-    #### Author and project details.
-
-    s.author = "Jim Weirich"
-    s.email = "jim@weirichhouse.org"
-#    s.homepage = "http://rake.rubyforge.org"
-  end
-
-  Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_zip = true
-    pkg.need_tar = true
-  end
-end
-
-
-# Publishing Tasks ---------------------------------------------------
-
-
-task :publish_on_osb => ["pkg/cm17a-#{PKG_VERSION}.tgz", "pkg/cm17a-#{PKG_VERSION}.gem"] do |t|
-  sh %{ssh umlcoop mkdir -p "htdocs/software/cm17a"}
-  sh %{scp -rq #{t.prerequisites.join(' ')} umlcoop:htdocs/software/cm17a}
-end
-
-# Optional publish task for Rake
-
-require 'rake/contrib/sshpublisher'
-require 'rake/contrib/rubyforgepublisher'
-
-publisher = Rake::CompositePublisher.new
-publisher.add Rake::RubyForgePublisher.new('x10-cm17a', 'jimweirich')
-publisher.add Rake::SshFilePublisher.new(
-  'umlcoop',
-  'htdocs/software/x10-cm17a',
-  '.',
-  'x10-cm17a.blurb')
-
-desc "Publish the Documentation to RubyForge."
-task :publish => [:rdoc] do
-  publisher.upload
-end
+# -*- ruby -*-
+
+require 'rake/clean'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rbconfig'
+
+begin
+  require 'rubygems'
+  require 'rake/gempackagetask'
+rescue Exception
+  nil
+end
+
+ARCH = Config::CONFIG['arch']
+SO_FILE = "lib/#{ARCH}/cm17a_api.so"
+
+MAKE = (ARCH =~ /win32/) ? 'nmake' : 'make'
+
+CLOBBER.include(
+  SO_FILE,
+  'ext/cm17a_api/*.o',
+  'ext/cm17a_api/*.obj',
+  'ext/cm17a_api/*.def',
+  'ext/cm17a_api/*.exp',
+  'ext/cm17a_api/*.lib',
+  'ext/cm17a_api/*.pdb',
+  'ext/cm17a_api/*.so',
+  'ext/cm17a_api/Makefile',
+  'ext/cm17a_api/MANIFEST',
+  'lib/*-*',
+  '**/*.log'
+  )
+
+desc "Default task (run tests)"
+task :default => :test
+
+desc "Run the unit tests"
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/test_*.rb']
+  t.libs << "lib/#{ARCH}"
+end
+task :test => [SO_FILE]
+
+task :xtest => [SO_FILE] do
+  test_files = FileList['test/test_*.rb']
+  ruby "-Ilib", "-Ilib/#{ARCH}",  '-e0',  *test_files.collect { |fn| "-r#{fn}" }
+end
+
+task :compile => [SO_FILE]
+
+directory File.dirname(SO_FILE)
+
+file SO_FILE => ["ext/cm17a_api/cm17a_api.so", File.dirname(SO_FILE)] do |t|
+  cp t.prerequisites.first, SO_FILE
+end
+
+file "ext/cm17a_api/Makefile" => ["ext/cm17a_api/extconf.rb"] do
+  Dir.chdir("ext/cm17a_api") do ruby "extconf.rb" end
+end
+
+CM17A_FILES = FileList[
+  'ext/cm17a_api/*.c',
+  'ext/cm17a_api/*.h',
+  'ext/cm17a_api/extconf.rb',
+  'ext/cm17a_api/Makefile',
+  'ext/cm17a_api/MANIFEST',
+] 
+
+file "ext/cm17a_api/cm17a_api.so" => CM17A_FILES do
+  Dir.chdir("ext/cm17a_api") do
+    sh MAKE
+  end
+end
+
+# RDoc Documentation -------------------------------------------------
+
+# Choose template, prefer the jamis template if it is available
+
+def choose_rdoc_template
+  libdir = Config::CONFIG['rubylibdir']
+  templates = Dir[File.join(libdir, 'rdoc/**/jamis.rb')]
+  templates.empty? ? 'html': 'jamis'
+end
+
+rd = Rake::RDocTask.new("rdoc") { |rdoc|
+  rdoc.rdoc_dir = 'html'
+  rdoc.template = choose_rdoc_template
+  rdoc.title    = "Ruby X10 Software"
+  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
+  rdoc.rdoc_files.include(
+    'lib/**/*.rb',
+    'doc/*.rdoc',
+    'ext/**/cm17a_api.c',
+    'README',
+    'MIT-LICENSE')
+  rdoc.rdoc_files.exclude('lib/**/other.rb', 'lib/**/bottlerocket.rb')
+}
+
+
+# Packaging Tasks ----------------------------------------------------
+
+file "ext/cm17a_api/MANIFEST" do |t|
+  open(t.name, "w") do |f|
+    f.puts Dir["ext/cm17a_api/*"].select { |fn|
+      fn =~ /\.(h|c|rb)$/
+    }.collect { |fn|
+      File.basename(fn)
+    }
+  end
+end
+
+PKG_VERSION = '1.0.0'
+PKG_FILES = FileList[
+  'Rakefile',
+  'setup.rb',
+  'test/*.rb',
+  'lib/**/*.rb',
+  'ext/cm17a_api/MANIFEST',
+  'ext/cm17a_api/*.h',
+  'ext/cm17a_api/*.c',
+  'ext/cm17a_api/*.rb',
+]
+
+if ! defined?(Gem)
+  puts "Package Target requires RubyGEMs"
+else
+  spec = Gem::Specification.new do |s|
+    
+    #### Basic information.
+
+    s.name = 'x10-cm17a'
+    s.version = PKG_VERSION
+    s.summary = "Ruby based X10 CM17A Firecracker Controller"
+    s.description = <<-EOF
+    EOF
+
+    s.files = PKG_FILES.to_a
+
+    #### C code extensions.
+
+    s.extensions << "ext/cm17a_api/extconf.rb"
+
+    #### Load-time details: library and application (you will need one or both).
+
+    s.require_path = 'lib'                         # Use these for libraries.
+
+    #### Documentation and testing.
+
+    s.has_rdoc = true
+#    s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
+#     s.rdoc_options <<
+#       '--title' <<  'Rake -- Ruby Make' <<
+#       '--main' << 'README' <<
+#       '--line-numbers'
+
+    #### Author and project details.
+
+    s.author = "Jim Weirich"
+    s.email = "jim@weirichhouse.org"
+#    s.homepage = "http://rake.rubyforge.org"
+  end
+
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+  end
+end
+
+
+# Publishing Tasks ---------------------------------------------------
+
+
+task :publish_on_osb => ["pkg/cm17a-#{PKG_VERSION}.tgz", "pkg/cm17a-#{PKG_VERSION}.gem"] do |t|
+  sh %{ssh umlcoop mkdir -p "htdocs/software/cm17a"}
+  sh %{scp -rq #{t.prerequisites.join(' ')} umlcoop:htdocs/software/cm17a}
+end
+
+# Optional publish task for Rake
+
+require 'rake/contrib/sshpublisher'
+require 'rake/contrib/rubyforgepublisher'
+
+publisher = Rake::CompositePublisher.new
+publisher.add Rake::RubyForgePublisher.new('x10-cm17a', 'jimweirich')
+publisher.add Rake::SshFilePublisher.new(
+  'umlcoop',
+  'htdocs/software/x10-cm17a',
+  '.',
+  'x10-cm17a.blurb')
+
+desc "Publish the Documentation to RubyForge."
+task :publish => [:rdoc] do
+  publisher.upload
+end

data/ext/cm17a_api/cm17a_api.c

@@ -32,6 +32,10 @@ static VALUE mX10;
 static VALUE mCm17a;
 static VALUE cCm17aController;
 static VALUE eX10Error;
+static VALUE symON;
+static VALUE symOFF;
+static VALUE symDIM;
+static VALUE symBRIGHTEN;
 
 /*
  * call-seq:
@@ -62,13 +66,13 @@ static VALUE cm17a_init(int argc, VALUE *argv, VALUE self)
  * address is given by the +house+ code (0-15) and the +unit+ code
  * (0-15).  The command must be one of the following constants:
  *
- * * <tt>X10::Cm17a::ON</tt> -- Turn the device on.
- * * <tt>X10::Cm17a::OFF</tt> -- Turn the device off.
- * * <tt>X10::Cm17a::DIM</tt> -- Dim the device by +steps+ steps.
- * * <tt>X10::Cm17a::BRIGHT</tt> -- Brighten the device by +steps+ steps.
+ * * <tt>:on</tt> -- Turn the device on.
+ * * <tt>:off</tt> -- Turn the device off.
+ * * <tt>:dim</tt> -- Dim the device by +steps+ steps.
+ * * <tt>:brighten</tt> -- Brighten the device by +steps+ steps.
  *
- * Note that the unit code is ignored for the <tt>BRIGHT</tt> and
- * <tt>DIM</tt> commands.  The bright/dim commands will effect the
+ * Note that the unit code is ignored for the <tt>:brighten</tt> and
+ * <tt>:dim</tt> commands.  The bright/dim commands will effect the
  * last addressed unit.
  */
 static VALUE cm17a_ruby_command(
@@ -80,8 +84,20 @@ static VALUE cm17a_ruby_command(
 {
     int house = NUM2INT(rhouse);
     int device = NUM2INT(rdevice);
-    int command = NUM2INT(rcommand);
     int steps = NUM2INT(rsteps);
+    int command;
+
+    if (rcommand == symON)
+	command = CM17A_ON;
+    else if (rcommand == symOFF)
+	command = CM17A_OFF;
+    else if (rcommand == symDIM)
+	command = CM17A_DIM;
+    else if (rcommand == symBRIGHTEN)
+	command = CM17A_BRIGHTEN;
+    else
+	command = NUM2INT(rcommand);
+    
     cm17a_command(fd, house, device, command, steps);
     return Qnil;
 }
@@ -103,12 +119,12 @@ void Init_cm17a_api()
 
     eX10Error = rb_eval_string("X10::X10Error");
 
+    symON = rb_eval_string(":on");
+    symOFF = rb_eval_string(":off");
+    symDIM = rb_eval_string(":dim");
+    symBRIGHTEN = rb_eval_string(":brighton");
+
     rb_define_method(cCm17aController, "initialize", cm17a_init, -1);
     rb_define_method(cCm17aController, "close",      cm17a_close, 0);
     rb_define_method(cCm17aController, "command",    cm17a_ruby_command, 4);
-
-    rb_define_const(mCm17a, "ON",       INT2NUM(CM17A_ON));
-    rb_define_const(mCm17a, "OFF",      INT2NUM(CM17A_OFF));
-    rb_define_const(mCm17a, "BRIGHTEN", INT2NUM(CM17A_BRIGHTEN));
-    rb_define_const(mCm17a, "DIM",      INT2NUM(CM17A_DIM));
 }

data/lib/x10/cm17a.rb

@@ -2,7 +2,6 @@
 
 require 'x10'
 require 'cm17a_api'
-
 require 'x10/cm17a_device'
 
 module X10

data/lib/x10/cm17a_device.rb

@@ -32,111 +32,30 @@ module X10
       
       # Turn the device on.
       def on
-	@controller.command(@house, @unit, X10::Cm17a::ON, 0)
-	@level = 1.0 if @on == false
-	@on = true
+	@controller.command(@house, @unit, :on, 0)
       end
       
       # Turn the device off.
       def off
-	@controller.command(@house, @unit, X10::Cm17a::OFF, 0)
-	@level = 0.0
-	@on = false
-      end
-      
-      # Adjust the brightness level.
-      #
-      # The level adjustment is given as a number between 0 and 1.  An
-      # adjustment amount of 1 will adjust a completely dim device
-      # into a completely bright device.  An adjustment of 0.5 will be
-      # one half of full range.
-      #
-      # Negative adjustment amounts dim the device.  Positive
-      # adjustments brighten the device.
-      def adjust(amount)
-	steps = steps_for(amount)
-	while steps > 0
-	  step = (steps > 6 ? 6 : steps)
-	  if amount > 0
-	    brighten(step)
-	  else
-	    dim(step)
-	  end
-	  steps -= step
+	@controller.command(@house, @unit, :off, 0)
+      end
+      
+      # Adjust the brightness level by +steps+.  If +steps+ is
+      # positive, the brightness level is increased that many steps.
+      # If +steps+ is negative, the brightness level is decreased by      
+      # <tt>|steps|</tt>.
+      #
+      # The controller limits the step size to 6, so larger steps must
+      # be broken up.
+      def step(steps)
+	direction = (steps > 0) ? :brighten : :dim
+	nsteps = steps.abs
+	while nsteps > 0
+	  n = (nsteps > 6) ? 6 : nsteps
+	  @controller.command(@house, @unit, direction, n)
+	  nsteps -= n
 	end
-	if @level
-	  @level += amount
-	  @level = 0.0 if @level < 0
-	  @level = 1.0 if @level > 1
-	end
-      end
-      
-      private
-      
-      # -- Questionable Methods --------------------------------------
-
-      # The following methods are provided as private methods.  They
-      # are used in testing, but I am uncertain whether they should be
-      # part of the public interface, due to the uncertaintity of
-      # there implementation.
-
-      # Is the device on?
-      #
-      # Since the CM17A protocol is write only, we can't really sense
-      # the on/off state of the device, so we remember the last
-      # commanded state.  This approach has the following
-      # disadvantages:
-      #
-      # * The on/off state is indeterminate until the first command is
-      #   issued.  Asking for the on/off state before the first
-      #   command will throw an X10::X10Error exception.
-      # * If there is more than one device object controlling a single
-      #   physical device, then the on/off state can be invalidated by
-      #   second device object.
-      def on?
-	fail X10::X10Error, "On/Off state is unknown" if @on.nil?
-	@on
       end
-      
-      # Is the device off?
-      #
-      # See also the discussion in the on? method.
-      def off?
-	! on?
-      end
-      
-      # Return the current brightness level between 0 (very dim) and
-      # 1.0 (very bright) of the device.
-      #
-      # Again, since the CM17A protocol is write only, the same
-      # caveats that apply to on? and off? are also applicable here.
-      #
-      # Furthermore, the real brightness level is a mystery.  The
-      # protocol docs say that stepping the brighteness level changes
-      # it by approximately 5%.  However, there seems to be only 10 or
-      # so steps from completely dim to completely bright.
-      def level
-	fail X10::X10Error, "Level is unknown" if @level.nil?
-	@level
-      end
-      
-      # -- Helper Commands -------------------------------------------
-
-      # Brightness steps for the given amount. 
-      def steps_for(amount)
-	(amount * 10).round.abs
-      end
-      
-      # Send a dim command for the given number of steps.
-      def dim(steps)
-	@controller.command(@house, @unit, X10::Cm17a::DIM, steps)
-      end
-      
-      # Send a brighten command for the given number of steps.
-      def brighten(steps)
-	@controller.command(@house, @unit, X10::Cm17a::BRIGHTEN, steps)
-      end
-
     end
   end
 end

data/lib/x10/cm17a_remote.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'drb'
+require 'x10'
+require 'x10/cm17a_device'
+
+module X10
+  module Cm17aRemote
+    class Controller
+      def initialize(uri="druby:localhost:7777")
+	@uri = uri
+	@remote = DRbObject.new(nil, @uri)
+      end
+      def command(house, unit, command, steps)
+	@remote.command(house, unit, command, steps)
+      end
+      def device(house, unit)
+	X10::Cm17a::Device.new(house, unit, self)
+      end
+      def self.x10_controller?
+	true
+      end
+    end
+  end
+end

data/test/test_cm17a_controller.rb

@@ -14,6 +14,7 @@ class TestApi < Test::Unit::TestCase
 
   def teardown
     X10.controller.close if X10.controller
+    X10.controller = nil
   end
 
   def test_default_create

data/test/test_cm17a_device.rb

@@ -26,7 +26,7 @@ class MockController < FlexMock
       X10.controller =  controller
       controller.mock_handle(:device, 1) { |house, unit|
 	X10::Cm17a::Device.new(house, unit, controller)
-      }	
+      }
     end
     
     def use
@@ -57,7 +57,7 @@ class TestCm17a < Test::Unit::TestCase
   def test_on
     MockController.use do |controller|
       controller.mock_handle(:command, 1) { |house, unit, cmd, step|
-	assert_equal X10::Cm17a::ON, cmd
+	assert_equal :on, cmd
 	assert_equal 0, step
       }
       dev = X10.device('a1')
@@ -68,7 +68,7 @@ class TestCm17a < Test::Unit::TestCase
   def test_off
     MockController.use do |controller|
       controller.mock_handle(:command, 1) { |house, unit, cmd, step|
-	assert_equal X10::Cm17a::OFF, cmd
+	assert_equal :off, cmd
 	assert_equal 0, step
       }
       dev = X10.device('a1')
@@ -76,37 +76,27 @@ class TestCm17a < Test::Unit::TestCase
     end
   end
 
-  def test_step_size
-    MockController.use do |controller|
-      dev = X10.device('a1')
-      assert_equal 0, dev.send(:steps_for, 0.0)
-      assert_equal 5, dev.send(:steps_for, 0.5)
-      assert_equal 5, dev.send(:steps_for, -0.5)
-      assert_equal 10, dev.send(:steps_for, 1.0)
-    end
-  end
-
   def test_adjust
     MockController.use do |controller|
       controller.mock_handle(:command, 2) { |house, unit, cmd, step|
 	if step == 4
 	  assert_equal 4, step
-	  assert_equal X10::Cm17a::BRIGHTEN, cmd
+	  assert_equal :brighten, cmd
 	else
 	  assert_equal 3, step
-	  assert_equal X10::Cm17a::DIM, cmd
+	  assert_equal :dim, cmd
 	end
       }
       dev = X10.device('a1')
-      dev.adjust(0.4)
-      dev.adjust(-0.3)
+      dev.step(4)
+      dev.step(-3)
     end
   end
 
   def test_big_adjustments
     MockController.use do |controller|
       controller.mock_handle(:command, 2) { |house, unit, cmd, step|
-	assert_equal X10::Cm17a::DIM, cmd
+	assert_equal :dim, cmd
 	if step == 6
 	  assert_equal 6, step
 	else
@@ -114,7 +104,7 @@ class TestCm17a < Test::Unit::TestCase
 	end
       }
       dev = X10.device('a1')
-      dev.adjust(-0.9)
+      dev.step(-9)
     end
   end
 
@@ -122,7 +112,7 @@ class TestCm17a < Test::Unit::TestCase
     MockController.use do |controller|
       controller.mock_handle(:command, 0) { }
       dev = X10.device('a1')
-      dev.adjust(0.0)
+      dev.step(0)
     end
   end
 
@@ -135,80 +125,12 @@ class TestCm17a < Test::Unit::TestCase
       dev = X10.device('b3')
       dev.off
       dev.on
-      dev.adjust(1)
-      dev.adjust(-1)
+      dev.step(1)
+      dev.step(-1)
     end
   end
 end
 
-######################################################################
-class TestCm17aNonApi < Test::Unit::TestCase
-  def setup
-    X10.controller = MockController.new
-    X10.controller.mock_handle(:command) { }
-    MockController.setup_controller(X10.controller)
-    @dev = X10.device("a1")
-  end
-
-  def teardown
-    X10.controller = nil
-  end
-
-  def test_query
-    @dev.on
-    assert @dev.send(:on?)
-    assert ! @dev.send(:off?)
-    @dev.off
-    assert ! @dev.send(:on?)
-    assert @dev.send(:off?)
-    @dev.on
-    assert @dev.send(:on?)
-    assert ! @dev.send(:off?)
-  end
-
-  def test_undefined_on_off_state
-    assert_raises(X10::X10Error) {
-      @dev.send(:on?)
-    }
-  end
-  
-  def test_undefined_level
-    assert_raises(X10::X10Error) {
-      @dev.send(:level)
-    }
-  end
-
-  def test_undefined_level_after_adjust
-    assert_raises(X10::X10Error) {
-      @dev.adjust(0.3)
-      @dev.send(:level)
-    }
-  end
-
-  def test_level
-    @dev.off
-    assert_equal 0.0, @dev.send(:level)
-
-    @dev.adjust(-0.5)
-    assert_equal 0.0, @dev.send(:level)
-
-    @dev.on
-    assert_equal 1.0, @dev.send(:level)
-
-    @dev.adjust(0.1)
-    assert_equal 1.0, @dev.send(:level)
-
-    @dev.adjust(-0.5)
-    assert_equal 0.5, @dev.send(:level)
-
-    @dev.adjust(-0.5)
-    assert_equal 0.0, @dev.send(:level)
-
-    @dev.adjust(-0.5)
-    assert_equal 0.0, @dev.send(:level)
-  end
-end
-
 ######################################################################
 class TestCm17aController < Test::Unit::TestCase
   def test_create

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: x10-cm17a
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2004-12-30
+  version: 1.0.0
+date: 2005-01-17
 summary: Ruby based X10 CM17A Firecracker Controller
 require_paths: 
   - lib
@@ -35,6 +35,7 @@ files:
   - lib/x10.rb
   - lib/x10/cm17a.rb
   - lib/x10/cm17a_device.rb
+  - lib/x10/cm17a_remote.rb
   - ext/cm17a_api/MANIFEST
   - ext/cm17a_api/cm17a.h
   - ext/cm17a_api/cm17a.c