eost 0.1.5 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9cf7eabe4ac0b063ac96b816560d9f4c07c87dd1c0e110a9993d3eb5bc4534
-  data.tar.gz: 6cb7ee1faa67d3426fa96da1eeb231eb797328550a7ef66d4654bb64573d16b6
+  metadata.gz: c56d6856a474ba9665cca2a7ffe0c2da80f7f59a3805f39894ceb44251b63fcb
+  data.tar.gz: 2f394e34158e52bf521024224b76cc882bbbbff322722b15b3d8b6893014cca9
 SHA512:
-  metadata.gz: c08c2e2ed421b3fef1610e0fd93c35d180d2939afd050b4f20f863d6bbf740ff6142bace94f05b637371cfff7410fe1048cff59818d0600f8ca1a61dfa94f0b5
-  data.tar.gz: bbfb0df62f2c9af92fd883bf9d3e2485ae80d2b209ec25627949bd6c41dd5725d7b812aa3e1b87481a2c76c265775b0a78d256d434ce0cda7681395fde44aff7
+  metadata.gz: 6d7f1a21656bede1d81a0d9c808e1bdcefc8699bb015e6c534c758c058b72d411bd863be4093da1ff3d5ce7d39803b9632ad2b2b43e3f5b24b0ee12b0fee3b73
+  data.tar.gz: 5ac5bf0c4f779688b85bd3c67f26d2988dd5223f7fa36d18b0ded364e0d44a8ed1c3a6d96ef8f069447b10d00f4cb583678d9d0baaf520f0562eff355953982f

data/.rubocop.yml

@@ -0,0 +1,12 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  EnabledByDefault: true
+
+Style/Copyright:
+    Enabled: false
+
+Lint/ConstantResolution:
+    Enabled: false
+
+Style/ConstantVisibility:
+    Enabled: false

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eost (0.1.5)
+    eost (0.1.11)
       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.38.0)
+    google-api-client (0.44.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.0)
+    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.1)
+    google-cloud-env (1.3.3)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    googleauth (0.12.0)
+    google-cloud-errors (1.0.1)
+    googleauth (0.13.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -45,16 +45,16 @@ 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)
-    public_suffix (4.0.4)
+    os (1.1.1)
+    public_suffix (4.0.5)
     rake (12.3.3)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -72,7 +72,7 @@ GEM
       multi_json (~> 1.10)
     thor (1.0.1)
     uber (0.1.0)
-    yard (0.9.24)
+    yard (0.9.25)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,4 +1,4 @@
-# Eost [![Build Status](https://travis-ci.com/hernanirvaz/esot.svg?branch=master)](https://travis-ci.com/hernanirvaz/esot)
+# Eost [![Build Status](https://travis-ci.com/hernanirvaz/eost.svg?branch=master)](https://travis-ci.com/hernanirvaz/eost)
 
 Arquiva eos-transactions.csv no bigquery. Pode apagar movimentos existentes ja no bigquery.
 
@@ -32,7 +32,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/eost. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/eost/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/hernanirvaz/eost. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/hernanirvaz/eost/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -41,4 +41,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Eost project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/eost/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Eost project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hernanirvaz/eost/blob/master/CODE_OF_CONDUCT.md).

data/eost.gemspec

@@ -11,8 +11,7 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
 
   spec.summary     = 'Arquiva eos-transactions.csv no bigquery.'
-  spec.description = spec.summary +
-                     ' Pode apagar movimentos existentes ja no bigquery.'
+  spec.description = spec.summary + ' Pode apagar movimentos existentes ja no bigquery.'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['yard.run'] = 'yard'
@@ -22,8 +21,7 @@ Gem::Specification.new do |spec|
   # 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0")
-                     .reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/eost.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'eost/version'
-require 'eost/bigquery'
-require 'eost/folhacalculo'
+require('thor')
+require('eost/bigquery')
+require('eost/carteiras')
+require('eost/eosscan')
+require('eost/folhacalculo')
+require('eost/formatar')
+require('eost/version')
 
