rupower 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGU2MmY1MjFiY2MzOTYwNDIyYTI2MTUwNWVlZjllN2M5YjU0YTljMA==
+  data.tar.gz: !binary |-
+    MTg2YWFjY2M5ZTU4NGIzZjlhMjg5MTI0NDNkODg5OGY1NzBiMjBhZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGM4Yjc0ODI0MjFhZjU5YjY0NmMzNWM4YjAwZTBiZTgwYjkwYTA5YTYzNDhi
+    YWNiMjQ3Mzc5M2NmOGI4NDA2OGM1Njc4MjQyZGJhNDA5NmIwOGIyMTBlNmJj
+    ZGNiOTBlM2YzOTUwNmFkNmVkMGYzMjExZGZhNWQ5ZjczMzg5ZDc=
+  data.tar.gz: !binary |-
+    MDVhNTE2NGRlOGJhOTM2ZWIyNjQ3MjJlNWI5NzdhOTJjNDc3MmY5Y2Y1MTQ2
+    NjJmZTdkNDAyNDAwNjEwNGM4MzdhZjlmMDRhNTRlZDYzODE4MGZhYWM3NGEw
+    NGFhYTdkOTk5ZmNhY2Q0MzM4NDBhYWY3NDVjNTI2NWJhMDdlMDc=

data/lib/rupower.rb

@@ -4,12 +4,13 @@ require_relative "rupower/version"
 module Rupower
 
   module Parser
-    TIME =      Regexp.new( /(\d{2}:){2}\d{2}\s\d{4}/ )
-    NUMBER =    Regexp.new(/^\d+[.]?\d*(|[%]|\s+\w+)$/)  #( /\A[+-]?\d+?(\.\d+)?\Z/ )
+    TIME   = Regexp.new(/\d{4},?\s(\d{2}:){2}\d{2}\s/)
+    ETA    = Regexp.new(/(\d+\.\d)\s(hour|minute)/)
+    NUMBER = Regexp.new(/^\d+[.,]?\d*(|[%]|\s+\w+)$/)  #( /\A[+-]?\d+?(\.\d+)?\Z/ )
   end
 
   class PowerDevice
-    def initialize( params = {refresh_always:true} )
+    def initialize( params = {refresh_always: true} )
       @refresh_always = params[:refresh_always]
       @command = params[:command] || Command.new
       refresh
@@ -30,8 +31,12 @@ module Rupower
       def typize( value )
         res = value
         res = value[/^yes$/] ? true : false if value[/^(yes|no)$/]
-        res = value.to_f == value.to_i ? value.to_i : value.to_f  if value[Parser::NUMBER ]
+        if value[Parser::NUMBER ]
+          value.gsub!(',','.')
+          res = value.to_f == value.to_i ? value.to_i : value.to_f
+        end
         res = DateTime.parse( value ) if value.match( Parser::TIME )
+        res = value if value[Parser::ETA]
         res
       end
 
@@ -49,7 +54,8 @@ module Rupower
     METHODS = [:native_path, :vendor, :model, :serial, :power_supply, :updated,
                :has_history, :has_statistics, :present, :rechargeable, :state,
                :energy, :energy_empty, :energy_full, :energy_full_design,
-               :energy_rate, :voltage, :percentage, :capacity, :technology]
+               :energy_rate, :voltage, :percentage, :capacity, :technology,
+               :time_to_empty, :time_to_full]
 
     METHODS.each do |method|
       define_method method do

data/lib/rupower/version.rb

@@ -1,3 +1,3 @@
 module Rupower
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/acceptance/rupower_test.rb

@@ -23,7 +23,7 @@ class RupowerTest < Test::Unit::TestCase
     assert_instance_of( Float,  @battery.voltage )
     assert_instance_of( String, @battery.vendor )
     assert_instance_of( String, @battery.native_path )
-    assert_instance_of( DateTime,   @battery.updated )
+    assert_instance_of( DateTime, @battery.updated )
   end
 
   def test_line_ac_get_methods_returns_correct_values

data/test/fixtures/upower_battery.txt

@@ -3,7 +3,7 @@
   model:                42T4795
   serial:               6804
   power supply:         yes
-  updated:              Sun Mar 25 22:56:15 2012 (22 seconds ago)
+  updated:              Wed 04 Dec 2013 02:06:26 AM CET (0 seconds ago)
   has history:          yes
   has statistics:       yes
   battery

data/test/fixtures/upower_line_ac.txt

@@ -1,7 +1,7 @@
   native-path:          /sys/devices/LNXSYSTM:00/device:00/PNP0A08:00/device:09/PNP0C09:00/ACPI0003:00/power_supply/AC
   power supply:         yes
-  updated:              Sat Mar 24 23:47:24 2012 (79753 seconds ago)
+  updated:              Wed 04 Dec 2013 02:06:26 AM CET (0 seconds ago)
   has history:          no
   has statistics:       no
   line-power
-    online:             yes
+    online:             yes

data/test/functional/rupower_battery_test.rb

@@ -33,7 +33,7 @@ class RupowerBatteryTest < Test::Unit::TestCase
   end
 
   def test_updated_returns_correct_value
-    assert_equal( DateTime.parse("Sun Mar 25 22:56:15 2012"), @battery.updated )
+    assert_equal( DateTime.parse("Wed 04 Dec 2013 02:06:26 AM CET"), @battery.updated )
   end
 
   def test_has_history_returns_correct_value

data/test/functional/rupower_line_ac_test.rb

@@ -22,7 +22,7 @@ class RupowerLineAcTest < Test::Unit::TestCase
   end
 
   def test_updated_returns_correct_value
-    assert_equal( DateTime.parse("Sat Mar 24 23:47:24 2012"), @line_ac.updated )
+    assert_equal( DateTime.parse("Wed 04 Dec 2013 02:06:26 AM CET"), @line_ac.updated )
   end
 
   def test_has_history_returns_correct_value

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rupower
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - k-nowicki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Rupower is UPower (http://upower.freedesktop.org) interface for Ruby,
   working for Battery and AC supply.
@@ -39,30 +38,26 @@ files:
 - test/stubs/command_stub.rb
 homepage: https://github.com/k-nowicki/rupower
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 151074513370215442
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rupower is UPower (http://upower.freedesktop.org) interface for Ruby.
 test_files:
 - test/acceptance/rupower_test.rb