mycoins 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65db69d59ded9743f0a39831d0af2125ff5f810f
-  data.tar.gz: eada59b0251d4249940fda0eae44155fe6990465
+  metadata.gz: e1eeaa2d4398a92bbc3079a14e66f834deac201b
+  data.tar.gz: 6b05e301b76e0c9b7faf6747c5033a8ee522f9cb
 SHA512:
-  metadata.gz: 58a8b65d293824ee97ea6c5107c492163c46de6c737fb433c1271ca7e6d41850cc71093a85ebf3728a8d9f1e9e4bef3b3676835e2b14241c3d7f2e75890a0dce
-  data.tar.gz: 9cabfdecf7dea158fddd01a2051c9ac9dc0e5cf7b11cb8ab08f42b902e2f8f3d17d011d126fe62e2af3dc5eca81173e8532962d2230374473a35e75bcb11be7b
+  metadata.gz: 4eceb49d43867af6b28b6c2c693f4befcf08788289d4dc54128c5729c3af1b0c16650905aeb610eb8ad88f6b30659d6ce383fee10a4c402e121c8342903fd4bd
+  data.tar.gz: 65bb1cb36f12c85bbf742cee232d72ec1c325cffe70d7c9b76300c6bd5ee8130bdc26ff6a8f8cffb59e8ef0e3a18718c76faf3e97c58fff7bb4896cb1bb6c2b5

data.tar.gz.sig

@@ -1,3 +1 @@
-w�RA5
-[uƯb=���Q����� ��Z
-�Ǣ�1&6��leq�-�����'v��Eo)\a�p�hB+S�x�Ї��'�g��xg+�B繞<mDV�#I��/x#���Jm6+���C� y�n��ɷ�p�X@��Z� �N���j|�'J벲����A��c�]C����|�`!�Zs'��Z���{(�[�=H���u�{��E�k^M|����U�y�pE��i-
��
+�\��P�,��w��@%V

data/lib/mycoins.rb

@@ -28,7 +28,7 @@ class MyCoins
 
     puts '@dx.to_xml: ' + @dx.to_xml if @debug
 
-    @mycurrency = @dx.currency || mycurrency.upcase
+    @mycurrency = (@dx.currency || mycurrency).upcase
     puts '@mycurrency: ' + @mycurrency.inspect if @debug
 
     mycoins = @dx.all.inject([]) do |r, mycoin|
@@ -53,20 +53,29 @@ class MyCoins
     a = @dx.all.inject([]) do |r, x|
 
       puts 'x: ' + x.inspect if @debug
-      usd_rate = @ccf.find(x.title).price_usd.to_f      
+      coin = @ccf.find(x.title)
+      usd_rate = coin.price_usd.to_f      
+
+      paid = ((x.qty.to_f * x.btc_price.to_f) * \
+              @ccf.price('bitcoin', x.date_purchased) * \
+             @jer.rate(@mycurrency)).round(2)
+      
+      value_usd = (usd_rate * x.qty.to_f).round(2)
       
       h = {
+        rank: coin.rank.to_i,
         name: x.title, 
-        qty: x.qty, 
-        value_usd: (usd_rate * x.qty.to_f).round(2)
+        qty: x.qty,
+        btc_price: x.btc_price,
+        paid: "%.2f" % paid,
+        value_usd: "%.2f" % value_usd
       }
       
 
       mycurrency = if @mycurrency and @mycurrency != 'USD' then
         
         local_value = ((usd_rate * x.qty.to_f) * @jer.rate(@mycurrency)).round(2)  
-        h.merge!(('value_' + @mycurrency.downcase).to_sym => local_value)
-
+        h.merge!(('value_' + @mycurrency.downcase).to_sym => "%.2f" % local_value)
         
         @mycurrency
         
@@ -76,26 +85,55 @@ class MyCoins
         
       end
       
-      r << h
+      value = (local_value || value_usd)
+      
+      h2 = {
+        profit: "%.2f" % (value - paid).round(2),
+        pct_profit: "%.2f" % (((value - paid) / value) * 100).round(2)
+      }
+      
+      r << h.merge!(h2)
       
     end
 
-    coins = a.map {|x| x.values}
+    coins = a.sort_by{|x| x[:rank]}.map {|x| x.values}
     
-    labels = %w(Name Qty USD)    
-    labels << @mycurrency if @mycurrency    
+    labels = %w(Rank Name Qty btc_price) + ["paid(#{@mycurrency}):", 'value(USD):']
+    labels << "value(#{@mycurrency}):" if @mycurrency    
+    labels += ['Profit:', 'Profit (%):']
     
     puts 'labels: ' + labels.inspect if @debug
     tf = TableFormatter.new(source: coins, labels: labels)
-    out = tf.display
+    out = "# " + @dx.title + "\n\n"
+    out << "last_updated: " + Time.now.strftime("%d/%m/%Y\n\n")
+    out << tf.display
+       
+    invested = sum(a, :paid)    
+    total = sum(a, ('value_' + @mycurrency.downcase).to_sym)    
+    net_profit = sum(a, :profit)
     
-    total = a.inject(0) do |r, x|
-      r + x[('value_' + @mycurrency.downcase).to_sym]
-    end
+    gross_profit_list, losses_list = a.partition {|x| x[:profit].to_f > 0}
     
-    out << "\n\nTotal: %s %s" % [total.round(2), @mycurrency]
+    gross_profit = sum(gross_profit_list, :profit)
+    losses = sum(losses_list, :profit)
+    
+    pct_gross_profit = 100 / (invested / gross_profit)
+    pct_losses = 100 / (invested / losses)
+    
+    
+    out << "\n\nInvested: %.2f %s" % [invested, @mycurrency]
+    out << "\nRevenue: %.2f %s" % [total, @mycurrency]    
+    out << "\n\nGross profit: %.2f %s (%%%.2f)" % [gross_profit, @mycurrency, pct_gross_profit]
+    out << "\nLosses: %.2f %s (%%%.2f)" % [losses, @mycurrency, pct_losses]    
+    out << "\n\nNet profit: %.2f %s" % [net_profit, @mycurrency]
     out
 
   end
   
+  private
+  
+  def sum(a, field)
+    a.inject(0) {|r, x| r + x[field].to_f }
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycoins
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson