abank 0.2.9 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36171477026334dbce5da50183c84e693047db8fb387c1306308f254590793fc
-  data.tar.gz: da568eeb037c6deb414981abed805596ae1034f94eee103948bfdec5da958734
+  metadata.gz: 862349d8ec53f6ad3415370e120ca04d89dc724e41251149473c5c50a5f4cb90
+  data.tar.gz: fae7d3fba89e53f8f8bdadaf8a096adc50cbedc8afb4770ea330a6a0bbab6bc6
 SHA512:
-  metadata.gz: a9fbda092cf84a6ee8a2552fbd0ff363d482fd599a243d263d03374978e6ab819cfcd270dc3d0c67456c4b54ddcc126d161e45180888a38922d1a4d468dbfe35
-  data.tar.gz: 69365abb9979d7ca48369451c8496708cee0d15a3f4a0ef73521daa608c0c9c94a67ce2e5a00c4f2656c40ed4b1386d3224ea26b2094a6879bb87f03b6a14b1f
+  metadata.gz: e61d65d1fa0a8dfeb47e8037e5f490c7637bd811206bd6c423bb6ef537bc318fa04cf383001fbcb8e95f8a31615baedc222e62049dc60cb641fc5d99b99a44b0
+  data.tar.gz: fd2034192ebc4608510d640986a13f3844cbce74c8ae6f637460131ca317701a2d4e212dba85214e0930591d8754d82e73d568f5eb028b1f6898501ae50e7c37

data/.travis.yml

@@ -2,4 +2,4 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.6.3
+  - 2.7.0

data/Gemfile.lock

@@ -1,43 +1,56 @@
 PATH
   remote: .
   specs:
-    abank (0.2.9)
+    abank (0.3.4)
       google-cloud-bigquery
       roo
       thor
-      yard
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.7)
+    ast (2.4.2)
+    backport (1.1.2)
+    benchmark (0.1.1)
+    concurrent-ruby (1.1.8)
     declarative (0.0.20)
