total_recall 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f485de3326ba5aa633added9df0493ab450c74d
-  data.tar.gz: 592cba4e119cf53c307c9734b6d518bb96b90ac5
+  metadata.gz: 4eeb842cfe9ee4786bc22a2727a1020e8cdb3fff
+  data.tar.gz: 46034a06760f81a905ffd0b384ebf2f4ac9f5751
 SHA512:
-  metadata.gz: f4e8ef75a9d06eef5b482edd546535d85472ae299bb004216d44b75a4d072e0eabfc9e430203f273bc86ffefdf5eb2f28cd06433da2ae2f30887d63c9439bd63
-  data.tar.gz: 38ee00655b8c99b10855fb7bfca8d4c8625886e5e0cb218f47241797b9aa19560da19e45b48936ca09ca6aff607a9150e0eda1b3a701fdfd91de8b9735d76f83
+  metadata.gz: f97bacdd8edd27e009edc074681213d1c00eedbb2981a7c4da89e605966376b5c9c8a9d1024017d0cec90a2ad04858c3c0fa30c0aacc240a8427a2a944d2087a
+  data.tar.gz: d746904a4b9f9f5a16eda0a7917d876e11749c2f0aa5dddbccd30fc4e36bfec242c0e4f7e2e54b775b0021d6dbfedea311c340a94fa6a76391bcd998cc72ddf1

data/.gitlab-ci.yml

@@ -0,0 +1,18 @@
+.spec: &spec
+  tags:
+    - docker
+  script:
+    - bundle install --binstubs --path vendor --without production --jobs $(nproc) > /dev/null
+    - bin/rspec
+
+spec2.1:
+  image: ruby:2.1
+  <<: *spec
+
+spec2.3:
+  image: ruby:2.3
+  <<: *spec
+
+spec2.4:
+  image: ruby:2.4
+  <<: *spec

data/CHANGELOG.md

@@ -1,46 +1,60 @@
-# 0.5.0 / unreleased
+# 0.6.0 / 2017-03-08
+
+* move repository to GitLab
+
+* upgrade dependencies
+
+* added option to use only transaction-section from template
+
+    This makes adding transactions to an existing ledger-file easier.
+
+    ```bash
+    $ total_recall ledger -c bank.yml --transactions-only >> bank.dat
+    ```
+
+# 0.5.0 / 2014-06-11
 
 * extend the ledger subcommand by passing it a file with customizations
 
-  ```
-  $ cat my_extension.rb
-  module MyExtension
-    def ask_account(*args)
-      # some custom stuff
-      super
+    ```ruby
+    $ cat my_extension.rb
+    module MyExtension
+      def ask_account(*args)
+        # some custom stuff
+        super
+      end
     end
-  end
-  TotalRecall::SessionHelper.include MyExtension
+    TotalRecall::SessionHelper.include MyExtension
 
-  $ total_recall ledger -c sample.yml -r ./my_extension.rb
-  ```
+    $ total_recall ledger -c sample.yml -r ./my_extension.rb
+    ```
 
 * add version subcommand
 
 * add default-helper
 
-  Let's you point to the default-value of an attribute:
+    Let's you point to the default-value of an attribute:
 
-  ```yaml
-  :context:
-    :transactions:
-      :__defaults__:
-        :a: 1
-      :a: !!proc |
-        ask("What value has a?", default: default)
-  ```
+    ```yaml
+    :context:
+      :transactions:
+        :__defaults__:
+          :a: 1
+        :a: !!proc |
+          ask("What value has a?", default: default)
+    ```
 
 * add transaction-helper
 
-  This allows you to use already set attributes of the transaction:
+    This allows you to use already set attributes of the transaction:
 
-  ```yaml
-  :context:
-    :transactions:
-      :a: 1
-      :b: !!proc |
-        transaction.a.succ
-  ```
+    ```yaml
+    :context:
+      :transactions:
+        :a: 1
+        :b: !!proc |
+          transaction.a.succ
+    ```
 
 # 0.4.0 / 2014-06-04
 

data/README.md