+# @author Hernani Rodrigues Vaz
 module Eost
   ID = `whoami`.chomp
 
@@ -12,33 +16,43 @@ module Eost
 
   # CLI para carregar folhas calculo comuns no bigquery
   class CLI < Thor
-    desc 'load', 'carrega dados da folha calculo no bigquery'
-    option :d, banner: 'DIR', default: "/home/#{ID}/Downloads",
-               desc: 'Onde procurar folhas calculo'
-    option :x, banner: 'EXT', default: '.csv',
-               desc: 'Extensao das folhas calculo'
-    option :e, type: :boolean, default: false,
-               desc: 'apaga linhas existentes no bigquery'
-    # processa csv
-    def load
-      # opcoes apagar linhas
+    desc 'workfc', 'carrega/apaga dados da folha calculo'
+    option :d, banner: 'DIR', default: "/home/#{ID}/Downloads", desc: 'Onde procurar folhas calculo'
+    option :x, banner: 'EXT', default: '.csv',                  desc: 'Extensao das folhas calculo'
+    option :e, type: :boolean, default: false,                  desc: 'apaga linha igual'
+    option :m, type: :boolean, default: false,                  desc: 'apaga linhas existencia multipla'
+    # processa folha calculo
+    def workfc
       Dir.glob("#{options[:d]}/*#{options[:x]}").sort.each do |f|
-        Bigquery.new(f, options[:e]).processa
+        Bigquery.new(f, { e: options[:e], m: options[:m], i: true }).processa_csv
       end
     end
 
-    desc 'mostra', 'mostra dados da folha calculo'
-    option :d, banner: 'DIR', default: "/home/#{ID}/Downloads",
-               desc: 'Onde procurar folhas calculo'
-    option :x, banner: 'EXT', default: '.csv',
-               desc: 'Extensao das folhas calculo'
-    # mostra csv
-    def mostra
+    desc 'showfc', 'mostra dados da folha calculo'
+    option :d, banner: 'DIR', default: "/home/#{ID}/Downloads", desc: 'Onde procurar folhas calculo'
+    option :x, banner: 'EXT', default: '.csv',                  desc: 'Extensao das folhas calculo'
+    # show folha calculo
+    def showfc
       Dir.glob("#{options[:d]}/*#{options[:x]}").sort.each do |f|
-        Bigquery.new(f).show
+        Bigquery.new(f).processa_csv
       end
     end
 
-    default_task :mostra
+    desc 'work', 'carrega transacoes novas no bigquery'
+    option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    # carrega transacoes novas no bigquery
+    def work
+      Bigquery.new('', options).processa
+    end
+
+    desc 'show', 'mostra reumo carteiras & transacoes'
+    option :v, type: :boolean, default: false, desc: 'mostra transacoes'
+    option :t, type: :boolean, default: false, desc: 'mostra transacoes todas ou somente novas'
+    # mostra reumo carteiras & transacoes
+    def show
+      Bigquery.new('', options).carteiras.mostra_resumo
+    end
+
+    default_task :show
   end
 end

data/lib/eost/bigquery.rb

@@ -1,93 +1,166 @@
 # frozen_string_literal: true
 
-require 'roo'
-require 'google/cloud/bigquery'
+require('roo')
+require('google/cloud/bigquery')
 
 module Eost
+  BD = 'hernanirvaz.coins'
   DF = '%Y-%m-%d'
   DI = '%Y-%m-%d %H:%M:%S'
 
-  # folhas calculo comuns no bigquery
+  # (see Bigquery)
   class Bigquery
-    # @return [Roo::Excelx] folha calculo a processar
-    attr_reader :book
-    # @return [Array] row folha calculo em processamento
-    attr_reader :row
+    # @return [Roo::CSV] folha calculo a processar
+    attr_reader :folha
+    # @return [Hash<Symbol, Boolean>] opcoes trabalho com linhas
+    attr_reader :linha
+
     # @return [Google::Cloud::Bigquery] API bigquery
     attr_reader :api
