abank 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1db6b7872fbccb5da608191caea95a6c79e598b40dc86f64b4c64597a57a2a
-  data.tar.gz: c021d951d7cfb4c83413a72c097bdf7958e75ae4c886277da3848a3e88b97242
+  metadata.gz: 36171477026334dbce5da50183c84e693047db8fb387c1306308f254590793fc
+  data.tar.gz: da568eeb037c6deb414981abed805596ae1034f94eee103948bfdec5da958734
 SHA512:
-  metadata.gz: 859152f519b2517cfbbbe36635f92b66ff648e8ebf24fe9bb041d40e2d1f953094d75d94cca4f198ee90df68ad40abd9ceeb24d10b06ebafc2eb7a00ee00da69
-  data.tar.gz: 8f2fdb535d5edd44e6c3a8a959475de72bb8760685509317a2194d6e2e4f56833ecfd0891d850ad6647c1db2fd46d7b90b405f5975a4a29a7cdc7b16eb2d12bc
+  metadata.gz: a9fbda092cf84a6ee8a2552fbd0ff363d482fd599a243d263d03374978e6ab819cfcd270dc3d0c67456c4b54ddcc126d161e45180888a38922d1a4d468dbfe35
+  data.tar.gz: 69365abb9979d7ca48369451c8496708cee0d15a3f4a0ef73521daa608c0c9c94a67ce2e5a00c4f2656c40ed4b1386d3224ea26b2094a6879bb87f03b6a14b1f

data/.rubocop.yml

@@ -1,30 +1,15 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   EnabledByDefault: true
 
 Style/Copyright:
-  Enabled: false
+    Enabled: false
 
-Style/DocumentationMethod:
-  Enabled: false
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false
+Lint/ConstantResolution:
+    Enabled: false
 
 Style/ConstantVisibility:
-  Enabled: false
-
-Layout/MultilineMethodArgumentLineBreaks:
-  Enabled: false
-
-Layout/MultilineHashKeyLineBreaks:
-  Enabled: false
-
-Layout/FirstMethodParameterLineBreak:
-  Enabled: false
-
-Layout/FirstHashElementLineBreak:
-  Enabled: false
+    Enabled: false
 
-Style/MissingElse:
-  Enabled: false
+Style/EmptyElse:
+    EnforcedStyle: nil

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.2.7)
+    abank (0.2.9)
       google-cloud-bigquery
       roo
       thor
@@ -12,12 +12,12 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.6)
-    declarative (0.0.10)
+    concurrent-ruby (1.1.7)
+    declarative (0.0.20)
     declarative-option (0.1.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.40.1)
