abank 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b52d3129983933c52306acea70fdfc2c1104038080b554456a4d8ac1e89406f5
-  data.tar.gz: 73ebaaa2457f7166cdb4f455534a6d8ff3554c78b7106bbb140efdfb145a96a6
+  metadata.gz: 18f8a44c8a32fc138ee5184b0bab2b57608041f74960cba12061cd4e00294e21
+  data.tar.gz: a0278c5241cbed5417f1be08bf7fe0c9f7dd3957c6e059866d5eec2fd5f1512d
 SHA512:
-  metadata.gz: ecd45604e88d0cf0aed881117b8865f5cb73baf7bafda6b4f33f35000b1807f106d3ebcd2f949f86009e89adca82fc53147e42e56b20b02361871385338df6ab
-  data.tar.gz: 44903880f6ebb27932ba21eaa1baebcd6df49af6fa0bddfb2e45a36cc646b6b996bd8fb06c2cf598a42956a3f734b14f075b1b817df05cfeafbc22a3814e8cbc
+  metadata.gz: ad0df9fa07cbacf1e63bf02863d912ce4ebbe963ae3dece73c3d5f61ff07552d848f6625891d7a600452ddc97faf8a816bc69a61099380c359b5f4b0d13ff9f8
+  data.tar.gz: bcb08fcba8e4299d3e87d35cc814c5bda1781c98e0f866fba9f4f9017e5ae33e45c307380747f8916d9ab3565c160f84aad3c6056b15183e60ffc9ffba5bbe1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.7.0)
+    abank (0.7.2)
       google-cloud-bigquery
       roo
       thor
@@ -75,11 +75,12 @@ GEM
     google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.2.1)
+    google-cloud-env (2.2.2)
+      base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.5.0)
     google-logging-utils (0.1.0)
