mycoins 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c33d039b936cfe61a4e29a73747d922f97947a
-  data.tar.gz: 1b302ae8333e53073695606e24194e000fa943c7
+  metadata.gz: 0de68ec33574a524691136fb578f4cbb1fb6da40
+  data.tar.gz: 76d834c23b04e3684fd97ea251b62aadc1aaaa35
 SHA512:
-  metadata.gz: e0511114a5f1f14f5e3bc4fa3c0382a04cdc41c74704f6d62f135b4bbe0fc5afbe11f5f110337f4d46560185cdf47c127888020a747522a0c2551d1b625d7ce4
-  data.tar.gz: e30fd3f9cabb2ae49b12c6a7fd1cf5138139191f9ff54114caf261f4f9b805e87bb72042039b950866577365424803c93b4934bf851b87f570501e8e5cb3a6bf
+  metadata.gz: 77284f5d25b3086518f58dac39d3600d45e904145fc24c06ded0f8202123cd54c8673f0886055927f946a4283f0b034df937c2112a9730afd69994575516e578
+  data.tar.gz: '04085ac00af0dcb7244c5a6b053cbf91f7dd96abc77fb309fbda9817188072f00fd32f1388fcfc84c25348b9b0da3f6de4d3a049e61afe0d33b2d31fda5f4513'

data/lib/mycoins.rb

@@ -122,9 +122,9 @@ class MyCoins
     a = build_records()
     
     invested = sum(a, :paid)
-    gross_profit_list, losses_list = a.partition {|x| x[:profit].to_f > 0}
+    gross_profit_list, losses_list = a.partition {|x| x[:roi].to_f > 0}
     gross_profit, losses = [gross_profit_list, losses_list]\
-        .map{|x| sum(x, :profit)}
+        .map{|x| sum(x, :roi)}
     pct_gross_profit = (100 / (invested / gross_profit)).round(2)
     pct_losses = (100 / (invested / losses)).round(2)
 
@@ -138,7 +138,7 @@ class MyCoins
       gross_profit: gross_profit.round(2), losses: losses.round(2),
       pct_gross_profit: pct_gross_profit,
       pct_losses: pct_losses,
-      net_profit: sum(a, :profit).round(2),
+      net_profit: sum(a, :roi).round(2),
       pct_net_profit: pct_gross_profit + pct_losses
     }
     
@@ -189,8 +189,8 @@ class MyCoins
       value = (local_value || value_usd)
       
       h2 = {
-        profit: "%.2f" % (value - paid).round(2),
-        pct_profit: "%.2f" % (((value - paid) / value) * 100).round(2)
+        roi: "%.2f" % (value - paid).round(2),
+        pct_roi: "%.2f" % (100 / (paid / (value - paid))).round(2)
       }
       
       r << h.merge!(h2)
@@ -244,7 +244,7 @@ class MyCoins
     labels = %w(Name Rank Qty btc_price) \
         + ["paid(#{@mycurrency}):", 'value(USD):']
     labels << "value(#{@mycurrency}):" if @mycurrency    
-    labels += ['Profit:', 'Profit (%):']
+    labels += ['ROI:', 'ROI (%):']
     
     puts 'labels: ' + labels.inspect if @debug
     
@@ -267,4 +267,4 @@ class MyCoins
     a.inject(0) {|r, x| r + x[field].to_f }
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   sCz5KsiHA9vj8OfrxhYrEb+ML4+J28Umdki7V1vgnQWmnI+Ok2SWlkScgzcmGXF6
   TJ4=
   -----END CERTIFICATE-----
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -41,7 +41,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.27
+        version: 1.7.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.27
+        version: 1.7.28
 - !ruby/object:Gem::Dependency
   name: justexchangerates
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +78,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.4
 description: 
 email: james@jamesrobertson.eu
 executables: []