gtmtech-crypto 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46c9c9aef20bd2c10db09c32bd54babe62b648a
-  data.tar.gz: f4c2dfa08b79ad6c8344af05088479745c85e835
+  metadata.gz: 666f62b7fcb98a96d19bfdd61f882db3af5c53f4
+  data.tar.gz: bf86844efd07b576b48b66d3d27de5c8491b4917
 SHA512:
-  metadata.gz: c92f1bf92055336e8ba92ddd0f78373eff333a41a50146998eac08f9dd4da4176abe56be65456a645458217b59f935012b08e57abfbd9cde7f19058292495953
-  data.tar.gz: 689cc7b71547047088ff6960c192a7a15daac222b112253d7ef6a7293a4f532dc5d12016918ea4ae0fcd052a3fc03c908e831b8b0239214bcb5cf45050391582
+  metadata.gz: 1d36a2cac0f0d375c6d1c743058d756f3f86519867a4c5ac92be9591b13b9b49897410b301eba4ccb2cd030f933c879fbc9359081dad016a2e4c69ef1dfd2bac
+  data.tar.gz: 6082adda14f0351d4610a34540fbedcd1ec849b4e979922016bc0a656d5b2b66f5f81938e2fb13d3275adf0488c5604a40f592a963314ae1a0047dad8fe1770d

data/gtmtech-crypto.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "gtmtech-crypto"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.description   = "Simple tool for accounting of cryptocurrencies"
   gem.summary       = "Simple tool for accounting of cryptocurrencies"
   gem.author        = "Geoff Meakin"
@@ -16,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency('trollop', '~> 2.0')
+  gem.add_dependency('colorize', '~> 0.8.1')
 end

data/lib/gtmtech/crypto/data.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'gtmtech/crypto/utils'
+require 'colorize'
 
 module Gtmtech
   module Crypto
@@ -46,7 +47,7 @@ module Gtmtech
         true
       end
 
-      def self.add_transaction date, source_account, source_currency, source_amount, dest_account, dest_currency, dest_amount, fees_account, fees_currency, fees_amount
+      def self.add_transaction date, source_account, source_currency, source_amount, dest_account, dest_currency, dest_amount, fees_account, fees_currency, fees_amount, references, percentage
         if date.downcase == "now"
           date = Time.now.to_s.split(" ").take(2).join(",")
         end
@@ -64,24 +65,110 @@ module Gtmtech
                                                "dest_amount"     => dest_amount,
                                                "fees_account"    => fees_account,
                                                "fees_currency"   => fees_currency,
-                                               "fees_amount"     => fees_amount }
+                                               "fees_amount"     => fees_amount,
+                                               "references"      => references,
+                                               "percentage"      => percentage }
       end
 
       def self.list_transactions
-        puts "Transactions for profile \"#{ENV['CRYPTO_PROFILE'] || 'main'}\":"
-        printf("%-36s %-20s %-15s %-15s %-15s %-15s %-30s\n", "id", "date", "src account", "src amount", "dest account", "dest amount", "ratio src/dest")
-        puts "-" * 150
+        outputs = []
+
+        puts "Transactions for profile \"#{ENV['CRYPTO_PROFILE'] || 'main'}\":\n".red
+        cols = "%-36s %-20s %-14s %-15s %-15s %-15s %-12s %-14s %s"
+        puts sprintf("#{cols}", 
+                      "id", 
+                      "date", 
+                      "%age", 
+                      "src account", 
+                      "src amount", 
+                      "dest account", 
+                      "dest amount", 
+                      "ratio", 
+                      "reference_ids").light_blue
+        puts "-" * 160
         @@document[ "transactions" ].each do |id, txn|
           ratio = ""
           if txn["source_currency"] != txn["dest_currency"]
             ratio = Utils.decimal_divide( txn["source_amount"], txn["dest_amount"] )
           end