+    # @return [Array] row folha calculo em processamento
+    attr_reader :row
     # @return [Google::Cloud::Bigquery::QueryJob] job bigquery
     attr_reader :job
-    # @return (see sql_select)
-    attr_reader :sql
-    # @return [Boolean] apaga linhas existentes sim/nao?
-    attr_reader :apaga
+    # @return (see sql)
+    attr_reader :sqr
 
-    # permite processa folhas calculo comuns no bigquery
-    #
     # @param [String] csv folha calculo para processar
-    # @param [Boolean] apaga linhas existentes sim/nao?
-    # @return [Bigquery] acesso folha calculo & bigquery
-    def initialize(csv = '', apaga = false)
-      @book = Roo::CSV.new(csv) if csv.size.positive?
-      @apaga = apaga
+    # @param [Hash<Symbol, Boolean>] ops opcoes trabalho com linhas
+    # @option ops [Boolean] :e (false) apaga linha igual?
+    # @option ops [Boolean] :m (false) apaga linhas existencia multipla?
+    # @option ops [Boolean] :i (false) insere linha nova?
+    # @return [Bigquery] acesso folhas calculo bloks.io & correspondente bigquery dataset
+    def initialize(csv = '', ops = { e: false, m: false, i: false })
+      @folha = Roo::CSV.new(csv) if csv.size.positive?
+      @linha = ops
+
       # usa env GOOGLE_APPLICATION_CREDENTIALS para obter credentials
       # @see https://cloud.google.com/bigquery/docs/authentication/getting-started
       @api = Google::Cloud::Bigquery.new
     end
 
-    # cria job bigquery & verifica execucao
-    #
-    # @param [String] sql para executar
-    # @return [Boolean] job ok?
-    def job_bigquery?(sql)
-      @job = api.query_job(sql)
-      @job.wait_until_done!
-      puts @job.error['message'] if @job.failed?
-      @job.failed?
+    # @return [Carteiras] API eosscan - processar transacoes
+    def transacoes
+      @transacoes ||= Carteiras.new(
+        {
+          wb: sql("select * from #{BD}.walletEos order by 1").map { |e| { ax: e[:weos], sl: e[:eos].to_d } },
+          nt: sql("select blocknumber,iax from #{BD}.eostx order by 1")
+        },
+        linha
+      )
     end
 
-    # cria Data Manipulation Language (DML) job bigquery
-    #
-    # @param (see job_bigquery?)
-    # @return [Integer] numero linhas afetadas
-    def dml(sql)
-      job_bigquery?(sql) ? 0 : job.num_dml_affected_rows
+    # @return [Carteiras] API eosscan - processar carteiras & transacoes
+    def carteiras
+      transacoes
     end
 
-    # cria sql job bigquery com resultados
-    #
-    # @return [Array<Hash>] resultado sql
-    def sql_select
-      # se array.count > 1 => nao fazer nada
-      @sql = job_bigquery?('select * ' + sql_where) ? [{}, {}] : job.data
+    # insere transacoes novas na tabela eos
+    def processa
+      puts(format("%<n>2i LINHAS INSERIDAS #{BD}.eos", n: transacoes.novas.count.positive? ? eos_insert_api : 0))
     end
 
-    # @return [String] parte sql para processamento linhas similares
+    # @return [String] campos da tabela eos no bigquery
+    def eos_fields
+      'blocknumber,time,contract,action,acfrom,acto,amount,symbol,memo,data,dias'
+    end
+
+    # @return [String] parte sql para processamento linhas existentes
     def sql_where
-      "from coins.eos where blocknumber=#{row[0]}"
+      "from #{BD}.eos where blocknumber=#{row[0]}"
     end
 
     # @return [Integer] numero linhas inseridas
-    def sql_insert
-      dml('insert coins.eos(blocknumber,time,contract,' \
-          'action,acfrom,acto,amount,symbol,memo,data,dias) VALUES(' +
-      sql_insert1 + sql_insert2)
+    def eos_insert_csv
+      return 1 unless linha[:i]
+
+      dml("INSERT #{BD}.eos(#{eos_fields}) VALUES(#{eos_csv_val1})")
     end
 
