gtmtech-crypto 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ed8270eb639f0c6bd3f0e8e9eb246be3d6d5ca
-  data.tar.gz: 577a3a6572ff24224185a41051f19e5f7bb334fb
+  metadata.gz: 9249ed0680a98415b65c2c8a4b0a2a09757c6f39
+  data.tar.gz: fc6c53c8576ce6a614f9a8e4e47ff6b8a3b28280
 SHA512:
-  metadata.gz: 5aae2d5056eb65275f79d34389d8ae5020e816ce1fbdd131b78853ae1895692a495f984681a0c95fa1ee75d05118ccfbb615de9a2d066bdbb2d987287d8b2ebd
-  data.tar.gz: 37640e9619beebfcdceae491a6e0da454466ed671d5e3aab3cc4d1c69dbf8696b0596f57ade724a518f4e1adbf50fde4706f0d80ccbf177156d36ce0dc639729
+  metadata.gz: b169a5d180010831985fe0a5272f479ac5dc64d56a5018258fa46613e25617541c7b62f5435facef4a5aa15a167fc1e1cea545212471b6c83ff4d8f27bf85e4d
+  data.tar.gz: 0666c0d29a85d7439032af75fa5d5e50520cae9a0af5b3b175692b9a3c57a978f86f8275fd8eddb034217a9b4e464e315da7322e91af31d6cd35066ada588907

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.0.6"
+  gem.version       = "0.0.7"
   gem.description   = "Simple tool for accounting of cryptocurrencies"
   gem.summary       = "Simple tool for accounting of cryptocurrencies"
   gem.author        = "Geoff Meakin"

data/lib/gtmtech/crypto/data.rb

@@ -89,30 +89,58 @@ module Gtmtech
         printf("%-20s %-10s %-20s\n", "account", "currency", "amount")
         puts "-" * 120
         fees = {}
+        currencies = {}
         @@document[ "accounts" ].each do | name, account_info |
           account_info[ "currencies" ].sort.each do | currency |
             decimal = "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" ] )
                 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 ], txn[ "fees_amount" ])
               end
+
+              # account reconciliation
               if txn[ "source_account" ] == name and txn[ "source_currency" ] == currency
                 decimal = Utils.decimal_minus( decimal, txn[ "source_amount" ] )
+
+                # 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 )
+                end
+
               end
               if txn[ "dest_account" ] == name and txn[ "dest_currency" ] == currency
                 decimal = Utils.decimal_add( decimal, txn[ "dest_amount" ] )
               end
             end
+            unless currencies.key? currency
+              currencies[ currency ] = "0.0"
+            end
+            currencies[ currency ] = Utils.decimal_add( currencies[ currency ], decimal )
             printf( "%-20s %-10s %-20s\n", name, currency, decimal )
           end
         end
         fees.keys.sort.each do |currency|
+          unless currencies.key? currency
+            currencies[ currency ] = "0.0"
+          end
+          currencies[ currency ] = Utils.decimal_add( currencies[ currency ], fees[ currency ] )
           printf( "%-20s %-10s %-20s\n", "**FEES**", currency, fees[ currency ] )
         end
+        puts ""
+        printf( "%-10s %-20s\n", "currency", "reconciliation" )
+        puts "-" * 120
+        currencies.keys.sort.each do |currency|
+          printf( "%-10s %-20s\n", currency, currencies[ currency ] )
+        end
       end
 
       def self.save

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

@@ -0,0 +1,41 @@
+require 'gtmtech/crypto/subcommand'
+
+module Gtmtech
+  module Crypto
+    module Subcommands
+
+      class Reconcile < Subcommand
+
+        def self.description
+          "reconcile transactions"
+        end
+
+        def self.usage
+          <<-EOS
+Usage (crypto #{self.prettyname})
+
+crypto #{self.prettyname}
+  - reconcile all transactions
+
+Options:
+EOS
+        end
+
+        def self.options
+          []
+        end
+
+        def self.reconcile
+          Data.load
+          Data.reconcile_transactions
+        end
+
+        def self.execute
+          self.reconcile
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -109,11 +109,6 @@ EOS
           Data.save
         end
 
-        def self.reconcile
-          Data.load
-          Data.reconcile_transactions
-        end
-
         def self.execute
           verb = ARGV.shift
           case verb.downcase
@@ -123,8 +118,6 @@ EOS
             self.list
           when "delete"
             self.delete
-          when "reconcile"
-            self.reconcile
           else
             self.error "transaction takes an action [new, list, delete] . See --help for more info"
           end

data/lib/gtmtech/crypto.rb

@@ -1,7 +1,7 @@
 module Gtmtech
   module Crypto
 
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
     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.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Geoff Meakin
@@ -46,6 +46,7 @@ files:
 - lib/gtmtech/crypto/subcommand.rb
 - lib/gtmtech/crypto/subcommands/account.rb
 - lib/gtmtech/crypto/subcommands/help.rb
+- lib/gtmtech/crypto/subcommands/reconcile.rb
 - lib/gtmtech/crypto/subcommands/txn.rb
 - lib/gtmtech/crypto/subcommands/unknown_command.rb
 - lib/gtmtech/crypto/subcommands/version.rb