-          printf("%-36s %-20s %-15s %-15s %-15s %-15s %-30s\n", id, txn["date"], "#{txn["source_account"]}.#{txn["source_currency"]}", txn["source_amount"], "#{txn["dest_account"]}.#{txn["dest_currency"]}", txn["dest_amount"], ratio)
-          ratio = ""
+          outputs << { :date => txn["date"],
+                       :lines => [] }
+          if Utils.decimal_equal?( txn[ "percentage" ], "100.0" )
+            outputs.last[ :lines ] << sprintf("#{cols}", 
+                                              id, 
+                                              txn["date"], 
+                                              "-",
+                                              "#{txn[ "source_account"] }.#{txn[ "source_currency"] }", 
+                                              txn["source_amount"], 
+                                              "#{txn[ "dest_account"] }.#{txn[ "dest_currency"] }", 
+                                              txn[ "dest_amount" ], 
+                                              ratio, 
+                                              txn[ "references" ][0..20] )
+          else
+            outputs.last[ :lines ] << sprintf("#{cols}", 
+                                              id, 
+                                              txn["date"], 
+                                              "100.0", 
+                                              "#{txn["source_account"]}.#{txn["source_currency"]}", 
+                                              txn["source_amount"], 
+                                              "#{txn["dest_account"]}.#{txn["dest_currency"]}", 
+                                              txn[ "dest_amount" ], 
+                                              ratio, 
+                                              txn[ "references" ][0..20] ).light_black
+            outputs.last[ :lines ] << sprintf("#{cols}", 
+                                              "", 
+                                              "", 
+                                              Utils.decimal_add( txn["percentage"], "0.0" ), 
+                                              "#{txn["source_account"]}.#{txn["source_currency"]}", 
+                                              Utils.decimal_multiply( txn["source_amount"], txn["percentage"], "0.01" ), 
+                                              "#{txn["dest_account"]}.#{txn["dest_currency"]}", 
+                                              Utils.decimal_multiply( txn[ "dest_amount" ], txn[ "percentage" ], "0.01" ), 
+                                              "", 
+                                              "" )
+          end
           if txn["fees_account"]
-            printf("%-36s %-20s %-15s %-15s %-15s %-15s %-30s\n", id, txn["date"], "#{txn["fees_account"]}.#{txn["fees_currency"]}", txn["fees_amount"], "fees.#{txn["fees_currency"]}", txn["fees_amount"], ratio)
+            if Utils.decimal_equal?( txn[ "percentage" ], "100.0" )
+              outputs.last[ :lines ] << sprintf("#{cols}", 
+                                                "",
+                                                "",
+                                                "-",
+                                                "#{txn["fees_account"]}.#{txn["fees_currency"]}",
+                                                txn["fees_amount"],
+                                                "FEES.#{txn["fees_currency"]}",
+                                                txn[ "fees_amount" ],
+                                                "",
+                                                "" )
+            else
+              outputs.last[ :lines ] << sprintf("#{cols}", 
+                                                "",
+                                                "",
+                                                "100.0",
+                                                "#{txn["fees_account"]}.#{txn["fees_currency"]}",
+                                                txn["fees_amount"], 
+                                                "FEES.#{txn["fees_currency"]}",
+                                                txn[ "fees_amount" ], 
+                                                "",
+                                                "" ).light_black
+              outputs.last[ :lines ] << sprintf("#{cols}", 
+                                                "",
+                                                "",
+                                                Utils.decimal_add( txn["percentage"], "0.0" ),
+                                                "#{txn["fees_account"]}.#{txn["fees_currency"]}",
+                                                Utils.decimal_multiply( txn["fees_amount"], txn["percentage"], "0.01" ),
+                                                "FEES.#{txn["fees_currency"]}",
+                                                Utils.decimal_multiply( txn[ "fees_amount" ], txn["percentage"], "0.01" ),
+                                                "",
+                                                "" )
+            end
           end
         end
+
+        outputs.sort_by { |k| k[ :date ] }.each do |k|
+          k[ :lines ].each do |line|
+            puts line
+          end
+        end
+
       end
 
       def self.delete_transaction id
@@ -91,48 +178,57 @@ module Gtmtech
       def self.reconcile_transactions conversions
         self.list_transactions
         puts ""
-        printf("%-20s %-10s %-20s %-30s\n", "account", "currency", "amount", "GBP equivalent")
+        cols = "%-20s %-10s %-20s %-30s"
+        puts sprintf("#{cols}", "account", "currency", "amount", "GBP equivalent").light_blue
         puts "-" * 120
         fees = {}
         currencies = {}
         @@document[ "accounts" ].each do | name, account_info |
           account_info[ "currencies" ].sort.each do | currency |
-            decimal = "0.0"
+            total     = "0.0"
+            txn_total = "0.0"
             @@document[ "transactions" ].each do |id, txn|
+
               # explicit fees
               if txn[ "fees_account" ] == name and txn[ "fees_currency" ] == currency
-                decimal = Utils.decimal_minus( decimal, txn[ "fees_amount" ] )
+                # print "#{txn_total} :     - #{txn[ "percentage" ]}% of #{txn[ "fees_amount" ]}".blue
+                txn_total = Utils.decimal_minus( txn_total, Utils.decimal_multiply( txn[ "fees_amount" ], txn[ "percentage" ], "0.01" ) )
+                # puts " = #{txn_total}".blue
                 unless fees.key? currency
                   fees[ currency ] = "0.0"
                 end
