rzwaveway 0.0.6 → 0.0.7

data/lib/rzwaveway/logger.rb

@@ -0,0 +1,7 @@
+module RZWaveWay
+  module Logger
+    def log
+      RZWaveWay::ZWay.instance.log
+    end
+  end
+end

data/lib/rzwaveway/version.rb

@@ -1,3 +1,3 @@
 module RZWaveWay
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/rzwaveway/zwave_device.rb

@@ -4,6 +4,7 @@ module RZWaveWay
   class ZWaveDevice
     include CommandClass
     include CommandClasses
+    include Logger
 
     attr_reader :name
     attr_reader :id
@@ -13,7 +14,7 @@ module RZWaveWay
     def initialize(id, data)
       @id = id
       initialize_from data
-      $log.info "Created ZWaveDevice with name='#{name}' (id='#{id}')"
+      log.info "Created ZWaveDevice with name='#{name}' (id='#{id}')"
     end
 
     def contacts_controller_periodically?
@@ -52,7 +53,7 @@ module RZWaveWay
           event = @command_classes[cc].process(values)
           events << event if event
         else
-          $log.warn "Could not find command class: '#{cc}'"
+          log.warn "Could not find command class: '#{cc}'"
         end
       end
       process_device_data(updates, events)

data/lib/rzwaveway/zway.rb

@@ -10,17 +10,10 @@ module RZWaveWay
     include Log4r
 
     attr_reader :devices
+    attr_reader :log
 
     def initialize
-      $log = Logger.new 'RZWaveWay'
-      formatter = PatternFormatter.new(:pattern => "[%l] %d - %m")
-      outputter = Outputter.stdout
-      outputter.formatter = formatter
-      outputter.level = Log4r::INFO
-      file_outputter = RollingFileOutputter.new('file', filename: 'rzwaveway.log', maxsize: 1048576, trunc: 86400)
-      file_outputter.formatter = formatter
-      file_outputter.level = Log4r::DEBUG
-      $log.outputters = [Outputter.stdout, file_outputter]
+      @log = default_logger
     end
 
     def execute(device_id, command_class, command_class_function, argument = nil)
@@ -37,10 +30,13 @@ module RZWaveWay
       clazz.new(device)
     end
 
-    def setup(hostname, *adapter_params)
+    def setup(options, *adapter_params)
+      hostname = options[:hostname] || '127.0.0.1'
+      port = options[:port] || 8083
       adapter_params = :httpclient if adapter_params.compact.empty?
-      @base_uri="http://#{hostname}:8083"
+      @base_uri="http://#{hostname}:#{port}"
       @connection = Faraday.new {|faraday| faraday.adapter *adapter_params}
+      @log = options[:logger] if options.has_key? :logger
     end
 
     def start
@@ -54,7 +50,7 @@ module RZWaveWay
           break
         else
           sleep 1.0
-          $log.warn 'No devices found at start-up, retrying'
+          log.warn 'No devices found at start-up, retrying'
         end
       end
     end
@@ -103,13 +99,17 @@ module RZWaveWay
       end
     end
 
+    def default_logger
+      Log4r::Logger.new 'RZWaveWay'
+    end
+
     def deliver_to_handlers events
       events.each do |event|
         handler = @event_handlers[event.class]
         if handler
           handler.call(event)
         else
-          $log.warn "No event handler for #{event.class}"
+          log.warn "No event handler for #{event.class}"
         end
       end
     end
@@ -122,7 +122,7 @@ module RZWaveWay
           device_events = @devices[id].process updates
           events += device_events unless device_events.empty?
         else
-          $log.warn "Could not find device with id '#{id}'"
+          log.warn "Could not find device with id '#{id}'"
         end
       end
       events
@@ -137,7 +137,7 @@ module RZWaveWay
           updates_per_device[device_id] = {} unless(updates_per_device.has_key?(device_id))
           updates_per_device[device_id][match_data.post_match] = value
         else
-          $log.debug "No device group match for key='#{key}'"
+          log.debug "No device group match for key='#{key}'"
         end
       end
       updates_per_device
@@ -152,10 +152,10 @@ module RZWaveWay
           results = JSON.parse response.body
           @update_time = results.delete('updateTime')
         else
-          $log.error(response.reason)
+          log.error(response.reason)
         end
       rescue StandardError => e
-        $log.error("Failed to communicate with ZWay HTTP server: #{e}")
+        log.error("Failed to communicate with ZWay HTTP server: #{e}")
       end
       results
     end
@@ -199,12 +199,12 @@ module RZWaveWay
         uri = URI.encode(@base_uri + RUN_BASE_PATH + command_path, '[]')
         response = @connection.get(uri)
         unless response.success?
-          $log.error(response.status)
-          $log.error(response.body)
+          log.error(response.status)
+          log.error(response.body)
         end
       rescue StandardError => e
-        $log.error("Failed to communicate with ZWay HTTP server: #{e}")
-        $log.error(e.backtrace)
+        log.error("Failed to communicate with ZWay HTTP server: #{e}")
+        log.error(e.backtrace)
       end
     end
   end

data/lib/rzwaveway.rb

@@ -1,5 +1,6 @@
 require_relative 'rzwaveway/command_classes'
 require_relative 'rzwaveway/events'
+require_relative 'rzwaveway/logger'
 require_relative 'rzwaveway/zwave_device'
 require_relative 'rzwaveway/zway'
-require_relative 'rzwaveway/extensions'
+require_relative 'rzwaveway/extensions'

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rzwaveway'
-require 'log4r'
 require 'securerandom'
 
 module SpecHelpers
@@ -28,10 +27,3 @@ end
 RSpec.configure do |c|
   c.include SpecHelpers
 end
-
-$log = Log4r::Logger.new 'RZWaveWay'
-# formatter = Log4r::PatternFormatter.new(:pattern => "[%l] %d - %m")
-# outputter = Log4r::Outputter.stdout
-# outputter.formatter = formatter
-# outputter.level = Log4r::DEBUG
-# $log.outputters = [Log4r::Outputter.stdout]

data/spec/zway_spec.rb

@@ -5,7 +5,7 @@ module RZWaveWay
     let(:http_stubs) { Faraday::Adapter::Test::Stubs.new }
     let(:zway) do
       zway = ZWay.instance
-      zway.setup('dummy', :test, http_stubs)
+      zway.setup({ hostname: 'dummy' }, :test, http_stubs)
       zway
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -113,6 +113,7 @@ files:
 - lib/rzwaveway/extensions.rb
 - lib/rzwaveway/extensions/fibaro_smoke_sensor.rb
 - lib/rzwaveway/extensions/ssa_siren_strobe_alarm.rb
+- lib/rzwaveway/logger.rb
 - lib/rzwaveway/version.rb
 - lib/rzwaveway/zwave_device.rb
 - lib/rzwaveway/zway.rb