+    google-api-client (0.43.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
@@ -25,7 +25,7 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
-    google-cloud-bigquery (1.21.1)
+    google-cloud-bigquery (1.21.2)
       concurrent-ruby (~> 1.0)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
@@ -34,10 +34,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.2)
+    google-cloud-env (1.3.3)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    googleauth (0.12.0)
+    googleauth (0.13.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -45,15 +45,15 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
-    jwt (2.2.1)
+    jwt (2.2.2)
     memoist (0.16.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    os (1.1.0)
+    os (1.1.1)
     public_suffix (4.0.5)
     rake (12.3.3)
     representable (3.0.4)

data/lib/abank.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'abank/big'
-require 'abank/contrato'
-require 'abank/rendas'
-require 'abank/folha'
-require 'abank/version'
+require('thor')
+require('abank/big')
+require('abank/contrato')
+require('abank/rendas')
+require('abank/folha')
+require('abank/version')
 
 # @author Hernani Rodrigues Vaz
 module Abank
   DR = "/home/#{`whoami`.chomp}/Downloads"
+  BD = 'hernanilr.ab'
 
   class Error < StandardError; end
 

data/lib/abank/big.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'google/cloud/bigquery'
+require('google/cloud/bigquery')
 
 module Abank
   # @see Big
@@ -42,16 +42,13 @@ module Abank
       @mvvls = ''
       @mvkys = opc.fetch(:k, '')
       @ctide = opc.fetch(:c, '')
-      # p ['B', opcao]
       opcao
     end
 
     # (see CLI#tag)
     def mv_classifica
-      dml('update hernanilr.ab.mv set mv.ct=tt.nct ' \
-            'from (select * from hernanilr.ab.cl) as tt ' \
-           "where #{ky_mv}=tt.ky")
-      puts 'MOVIMENTOS CLASSIFICADOS ' + bqnrs.to_s
+      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}")
     end
 
     # apaga movimentos & suas rendas associadas no bigquery
@@ -61,7 +58,7 @@ module Abank
       vars_mv_work
       if mvkys.size.positive?
         # obtem lista contratos arrendamento associados aos movimentos a apagar
-        @ctlct = sel("select ct from hernanilr.ab.mv where #{ky_mv} in(#{mvkys}) and substr(ct,1,1)='r' group by 1")
+        @ctlct = sql("select ct from #{BD}.mv where #{ky_mv} in(#{mvkys}) and substr(ct,1,1)='r' group by 1")
 
         # apaga rendas associadas e depois movimentos
         @opcao[:t] = true
@@ -69,6 +66,7 @@ module Abank
 
         # para obrigar re_work a trabalhar com lista contratos (ctlct)
         @bqnrs = 0
+      else
       end
       self
     end
@@ -78,9 +76,10 @@ module Abank
     # @return [Big] acesso a base dados abank no bigquery
     def mv_insert
       if mvvls.size.positive?
-        dml('insert hernanilr.ab.mv VALUES' + mvvls)
-        puts 'MOVIMENTOS INSERIDOS ' + bqnrs.to_s
+        dml("insert #{BD}.mv VALUES#{mvvls}")
+        puts("MOVIMENTOS INSERIDOS #{bqnrs}")
         mv_classifica if bqnrs.positive?
+      else
       end
       self
     end
@@ -95,8 +94,8 @@ module Abank
 
     # apaga movimentos no bigquery
     def mv_delete_dml
-      dml("delete from hernanilr.ab.mv where #{ky_mv} in(#{mvkys})")
-      puts 'MOVIMENTOS APAGADOS ' + bqnrs.to_s
+      dml("delete from #{BD}.mv where #{ky_mv} in(#{mvkys})")
+      puts("MOVIMENTOS APAGADOS #{bqnrs}")
     end
 
     # @return [String] expressao sql da chave de movimentos
@@ -106,13 +105,13 @@ module Abank
 
     # cria job bigquery & verifica execucao
     #
-    # @param [String] sql comando a executar
+    # @param [String] cmd comando a executar
     # @return [Boolean] job ok?
-    def job?(sql)
-      # p sql
-      @bqjob = bqapi.query_job(sql)
+    def job?(cmd)
+      # p cmd
+      @bqjob = bqapi.query_job(cmd)
       @bqjob.wait_until_done!
-      puts @bqjob.error['message'] if @bqjob.failed?
+      puts(@bqjob.error['message']) if @bqjob.failed?
       @bqjob.failed?
     end
 
@@ -121,16 +120,16 @@ module Abank
     # @param (see job?)
     # @param [Array] erro quando da erro no bigquery
     # @return [Google::Cloud::Bigquery::Data] resultado do sql
-    def sel(sql, erro = [])
-      @bqres = job?(sql) ? erro : bqjob.data
+    def sql(cmd, erro = [])
+      @bqres = job?(cmd) ? erro : bqjob.data
     end
 
     # executa Data Manipulation Language (DML) no bigquery
     #
     # @param (see job?)
     # @return [Integer] numero rows afetadas pelo dml
-    def dml(sql)
-      @bqnrs = job?(sql) ? 0 : bqjob.num_dml_affected_rows
+    def dml(cmd)
+      @bqnrs = job?(cmd) ? 0 : bqjob.num_dml_affected_rows
     end
   end
 end

data/lib/abank/contrato.rb

@@ -20,10 +20,10 @@ module Abank
     def ct_cria
       if existe_contrato?
         @bqnrs = 1
-        puts 'CONTRATO JA EXISTE'
+        puts('CONTRATO JA EXISTE')
       else
-        dml('insert into hernanilr.ab.re ' + sql_contrato_mv)
-        puts "CONTRATO #{ctide} " + (bqnrs.zero? ? 'NAO EXISTE' : 'INSERIDO')
+        dml("insert into #{BD}.re #{sql_contrato_mv}")
+        puts("CONTRATO #{ctide} " + (bqnrs.zero? ? 'NAO EXISTE' : 'INSERIDO'))
       end
       return unless existem_rendas?
 
@@ -52,8 +52,8 @@ module Abank
 
     # apaga rendas da lista de contratos arrendamento
     def lc_apaga
-      dml("delete from hernanilr.ab.re where ct in(#{str_lc})#{opcao[:t] ? '' : ' and cnt>0'}")
-      puts "RENDAS #{str_lc('')} APAGADAS " + bqnrs.to_s
+      dml("delete from #{BD}.re where ct in(#{str_lc})#{opcao[:t] ? '' : ' and cnt>0'}")
+      puts("RENDAS #{str_lc('')} APAGADAS " + bqnrs.to_s)
     end
 
     # @return [String] texto formatado que representa lista de contratos arrendamento
@@ -68,8 +68,8 @@ module Abank
       @ctlcm = []
       ctlct.each do |c|
         @ctide = c[:ct]
-        sel(sql_last_re)
-        @ctlcm << bqres[0].merge({ mv: sel(sql_novo_mv(bqres[0][:dl])) })
+        sql(sql_last_re)
+        @ctlcm << bqres[0].merge({ mv: sql(sql_novo_mv(bqres[0][:dl])) })
       end
       self
     end
@@ -82,25 +82,25 @@ module Abank
 
     # @return [Boolean] contrato arrendamento ja existe sim/nao?
     def existe_contrato?
-      sel("select ct from hernanilr.ab.re where ct='#{ctide}' and cnt=0").count.positive?
+      sql("select ct from #{BD}.re where ct='#{ctide}' and cnt=0").count.positive?
     end
 
     # @return [String] sql para obter ultima renda do contrato arrendamento
     def sql_last_re
       'select ct,DATE_SUB(DATE_SUB(dl,INTERVAL dias DAY),INTERVAL IF(cnt=0,0,cnt-1) MONTH) as dc,ano,cnt,dl ' \
-        "from hernanilr.ab.re where ct='#{ctide}' order by ano desc,cnt desc limit 1"
+        "from #{BD}.re where ct='#{ctide}' order by ano desc,cnt desc limit 1"
     end
 
     # @return [String] sql para obter movimentos novos (depois da ultima renda do contrato arrendamento)
     def sql_novo_mv(mdl)
-      "select dl,vl from hernanilr.ab.mv where ct='#{ctide}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
+      "select dl,vl from #{BD}.mv where ct='#{ctide}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
     end
 
     # @return [String] sql para obter dados do inicio contrato arrendamento
     def sql_contrato_mv
       if opcao[:d].size.zero?
         'select ct,EXTRACT(YEAR FROM DATE_TRUNC(dl,MONTH)) as ano,0 as cnt,DATE_TRUNC(dl,MONTH) as dl,0 dias ' \
-          "from hernanilr.ab.mv where ct='#{ctide}' order by dl limit 1"
+          "from #{BD}.mv where ct='#{ctide}' order by dl limit 1"
       else
         "select '#{ctide}' as ct,EXTRACT(YEAR FROM DATE '#{opcao[:d]}') as ano" \
               ",0 as cnt,DATE '#{opcao[:d]}' as dl,0 dias"

data/lib/abank/folha.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'roo'
+require('roo')
 
 module Abank
   # acesso a folha calculo & base dados abank no bigquery
@@ -42,7 +42,7 @@ module Abank
       n = 0
       folha.sheet(0).parse(header_search: ['Data Lanc.', 'Data Valor', 'Descrição', 'Valor']) do |r|
         n += 1
-        puts n == 1 ? "\n" + folha.info : processa_linha(r)
+        puts n == 1 ? "\n#{folha.info}" : processa_linha(r)
       end
       return unless opcao[:i]
 
@@ -60,7 +60,7 @@ module Abank
       #  array.count = 0 ==> pode carregar esta linha
       #  array.count = 1 ==> mais testes necessarios
       #  array.count > 1 ==> nao pode carregar esta linha
-      sel(sql_existe_mv, [{}, {}])
+      sql(sql_existe_mv, [{}, {}])
       if linha_naoexiste? then linha_base + values_mv
       elsif linha_existe? then linha_existe
       elsif linha_simila? then linha_similar
@@ -85,18 +85,18 @@ module Abank
     # @return [String] texto linha existente formatada para display
     def linha_existe
       add_kys if opcao[:e]
-      linha_base + ' EXIS ' + format('%<v1>20d', v1: bqres.first[:ky])
+      "#{linha_base} EXIS #{format('%<v1>20d', v1: bqres.first[:ky])}"
     end
 
     # @return [String] texto linha similar formatada para display
     def linha_similar
       add_kys if opcao[:s]
-      linha_base + ' SIMI ' + format('%<v1>-20.20s', v1: bqres.first[:ds].strip)
+      "#{linha_base} SIMI #{format('%<v1>-20.20s', v1: bqres.first[:ds].strip)}"
     end
 
     # @return [String] texto linha existencia multipla formatada para display
     def linha_multiplas
-      linha_base + ' MULT(' + bqres.count.to_s + ')'
+      "#{linha_base} MULT(#{bqres.count})"
     end
 
     # obtem chaves movimento (keysin.mv) para apagar
@@ -121,7 +121,7 @@ module Abank
 
     # @return [String] sql para movimentos no bigquery
     def sql_existe_mv
-      "select *,#{ky_mv} as ky from hernanilr.ab.mv " \
+      "select *,#{ky_mv} as ky from #{BD}.mv " \
        "where nc=#{conta} and dl='#{rowfc[0].strftime(DF)}' and vl=#{rowfc[3]}"
     end
 
@@ -145,7 +145,7 @@ module Abank
 
     # @return [String] classificacao do movimento (null --> classificacao automatica)
     def ctc
-      opcao[:g].size.zero? ? 'null' : ("'" + opcao[:g] + "'")
+      opcao[:g].size.zero? ? 'null' : "'#{opcao[:g]}'"
     end
 
     # @return [String] tipo movimento c[redito] ou d[ebito]

data/lib/abank/rendas.rb

@@ -27,7 +27,7 @@ module Abank
     # (see CLI#recriare)
     def re_atualiza
       # obtem contratos ativos
-      @ctlct = sel('SELECT ct from hernanilr.ab.re group by 1')
+      @ctlct = sql("SELECT ct from #{BD}.re group by 1")
 
       # [re]cria rendas [novas|todas]
       lr_apaga.cm_cria.vr_cria.re_insert
@@ -49,10 +49,10 @@ module Abank
     # insere rendas no bigquery
     def re_insert
       if revls.size.zero?
-        puts 'NAO EXISTEM RENDAS NOVAS'
+        puts('NAO EXISTEM RENDAS NOVAS')
       else
-        dml('insert hernanilr.ab.re VALUES' + revls)
-        puts "RENDAS #{str_lc('')} CRIADAS " + bqnrs.to_s
+        dml("insert #{BD}.re VALUES#{revls}")
+        puts("RENDAS #{str_lc('')} CRIADAS " + bqnrs.to_s)
       end
     end
 

data/lib/abank/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abank
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Arquiva movimentos conta-corrente, conta-cartao do activobank no bigquery.