-    # @return [String] campos insert da linha bigquery
-    def sql_insert1
-      "#{row[0]},'#{DateTime.parse(row[1]).strftime(DI)}','#{row[2]}',"
+    # @return [String] valores formatados para insert eos (parte1)
+    def eos_csv_val1
+      "#{row[0]}," \
+      "'#{Time.parse(row[1]).strftime(DI)}'," \
+      "'#{row[2]}'," \
+      "#{eos_csv_val2}"
     end
 
-    # @return [String] campos insert da linha bigquery
-    def sql_insert2
-      "'#{row[3]}','#{row[4]}','#{row[5]}',#{row[6]}," \
-      "'#{row[7]}','#{row[8]}','#{row[9]}',0)"
+    # @return [String] valores formatados para insert eos (parte2)
+    def eos_csv_val2
+      "'#{row[3]}'," \
+      "'#{row[4]}'," \
+      "'#{row[5]}'," \
+      "#{Float(row[6])}," \
+      "'#{row[7]}'," \
+      "'#{row[8]}'," \
+      "'#{row[9]}',0"
+    end
+
+    # @return [Integer] numero linhas inseridas
+    def eos_insert_api
+      dml("INSERT #{BD}.eos(#{eos_fields}) VALUES#{transacoes.novas.map { |e| eos_api_val1(e) }.join(',')}")
     end
 
-    # @return [Integer] numero linhas apagadas
-    def sql_delete
-      dml('delete ' + sql_where)
+    # @param [Hash] htx transacao ligadas a uma carteira - sem elementos irrelevantes
+    # @return [String] valores formatados para insert eos (parte1)
+    def eos_api_val1(htx)
+      "(#{Integer(htx['block_num'])}," \
+      "DATETIME(TIMESTAMP('#{htx['block_time']}'))," \
+      "'#{act(htx)['account']}'," \
+      "'#{act(htx)['name']}'," \
+      "'#{act_data(htx)['from']}'," \
+      "'#{act_data(htx)['to']}'," \
+      "#{eos_api_val2(htx)}"
+    end
+
+    # @param [Hash] htx transacao ligadas a uma carteira - sem elementos irrelevantes
+    # @return [String] valores formatados para insert eos (parte2)
+    def eos_api_val2(htx)
+      "#{act_data(htx)['quantity'].to_d}," \
+      "'#{act_data(htx)['quantity'][/[[:upper:]]+/]}'," \
+      "'#{act_data(htx)['memo']}'," \
+      "'#{act_data(htx)}'," \
+      "#{Integer(linha[:h][String(htx['block_num'])] || 0)})"
+    end
+
+    # @param [Hash] htx transacao normal
+    # @return [Hash] dados da acao
+    def act(htx)
+      htx['action_trace']['act']
+    end
+
+    # @param [Hash] htx transacao normal
+    # @return [Hash] dados da acao
+    def act_data(htx)
+      act(htx)['data']
+    end
+
+    # cria job bigquery & verifica execucao
+    #
+    # @param cmd (see sql)
+    # @return [Boolean] job ok?
+    def job?(cmd)
+      @job = api.query_job(cmd)
+      @job.wait_until_done!
+      puts(@job.error['message']) if @job.failed?
+      @job.failed?
+    end
+
+    # cria Structured Query Language (SQL) job bigquery
+    #
+    # @param [String] cmd comando SQL a executar
+    # @param [Array<Hash>] red resultado quando SQL tem erro
+    # @return [Google::Cloud::Bigquery::Data] resultado do SQL
+    def sql(cmd, red = [])
+      @sqr = job?(cmd) ? red : job.data
+    end
+
+    # cria Data Manipulation Language (DML) job bigquery
+    #
+    # @param cmd (see sql)
+    # @return [Integer] numero linhas afetadas
+    def dml(cmd)
+      job?(cmd) ? 0 : job.num_dml_affected_rows
     end
   end
 end