-    declarative-option (0.1.0)
-    faraday (1.0.1)
+    e2mmap (0.1.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.43.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    google-apis-bigquery_v2 (0.9.0)
+      google-apis-core (~> 0.1)
+    google-apis-core (0.3.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
+      googleauth (~> 0.14)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-bigquery (1.21.2)
+      rexml
+      signet (~> 0.14)
+      webrick
+    google-cloud-bigquery (1.31.0)
       concurrent-ruby (~> 1.0)
-      google-api-client (~> 0.33)
+      google-apis-bigquery_v2 (~> 0.1)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    google-cloud-core (1.5.0)
+    google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
+    google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    googleauth (0.13.1)
+    google-cloud-errors (1.1.0)
+    googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -45,34 +58,87 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
-    jwt (2.2.2)
+    jaro_winkler (1.5.4)
+    jwt (2.2.3)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    kwalify (0.7.2)
     memoist (0.16.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     os (1.1.1)
-    public_suffix (4.0.5)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    psych (3.3.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rainbow (3.0.0)
     rake (12.3.3)
-    representable (3.0.4)
+    reek (6.0.4)
+      kwalify (~> 0.7.0)
+      parser (~> 3.0.0)
+      psych (~> 3.1)
+      rainbow (>= 2.0, < 4.0)
+    regexp_parser (2.1.1)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    reverse_markdown (2.0.0)
+      nokogiri
+    rexml (3.2.5)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
+    rubocop (1.13.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
-    signet (0.14.0)
+    signet (0.15.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    thor (1.0.1)
+    solargraph (0.40.4)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+    thor (1.1.0)
+    tilt (2.0.10)
+    trailblazer-option (0.1.1)
     uber (0.1.0)
-    yard (0.9.25)
+    unicode-display_width (2.0.0)
+    webrick (1.7.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -81,6 +147,10 @@ DEPENDENCIES
   abank!
   bundler
   rake (~> 12.0)
+  reek
+  rubocop
+  solargraph
+  yard
 
 BUNDLED WITH
    2.1.4

data/abank.gemspec

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require_relative 'lib/abank/version'
+require_relative('lib/abank/version')
 
 Gem::Specification.new do |spec|
-  spec.name          = 'abank'
-  spec.version       = Abank::VERSION
+  spec.name        = 'abank'
+  spec.version     = Abank::VERSION
   spec.authors     = ['Hernâni Rodrigues Vaz']
   spec.email       = ['hernanirvaz@gmail.com']
   spec.homepage    = 'https://github.com/hernanirvaz/abank'
   spec.license     = 'MIT'
-
   spec.summary     = 'Arquiva movimentos conta-corrente, conta-cartao do activobank no bigquery.'
-  spec.description = spec.summary + ' Permite apagar/recriar movimentos/rendas ja no bigquery. ' \
+  spec.description = "#{spec.summary} Permite apagar/recriar movimentos/rendas ja no bigquery. "\
                      ' Permite ainda classificar movimentos no bigquery.'
 
+  spec.required_ruby_version    = Gem::Requirement.new('~> 2.7')
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['yard.run'] = 'yard'
-
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.metadata['yard.run']     = 'yard'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads files in RubyGem that have been added into git.
@@ -29,11 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('reek')
+  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency('solargraph')
+  spec.add_development_dependency('yard')
 
-  spec.add_dependency 'google-cloud-bigquery'
-  spec.add_dependency 'roo'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'yard'
+  spec.add_dependency('google-cloud-bigquery')
+  spec.add_dependency('roo')
+  spec.add_dependency('thor')
 end

data/lib/abank.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require('thor')
-require('abank/big')
-require('abank/contrato')
-require('abank/rendas')
-require('abank/folha')
+require('abank/big1')
+require('abank/big2')
+require('abank/big3')
+require('abank/folha1')
+require('abank/folha2')
 require('abank/version')
 
 # @author Hernani Rodrigues Vaz
@@ -12,30 +13,19 @@ module Abank
   DR = "/home/#{`whoami`.chomp}/Downloads"
   BD = 'hernanilr.ab'
 
-  class Error < StandardError; end
-
   # CLI para carregar folhas calculo comuns no bigquery
   class CLI < Thor
     desc 'tag', 'classifica movimentos'
     # classifica movimentos
     def tag
-      Big.new.mv_classifica
+      Big.new(options.to_h).mv_classifica.ct_dados.re_insert
     end
 
     desc 'apagamv', 'apaga movimentos'
     option :k, banner: 'KEY[,KEY...]', required: true, desc: 'keys movimentos a apagar'
     # apaga movimentos
     def apagamv
-      Big.new(k: options[:k]).mv_delete.mv_insert.re_work
-    end
-
-    desc 'criact', 'cria contrato arrendamento'
-    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
-    option :t, type: :boolean, default: true,      desc: 'cria todas as rendas?'
-    option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
-    # cria contrato arrendamento
-    def criact
-      Big.new(c: options[:c], t: options[:t], d: options[:d]).ct_cria
+      Big.new(options.transform_keys(&:to_sym)).mv_delete.ct_dados.re_insert
     end
 
     desc 'apagact', 'apaga contrato arrendamento'
@@ -43,50 +33,53 @@ module Abank
     option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     # apaga contrato arrendamento
     def apagact
-      Big.new(c: options[:c], t: options[:t]).ct_apaga
+      Big.new(options.transform_keys(&:to_sym)).ct_apaga
+    end
+
+    desc 'criact', 'cria contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
+    option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
+    option :t, type: :boolean, default: true,      desc: 'cria todas as rendas?'
+    # cria contrato arrendamento
+    def criact
+      Big.new(options.transform_keys(&:to_sym)).ct_cria
     end
 
     desc 'recriact', 'atualiza rendas de contrato arrendamento'
     option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
-    option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
+    option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     # atualiza rendas de contrato arrendamento
     def recriact
-      Big.new(c: options[:c], t: options[:t]).ct_apaga
-      Big.new(c: options[:c], t: true, d: options[:d]).ct_cria
+      opc = options[:c]
+      Big.new(c: opc, t: options[:t]).ct_apaga
+      Big.new(c: opc, t: true, d: options[:d]).ct_cria
     end
 
     desc 'recriare', 'atualiza rendas dos contratos ativos'
     option :t, type: :boolean, default: false, desc: 'atualiza todas as rendas?'
     # atualiza rendas dos contratos ativos
     def recriare
-      Big.new(t: options[:t]).re_atualiza
+      Big.new(options.transform_keys(&:to_sym)).re_atualiza
     end
 
     desc 'work', 'carrega/apaga dados da folha calculo'
     option :s, type: :boolean, default: false, desc: 'apaga movimento similar'
     option :e, type: :boolean, default: false, desc: 'apaga movimento igual'
     option :v, banner: 'DATA', default: '',    desc: 'data valor para movimentos a carregar'
-    option :g, banner: 'TAG', default: '',     desc: 'classificacao para movimentos a carregar'
+    option :g, banner: 'TAG',  default: '',    desc: 'classificacao para movimentos a carregar'
     # carrega/apaga dados da folha calculo
     def work
-      Dir.glob("#{DR}/*.xlsx").sort.each do |f|
-        Folha.new(work_opc.merge(f: f)).processa_xls
+      Dir.glob("#{DR}/*.xlsx").sort.each do |file|
+        Folha.new(options.transform_keys(&:to_sym).merge(f: file, i: true)).processa_xls
       end
     end
 
     desc 'show', 'mostra dados da folha calculo'
     # mostra folha calculo
     def show
-      Dir.glob("#{DR}/*.xlsx").sort.each do |f|
-        Folha.new(f: f).processa_xls
-      end
-    end
-
-    no_commands do
-      # @return [Hash] opcoes trabalho com movimentos para work
-      def work_opc
-        { s: options[:s], e: options[:e], i: true, v: options[:v], g: options[:g] }
+      Dir.glob("#{DR}/*.xlsx").sort.each do |file|
+        Folha.new(options.merge(f: file)).processa_xls
       end
     end
 

data/lib/abank/big1.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require('google/cloud/bigquery')
+
+module Abank
+  # @see Big
+  class Big
+    # @return [Hash] opcoes trabalho
+    attr_reader :opcao
+
+    # @return [Google::Cloud::Bigquery::Data] resultado do Structured Query Language (SQL) no bigquery
+    attr_reader :bqres
+
+    # @return [Integer] numero linhas afetadas pelo Data Manipulation Language (DML) no bigquery
+    attr_reader :bqnrs
+
+    # acesso a base dados abank no bigquery
+    #
+    # @param [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    # @option opcoes [String]  :k ('') movimentos a apagar (keysin.mv)
+    # @option opcoes [String]  :c ('') id contrato arrendamento (re)
+    # @option opcoes [String]  :d ('') data inicio contrato arrendamento (re)
+    # @option opcoes [Boolean] :t (false) trabalha todas as rendas? (re)
+    # @return [Hash] opcoes trabalho
+    def initialize(opcoes = {})
+      @opcao = opcoes
+      opcao
+    end
+
+    # @return [Google::Cloud::Bigquery] API bigquery
+    def bqapi
+      @bqapi ||= Google::Cloud::Bigquery.new
+    end
+
+    # @return [String] movimentos a apagar (keysin.mv)
+    def mvkys
+      opcao[:k][/([-+]*\d)+(,[-+]*\d+)*/].to_s
+    end
+
+    # apaga movimentos & suas rendas associadas no bigquery
+    #
+    # @return [Big] acesso a base dados abank no bigquery
+    def mv_delete
+      @ctlct = []
+      unless mvkys.empty?
+        # obtem lista contratos arrendamento associados aos movimentos a apagar
+        @ctlct = sql("select distinct ct from #{BD}.mv where #{ky_mv} in(#{mvkys}) and substr(ct,1,1)='r'")
+
+        # apaga todas as rendas dos contratos arrendamento associados aos movimentos a apagar
+        opcao[:t] = true unless ctlct.empty?
+        re_apaga.mv_delete_dml
+      end
+      self
+    end
+
+    # apaga movimentos no bigquery
+    def mv_delete_dml
+      dml("delete from #{BD}.mv where #{ky_mv} in(#{mvkys})")
+      puts("MOVIMENTOS APAGADOS #{bqnrs}")
+    end
+
+    # (see CLI#tag)
+    def mv_classifica
+      dml("update #{BD}.mv set mv.ct=tt.nct from (select * from #{BD}.cl) as tt where #{ky_mv}=tt.ky")
+      puts("MOVIMENTOS CLASSIFICADOS #{bqnrs}")
+      @ctlct = sql("select distinct ct from #{BD}.re") if bqnrs.positive?
+      self
+    end
+
+    # @return [String] expressao sql da chave de movimentos
+    def ky_mv
+      'FARM_FINGERPRINT(CONCAT(CAST(mv.nc as STRING),mv.ds,CAST(mv.dl as STRING),CAST(mv.vl as STRING)))'
+    end
+
+    # @param [String] cmd comando a executar
+    # @return [Google::Cloud::Bigquery::QueryJob] tarefa SQL/DML no bigquery
+    def job(cmd)
+      bqjob = bqapi.query_job(cmd)
+      bqjob.wait_until_done!
+      err = bqjob.error
+      puts(err['message']) if err
+      bqjob
+    end
+
+    # executa Structured Query Language (SQL) no bigquery
+    #
+    # @param (see job)
+    # @param [Array] erro resultado quando falha execucao
+    # @return [Google::Cloud::Bigquery::Data] resultado do SQL
+    def sql(cmd, erro = [])
+      # se job.failed? executa job(cmd).data => StandardError
+      @bqres = job(cmd).data
+    rescue StandardError
+      @bqres = erro
+    end
+
+    # executa Data Manipulation Language (DML) no bigquery
+    #
+    # @param (see job)
+    # @return [Integer] numero rows afetadas pelo DML
+    def dml(cmd)
+      # se job.failed? executa Integer(nil) => StandardError
+      @bqnrs = Integer(job(cmd).num_dml_affected_rows)
+    rescue StandardError
+      @bqnrs = 0
+    end
+  end
+end