moneymanager 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39450e9d5be4a772dec12a2db8fb9d0067ead553
-  data.tar.gz: 0db1716715290873ac2c5a903ef24a0ca9cef7ef
+  metadata.gz: d12b2140748dad9d3d6eda4bdc9bb3000932eeba
+  data.tar.gz: 59f8c42433720e5875a1098a40a49b2a2572323a
 SHA512:
-  metadata.gz: 79a578a780c6c0f523665c2b4da019912cc45588fc9ccaf76abb58e56a146a8998f2d8247b3165c91fc172ef0d19460b844eaf6a1e7faf3298b3f9b6289a9451
-  data.tar.gz: 0c3112832a722691da332cd101b5fbe39a721551b2e9135984f39cae1451444f1c21f45f9735eac9b7b889317df84e7beebfe2927d7f924668270704915f47cb
+  metadata.gz: 57ae82ff42ba946498532d090b752293eaf5134e3a63afb986de516a7df120df2a92516ec3ce481a36f7823047c7249320863880f451b991f4ee89f8d0a2b0af
+  data.tar.gz: 489c85decc4ae67e7d2ec5314681a2088a1e6ce0fc8f84e43339fa885b35036305050e872b064f9ccb9bf6ddacd19c3a24262755f23a993e19f85081a17ccc63

data/README.md

@@ -17,7 +17,7 @@ I ended up writing my own tool instead of using MoneyWiz et simila is that all t
 
 * The database is just a plain, non-encrypted file. 
 * There are no fancy charts.
-* The `print/review/tag` taks are _monthly_ based. If you have undreds of transaction per month using this tool can be tedious.
+* The filter is _monthly_ based. If you have undreds of transaction per month this tool can be tedious.
 * 
 
 ## Usage
@@ -117,61 +117,59 @@ Assign a tag to each (or not) transaction. To generate hierarchy of tags, use a
 
 ## Reporting
 
-#### Global Incomes/Expenses
+#### Total
 
 	$ mm report --month 8
 
     $ mm report --month 8
-    Which type of report? (Use arrow keys, press Enter to select)
-    ‣ Global Incomes/Expenses
-      All categories
-      One category
+	Which type of report? (Use arrow keys, press Enter to select)
+	‣ Total (Incomes)
+	  Total (Expenses)
+	  All Incomes
+	  All Expenses
+	  Specific Tag
 
 
-    +---------+-----------+
-    |       Summary       |
-    +---------+-----------+
-    | Income  |  1234.0 € |
-    | Expense | -5678.0 € |
-    | Delta   |  9999.0 € |
-    +---------+-----------+
+	Which type of report? Total (Incomes)
+	+-----------+
+	| 99999.0 € |
+	+-----------+
 
-#### Global Incomes/Expenses
+#### All Incomes/Expenses
 
     
      $ mm report
     Which type of report? (Use arrow keys, press Enter to select)
-      Global Incomes/Expenses
-    ‣ All categories
-      One category
+      Total (Incomes)
+	  Total (Expenses)
+	‣ All Incomes
+	  All Expenses
+	  Specific Tag
     
+      
     
-    +------------+----------+
-    |        Incomes        |
-    +------------+----------+
-    | Salary     |  999.0 € |
-    | Investment |  999.0 € |
-    | Rent       |  999.0 € |
-    +------------+----------+
-    +-------------------+-----------+
-    |           Expenses            |
-    +-------------------+-----------+
-    | Heating           |   -99.0 € |
-    | Mortage           |   -99.0 € |
-    | Car/Gasoline      |   -99.0 € |
-    | Car/Insurace      | -9999.0 € |
-    | Car/Tire          |  -999.0 € |
-    +-------------------+-----------+
+    Which type of report? All Incomes
+	+--------------+----------+
+	| Kindergeld   |  999.0 € |
+	| Rimborsi     |  998.0 € |
+	| Stipendio    | 8998.0 € |
+	| Stockoptions | 9999.0 € |
+	| Unknown      |  888.0 € |
+	+--------------+----------+
+	|             9999999.0 € |
+	+--------------+----------+
     
 
-#### Report for one Tag
+#### One tag grouped by month
 
 
      $ mm report
     Which type of report? (Use arrow keys, press Enter to select)
-      Global Incomes/Expenses
-      All categories
-    ‣ One category
+      Total (Incomes)
+	  Total (Expenses)
+	  All Incomes
+	  All Expenses
+	‣ Specific Tag
     
     Select a tag. (Use arrow keys, press Enter to select)
     ‣ Heating
@@ -180,20 +178,25 @@ Assign a tag to each (or not) transaction. To generate hierarchy of tags, use a
       Car/Insurance
       Car/Tire
     
-    +-----------------+---------+
-    |         Expenses          |
-    +-----------------+---------+
-    | Heating         | -99.0 € |
-    +-----------------+---------+
+	Select a tag. Kita
+	+---+---------+
+	| 8 | -99.0 € |
+	| 9 | -99.0 € |
+	+---+---------+
+	|    -198.0 € |
+	+---+---------+
 
 
 
 
-## Next release
+## To do
 
-* Report for nested tags ( Car/Gasoline, Car/Insurance etc)
-* Multiple tags
-* Report for one tag splitted by month
+* [ ] Report for nested tags ( Car/Gasoline, Car/Insurance etc)
+* [ ] Multiple tags
+* [x] Report for one tag splitted by month
+* [ ] Add a backup options
+* [ ] Manage multiple banck account
+* [ ] Exclude account transfer from the list of expenses/incomes
 
 ## Contributing
 

data/exe/mm

@@ -67,54 +67,32 @@ command :report do |c|
 
     prompt = TTY::Prompt.new
     command = prompt.select('Which type of report?') do |menu|
-      menu.choice 'Global Incomes/Expenses', :global
-      menu.choice 'All categories', :all
-      menu.choice 'Specific Tag', :one
+      menu.choice 'Total (Incomes)', :global_incomes
+      menu.choice 'Total (Expenses)', :global_expenses
+      menu.choice 'All Incomes', :all_incomes
+      menu.choice 'All Expenses', :all_expenses
+      menu.choice 'Specific Tag', :one_tag
     end
-
+    report = Report.new
     case command
-    when :global
-      print_global_report(entries)
-    when :all
-      print_all_categories_report(entries)
-    when :one
+    when :global_incomes
+      report.print_total_report(entries, true)
+    when :global_expenses
+      report.print_total_report(entries, false)
+    when :all_incomes
+      report.print_group_by_categories_report(entries, true)
+    when :all_expenses
+      report.print_group_by_categories_report(entries, false)
+    when :one_tag
       archiver = Moneymanager::Archiver.new
       tags = archiver.tags.sort!
       tag = prompt.select('Select a tag.', tags, per_page: 30)
-      print_one_category_report(entries, tag)
+      report.print_group_by_month_report(entries,tag)
       end
   end
 end
 
-def print_global_report(entries)
-  expenses = entries.reject(&:income?).map(&:amount).reduce(:+)
-  incomes = entries.reject(&:expense?).map(&:amount).reduce(:+)
-  Layout.print_summary(incomes, expenses)
-end
-
-def print_all_categories_report(entries)
-  expenses = entries.reject(&:income?).each_with_object(Hash.new(0)) do |current, sum|
-    tag = current.tag ||= 'Unknown'
-    sum[tag] += current.amount
-  end
-  incomes = entries.reject(&:expense?).each_with_object(Hash.new(0)) do |current, sum|
-    tag = current.tag ||= 'Unknown'
-    sum[tag] += current.amount
-  end
-
-  incomes = incomes.map { |x, v| [x, v] }
-  Layout.print_summary_per_category('Incomes', incomes)
-
-  expenses = expenses.map { |x, v| [x, v] }
-  Layout.print_summary_per_category('Expenses', expenses)
-end
 
-def print_one_category_report(entries, tag)
-  entries = entries.select do |entry|
-    entry.tag == tag
-  end
-  print_all_categories_report(entries)
-end
 
 def get_entries(month)
   archiver = Moneymanager::Archiver.new

data/lib/moneymanager/layout.rb

@@ -28,28 +28,25 @@ class Layout
     amount < 0 ? s.red : s.green
   end
 
-  def self.print_summary(income, expenses)
-    delta = income + expenses
+  def self.print_single_value(total)
     table = Terminal::Table.new do |t|
-      t << ['Income', formatted_amount(income)]
-      t << ['Expense', formatted_amount(expenses)]
-      t << ['Delta', formatted_amount(delta)]
+      t << [formatted_amount(total)]
     end
-    table.align_column(1, :right)
-    table.title = 'Summary'
+    table.align_column(0, :right)
     puts table
   end
 
-  def self.print_summary_per_category(title, rows)
+  def self.print_generic_rows(rows)
     return unless rows.count > 0
-    rows = rows.sort! { |r1, r2| r1.first <=> r2.first }
-    rows = rows.map do |row|
-      row[-1] = formatted_amount(row.last)
-      row
-    end
-    table = Terminal::Table.new rows: rows
-    table.align_column(1, :right)
-    table.title = title
+    sum = rows.reduce(0) { |  tot, row | tot + row.last }
+    table = Terminal::Table.new
+    rows = rows.each { |row|
+      table.add_row [
+        { :value => row[0], :alignment => :left},
+      { :value => formatted_amount(row.last), :alignment => :right }]
+    }
+    table.add_separator
+    table.add_row [{ :value => formatted_amount(sum), :colspan => 2, :alignment => :right }]
 
     puts table
   end

data/lib/moneymanager/report.rb

@@ -0,0 +1,35 @@
+class Report
+
+  def print_total_report(entries, onlyIncome)
+    total = 0
+    if (onlyIncome)
+      total = entries.reject(&:expense?).map(&:amount).reduce(:+)
+    else
+      total = entries.reject(&:income?).map(&:amount).reduce(:+)
+    end
+    Layout.print_single_value(total)
+  end
+
+  def print_group_by_categories_report(entries, onlyIncome)
+
+    entries = entries.select { |entry|
+      entry.income? == onlyIncome
+    }.each_with_object(Hash.new(0)) { |current, sum|
+      tag = current.tag ||= 'Unknown'
+      sum[tag] += current.amount
+    }.map { |x, v|
+      [x, v]
+    }.sort! { |r1, r2| r1.first <=> r2.first }
+    Layout.print_generic_rows(entries)
+  end
+
+  def print_group_by_month_report(entries, tag)
+    entries = entries.select { |entry|
+      entry.tag == tag
+    }.each_with_object(Hash.new(0)) { | current, sum |
+      month = current.date.month
+      sum[month] += current.amount
+    }
+    Layout.print_generic_rows(entries)
+  end
+end

data/lib/moneymanager/version.rb

@@ -1,3 +1,3 @@
 module Moneymanager
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/moneymanager.rb

@@ -8,3 +8,4 @@ require 'moneymanager/parser'
 require 'moneymanager/entry'
 require 'moneymanager/tagger'
 require 'moneymanager/reviewer'
+require 'moneymanager/report'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moneymanager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ignazioc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -132,6 +132,7 @@ files:
 - lib/moneymanager/entry.rb
 - lib/moneymanager/layout.rb
 - lib/moneymanager/parser.rb
+- lib/moneymanager/report.rb
 - lib/moneymanager/reviewer.rb
 - lib/moneymanager/tagger.rb
 - lib/moneymanager/version.rb