trigger_switch_d 0.1.2 → 0.1.3

data/bin/ts_setup

@@ -29,6 +29,8 @@
 #    (for system wide folder)
 #    ts_setup system
 
+require 'open3'
+
 if ((ARGV.length != 1) || ((ARGV[0] =~ /^(home|system)$/) == nil))
   puts <<-EOS
 # ==Usage
@@ -53,13 +55,16 @@ def create(path)
   config = "config"
   config_path = "#{path}/#{config}"
   db_path = "#{path}/#{db}"
-  `mkdir #{path}`
-  `mkdir #{path}/log`
-  `mkdir #{db_path}`
-  `mkdir #{config_path}`
-  `touch #{db_path}/devices`
-  `touch #{db_path}/scheduled_actions`
-  `cp samples/environment.rb #{config_path}`
+  gem_path = "/#{Gem.bin_path('trigger_switch_d', 'ts_setup', ">=0").split("/")[1..-3].join("/")}"
+  Open3.popen3("mkdir #{path}")
+  Open3.popen3("mkdir #{path}/log")
+  Open3.popen3("mkdir #{db_path}")
+  Open3.popen3("mkdir #{config_path}")
+  Open3.popen3("touch #{db_path}/devices")
+  Open3.popen3("touch #{db_path}/scheduled_actions")
+  Open3.popen3("cp #{gem_path}/samples/environment.rb #{config_path}")
+  Open3.popen3("cp #{gem_path}/samples/lookup.dsl #{config_path}")
+  Open3.popen3("cp -R #{gem_path}/samples #{path}")
 end
 
 case ARGV[0]

data/bin/tsd

@@ -60,7 +60,7 @@ $LOAD_PATH.push File.join(File.dirname(__FILE__),".." ,"lib" )
 require 'tellstick'
 require 'trigger_switch_d'
 
-if $0 == __FILE__
+if ($0 =~ /bin\/tsd/) != nil
   file = File.open(TriggerSwitchD::ConfigFactory::ProperEnvironmentFile.new.path,"r")
   app = TriggerSwitchD::Application.new(file)
   file.close

data/lib/tellstick/proxy_io.rb

@@ -22,7 +22,7 @@ module Tellstick
       @init_args = args
       @class_to_proxy = klass
       @tio = nil
-      # open
+      open
     end
     
     def method_missing(method_id)
@@ -52,6 +52,10 @@ module Tellstick
       @tio.gets
     end
     
+    def to_s
+      open
+      @tio
+    end
     private
     
     def create_io_instance

data/lib/trigger_switch_d/action.rb

@@ -96,10 +96,8 @@ module TriggerSwitchD
     end
     
     def self.__action_gut__(*args)
-      args.each do |stick_call|
-        output, model_name, *params = args.flatten
-        Tellstick::create(output,model_name).send(*params)
-      end
+      output, model_name, *params = args.flatten
+      Tellstick::create(output,model_name).send(*params)
     end
     
     def self.methodize_executable(executable)

data/lib/trigger_switch_d/config.rb

@@ -90,7 +90,7 @@ module TriggerSwitchD
 
     def self.set_type(name)
       types = {"log_object" => "Hash.new(STDOUT).merge({:spec => StringIO.new, :development => STDOUT, 
-                              :file => Tellstick::ProxyIO.new(File,Config.log_path,\"a+\",Proc.new { })})",
+                              :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

data/samples/environment.rb

@@ -23,7 +23,7 @@ Config.geo_position = {:north => 54.57525, :west => -12.94125}
 #       number instead of the xxxxxxxx
 Config.log_path = "~/.trigger_switch_d/log"
 Config.db_path = "~/.trigger_switch_d/db"
-Config.dsl_path = "config"
+Config.dsl_path = "~/.trigger_switch_d/config"
 # Config.vcp_port = "/dev/tty.usbserial-xxxxxxxx"
 
 #Log: can be one of :file, :development or :spec (:spec is for the rspecs, ie don't use)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Pontus Str\xC3\xB6mdahl"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +02:00
+date: 2010-04-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency