trigger_switch_d 0.1.0 → 0.1.1

data/README.rdoc

@@ -9,8 +9,8 @@ See link:License.txt
 
 Mac OSX 
 USB dongle (such as tellstick from http://www.telldus.se)
-ruby-ftd2xx gem (git://github.com/pfspontus/ruby-ftd2xx)
-ftd2xx USB drivers (available at http://ftdichip.com)
+ruby-serialport (http://ruby-serialport.rubyforge.org/)
+VCP USB drivers (available at http://ftdichip.com)
 
 ==Description
 Scheduled (tsd) is run as a daemon without any need for user interaction.

data/bin/teach

@@ -34,11 +34,14 @@
 
 $LOAD_PATH.push File.join(File.dirname(__FILE__),".." ,"lib" )
 require 'tellstick'
+require 'trigger_switch_d'
 
 #code to run tellstick app
-output = Tellstick::TellstickIO.new
-stick = Tellstick::create(output,ARGV[2])
+File.open(TriggerSwitchD::ConfigFactory::ENV_PATH,"r") do |config_file|
+  TriggerSwitchD::ConfigFactory.new(config_file)
+end
+stick = Tellstick::create(TriggerSwitchD::Config.output,ARGV[2])
 stick.teach(ARGV[0],ARGV[1])
-output.close
+TriggerSwitchD::Config.output.close
 
 

data/bin/tsd

@@ -61,7 +61,7 @@ require 'tellstick'
 require 'trigger_switch_d'
 
 if $0 == __FILE__
-  file = File.open("config/config.rb","r")
+  file = File.open(TriggerSwitchD::ConfigFactory::ENV_PATH,"r")
   app = TriggerSwitchD::Application.new(file)
   file.close
 	app.start

data/bin/turn_off

@@ -31,12 +31,15 @@
 
 $LOAD_PATH.push File.join(File.dirname(__FILE__),".." ,"lib" )
 require 'tellstick'
+require 'trigger_switch_d'
 
 #code to run tellstick app
-output = Tellstick::TellstickIO.new
-stick = Tellstick::create(output,ARGV[2])
+File.open(TriggerSwitchD::ConfigFactory::ENV_PATH,"r") do |config_file|
+  TriggerSwitchD::ConfigFactory.new(config_file)
+end
+stick = Tellstick::create(TriggerSwitchD::Config.output,ARGV[2])
 stick.turn_off(ARGV[0],ARGV[1])
-output.close
+TriggerSwitchD::Config.output.close
 
 
 

data/bin/turn_on

@@ -31,9 +31,12 @@
 
 $LOAD_PATH.push File.join(File.dirname(__FILE__),".." ,"lib" )
 require 'tellstick'
+require 'trigger_switch_d'
 
 #code to run tellstick app
-output = Tellstick::TellstickIO.new
-stick = Tellstick::create(output,ARGV[2])
+File.open(TriggerSwitchD::ConfigFactory::ENV_PATH,"r") do |config_file|
+  TriggerSwitchD::ConfigFactory.new(config_file)
+end
+stick = Tellstick::create(TriggerSwitchD::Config.output,ARGV[2])
 stick.turn_on(ARGV[0],ARGV[1])
-output.close
+TriggerSwitchD::Config.output.close

data/lib/tellstick.rb

@@ -16,5 +16,4 @@
 
 
 require "tellstick/tellstick"
-require "tellstick/tellstick_io"
-
+require "tellstick/proxy_io"

data/lib/tellstick/proxy_io.rb

@@ -0,0 +1,58 @@
+# TriggerSwitchD, executes commands to activate/deactive remote switches.
+# (c) Copyright 2010 Pontus Strömdahl, AdhocSkill. 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Tellstick
+  
+  class ProxyIO #:nodoc:all
+    public
+    def initialize(klass,*args)
+      @init_args = args
+      @class_to_proxy = klass
+      @tio = nil
+      open
+    end
+    def open
+      return unless @tio == nil
+      if (@init_args.empty?)
+        @tio = @class_to_proxy.new
+      else
+        @tio = @class_to_proxy.new(@init_args[0],@init_args[1])
+        @init_args[2].call(@tio)
+      end
+      if @tio.methods.include?("connected?")
+        def self.connected?
+          open
+          @tio.connected?
+        end
+      end
+      return if @tio.private_methods.include?("open")
+      @tio.open
+    end
+    def close
+      @tio.close unless @tio == nil
+      @tio = nil
+    end
+    def puts(input)
+      open
+      @tio.puts(input)
+    end
+    def gets
+      open
+      @tio.gets
+    end
+  end
+end
+

data/lib/trigger_switch_d.rb

@@ -16,6 +16,7 @@
 
 
 $LOAD_PATH.push File.join(File.dirname(__FILE__),"trigger_switch_d")
+require "rubygems"
 require "config"
 require "daylight"
 require "action"

data/lib/trigger_switch_d/config.rb

@@ -13,10 +13,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+require "serialport"
 
 module TriggerSwitchD
   module ConfigFactory
+    ENV_PATH = "config/environment.rb"
     
     #Creates the Config class from the config/config.rb file
     #See samples/config.rb for more documentation
@@ -25,6 +26,7 @@ module TriggerSwitchD
       attributes = env.map do |attribute|
         attribute.scan(/Config.([\w_]+) =/).flatten[0]
       end
+      attributes.compact!
       cls = <<-EOS
       class Config
          #{attributes.map {|name| "def self.#{name}=(value); #{append_filenames(name)}; end"}.join("\n")}
@@ -62,8 +64,10 @@ module TriggerSwitchD
     end
 
     def self.set_type(name)
-      types = {"log_object" => "{:spec => StringIO.new, :development => STDOUT, :file => File.open(\"#log_path}\",\"a+\")}",
-                "output" => "{:spec => StringIO.new, :development => STDOUT, :tellstick => Tellstick::TellstickIO.new}"}
+      types = {"log_object" => "{:spec => StringIO.new, :development => STDOUT, 
+                                  :file => File.open(\"#log_path}\",\"a+\")}",
+                "output" => "Hash.new(STDOUT).merge({:spec => StringIO.new, :development => STDOUT, 
+                              :vcp => Tellstick::ProxyIO.new(SerialPort,Config.vcp_port,4800,Proc.new { |sp| sp.puts(\"~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M\"); sp.puts(\"S+\"); sp.gets })})"}
       return "@#{name}=value" unless types.keys.include? name
       "@#{name}=#{types[name]}[value]".gsub("log_path","{log_path")
     end

data/spec/tellstick/{tellstick_io_spec.rb → proxy_io_spec.rb}

@@ -18,14 +18,17 @@
 require File.join(File.dirname(__FILE__),"..","spec_helper")
 
 module Tellstick
-  describe TellstickIO do
-    it "writes commands to usb dongle" do
-      dongle = TellstickIO.new
-      dongle.puts("S+")
-      dongle.gets.should include("+S")
-      dongle.puts("T+")
-      dongle.gets.should include("+T")
-      dongle.close
-    end
+  describe ProxyIO do        
+    it "should respond to puts, gets when there is no TellstickIO instance" do
+      dongle = StringIO.new
+      dongle.stub!(:new).and_return(dongle)
+      dongle.stub!(:gets).and_return("bla")
+      dongle.stub!(:close)
+      proxy = ProxyIO.new(StringIO)
+      proxy.close
+      Proc.new { proxy.puts "bla" }.should_not raise_error(NoMethodError)
+      proxy.close
+      Proc.new { proxy.gets }.should_not raise_error(NoMethodError)
+    end      
   end
 end

data/spec/trigger_switch_d/application_spec.rb

@@ -22,12 +22,15 @@ module TriggerSwitchD
   
   describe "Application" do
     before(:each) do
+      mock_sp = StringIO.new
+      SerialPort.stub!(:new).and_return(mock_sp)
       @file = StringIO.new
       @file.puts <<-EOS
       Config.geo_position = {:north => 54.57525, :west => -12.94125}
       Config.log_path = "log"
       Config.db_path = "db"
       Config.dsl_path = "config"
+      Config.vcp_port = "/dev/tty.usbserial-xxxxxxxx"
       #Config.log_object = :file
       Config.log_object = :spec
       Config.output = :spec

data/spec/trigger_switch_d/config_spec.rb

@@ -20,12 +20,18 @@ require File.join(File.dirname(__FILE__),"..","spec_helper")
 module TriggerSwitchD
   describe "Config" do
     before(:each) do
+      @sio = mock("SerialPort")
+      @sio.stub!(:open)
+      @sio.stub!(:puts)
+      @sio.stub!(:gets)
+      SerialPort.stub!(:new).and_return(@sio)
       file = StringIO.new
       file.puts <<-EOS
       Config.geo_position = {:north => 54.57525, :west => -12.94125}
       Config.log_path = "log"
       Config.db_path = "db"
       Config.dsl_path = "config"
+      Config.vcp_port = "/dev/tty.usbserial-xxxxxxxx"
       Config.unix_socket_path = "/tmp"
       Config.log_object = :spec
       Config.output = :spec
@@ -67,7 +73,10 @@ module TriggerSwitchD
       Config.output = :development
       Config.output.should be_kind_of(IO)
       Config.output = :tellstick
-      Config.output.should be_kind_of(Tellstick::TellstickIO)
+      Config.output.should == STDOUT
+      SerialPort.should_receive(:new).and_return(@sio)
+      Config.output = :vcp
+      Config.output.should be_kind_of(Tellstick::ProxyIO)
     end
     
     it "should respond to environment" do
@@ -90,5 +99,56 @@ EOS
                                     :at_location => {:north => 54.57525, :west => -12.94125}}
       
     end
+    
+    it "should handle empty line in config file" do
+      file = StringIO.new
+      file.puts <<-EOS
+# TriggerSwitchD, executes commands to activate/deactive remote switches.
+# (c) Copyright 2010 Pontus Strömdahl, AdhocSkill. 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#longitude and latitude for Malmö, Sweden. decimal form
+Config.geo_position = {:north => 54.57525, :west => -12.94125}
+
+#Paths: base for files tsd.log, devices, scheduled_actions and lookup.dsl (leave alone if uncertain) 
+Config.log_path = "log"
+Config.db_path = "db"
+Config.dsl_path = "config"
+
+#Log: can be one of :file, :development or :spec (:spec is for the rspecs, ie don't use)
+#     when log_object is set to :file, the log is written to tsd.log (log_path + /tsd.log)
+#     when log_object is set to :development the log is written to STDOUT, useful for debugging
+# Config.log_object = :file
+Config.log_object = :development
+# Config.log_object = :spec
+
+#Output: can be one of :development, :tellstick or :spec (:spec is for the rspecs, ie don't use)
+#        when output is set to :development output is written to STDOUT, useful for debugging
+#        when output is set to :tellstick output is sent to the usb port that has a tellstick 
+#          (see www.teldus.se for more information)
+# Config.output = :tellstick
+Config.output = :development
+# Config.output = :spec
+
+#Unix socket: (leave alone if uncertain)
+Config.unix_socket_path = "/tmp"
+
+      EOS
+      file.seek(0)
+      Proc.new { ConfigFactory.new(file) }.should_not raise_error
+    end
   end
 end

data/trigger_switch_d.gemspec

@@ -18,7 +18,7 @@
 require 'rubygems'
 SPEC = Gem::Specification.new do |s|
   s.name = "trigger_switch_d"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.author = "Pontus Strömdahl"
   s.email = "pontus.stromdahl@adhocskill.com"
   s.homepage = "http://www.adhocskill.com/"
@@ -39,5 +39,5 @@ SPEC = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc"]
-  s.add_dependency("ruby-ftd2xx", ">= 0.0.1")
+  s.add_dependency("serialport", ">= 0.8.0")
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Pontus Str\xC3\xB6mdahl"
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +01:00
+date: 2010-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-ftd2xx
+  name: serialport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 8
         - 0
-        - 1
-        version: 0.0.1
+        version: 0.8.0
   type: :runtime
   version_requirements: *id001
 description: "  Schedule remote triggered switches and dimmers to activate/deactivate the lights in your home.\n\n  Type your schedule in plain text and have an USB connected tellstick send the appropriate commands,\n\n  according to your schedule.\n"
@@ -116,8 +116,8 @@ files:
 - lib/tellstick/protocol/protocol_loader.rb
 - lib/tellstick/protocol/rising_sun.rb
 - lib/tellstick/protocol/waveman.rb
+- lib/tellstick/proxy_io.rb
 - lib/tellstick/tellstick.rb
-- lib/tellstick/tellstick_io.rb
 - lib/tellstick.rb
 - lib/trigger_switch_d/action.rb
 - lib/trigger_switch_d/application.rb
@@ -133,7 +133,7 @@ files:
 - spec/tellstick/protocol/proove_spec.rb
 - spec/tellstick/protocol/rising_sun_spec.rb
 - spec/tellstick/protocol/waveman_spec.rb
-- spec/tellstick/tellstick_io_spec.rb
+- spec/tellstick/proxy_io_spec.rb
 - spec/tellstick/tellstick_spec.rb
 - spec/trigger_switch_d/application_spec.rb
 - spec/trigger_switch_d/config_spec.rb

data/lib/tellstick/tellstick_io.rb

@@ -1,80 +0,0 @@
-# TriggerSwitchD, executes commands to activate/deactive remote switches.
-# (c) Copyright 2010 Pontus Strömdahl, AdhocSkill. 
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-require "rubygems"
-require "ftd2xx"
-require "pp"
-
-module Tellstick
-  
-  #IO stream associated with the tellstick
-  class TellstickIO
-    def initialize
-      open
-    end
-
-    #writes input string to tellstick
-    def puts(input)
-      input.scan(/.{1,8}/).each do |str|
-        Ftd2xx.write(@handle,str)
-      end
-    end
-    
-    #reads string from tellstick
-    def gets
-      reply = ""
-      bytes_read = 1
-      c = " "
-      while (bytes_read != 0) and (c != "\n")
-        c = " "
-        bytes_read = Ftd2xx.read(@handle,c)
-        reply << c
-      end
-      reply
-    end
-    
-    #close tellstick stream
-    def close
-      Ftd2xx.ft_close(@handle)
-      @handle = nil
-    end
-    
-    #opens tellstick stream
-    def open
-      Ftd2xx.ft_set_vidpid(0x1781,0x0c30)
-      device_index = Ftd2xx.create_device_info_list - 1
-      @handle = Ftd2xx.open(device_index)
-      Ftd2xx.ft_set_baud_rate(@handle,4800)
-      Ftd2xx.ft_set_timeouts(@handle,5000,0)
-      if @handle == nil
-        def puts(input);end 
-        def gets;end 
-      end
-    end
-    
-    #true if connected
-    def connected?
-      close
-      open
-      puts("S+")
-      answer = gets
-      close
-      open
-      answer == "+S\r\n"
-    end
-  end
-end