-                fees[ currency ] = Utils.decimal_add( fees[ currency ], txn[ "fees_amount" ])
+                fees[ currency ] = Utils.decimal_add( fees[ currency ], Utils.decimal_multiply( txn[ "fees_amount" ], txn[ "percentage" ], "0.01" ) )
               end
 
               # account reconciliation
               if txn[ "source_account" ] == name and txn[ "source_currency" ] == currency
-                decimal = Utils.decimal_minus( decimal, txn[ "source_amount" ] )
-
+                # print "#{txn_total} :     - #{txn[ "percentage" ]}% of #{txn[ "source_amount" ]}".blue
+                txn_total = Utils.decimal_minus( txn_total, Utils.decimal_multiply( txn[ "source_amount" ], txn[ "percentage" ], "0.01" ) )
+                # puts " = #{txn_total}".blue
+ 
                 # implicit fees
                 if txn[ "source_currency" ] == txn[ "dest_currency" ] and txn[ "source_amount" ] != txn[ "dest_amount" ]
                   implicit_fees = Utils.decimal_minus( txn[ "source_amount" ], txn[ "dest_amount" ] )
                   unless fees.key? currency
                     fees[ currency ] = "0.0"
                   end
-                  fees[ currency ] = Utils.decimal_add( fees[ currency ], implicit_fees )
+                  fees[ currency ] = Utils.decimal_add( fees[ currency ], Utils.decimal_multiply( implicit_fees, txn[ "percentage" ], "0.01" ) )
                 end
 
               end
               if txn[ "dest_account" ] == name and txn[ "dest_currency" ] == currency
-                decimal = Utils.decimal_add( decimal, txn[ "dest_amount" ] )
+                # print "#{txn_total} :     + #{txn[ "percentage" ]}% of #{txn[ "dest_amount" ]}".blue
+                txn_total = Utils.decimal_add( txn_total, Utils.decimal_multiply( txn[ "dest_amount" ], txn[ "percentage" ], "0.01" ) )
+                # puts " = #{txn_total}".blue
               end
             end
             unless currencies.key? currency
               currencies[ currency ] = "0.0"
             end
-            currencies[ currency ] = Utils.decimal_add( currencies[ currency ], decimal )
+            currencies[ currency ] = Utils.decimal_add( currencies[ currency ], txn_total )
             gbp_equiv = "?"
-            gbp_equiv = Utils.decimal_multiply( decimal, conversions[ currency ] ) if conversions.key? currency
-            printf( "%-20s %-10s %-20s %-30s\n", name, currency, decimal, gbp_equiv )
+            gbp_equiv = Utils.decimal_multiply( txn_total, conversions[ currency ] ) if conversions.key? currency
+            puts sprintf( "#{cols}", name, currency, txn_total, gbp_equiv )
           end
         end
         fees.keys.sort.each do |currency|
@@ -141,11 +237,12 @@ module Gtmtech
           end
           gbp_equiv = "?"
           gbp_equiv = Utils.decimal_multiply( fees[ currency ], conversions[ currency ] ) if conversions.key? currency
-          printf( "%-20s %-10s %-20s %-30s\n", "**FEES**", currency, fees[ currency ], gbp_equiv)
+          puts sprintf( "#{cols}", "**FEES**", currency, fees[ currency ], gbp_equiv)
         end
 
         puts ""
-        printf( "%-10s %-20s\n", "currency", "reconciliation" )
+        cols = "%-10s %-20s"
+        puts sprintf( "#{cols}", "currency", "reconciliation" ).light_blue
         puts "-" * 120
         currencies.keys.sort.each do |currency|
           currency_fees = fees[ currency ] || "0.0"
@@ -155,25 +252,28 @@ module Gtmtech
         gbp_total = "0.0"
         gbp_known = true
         puts ""
-        printf( "%-10s %-20s %-20s\n", "currency", "totals", "GBP equivalent" )
+        cols = "%-10s %-20s %-20s"
+        puts sprintf( "#{cols}", "currency", "totals", "GBP equivalent" ).light_blue
         puts "-" * 120
         currencies.keys.sort.each do |currency|
           amount = currencies[ currency ]
           if conversions.key? currency
             gbp_equiv = Utils.decimal_multiply( amount, conversions[ currency ] )