@@ -1,4 +1,5 @@
-# TotalRecall [![travis](https://secure.travis-ci.org/eval/total_recall.png?branch=master)](https://secure.travis-ci.org/#!/eval/total_recall)
+# TotalRecall [![build status](https://gitlab.com/eval/total_recall/badges/master/build.svg)](https://gitlab.com/eval/total_recall/commits/master)
+
 
 Turn **any** csv-file into a [Ledger](http://ledger-cli.org/) journal.
 
@@ -14,7 +15,7 @@ gem install total_recall
 
 ```bash
 total_recall sample
-# An annotated config 'sample.yml' will be written the current directory.
+# An annotated config 'sample.yml' will be written to the current directory.
 ```
 
 ### Generate a ledger
@@ -95,7 +96,7 @@ total_recall ledger -c my-bank.yml -r ./my_extension.rb
 
 This makes it possible to add helpers or redefine existing ones:
 
-```
+```ruby
 cat my_extension.rb
 module MyExtension
   # adding some options to an existing helper:
@@ -130,7 +131,7 @@ Gert Goet (eval) :: gert@thinkcreate.nl :: @gertgoet
 
 (The MIT license)
 
-Copyright (c) 2014 Gert Goet, ThinkCreate
+Copyright (c) 2017 Gert Goet, ThinkCreate
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,15 +1,6 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run the specs"
 task :default => :spec
-
-desc 'Removes trailing whitespace'
-task :whitespace do
-  sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
-end

data/lib/total_recall.rb

@@ -1,6 +1,6 @@
 require 'yaml'
-require "thor"
-require "mustache"
+require 'thor'
+require 'mustache'
 require 'csv'
 
 module TotalRecall
@@ -107,6 +107,7 @@ module TotalRecall
     def initialize(options = {})
       options = { file: 'total_recall.yml' }.merge(options)
       @config_file = File.expand_path(options[:file])
+      @transactions_only = !!options[:transactions_only]
     end
 
     def config
@@ -136,6 +137,26 @@ module TotalRecall
       end
     end
 
+    def transactions_only_template
+      @transactions_only_template ||= begin
+        Mustache::Template.new("").tap do |t|
+          _transactions_tokens = proc { transactions_tokens }
+          t.define_singleton_method(:tokens) do |*|
+            _transactions_tokens.call
+          end
+        end
+      end
+    end
+
+    def transactions_tokens
+      @transactions_tokens ||= begin
+        Mustache::Template.new(template).tokens.detect do |type, tag, *rest|
+          type == :mustache && tag == :section &&
+            [:mustache, :fetch, ["transactions"]]
+        end
+      end
+    end
+
     def context
       @context ||= config[:context].merge(transactions: transactions)
     end
@@ -183,7 +204,11 @@ module TotalRecall
     end
 
     def ledger
-      Mustache.render(template, context)
+      tmp = @transactions_only ?
+            transactions_only_template :
+            template
+
+      Mustache.render(tmp, context)
     end
   end
 
@@ -196,11 +221,13 @@ module TotalRecall
     desc "ledger", "Convert CONFIG to a ledger"
     method_option :config, :aliases => "-c", :desc => "Config file", :required => true
     method_option :require, :aliases => "-r", :desc => "File to load"
+    method_option :transactions_only, :type => :boolean
     def ledger
       load(options[:require]) if options[:require]
 
       config_path = File.expand_path(options[:config])
-      puts TotalRecall::Config.new(file: config_path).ledger
+      puts TotalRecall::Config.new(file: config_path,
+                                   :transactions_only => options[:transactions_only]).ledger
     end
 
     desc "sample", "Generate an annotated config"

data/lib/total_recall/templates/sample.yml.tt

@@ -37,8 +37,8 @@
   #:file: sample.csv
   :raw: |-
     "date";"description";"effective_data";"amount"
-    "03.11.2013";"Foo";"04.11.2013";"1.638,00"
-    "03.11.2013";"Bar";"04.11.2013";"-492,93"
+    "2013-11-01";"Foo";"2013-11-02";"1.638,00"
+    "2013-11-02";"Bar";"2013-11-03";"-492,93"
   :options:
     # Any option accepted by CSV#new (http://www.ruby-doc.org/stdlib-2.1.1/libdoc/csv/rdoc/CSV.html#method-c-new).
     :col_sep: ";"

data/lib/total_recall/templates/simple.yml.tt

@@ -7,7 +7,7 @@
 
     {{# transactions}}
     {{date}} {{{description}}}
-      {{to}}    {{currency}} {{amount}}
+      {{to}}    EUR {{amount}}
       {{from}}
 
     {{/ transactions}}
@@ -15,21 +15,20 @@
 :csv:
   #:file: <%= @name %>.csv
   :raw: |-
-    "03.11.2013";"Foo";"04.11.2013";"1.638,00";""
-    "03.11.2013";"Bar";"04.11.2013";"-492,93";""
+    "2013-11-01","Foo","2013-11-02","1.638,00"
+    "2013-11-02","Bar","2013-11-03","-492,93"
   :options:
-    :col_sep: ";"
-    :headers: false
+    #:col_sep: ";"
+    #:headers: false
 
 :context:
   :transactions:
     :__defaults__:
       :from: !!proc |
         ask_account("What account provides these transactions?", default: 'Assets:Checking')
-      :currency: $
-    :date: !!proc Date.parse(row[0])
+    :date: !!proc row[0]
     :description: !!proc row[1]
     :amount: !!proc row[3]
     :to: !!proc |
-      render_row(columns: [0, 1, 3, 4])
+      render_row(columns: [0, 1, 3])
       ask_account("To what account did the money go?")

data/lib/total_recall/version.rb

@@ -1,3 +1,3 @@
 module TotalRecall
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-require "bundler/setup"
-Bundler.require :default, :test
-
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'total_recall'
 require 'fakefs/spec_helpers'
+
+RSpec.configure do |config|
+  config.color = true
+  config.tty = true
+end

data/spec/total_recall/total_recall_spec.rb

@@ -106,6 +106,28 @@ describe TotalRecall::Config do
 
       expect(instance.template).to eql('File template')
     end
+
+    context 'transactions only' do
+      it 'takes only the transactions-section of the template into account' do
+        instance = instance_with_config(<<-CONFIG, :transactions_only => true)
+        :csv:
+          :raw: |-
+            row1
+        :context:
+          :a: 1
+          :transactions:
+            :b: !!proc row[0]
+        :template:
+          :raw: |-
+            {{a}}
+            {{# transactions}}
+            {{b}}
+            {{/ transactions}}
+        CONFIG
+
+        expect(instance.ledger).to eql("row1\n")
+      end
+    end
   end
 
   describe 'YAML types' do

data/total_recall.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["gert@thinkcreate.nl"]
   gem.description   = %q{Turn any csv into a Ledger journal}
   gem.summary       = %q{Turn any csv into a Ledger journal}
-  gem.homepage      = "https://github.com/eval/total_recall"
+  gem.homepage      = "https://gitlab.com/eval/total_recall/tree/master#totalrecall-"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files -z`.split("\x0")
@@ -19,11 +19,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'thor', '~> 0.19'
-  gem.add_dependency 'terminal-table', '~> 1.4'
-  gem.add_dependency 'highline', '~> 1.6'
-  gem.add_dependency 'mustache', '~> 0.99'
-  gem.add_development_dependency "bundler", "~> 1.6"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency 'rspec', '~> 3.0.0'
-  gem.add_development_dependency 'fakefs'
+  gem.add_dependency 'terminal-table', '~> 1.7'
+  gem.add_dependency 'highline', '~> 1.7'
+  gem.add_dependency 'mustache', '~> 1.0'
+  gem.add_development_dependency 'bundler', '~> 1.11'
+  gem.add_development_dependency 'rake', '~> 12.0'
+  gem.add_development_dependency 'rspec', '~> 3.4'
+  gem.add_development_dependency 'fakefs', '~> 0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: total_recall
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Gert Goet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,98 +30,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: Turn any csv into a Ledger journal
 email:
 - gert@thinkcreate.nl
@@ -132,7 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
+- ".gitlab-ci.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -143,11 +143,10 @@ files:
 - lib/total_recall/templates/sample.yml.tt
 - lib/total_recall/templates/simple.yml.tt
 - lib/total_recall/version.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/total_recall/total_recall_spec.rb
 - total_recall.gemspec
-homepage: https://github.com/eval/total_recall
+homepage: https://gitlab.com/eval/total_recall/tree/master#totalrecall-
 licenses:
 - MIT
 metadata: {}
@@ -167,11 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Turn any csv into a Ledger journal
 test_files:
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/total_recall/total_recall_spec.rb

data/.travis.yml

@@ -1,3 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.1

data/spec/spec.opts

@@ -1 +0,0 @@
---color