expedition 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b001358532eca38c34e829587ff88f5ce5e0f0
-  data.tar.gz: 38bf70bc6eec3aee3453487d19833170eac1c4af
+  metadata.gz: b469b07e45e60d178dbfa91fa63c46c7d3d0f3ea
+  data.tar.gz: 88fdd81ad47d6d705cf314c72a6b66f0d4dacffe
 SHA512:
-  metadata.gz: 111ba58baef943aac22bd2b4a618f56e40b375d27b8395b0f6fcd016bf30922eadb588f9275cb5e9c91ee2f96b67a1bbb3f63cde0b53b07c764f7614c200b7d2
-  data.tar.gz: b51384cbb26b4c65bb5a075f59a9ba4a24a562cce966c8f8a875051af0585e27cb313866a4b70cec78c54a5d52709e317e6b537de0af3fa8214452267abd73c2
+  metadata.gz: 263182dee4dc4eaf432fb2bd3e1df358d9f90345f8203965e144b27665f354944af9e735ea0c0253c3eeeab4559a852863679f2bb312af54ab261d3b37b6d7e2
+  data.tar.gz: 05b339be299f3f259dbd023e5899d97c817795d77d2aee47f27ed8addacbbabc6a8197df5a3b7f2d63e8b8e2ef379e00b485d14a22cb26c611eafead42773ddd

data/lib/expedition/client.rb

@@ -41,12 +41,7 @@ module Expedition
 
     def metrics
       send(:devs) do |body|
-        body[:devs].collect { |attrs|
-          attrs.merge(
-            enabled: attrs[:enabled] == 'Y',
-            status: attrs[:status].downcase
-          )
-        }
+        body[:devs].collect(&method(:parse_metrics))
       end
     end
 
@@ -85,5 +80,22 @@ module Expedition
     def command_json(command, *parameters)
       MultiJson.dump(command: command, parameter: parameters.join(','))
     end
+
+    def parse_metrics(attrs)
+      attrs.merge!(
+        enabled: attrs[:enabled] == 'Y',
+        status: attrs[:status].downcase,
+        last_share_time: (Time.at(attrs[:last_share_time]) rescue attrs[:last_share_time]),
+        last_valid_work: (Time.at(attrs[:last_valid_work]) rescue attrs[:last_valid_work])
+      )
+
+      interval = attrs.keys.detect { |k| k =~ /^mhs_\d+s$/ }[/\d+s$/]
+
+      # Remove the `_Ns` suffix from hash rate fields.
+      attrs.merge!(
+        mhs: attrs.delete("mhs_#{interval}"),
+        khs: attrs.delete("khs_#{interval}")
+      )
+    end
   end # Client
 end # Expedition

data/lib/expedition/version.rb

@@ -1,3 +1,3 @@
 module Expedition
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/spec/expedition/client_spec.rb

@@ -61,4 +61,205 @@ describe Expedition::Client do
       end
     end
   end
+
+  describe '#devices' do
+
+    subject(:devices) do
+      client.devices
+    end
+
+    let(:client) do
+      described_class.new
+    end
+
+    let(:socket) do
+      double(TCPSocket)
+    end
+
+    let(:response) do
+      {
+        'STATUS' => [
+          {
+            'STATUS' => 'S',
+            'When' => 1399577859,
+            'Code' => 69,
+            'Msg' => 'Device Details',
+            'Description' => 'sgminer 4.1.153'
+          }
+        ],
+       'DEVDETAILS' => [
+          {
+            'DEVDETAILS' => 0,
+            'Name' => 'GPU',
+            'ID' => 0,
+            'Driver' => 'opencl',
+            'Kernel' => 'ckolivas',
+            'Model' => 'AMD Radeon R9 200 Series',
+            'Device Path' => ''
+          },
+          {
+            'DEVDETAILS' => 1,
+            'Name' => 'GPU',
+            'ID' => 1,
+            'Driver' => 'opencl',
+            'Kernel' => 'ckolivas',
+            'Model' => 'AMD Radeon R9 200 Series',
+            'Device Path' => ''
+          },
+          {
+            'DEVDETAILS' => 2,
+            'Name' => 'GPU',
+            'ID' => 2,
+            'Driver' => 'opencl',
+            'Kernel' => 'ckolivas',
+            'Model' => 'AMD Radeon R9 200 Series',
+            'Device Path' => ''
+          }
+        ],
+       'id' => 1
+      }.to_json
+    end
+
+    before do
+      allow(TCPSocket).to receive(:new).with(client.host, client.port).and_return(socket)
+      allow(socket).to receive(:puts)
+      allow(socket).to receive(:gets).and_return(response)
+    end
+
+    specify do
+      expect(devices.body).to eq([
+        {
+          'device_path' => '',
+          'driver' => 'opencl',
+          'id' => 0,
+          'kernel' => 'ckolivas',
+          'model' => 'AMD Radeon R9 200 Series',
+          'variant' => 'gpu'
+        },
+        {
+          'device_path' => '',
+          'driver' => 'opencl',
+          'id' => 1,
+          'kernel' => 'ckolivas',
+          'model' => 'AMD Radeon R9 200 Series',
+          'variant' => 'gpu'
+        },
+        {
+          'device_path' => '',
+          'driver' => 'opencl',
+          'id' => 2,
+          'kernel' => 'ckolivas',
+          'model' => 'AMD Radeon R9 200 Series',
+          'variant' => 'gpu'
+        }
+      ])
+    end
+  end
+
+  describe '#metrics' do
+
+    subject(:metrics) do
+      client.metrics
+    end
+
+    let(:client) do
+      described_class.new
+    end
+
+    let(:socket) do
+      double(TCPSocket)
+    end
+
+    let(:response) do
+      {
+        'STATUS' => [
+          {
+            'STATUS' => 'S',
+            'When' => 1399419744,
+            'Code' => 9,
+            'Msg' => '3 GPU(s)',
+            'Description' => 'sgminer 4.1.153'
+          }
+        ],
+        'DEVS' => [
+          {
+            'Accepted' => 2,
+            'Device Elapsed' => 11,
+            'Device Hardware%' => 0.0,
+            'Device Rejected%' => 0.0,
+            'Diff1 Work' => 158,
+            'Difficulty Accepted' => 256.0,
+            'Difficulty Rejected' => 0.0,
+            'Enabled' => 'Y',
+            'Fan Percent' => 50,
+            'Fan Speed' => -1,
+            'GPU Activity' => 100,
+            'GPU Clock' => 944,
+            'GPU Voltage' => 0.0,
+            'GPU' => 0,
+            'Hardware Errors' => 0,
+            'Intensity' => '0',
+            'KHS 1s' => 923,
+            'KHS av' => 915,
+            'Last Share Difficulty' => 128.0,
+            'Last Share Pool' => 0,
+            'Last Share Time' => 1399419741,
+            'Last Valid Work' => 1399419743,
+            'MHS 1s' => 0.923,
+            'MHS av' => 0.9148,
+            'Memory Clock' => 1500,
+            'Powertune' => 30,
+            'Rejected' => 0,
+            'Status' => 'Alive',
+            'Temperature' => 68.0,
+            'Total MH' => 10.1489,
+            'Utility' => 10.8166
+          }
+        ],
+        'id' => 1
+      }.to_json
+    end
+
+    before do
+      allow(TCPSocket).to receive(:new).with(client.host, client.port).and_return(socket)
+      allow(socket).to receive(:puts)
+      allow(socket).to receive(:gets).and_return(response)
+    end
+
+    specify do
+      expect(metrics.body).to eq([
+        'accepted' => 2,
+        'device_elapsed' => 11,
+        'device_hardware_percent' => 0.0,
+        'device_rejected_percent' => 0.0,
+        'diff1_work' => 158,
+        'difficulty_accepted' => 256.0,
+        'difficulty_rejected' => 0.0,
+        'enabled' => true,
+        'fan_percent' => 50,
+        'fan_speed' => -1,
+        'gpu' => 0,
+        'gpu_activity' => 100,
+        'gpu_clock' => 944,
+        'gpu_voltage' => 0.0,
+        'hardware_errors' => 0,
+        'intensity' => '0',
+        'khs' => 923,
+        'khs_av' => 915,
+        'last_share_difficulty' => 128.0,
+        'last_share_pool' => 0,
+        'last_share_time' => Time.utc(2014, 05, 06, 23, 42, 21),
+        'last_valid_work' => Time.utc(2014, 05, 06, 23, 42, 23),
+        'memory_clock' => 1500,
+        'mhs' => 0.923,
+        'mhs_av' => 0.9148,
+        'powertune' => 30,
+        'rejected' => 0,
+        'status' => 'alive',
+        'temperature' => 68.0,
+        'total_mh' => 10.1489,
+        'utility' => 10.8166
+      ])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,15 @@ RSpec.configure do |config|
   config.order = 'random'
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.before(:suite) do
+    @time_zone = ENV['TZ']
+    ENV['TZ']  = 'UTC'
+  end
+
+  config.after(:suite) do
+    ENV['TZ'] = @time_zone
+  end
 end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expedition
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gabe Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json