sunscout 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932d2d5473a423b5839198dde6179124b13c5090
-  data.tar.gz: ea0ca9ec4af624858f71f976a50b3abf6e63a7de
+  metadata.gz: 644c483147167e8f1ef8cdfb1523410f0f573db2
+  data.tar.gz: db5cd8d9fa95c7e639d8709462c6b384f30552c5
 SHA512:
-  metadata.gz: 88afb8ab77d532ddc8cca0344259904d32856c33c4f836d282b831b59c6aefebc6703a08e83c1b0478a451621ccb253d013d0c1f1f1c094ba78b12a39c487823
-  data.tar.gz: a7f2a597d77e64702d9dc997e7602b62b0b499db5c8828ba27733d1557a1b6a17978eefd09544306c15c462d2eb88d9c6798200efd5672f5a37a258ee9603637
+  metadata.gz: 086a705e56e0537293fef631e8e7e363547b9b35864a86887d32bbe230ab612da11585b66e04bec7035cf3c5cd921720565381d62a970c33726132dd85613438
+  data.tar.gz: 800a75d24883102b32a6549235f685958c0040c59f4c0ca00cd5adcd9763b3fcdebdeddf8094ae62abcf706808b79a74e50d566166f5e8959317f7073439a4d7

data/lib/sunscout/solar_log.rb

@@ -15,7 +15,7 @@ module Sunscout
   #   require 'sunscout'
   #   
   #   puts 'Querying data from SolarLog API'
-  #   solar_log = Sunscout::SolarLog::SolarLog.new('http://10.0.0.10')
+  #   solar_log = Sunscout::SolarLog::SolarLog.new('http://10.0.0.10', timezone: '+0500')
   #   
   #   puts "Data from: #{ solar_log.time.iso8601 }"
   #   puts "AC Power: #{ solar_log.power_ac }W (DC Power: #{ solar_log.power_dc }W, #{ (solar_log.efficiency*100).round(0) }% efficiency, #{ solar_log.alternator_loss }W loss)"

data/lib/sunscout/solar_log/client.rb

@@ -75,7 +75,7 @@ module Sunscout
       def parse_data(data)
         data = data.fetch('801').fetch('170')
 
-        out = {
+        {
           time:                  data.fetch('100'),
           power_ac:              data.fetch('101'),
           power_dc:              data.fetch('102'),

data/lib/sunscout/solar_log/solar_log.rb

@@ -7,7 +7,7 @@ module Sunscout
     # High-level binding to the SolarLog HTTP API
     # @example Basic usage
     #   require 'sunscout'
-    #   sl = Sunscout::SolarLog::SolarLog.new('http://10.60.1.10')
+    #   sl = Sunscout::SolarLog::SolarLog.new('http://10.60.1.10', timezone: 'CEST')
     #   puts "AC power: #{ sl.power_ac }W (DC: #{ sl.power_dc }W, Efficiency #{ (sl.efficiency*100).round(0) }%)"
     #   puts "Remaining power: #{ sl.power_available }W"
     class SolarLog
@@ -72,11 +72,16 @@ module Sunscout
       # This also immediately queries data from the SolarLog API.
       #
       # @param host [String] URI of the SolarLog web interface
-      def initialize(host)
+      # @param timezone [String] Timezone (or offset) which the SolarLog station resides in.
+      #   If none is specified, assume UTC.
+      def initialize(host, timezone: '+0000')
         client = Sunscout::SolarLog::Client.new(host)
         data = client.get_data
 
-        @time = DateTime.strptime(data.fetch(:time), '%d.%m.%y %H:%M:%s')
+        # SolarLog returns the time a) without a timezone indicator and b) as whatever the station is configured.
+        # Hence, the user has to specify what timezone it is in - otherwise we'll just fall back to UTC.
+        time = "#{ data.fetch(:time) } #{ timezone }"
+        @time = DateTime.strptime(time, '%d.%m.%y %H:%M:%s %Z')
 
         @power_ac    = data.fetch :power_ac
         @power_dc    = data.fetch :power_dc

data/sunscout.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sunscout"
-  spec.version       = '0.1'
+  spec.version       = '0.2'
   spec.authors       = ["Michael Senn"]
   spec.email         = ["michael@morrolan.ch"]
 
   spec.summary       = %q{Binding to Solarlog HTTP API}
   # spec.description   = %q{}
-  # spec.homepage      = ""
+  spec.homepage      = "https://bitbucket.org/Lavode/sunscout"
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -23,3 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunscout
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Michael Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ files:
 - lib/sunscout/solar_log/client.rb
 - lib/sunscout/solar_log/solar_log.rb
 - sunscout.gemspec
-homepage: 
+homepage: https://bitbucket.org/Lavode/sunscout
 licenses:
 - Apache-2.0
 metadata: {}