mfi 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14de77104a8ccb5ed5ed50f6794ac40404d83ee
-  data.tar.gz: 32a1abe857da69e501019df8477cca705e2e9901
+  metadata.gz: 5f5d5816c63b83b138ebed2c36a15e508c201ad7
+  data.tar.gz: 2b114ec46eb7cea740801a1b4aa0c652297dd296
 SHA512:
-  metadata.gz: 39f02f69df4aa53648e38278362518f3578f1f627ca7fdd7d1cc1f93ea4a9f3a4c8aca9a00abebbe36181f9b91a1a51eb73e05b3fa8c2e8a0e950ee81e2174da
-  data.tar.gz: 7129e7eed14410e49a89940d54a396b50cc155dd5aaeaeea4395684fbbd29174591636b0442978484a18358bede997ccac178279bf0b1ebdcac82f94f5418bac
+  metadata.gz: 9274c5435c0eb10bd153bf0cbbc6c5d7134bd0aa3ed51cf5a52a0a56513e294308f61b4adeffc9f18618d0b4e080aa4cf955eb35ca77537f9753158be2ad5880
+  data.tar.gz: 8f521bec537ca166d7a8b9352756108181511a1fe66dc98fdb03883bed897adea5d845cdddb186bfbf100d84bd7a68552a54ff60399609f3b573804efff52c67

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/README.md

@@ -13,20 +13,20 @@ gem install mfi
 mPower ports are linux based wifi-enabled power strips.  Each port has sensors for amps, voltage, and power factor.  Additionally each port has a relay.  Here is a script that samples all powers, and disables a port if the energy exceeds 10kWh.
 
 ```ruby
-device = MFi::MPower.new(
+mpower = MFi::MPower.new(
   :host => "hostname",
   :user => "username",
   :pass => "password"
 )
 
-device.connect!
-
-device.sample.each { |reading|
-  puts reading.to_s
-  if reading.energy > 10
-    puts "Port #{reading.port} has consumed >= 10 kWh. Switching off..."
-    device.switch_off(reading.port)
-  end
+mpower.exec { |remote| 
+  remote.sample.each { |reading|
+    puts reading.to_s
+    if reading.energy > 10
+      puts "Port #{reading.port} has consumed >= 10 kWh. Switching off..."
+      remote.switch_off(reading.port)
+    end
+  }
 }
 ```
 

data/Rakefile

@@ -1,6 +1,7 @@
 $: << File.dirname(__FILE__) + "/lib"
 
 require "mfi"
+require "pp"
 
 task :default => :sample
 
@@ -12,19 +13,29 @@ task :env do
   )
 end
 
+task :enable => :env do
+  @mpower.exec { |m|
+    pp m.enable_read
+    pp m.enable_write
+  }
+end
+
 task :sample => :env do
-  @mpower.connect!
-  @mpower.sample.each { |reading|
-    puts reading
+  @mpower.exec { |m|
+    m.sample.each { |reading|
+      puts reading
+    }
   }
 end
 
 task :switch_off => :env do
-  @mpower.connect!
-  @mpower.switch_off
+  @mpower.exec { |m|
+    m.switch_off
+  }
 end
 
 task :switch_on => :env do
-  @mpower.connect!
-  @mpower.switch_on
+  @mpower.exec { |m|
+    m.switch_on
+  }
 end

data/lib/mfi.rb

@@ -4,7 +4,7 @@ require "net/ssh"
 require "json"
 
 module MFi
-  Version = "0.9.0"
+  Version = "0.9.1"
 end
 
 require "mpower"

data/lib/mpower.rb

@@ -46,6 +46,14 @@ module MFi
       @ssh = Net::SSH.start(@host, @user, :password => @pass)
     end
 
+    # execute commands in a given execution context
+    def exec &block
+      connect!
+      yield self
+    ensure
+      disconnect!
+    end
+
     # Sample all metrics from the mPower device
     # +port+ the port option, default is all
     def sample port=-1
@@ -61,14 +69,14 @@ module MFi
 
     # Write enable port, allowing relay toggling
     # +port+ the port option, default is all
-    def enable port=-1
-      run(:func => "enableWrite", :port => port)
+    def enable_write port=-1
+      run(:func => "enableWrite", :port => port, :value => 1)
     end
 
     # Write disable port, disabling relay toggling
     # +port+ the port option, default is all
-    def disable port=-1
-      run(:func => "enableRead", :port => port)
+    def enable_read port=-1
+      run(:func => "enableRead", :port => port, :value => 1)
     end
 
     # Switch off, or disable power on a given port
@@ -85,6 +93,10 @@ module MFi
 
     private
 
+    def disconnect!
+      @ssh.close
+    end
+
     def run opts
       env = opts.map { |k,v| "#{k}=#{v}" }.join(" ")
       cmd = "#{env} cgi -q /usr/www/mfi/io.cgi"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mfi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Dan Simpson
@@ -44,6 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md