Floppy-currentcostd 1.2.3 → 1.3.0

data/bin/currentcostd

@@ -49,7 +49,7 @@ Dir.glob(File.join(File.dirname(__FILE__), '/../lib/currentcostd/publishers/*.rb
 Daemons.run_proc('currentcostd', :dir_mode => :system) do
 
   # Create meter object
-  meter = CurrentCost::Meter.new config['currentcost']['port']
+  meter = CurrentCost::Meter.new config['currentcost']['port'], :cc128 => config['currentcost']['cc128']
 
   # Register publishers with meter if their configuration sections are defined
   CurrentCostDaemon::Publishers.constants.each do |publisher|
@@ -64,4 +64,4 @@ Daemons.run_proc('currentcostd', :dir_mode => :system) do
     sleep(30)
   end
 
-end
+end

data/config/currentcostd.example.yml

@@ -3,6 +3,7 @@
 
 currentcost:
   port: /dev/ttyS0
+  cc128: true
 
 # Enable this to dump meter data to standard output
 debug:
@@ -23,4 +24,13 @@ http:
 carbondiet:
   enabled: false
   username: your_carbondiet_username_goes_here
-  password: your_carbondiet_password_goes_here
+  password: your_carbondiet_password_goes_here
+
+# Enable this section to send data directly to an AMEE profile
+# The profile with the specified UID should already exist.
+amee:
+  enabled: false
+  server: dev.amee.com
+  username: your_amee_username_goes_here
+  password: your_amee_password_goes_here
+  profile_uid: ABC123DEF456

data/lib/currentcostd/publishers/amee.rb

@@ -0,0 +1,73 @@
+# Copyright (c) 2008 James Smith (www.floppy.org.uk)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+
+require 'amee'
+
+module CurrentCostDaemon
+
+  module Publishers
+
+    class AMEEPublisher
+    
+      def self.config_section
+        'amee'
+      end
+    
+      def initialize(config)
+        @profile_uid = config['amee']['profile_uid']
+        @last_minute = Time.now.min - 1
+        # Open AMEE connection
+        server = config['amee']['server']
+        username = config['amee']['username']
+        password = config['amee']['password']
+        @amee = AMEE::Connection.new(server, username, password)
+    	  @amee.authenticate
+      end
+
+      def update(reading)
+        # Let's put data into AMEE every minute.
+        if Time.now.min != @last_minute
+          # Store time
+          @last_minute = Time.now.min
+          # Estimate kwh figure from current power usage
+          kwh = (reading.total_watts / 1000.0)
+          # Add item to AMEE
+	        AMEE::Profile::Item.create_without_category(@amee, 
+			      "/profiles/#{@profile_uid}/home/energy/quantity", 
+			      "CDC2A0BA8DF3", 
+			      :start_date => Time.now, 
+			      :end_date => Time.now + 60, 
+			      :energyConsumption => kwh, 
+			      :energyConsumptionUnit => "kWh", 
+			      :energyConsumptionPerUnit => "h", 
+			      :name => "currentcost")
+        end
+      rescue
+        puts "Something went wrong (AMEE)!"
+        puts $!.inspect
+      end
+    
+    end  
+
+  end
+
+end

data/lib/currentcostd/publishers/carbondiet.rb

@@ -39,7 +39,7 @@ module CurrentCostDaemon
       def update(reading)
         # Carbon Diet is daily, so we only want to do something if there is
         # history data, and only once a day, really. Say around 5am, why not.
-        if !reading.history.nil? && reading.hour == 5
+        if !reading.history.nil? && reading.hour == 7
           # Create http post request
           post = Net::HTTP::Post.new("/data_entry/electricity/#{@account}/currentcost")
           post.basic_auth(@username, @password)
@@ -51,7 +51,7 @@ module CurrentCostDaemon
               unless reading.history[:days][i].nil?
                 xml.entry do
                   xml.date Date.today - i
-                  xml.value reading.history[:days][i]
+                  xml.value reading.history[:days][i][0]
                 end
               end
             end

data/lib/currentcostd/publishers/http.rb

@@ -50,11 +50,11 @@ module CurrentCostDaemon
     <h2>Hourly</h2>
     <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:hours].reverse.delete_if{|x|x.nil?}.join(',')}&chds=0,#{@@history[:hours].delete_if{|x|x.nil?}.max}'/>
     <h2>Daily</h2>
-    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:days].reverse.map{|x| x.nil? ? 0 : x}.join(',')}&chds=0,#{@@history[:days].delete_if{|x|x.nil?}.max}'/>
+    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:days].reverse.map{|x| x.nil? ? 0 : x[0]}.join(',')}&chds=0,#{@@history[:days].delete_if{|x|x.nil?}.max}'/>
     <h2>Monthly</h2>
-    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:months].reverse.map{|x| x.nil? ? 0 : x}.join(',')}&chds=0,#{@@history[:months].delete_if{|x|x.nil?}.max}'/>
+    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:months].reverse.map{|x| x.nil? ? 0 : x[0]}.join(',')}&chds=0,#{@@history[:months].delete_if{|x|x.nil?}.max}'/>
     <h2>Yearly</h2>
-    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:years].reverse.map{|x| x.nil? ? 0 : x}.join(',')}&chds=0,#{@@history[:years].delete_if{|x|x.nil?}.max}'/>
+    <img src='http://chart.apis.google.com/chart?cht=lc&chs=400x125&chd=t:#{@@history[:years].reverse.map{|x| x.nil? ? 0 : x[0]}.join(',')}&chds=0,#{@@history[:years].delete_if{|x|x.nil?}.max}'/>
   </body>
 </html>"
           elsif request.query['format'] == "eeml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-currentcostd
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors: 
 - James Smith
@@ -9,20 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-26 00:00:00 -08:00
+date: 2009-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: Floppy-currentcost
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.3.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: Floppy-amee
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: Floppy-eeml
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +54,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,6 +77,7 @@ files:
 - lib/currentcostd/publishers/pachube.rb
 - lib/currentcostd/publishers/http.rb
 - lib/currentcostd/publishers/carbondiet.rb
+- lib/currentcostd/publishers/amee.rb
 - config/currentcostd.example.yml
 - bin/currentcostd
 has_rdoc: false