-            printf( "%-10s %-20s %-20s\n", currency, currencies[ currency ], gbp_equiv )
+            puts sprintf( "#{cols}", currency, currencies[ currency ], gbp_equiv )
             gbp_total = Utils.decimal_add( gbp_total, gbp_equiv )
           else
-            printf( "%-10s %-20s %-20s\n", currency, currencies[ currency ], "?" )
+            puts sprintf( "#{cols}", currency, currencies[ currency ], "?" )
             gbp_known = false
           end
         end
 
         puts ""
+        puts "profit/loss (equivalent GBP)".blue
+        puts "----------------------------"
         if gbp_known
-          puts "GBP profit/loss (equivalent): #{gbp_total}"
+          puts gbp_total
         else
-          puts "GBP profit/loss (equivalent): unknown - specify conversions on command-line"
+          puts "unknown - specify conversions on command-line - see --help"
         end
       end
 

data/lib/gtmtech/crypto/subcommands/txn.rb

@@ -14,7 +14,7 @@ module Gtmtech
           <<-EOS
 Usage (crypto #{self.prettyname})
 
-crypto #{self.prettyname} new --date=<s> --from=<s> --to=<s> [--fees=<s>]
+crypto #{self.prettyname} new --date=<s> --from=<s> --to=<s> [--fees=<s>] [--references=<s>] [--percentage=<s>]
   - create a new transaction
 
 crypto #{self.prettyname} delete --id=<s>
@@ -51,7 +51,17 @@ EOS
            {:name => :id,
             :description => "Specify the id you wish to amend/delete in a delete operation",
             :short => 'i',
-            :type => :string}
+            :type => :string},
+           {:name => :references,
+            :description => "Specify any thirdparty / blockchain reference IDs associated with the transaction (Optional)",
+            :short => 'r',
+            :type => :string,
+            :default => ""},
+           {:name => :percentage,
+            :description => "Percentage of the transaction which actually applies to this profile (for the case of a transaction which spans multiple profiles and should only be counted in part) (Optional)",
+            :short => 'p',
+            :type => :string,
+            :default => "100.0"}
           ]
         end
 
@@ -93,7 +103,7 @@ EOS
           Data.load
           self.error "The account #{source_account}.#{source_currency} does not yet exist" unless Data.account_exists? source_account, source_currency
           self.error "The account #{dest_account}.#{dest_currency} does not yet exist"     unless Data.account_exists? dest_account, dest_currency
-          Data.add_transaction @@options[:date], source_account, source_currency, source_amount, dest_account, dest_currency, dest_amount, fees_account, fees_currency, fees_amount
+          Data.add_transaction @@options[:date], source_account, source_currency, source_amount, dest_account, dest_currency, dest_amount, fees_account, fees_currency, fees_amount, @@options[ :references ], @@options[ :percentage ]
           Data.save
         end
 

data/lib/gtmtech/crypto/utils.rb

@@ -60,21 +60,24 @@ module Gtmtech
       end
 
       def self.decimal_add decimal1, decimal2
-        ( BigDecimal( decimal1 ) + BigDecimal( decimal2 ) ).to_s("F")
+        ( BigDecimal( decimal1 ) + BigDecimal( decimal2 ) ).truncate(8).to_s("F")
       end
 
       def self.decimal_minus decimal1, decimal2
-        ( BigDecimal( decimal1 ) - BigDecimal( decimal2 ) ).to_s("F")
+        ( BigDecimal( decimal1 ) - BigDecimal( decimal2 ) ).truncate(8).to_s("F")
       end
 
-      def self.decimal_multiply decimal1, decimal2
-        ( BigDecimal( decimal1 ) * BigDecimal( decimal2 ) ).truncate(8).to_s("F")
+      def self.decimal_multiply decimal1, decimal2, decimal3 = "1.0"
+        ( BigDecimal( decimal1 ) * BigDecimal( decimal2 ) * BigDecimal( decimal3 ) ).truncate(8).to_s("F")
       end
 
       def self.decimal_divide decimal1, decimal2
         ( BigDecimal( decimal1 ) / BigDecimal( decimal2 ) ).truncate(8).to_s("F")
       end
 
+      def self.decimal_equal? decimal1, decimal2
+        BigDecimal( decimal1 ) == BigDecimal( decimal2 )
+      end
     end
   end
 end

data/lib/gtmtech/crypto.rb

@@ -1,7 +1,7 @@
 module Gtmtech
   module Crypto
 
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
     DESCRIPTION = "crypto is a cli tool for simple accounting of cryptocurrencies"
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtmtech-crypto
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Geoff Meakin
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: Simple tool for accounting of cryptocurrencies
 email: 
 executables: