Floppy-currentcostd 1.3.0 → 1.4.0

data/README

@@ -30,4 +30,12 @@ builder >= 2.1.2
 
 2) Edit the settings in your new currentcostd.yml
 
-3) Run "sudo currentcostd start" to start the daemon.
+3) Run "sudo currentcostd start" to start the daemon.
+
+== AVAILABLE PUBLISHERS
+
+ * AMEE (www.amee.cc)
+ * Carbon Diet (www.carbondiet.org)
+ * Pachube (www.pachube.com)
+ * Twitter (www.twitter.com)
+ * Local HTTP server

data/config/currentcostd.example.yml

@@ -34,3 +34,10 @@ amee:
   username: your_amee_username_goes_here
   password: your_amee_password_goes_here
   profile_uid: ABC123DEF456
+
+# Enable this section to post to Twitter.
+# This will post once a minute - I don't suggest you use your normal Twitter account ;)
+twitter:
+  enabled: false
+  username: your_twitter_username_goes_here
+  password: your_twitter_password_goes_here

data/lib/currentcostd/publishers/amee.rb

@@ -20,7 +20,7 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 
-require 'amee'
+require 'net/http'
 
 module CurrentCostDaemon
 
@@ -36,11 +36,9 @@ module CurrentCostDaemon
         @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
+        @server = config['amee']['server']
+        @username = config['amee']['username']
+        @password = config['amee']['password']
       end
 
       def update(reading)
@@ -50,16 +48,28 @@ module CurrentCostDaemon
           @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")
+          # Create POST options
+          options = {
+            :dataItemUid => "CDC2A0BA8DF3",
+			      :startDate => Time.now.xmlschema,
+			      :endDate => (Time.now + 60).xmlschema,
+			      :energyConsumption => kwh,
+			      :energyConsumptionUnit => "kWh",
+			      :energyConsumptionPerUnit => "h",
+			      :name => "currentcost"
+          }
+          puts "Storing in AMEE..."
+          # Post data to AMEE
+          req = Net::HTTP::Post.new("/profiles/#{@profile_uid}/home/energy/quantity")
+          req.basic_auth @username, @password
+          req['Accept'] = "application/xml"
+          req.set_form_data(options)
+          http = Net::HTTP.new(@server)
+          http.start do
+            response = http.request(req)
+            raise response.body if (response.code != "200" && response.code != "201")
+          end
+          puts "done"
         end
       rescue
         puts "Something went wrong (AMEE)!"

data/lib/currentcostd/publishers/carbondiet.rb

@@ -38,8 +38,15 @@ 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 == 7
+        # history data, and only once a day, ideally. If it's 3am, upload history 
+        # if we have it.
+        # This is horribly hacky, it post every time there is day history during
+        # this hour. Also the carbondiet code at the other end is hacky.
+        # All this needs improving.
+        puts reading.to_yaml
+        puts "stuff"
+        if !reading.history.nil? && reading.hour == 3
+          puts "Storing in Carbon Diet..."
           # Create http post request
           post = Net::HTTP::Post.new("/data_entry/electricity/#{@account}/currentcost")
           post.basic_auth(@username, @password)
@@ -60,6 +67,7 @@ module CurrentCostDaemon
           http = Net::HTTP.new('www.carbondiet.org')
           http.start
           http.request(post)
+          puts "done"
         end
       rescue
         puts "Something went wrong (carbondiet)!"

data/lib/currentcostd/publishers/http.rb

@@ -39,21 +39,25 @@ module CurrentCostDaemon
             response['Content-Type'] = "text/html"
             response.body = "
 <html>
+  <head>
+    <meta http-equiv='refresh' content='6' />
+    <meta name='viewport' content='width=420'/> 
+  </head>
   <body>
     <div style='float:right'>
       <a title='EEML' href='/?format=eeml'><span style='border:1px solid;border-color:#9C9 #030 #030 #696;padding:0 3px;font:bold 10px verdana,sans-serif;color:#FFF;background:#090;text-decoration:none;margin:0;'>EEML</span></a>
       <a title='XML' href='/?format=xml'><span style='border:1px solid;border-color:#FC9 #630 #330 #F96;padding:0 3px;font:bold 10px verdana,sans-serif;color:#FFF;background:#F60;text-decoration:none;margin:0;'>XML</span></a>
     </div>
-    <h1>Current Total</h1>
-    <p>#{@@total} Watts</p>
-    <h1>History</h1>
-    <h2>Hourly</h2>
+    <h1>#{@@total} Watts</h2>
+    <p>updated at #{@@updated_at}</p>
+    <h2>History</h2>
+    <h3>Hourly</h3>
     <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>
+    <h3>Daily</h3>
     <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>
+    <h3>Monthly</h3>
     <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>
+    <h3>Yearly</h3>
     <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>"
@@ -102,7 +106,9 @@ module CurrentCostDaemon
       end
 
       def update(reading)
+        puts "Updating HTTP publisher..."
         Servlet.update(reading)
+        puts "done"
       rescue
         puts "Something went wrong (http)!"
         puts $!.inspect

data/lib/currentcostd/publishers/pachube.rb

@@ -48,12 +48,15 @@ module CurrentCostDaemon
         eeml[0].value = reading.total_watts
         eeml.set_updated!
         # Put data
-        put = Net::HTTP::Put.new("/feeds/#{@feed}.xml")
+        puts "Storing in Pachube..."
+        put = Net::HTTP::Put.new("/api/#{@feed}.xml")
         put.body = eeml.to_eeml
         put['X-PachubeApiKey'] = @api_key
         http = Net::HTTP.new('www.pachube.com')
         http.start
-        http.request(put)
+        response = http.request(put)
+        raise response.code if response.code != "200"
+        puts "done"
       rescue
         puts "Something went wrong (pachube)!"
         puts $!.inspect

data/lib/currentcostd/publishers/twitter.rb

@@ -0,0 +1,69 @@
+# 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 'cgi'
+
+module CurrentCostDaemon
+
+  module Publishers
+
+    class Twitter
+    
+      def self.config_section
+        'twitter'
+      end
+    
+      def initialize(config)
+        @username = config['twitter']['username']
+        @password = config['twitter']['password']
+        @last_minute = Time.now.min - 1
+      end
+
+      def update(reading)
+        # Tweet once a minute
+        if Time.now.min != @last_minute
+          # Store time
+          @last_minute = Time.now.min
+          message = "At the moment, I'm using #{reading.total_watts} watts"
+          # Tweet
+          puts "Tweeting..."
+          req = Net::HTTP::Post.new("/statuses/update.json")
+          req.basic_auth @username, @password
+          req.set_form_data "status" => message
+          http = Net::HTTP.new("twitter.com")
+          http.start do
+            response = http.request(req)
+            raise response.body if (response.code[0] != "2")
+          end
+          puts "done"
+        end
+      rescue
+        puts "Something went wrong (twitter)!"
+        puts $!.inspect
+        nil
+      end
+    
+    end  
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-currentcostd
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -08:00
+date: 2009-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: Floppy-eeml
@@ -78,6 +78,7 @@ files:
 - lib/currentcostd/publishers/http.rb
 - lib/currentcostd/publishers/carbondiet.rb
 - lib/currentcostd/publishers/amee.rb
+- lib/currentcostd/publishers/twitter.rb
 - config/currentcostd.example.yml
 - bin/currentcostd
 has_rdoc: false