-    googleauth (1.13.1)
+    googleauth (1.14.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
@@ -106,10 +107,10 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.3)
+    nokogiri (1.18.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     os (1.1.4)
@@ -142,7 +143,7 @@ GEM
     roo (2.10.1)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
-    rubocop (1.73.2)
+    rubocop (1.74.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -213,4 +214,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.6.3
+   2.6.5

data/lib/abank/big.rb

@@ -17,6 +17,7 @@ module Abank
     # acesso a base dados abank no bigquery
     # @param [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
     # @option opcoes [String]  :k ('') movimentos a apagar (keysin.mv)
+    # @option opcoes [Integer] :n (0) conta apagar movimentos >3 outras (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)
@@ -40,10 +41,15 @@ module Abank
     # @return [Big] acesso a base dados abank no bigquery
     def mv_delete
       @ctlct = []
-      return self if mvkys.empty?
+      return self if mvkys.empty? && contadel.zero?
 
       # obtem lista contratos arrendamento associados aos movimentos a apagar
-      @ctlct = sql("select distinct ct from #{BD}.gmr where ky IN UNNEST(@kys)", kys: mvkys)
+      @ctlct =
+        if contadel.zero?
+          sql("select distinct ct from #{BD}.gmr where ky IN UNNEST(@kys)", kys: mvkys)
+        else
+          sql("select distinct ct from #{BD}.gmr where nc=@nc", nc: contadel)
+        end
       re_apaga
       mv_delete_dml
       self
@@ -92,7 +98,7 @@ module Abank
         opcao[:c] = ctr[:ct]
         lre = sql("select * from #{BD}.glr where ct=@ct order by ano desc,cnt desc limit 1", ct: opcao[:c]).first
         lre[:dl] -= 1 if lre[:cnt].zero?
-        ctr.merge(lre, mv: sql("select * from #{BD}.gmn where ct=@ct and dl>=@ud order by 1,2", ct: opcao[:c], ud: lre[:dl] + 1))
+        ctr.merge(lre, mv: sql("select * from #{BD}.gmr where ct=@ct and dv>=@ud order by 1,2", ct: opcao[:c], ud: lre[:dl] + 1))
       end
       self
     end
@@ -124,6 +130,11 @@ module Abank
       @bqapi ||= Google::Cloud::Bigquery.new
     end
 
+    # @return [Integer] numero conta apagar movimentos
+    def contadel
+      @contadel ||= opcao[:n] > 3 ? opcao[:n] : 0
+    end
+
     # @return [String] movimentos a apagar (keysin.mv)
     def mvkys
       @mvkys ||= opcao[:k].to_s.scan(/[-+]?\d+/).map(&:to_i)
@@ -204,7 +215,11 @@ module Abank
 
     # apaga movimentos no bigquery
     def mv_delete_dml
-      dml("delete from #{BD}.mv where #{BD}.ky(dl,dv,ds,vl,nc,ex) IN UNNEST(@kys)", kys: mvkys)
+      if contadel.zero?
+        dml("delete from #{BD}.mv where #{BD}.ky(dl,dv,ds,vl,nc,ex) IN UNNEST(@kys)", kys: mvkys)
+      else
+        dml("delete from #{BD}.mv where nc=@nc", nc: contadel)
+      end
       puts("MOVIMENTOS APAGADOS #{bqnrs}")
     end
 

data/lib/abank/folha.rb

@@ -15,17 +15,27 @@ module Abank
     # @option opcoes [Boolean] :s (false) apaga movimento similar? (mv)
     # @option opcoes [Boolean] :e (false) apaga movimento igual? (mv)
     # @option opcoes [Boolean] :i (false) insere movimento novo? (mv)
+    # @option opcoes [Integer] :n (0) conta dos movimentos (mv)
     # @option opcoes [String]  :v ('') data valor movimentos (mv)
     # @option opcoes [String]  :g ('') classificacao movimentos (mv)
     def initialize(opcoes = {})
       super
-      @opcao = opcao.merge(s: opcoes.fetch(:s, false), e: opcoes.fetch(:e, false), i: opcoes.fetch(:i, false), v: opcoes.fetch(:v, ''), g: opcoes.fetch(:g, ''), k: +'', f: opcoes[:f])
+      @opcao = opcao.merge(
+        s: opcoes.fetch(:s, false),
+        e: opcoes.fetch(:e, false),
+        i: opcoes.fetch(:i, false),
+        n: opcoes.fetch(:n, 0),
+        v: opcoes.fetch(:v, ''),
+        g: opcoes.fetch(:g, ''),
+        k: +'',
+        f: opcoes[:f]
+      )
       @mvvls = []
     end
 
     # carrega/mostra folha calculo
     def processa_xls
-      puts("\n#{folha.info}")
+      puts("\n#{opcao[:f]}")
       mvs = sql("select * from #{BD}.gmv where nc=@nc", nc: conta).group_by { |m| [m[:dl], m[:vl].to_f] }
       folha.sheet(0).parse(header_search: ['Data Lanc.', 'Data Valor', 'Descrição', 'Valor']) do |r|
         next unless valid?(r.values)
@@ -43,24 +53,45 @@ module Abank
       end
       return unless opcao[:i]
 
+      # para nao apagar movimentos duma conta, por aqui somente com keys opcao[:k]
+      opcao[:n] = 0
       mv_delete.mv_insert.ct_dados.re_insert
     end
 
     private
 
-    # @return [Roo::Excelx] folha calculo a processar
+    # @return [Roo::Excelx] folha a processar
     def folha
       @folha ||= Roo::Spreadsheet.open(opcao[:f])
     rescue StandardError
       raise("Erro ao abrir a folha de cálculo: #{opcao[:f]}")
     end
 
+    # @return [Integer] multiplicador valores
+    def sig
+      @sig ||= cartao? ? -1 : 1
+    end
+
     # @example
-    #   mov*.xlsx     --> 1 --> conta-corrente
-    #   movCard*.xlsx --> 2 --> conta-cartao
-    # @return [Integer] numero conta associado a folha calculo
+    #   mov*.xlsx     1 --> corrente
+    #   movCard*.xlsx 2 --> cartao
+    #   opcao[:n]     3 --> cash
+    #   opcao[:n]     n --> outras
+    # @return [Integer] numero conta
     def conta
-      @conta ||= opcao[:f].match?(/card/i) ? 2 : 1
+      @conta ||= fconta
+    end
+
+    # @return [Boolean] folha cartao credito
+    def cartao?
+      opcao[:f].match?(/card/i)
+    end
+
+    # @return [Integer] obter numero conta
+    def fconta
+      return opcao[:n] if opcao[:n] > 2
+
+      cartao? ? 2 : 1
     end
 
     # @param [Array] row folha calculo em processamento
@@ -69,7 +100,7 @@ module Abank
       return false unless row[0].is_a?(Date) && row[1].is_a?(Date)
 
       row[2] = row[2].to_s.strip.gsub("'", '').gsub('\\', '') # Descrição
-      row[3] = row[3].to_f * (conta == 1 ? 1 : -1) # Valor
+      row[3] = row[3].to_f * sig # Valor
       @rowfc = row
       true
     rescue StandardError => e
@@ -84,7 +115,7 @@ module Abank
 
     # @return [String] novo texto base formatado para display
     def lnexi
-      @mvvls << "('#{rowfc[0].iso8601}','#{dvc.iso8601}','#{rowfc[2]}',#{rowfc[3]},#{conta},#{dvc.year},#{dvc.month},'#{tpc}',#{ctc},null,null)"
+      @mvvls << "('#{rowfc[0].iso8601}','#{dvc.iso8601}','#{rowfc[2]}',#{rowfc[3]},#{conta},#{dvc.year},#{dvc.month},#{ctc},null,null)"
       "#{lbase} NOVO"
     end
 
@@ -111,10 +142,9 @@ module Abank
 
     # @return [Date] data valor corrigida
     def dvc
-      dvl = opcao[:v].to_s
-      dvl.empty? ? rowfc[1] : Date.parse(dvl)
+      d = opcao[:v].to_s
+      d.empty? ? rowfc[1] : Date.parse(d)
     rescue ArgumentError
-      puts("Invalid date format in #{opcao[:v].inspect}")
       rowfc[1]
     end
 
@@ -123,10 +153,5 @@ module Abank
       cmv = opcao[:g].to_s
       cmv.empty? ? 'null' : "'#{cmv}'"
     end
-
-    # @return [String] tipo movimento c[redito] ou d[ebito]
-    def tpc
-      rowfc[3].positive? ? 'c' : 'd'
-    end
   end
 end

data/lib/abank/version.rb

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

data/lib/abank.rb

@@ -18,8 +18,9 @@ module Abank
       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'
+    desc 'apagamv', 'apaga movimentos keys|conta'
+    option :k, banner: 'KEY[,KEY...]', default: '', desc: 'keys movimentos apagar'
+    option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta movimentos apagar (>3 outras)'
     # apaga movimentos
     def apagamv
       Big.new(options.transform_keys(&:to_sym)).mv_delete.ct_dados.re_insert
@@ -60,7 +61,8 @@ module Abank
     desc 'work', 'carrega/apaga dados da folha calculo'
     option :s, type: :boolean, default: false, desc: 'apaga movimento similar (=data,=valor,<>descricao)'
     option :e, type: :boolean, default: false, desc: 'apaga movimento igual'
-    option :v, banner: 'DATA', default: '',    desc: 'data valor para movimentos a carregar'
+    option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta destino (0 auto,1 corrente,2 cartao,3 chash,> outras)'
+    option :v, banner: 'DATA', default: '',    desc: 'data lancamento para movimentos a carregar'
     option :g, banner: 'TAG',  default: '',    desc: 'classificacao para movimentos a carregar'
     # carrega/apaga dados da folha calculo
     def work
@@ -70,10 +72,11 @@ module Abank
     end
 
     desc 'show', 'mostra dados da folha calculo'
+    option :n, banner: 'CONTA', type: :numeric, default: 0, desc: 'conta destino (0 auto,1 corrente,2 cartao,3 chash,> outras)'
     # mostra folha calculo
     def show
       Dir.glob("#{DR}/*.xlsx").each do |file|
-        Folha.new(options.merge(f: file)).processa_xls
+        Folha.new(options.transform_keys(&:to_sym).merge(f: file)).processa_xls
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 bindir: exe
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Arquiva movimentos conta-corrente, conta-cartao do activobank no bigquery.
 test_files: []