mycoins 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9063bf7d8e535883f1e55545527de144a902e24b
-  data.tar.gz: 20cde3a4c46527bb40335058bffcf4c3e3c46483
+  metadata.gz: 81094f6de11121c276fa8bd1039820aec9783736
+  data.tar.gz: 2396fe1349594814d82360abe4ba713820dbb93f
 SHA512:
-  metadata.gz: c84f73b889a610b3418b05ae741f03f222b7d490c0b4ece66d6175f15d231b4fd8556c7b4af92df47cd6e088a7e992995f46f5a509877d990b5b35e77b086d8d
-  data.tar.gz: 26792b76258cd39028aa80831ea7d86b291c361c6a6a5cb0654faf05034da6020b7c406379d0302c627ea385e15386602e5e3eb37ae73b60361e389091b431d9
+  metadata.gz: 6c616ce1a054d8cf5bab8b38af96bfb715e19555ffc0daefbb2877ff3d3ceb174584b258d75b88dde2b5c4a0e1a0f6350f82a7e514dda9bbf3c2cf62db1d15ef
+  data.tar.gz: bf1a81b0e3c4f1d8e1637062e40a5405478209e655da423f0ea09e6dc9e01781498f60ee182d57609d3cd372de49efa13defeea82d92ff9c81c53f90568ec648

data/lib/mycoins.rb

@@ -7,6 +7,7 @@ require 'cryptocoin_fanboi'
 
 
 class MyCoins
+  include Colour
   
   attr_accessor :mycurrency
 
@@ -139,6 +140,7 @@ class MyCoins
     end    
 
     btc_val = ((total_value * rate) / btc).round(4)
+    
 
     h = {
       title: title,
@@ -188,8 +190,7 @@ class MyCoins
         rank: coin.rank.to_i,
         qty: "%.2f" % x.qty,
         btc_price:  "%.5f" % x.btc_price,
-        paid: "%.0f" % paid,
-        value_usd: "%.0f" % value_usd
+        paid: "%.0f" % paid
       }
       
       mycurrency = if @mycurrency and @mycurrency != 'USD' then
@@ -211,15 +212,15 @@ class MyCoins
       value = (local_value || value_usd)
       
       h2 = {
-        roi: "%.2f" % (value - paid).round(2),
-        pct_roi: "%.2f" % (100 / (paid / (value - paid))).round(2)
+        roi: "%s" % (value - paid).round(2),
+        pct_roi: "%s" % (100 / (paid / (value - paid))).round(2)
       }
       
       r << h.merge!(h2)
       
     end
     
-  end
+  end  
   
   def fetch_symbols(coin_names)
     
@@ -251,7 +252,7 @@ class MyCoins
       
       fields = line.split('|')   
       
-      a2 = fields[-3..-1].map {|x| x[/^ +-/] ? x.red : x.green }
+      a2 = fields[-3..-1].map {|x| c(x) }
       (fields[0..-4] + a2 ).join('|')  
 
     end    
@@ -265,8 +266,8 @@ class MyCoins
     coins.reverse! if order_by == :rank
     
     labels = %w(Name Rank Qty btc_price) \
-        + ["paid(#{@mycurrency}):", 'value(USD):']
-    labels << "value(#{@mycurrency}):" if @mycurrency    
+        + ["paid:"]
+    labels << "value:" if @mycurrency    
     labels += ['ROI:', 'ROI (%):']
     
     puts 'labels: ' + labels.inspect if @debug
@@ -275,13 +276,15 @@ class MyCoins
     out << "last_updated: %s\n\n" % r.datetime
     
     out << format_table(coins, labels: labels)
+    
+    out << "\nNote: paid and value columns displayed in " + @mycurrency
         
     out << "\n\nInvested: %.2f %s" % [r.invested, @mycurrency]
-    out << "\n\nGross profit: %.2f %s (%.2f%%)" % \
-        [r.gross_profit, @mycurrency, r.pct_gross_profit]
+    out << "\n\nGross profit: %s %s (%s)" % \
+        [c(r.gross_profit), @mycurrency, c(r.pct_gross_profit.to_s + "%")]
     out << "\nLosses: %.2f %s (%.2f%%)" % [r.losses, @mycurrency, r.pct_losses]
-    out << "\n\nNet profit: %.2f %s (%.2f%%)" % [r.net_profit, @mycurrency, 
-                                                 r.pct_net_profit]
+    out << "\n\nNet profit: %s %s (%s)" % [c(r.net_profit), @mycurrency, 
+                                                 c(r.pct_net_profit.to_s + "%")]
     out << "\nCurrent value: %.2f %s (%s BTC)" % [r.value, @mycurrency, 
                                                   r.btc_value]
     out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   sCz5KsiHA9vj8OfrxhYrEb+ML4+J28Umdki7V1vgnQWmnI+Ok2SWlkScgzcmGXF6
   TJ4=
   -----END CERTIFICATE-----
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 description: 
 email: james@jamesrobertson.eu
 executables: []