rzwaveway 0.0.1 → 0.0.2

data/lib/rzwaveway/command_classes.rb

@@ -1,6 +1,3 @@
-require 'pp'
-require_relative 'events'
-
 module RZWaveWay
   module CommandClasses
     SENSOR_BINARY = 48

data/lib/rzwaveway/zwave_device.rb

@@ -1,7 +1,5 @@
 require 'json'
 
-require_relative 'command_classes'
-
 module RZWaveWay
   class ZWaveDevice
     include CommandClasses
@@ -11,7 +9,7 @@ module RZWaveWay
     def initialize(id, data)
       @id = id
       @command_classes = create_commandclasses_from data
-      puts "Created ZWaveDevice with id='#{id}'"
+      $log.info "Created ZWaveDevice with id='#{id}'"
     end
 
     def create_commandclasses_from data
@@ -56,7 +54,8 @@ module RZWaveWay
         if @command_classes.has_key? cc
           events << (@command_classes[cc].process(values, @id))
         else
-          puts "Could not find command class: '#{cc}'"
+          $log.warn "Could not find command class: '#{cc}'"
+        end
       end
       events
     end
@@ -71,11 +70,10 @@ module RZWaveWay
           cc_updates << [match_data.post_match, value]
           updates_per_commandclass[command_class] = cc_updates
         else
-          puts "? #{key}" unless key.match(/\Adata./)
+          $log.warn "? #{key}" unless key.match(/\Adata./)
         end
       end
       updates_per_commandclass
     end
-
   end
-end
+end

data/lib/rzwaveway/zway.rb

@@ -1,9 +1,19 @@
 require 'uri'
+require 'log4r'
 require 'net/http'
 require 'json'
 
 module RZWaveWay
   class ZWay
+    include Log4r
+
+    def self.init
+      $log = Logger.new 'RZWaveWay'
+      outputter = Outputter.stdout
+      outputter.formatter = PatternFormatter.new(:pattern => "[%l] %d - %m")
+      $log.outputters = Outputter.stdout
+    end
+
     def initialize hostname
       @devices = {}
       @update_time = "0"
@@ -36,7 +46,7 @@ module RZWaveWay
         if @devices[id]
           events.concat (@devices[id].process updates)
         else
-          puts "Could not find device with id '#{id}'"
+          $log.warn "Could not find device with id '#{id}'"
         end
       end
       events.each do |event|
@@ -44,7 +54,7 @@ module RZWaveWay
         if handler
           handler.call(event)
         else
-          puts "no handler for #{event.class}"
+          $log.warn "no handler for #{event.class}"
         end
       end
       events
@@ -73,7 +83,7 @@ module RZWaveWay
           device_updates << [match_data.post_match, value]
           updates_per_device[device_id] = device_updates
         else
-          puts "? #{key}"
+          $log.warn "? #{key}"
         end
       end
       updates_per_device
@@ -91,4 +101,4 @@ module RZWaveWay
       @event_handlers[event] = listener
     end
   end
-end
+end

data/lib/rzwaveway.rb

@@ -1,4 +1,4 @@
-require 'rzwaveway/command_classes'
-require 'rzwaveway/events'
-require 'rzwaveway/zwave_device'
-require 'rzwaveway/zway'
+require_relative 'rzwaveway/command_classes'
+require_relative 'rzwaveway/events'
+require_relative 'rzwaveway/zwave_device'
+require_relative 'rzwaveway/zway'

data/rzwaveway.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rzwaveway"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.authors = ["Vincent Touchard"]
   s.date = %q{2014-02-08}
   s.summary = 'ZWave API for ZWay'
@@ -9,4 +9,16 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rzwaveway'
   s.files = `git ls-files`.split("\n")
   s.has_rdoc = false
-end
+
+  dependencies = [
+    [:runtime,     "log4r",  "~> 1.1.10"]
+  ]
+
+  dependencies.each do |type, name, version|
+    if s.respond_to?("add_#{type}_dependency")
+      s.send("add_#{type}_dependency", name, version)
+    else
+      s.add_dependency(name, version)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-02-08 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
 description: A Ruby API to use the Razberry ZWave ZWay interface
 email: vincentoo@yahoo.com
 executables: []