aq_banking 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d0bb8ab7a557647a25a06b7a73765cab0270ad
-  data.tar.gz: 378949a71c9fe792ce46a6211f263abc5d97b1b9
+  metadata.gz: 609175a7c3cc48f8fd363bef763738f608c8cb94
+  data.tar.gz: 5a77dc9be4047aeecdb885a7336eba78619f963c
 SHA512:
-  metadata.gz: c70c690ba8abaaf78102c6f8d60f7007d8d02ac0fa7adb3b84f76bd2b0445850b9fa50cbfb5e665ef3ef2f1067740a5329edbf16be9f4d7a65fde00491bd474c
-  data.tar.gz: 39ece253a7a92c3aaca0800e28a738204ac745e0a1df9fea4ad894b14b7cd54e433505251e7b61a044f791be9dd612f2ceeadf60f0e4d745c7384ff642aaf485
+  metadata.gz: 1a3c37599be9fc428c46d7c0914c47d8b4f45d0d8f60fe85ba115ce1f75656061a75f59f3df4c1011ae57bfc5c3ceea6cdeee0b47f21a173be083b09a43e336f
+  data.tar.gz: d3af01a507153d2e26417d66706fbc00ea054a187a836a4aa750a73d03ade9e78cfa511c32f2be808d23d6b517ff154ab4dafaf504371dd524124ad064765fc7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3
+ruby-2.3.1

data/.travis.yml

@@ -2,6 +2,5 @@ language: ruby
 rvm:
   - 2.3.0
   - 2.2.2
-  - 2.1.5
 before_install: gem install bundler -v 1.10.3
 script: bundle exec rspec

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.0
+FROM ruby:2.3.1
 MAINTAINER Robin Wenglewski, robin@wenglewski.de
 
 RUN apt-get update -qq && apt-get install -y \
@@ -6,6 +6,9 @@ RUN apt-get update -qq && apt-get install -y \
     aqbanking-tools \
     ktoblzcheck
 
+WORKDIR /gem
+
+COPY ./pkg /gem
 RUN gem install aq_banking
 
 ENTRYPOINT ["aq_banking"]

data/README.md

@@ -9,31 +9,10 @@ Sample:
 
 ```bash
 $ aq_banking request --bank=diba BLZ ACCCOUNT_NUMBER LOGIN_ID PASSWORD --from=2016-04-18
-{
-  "iban": "...",
-  "bic": "...",
-  "owner": "WENGLEWSKI, ROBIN",
-  "currency": "EUR",
-  "bank_code": "...",
-  "bank_name": "ING-DiBa",
-  "booked_balance": 123.45,
-  "noted_balance": 123.45,
-  "number": "...",
-  "name": "Girokonto",
-  "transactions": [
-    {
-      "amount": -22.0,
-      "currency": "EUR",
-      "date": "2016-04-18 12:00:00 UTC",
-      "valuta_date": "2016-04-18 12:00:00 UTC"
-      ...
-    },
-    ...
-  ],
-  ...
-}
 ```
 
+See (transaction.txt.json)[./spec/fixtures/transaction.txt.json] for a sample response.
+
 It still requires the aq_banking command line tools (aqhbci-tool4, aqbanking-cli) to be present.
 To my experience, these tools are very unstable and full of bugs.
 This tool is developed using a specific version which ships with the docker image.
@@ -75,8 +54,11 @@ And then execute:
 
 ## Release
 
-    # publish gem, build and push docker container
-    rake release && docker-compose build --no-cache gem && docker push rweng/aq_banking
+    # publish gem
+    rake release
+    
+    # publish docker
+    rake build && docker-compose build gem && docker push rweng/aq_banking
 
 
 # Contributing

data/aq_banking.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "treetop"
   spec.add_dependency "activesupport"
   spec.add_dependency "highline", "~> 1.7.8"
+  spec.add_dependency 'awrence'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/aq_banking.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
+require 'awrence'
 
 module AqBanking
   HBCI_VERSIONS = %w(220 300)

data/lib/aq_banking/cli.rb

@@ -15,6 +15,7 @@ module AqBanking
     option :hbci_version
     option :from, banner: 'FROM - e.g. 2016-01-01'
     option :to, banner: 'TO - e.g. 2016-01-01'
+    option :format, default: 'json', banner: 'choose from: raw | json' 
     desc 'request BANK_CODE ACCOUNT_NUMBER USER_ID PASSWORD', 'requests balance and transactions for an account. you must either specify --bank= or (--server-url and maybe --hbci-version)'
     def request(bank_code, account_number, user_id, password)
       request_options = {
@@ -33,7 +34,14 @@ module AqBanking
       response = commander.send_request!(request_options)
       account = parser.parse_account_list(response).first
 
-      puts account.to_json
+      case options[:format]
+      when 'json'
+        puts account.to_json
+      when 'raw'
+        puts account.to_raw
+      else
+        puts 'unknown format'
+      end
     end
 
     desc 'list_banks', 'shows valid values for the --bank flag'

data/lib/aq_banking/commander.rb

@@ -98,7 +98,7 @@ module AqBanking
       loop do
         count = count + 1
         result = run "aqhbci-tool4 deluser --with-accounts -u %p -b %p" % [user_id, bank_code]
-        break if result.stderr.include? 'ERROR: No matching users' or result.stdout.match /User %d+ deleted\./
+        break if result.success? or result.stderr.include? 'ERROR: No matching users'
 
         raise 'could not delete user' if count >= max_trials
       end
@@ -122,7 +122,7 @@ module AqBanking
 
       cmd = "#{aq_hbci} -P #{pin_file} getsysid -u #{user_id} -b #{bank_code}"
 
-      run_or_raise(cmd, 'Could not get sysid. This might be because the userId or password is wrong. Check if these are the credentials with which you log into your online banking.')
+      run_or_raise(cmd, 'Could not get sysid. This might be because the bank_code, userId or password is wrong, or internet banking is not active. Check if you can log into your internet banking w/ these credentials.')
     end
 
     private

data/lib/aq_banking/parsed/account.rb

@@ -52,7 +52,11 @@ module AqBanking::Parsed
     end
 
     def to_json
-      JSON.pretty_generate(to_h)
+      JSON.pretty_generate(to_h.to_camelback_keys)
+    end
+
+    def to_raw
+      tree.text_value
     end
 
     private

data/lib/aq_banking/parsed/transaction.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module AqBanking::Parsed
   class Transaction
     extend DefineField
@@ -15,8 +17,12 @@ module AqBanking::Parsed
       @tree = transaction_block
     end
 
+    def uid
+      Digest::SHA256.hexdigest self.tree.text_value
+    end
+
     def to_h
-      %i(local_bank_code local_account_number local_name remote_bank_code remote_account_number remote_name
+      %i(uid purpose local_bank_code local_account_number local_name remote_bank_code remote_account_number remote_name
         currency amount date valuta_date).reduce({}) do |result, field|
         result[field] = send(field)
         result

data/lib/aq_banking/version.rb

@@ -1,3 +1,3 @@
 module AqBanking
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aq_banking
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: awrence
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement