recon_tools 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5569c3da1aed08b4c3aebecd24ffc7fc835d3ff15bf4834d0b4e1216b5d0d87b
-  data.tar.gz: 7a3df1fe4067f8e9a12b1c2f2cd8e1d90bae71e3c930330d05b90f30cfb840dd
+  metadata.gz: 4b866c032ac00e240c6f2a9b435d3996e3b27eeffbdbb9b8fe30fb43ec893e3c
+  data.tar.gz: cc652526fce21cfa9c181d1fb7bc048fdaa5def28abeda4ce3ebfce720e439e8
 SHA512:
-  metadata.gz: 62be24d6d7835681cf131eca7795e3bd29b6850beebe40ff287266c955aa0b2b93d96dffe87297857c363b7e1155e77264ff119e7c5750abb743280af1d1fd84
-  data.tar.gz: 8cc24f10e651970b1d57fe93e2fd00d89d27a8be38f105fdf49ac5eeec365bc8cbf75170ba7d188358af1c4528247cea657815c78c6ad68c623db2dc21daa182
+  metadata.gz: 801c31bb190bdb55a0cbb9d3e35a613142c453d2810229241ff6b6cdf96210db0f5cbe30b1eccf67ccda3c93b0d4d8967dfe4574e0bd44f3122557727c8fed77
+  data.tar.gz: ae76435de549558f70baa85d22d7ae2a5b53f01d10ac8e21c930f618c507408c06a46e50a5b44b8208aaa76e78ccc697d4db1644d0bff3de005e9ceb3fb58e77

data/lib/recon_services.rb

@@ -4,15 +4,15 @@ require 'logging'
 class ReconServices
   def initialize
     @logger = Logging.logger(STDOUT)
-    @logger.level = :info
+    @logger.level = :debug
   end
 
   def get_jira_data(company_url_base = "leadtechie", project = "TEST", jira_col_start, jira_col_end)
     token = ENV['RECON_TOOLS_JIRA_TOKEN']
     email = ENV['RECON_TOOLS_JIRA_EMAIL']
     #if token="" or email= ""
-    assert_not_equal nil, token, "Token not set as environment variable"
-    assert_not_equal nil, email, "email not set as environment variable"
+    #assert_not_equal nil, token, "Token not set as environment variable"
+    #assert_not_equal nil, email, "email not set as environment variable"
     jira_connect = JiraConnect.new(email, token)
 
 
@@ -28,7 +28,7 @@ class ReconServices
   # Does a reconciliation of the data
   # Makes updates to the data on the sheet with the new data from JIRA
   # Rereads data from the sheet and confirms the same as from JIRA
-  def jira_googlesheets_reconcile_and_update(sheet_name, tab_number, sheet_col_start, sheet_col_end, copy_flag=false, write_change_log=false, google_credentials_file,
+  def jira_googlesheets_reconcile_and_update(sheet_name, tab_number, sheet_col_start, sheet_col_end, row_offset, copy_flag=false, write_change_log=false, google_credentials_file,
                                              company_url_base, project, jira_col_start, jira_col_end)
     @logger.info "Starting e2e tests in jira_googlesheets_reconcile_and_update"
     @logger.info "Connecting to JIRA and gets list of components_from_jira"
@@ -36,9 +36,11 @@ class ReconServices
     #puts Dir.pwd
     @logger.info "Connecting to GoogleSheets and reads list from matched_records"
     googlesheets_connect = GoogleSheetsConnect.new(google_credentials_file)
-    sheet_data = googlesheets_connect.read_sheet_data sheet_name, 0, 0, sheet_col_end
+    sheet_data = googlesheets_connect.read_sheet_data sheet_name, tab_number, row_offset, sheet_col_end
     sheet_data = sheet_data.map { |e| e[sheet_col_start..sheet_col_end]}
 
+    @logger.debug "row_offset "
+    @logger.debug row_offset
     @logger.debug "sheet_data"
     @logger.debug sheet_data
     @logger.debug "sheet_data"
@@ -60,14 +62,14 @@ class ReconServices
     end
 
     @logger.info "Updating he data on the sheet with the new data from JIRA"
-    googlesheets_connect.update_specific_cells(recon_tools.updates, sheet_name, sheet_id, sheet_col_start)
+    googlesheets_connect.update_specific_cells(recon_tools.updates, sheet_name, sheet_id, sheet_col_start, row_offset)
 
     #sheet_data_new = googlesheets_connect.read_sheet_data sheet_name, sheet_id, 0, 5
     #sheet_data_new.each { |e| e.delete_at(0)}
     #assert_equal components_from_jira, sheet_data_new, "Compare updated data from sheet with JIRA"
 
     if write_change_log
-      googlesheets_connect.write_column recon_tools.changelog, sheet_name, sheet_id, sheet_col_end
+      googlesheets_connect.write_column recon_tools.changelog, sheet_name, sheet_id, sheet_col_end, row_offset
     end
 
     @logger.info "ending e2e tests in jira_googlesheets_reconcile_and_update"

data/lib/recon_tools/google_sheets_connect.rb

@@ -8,7 +8,7 @@ require "google_docs"
 
 class GoogleSheetsConnect
   @session
-  def initialize(json_crednetials = "config/credentials.json")
+  def initialize(json_crednetials = "../credentials.json")
     #credentials = File.read("../config/credentials.json")
     #puts credentials
     @session = GoogleDrive::Session.from_service_account_key(json_crednetials)
@@ -31,45 +31,45 @@ class GoogleSheetsConnect
     spreadsheet.worksheets.length-1
   end
 
-  def insert_data(dataToInsert, sheetName)
+  def insert_data(dataToInsert, sheetName, row_offset=0)
     spreadsheet = @session.spreadsheet_by_title(sheetName)
     worksheet = spreadsheet.worksheets.first
 #    worksheet.rows.each { |row| puts row.first(6).join(" | ") }
 
-    worksheet.insert_rows(1 , dataToInsert)
+    worksheet.insert_rows(1+row_offset, dataToInsert)
     worksheet.save
   end
 
-  def update_data(data_to_insert, sheet_name, tabNumber=0)
+  def update_data(data_to_insert, sheet_name, tabNumber=0, row_offset=0)
     spreadsheet = @session.spreadsheet_by_title(sheet_name)
     worksheet = spreadsheet.worksheets[tabNumber]
 
     data_to_insert.each_with_index do |row, rowIndex|
       row.each_with_index do |value, colIndex|
-        worksheet[rowIndex+1, colIndex+1]= value
+        worksheet[rowIndex+1+row_offset, colIndex+1]= value
         puts "#{rowIndex}, #{colIndex} = #{value}"
       end
     end
     worksheet.save
   end
 
-  def update_specific_cells(data_to_insert, sheet_name, tabNumber=0, colOffset=0)
+  def update_specific_cells(data_to_insert, sheet_name, tabNumber=0, colOffset=0, row_offset=0)
     spreadsheet = @session.spreadsheet_by_title(sheet_name)
     worksheet = spreadsheet.worksheets[tabNumber]
 
     data_to_insert.each do |update|
-        worksheet[update[0]+1, update[1]+1+colOffset]= update[2]
+        worksheet[update[0]+1+row_offset, update[1]+1+colOffset]= update[2]
         #puts "#{row}, #{col} = #{value}"
     end
     worksheet.save
   end
 
-  def write_column(data_to_insert, sheet_name, tabNumber=0, colOffset=0)
+  def write_column(data_to_insert, sheet_name, tabNumber=0, colOffset=0, row_offset=0)
     spreadsheet = @session.spreadsheet_by_title(sheet_name)
     worksheet = spreadsheet.worksheets[tabNumber]
 
     data_to_insert.each_with_index do |value, index|
-        worksheet[index+1, 1+colOffset]= "#{DateTime::now} #{value} \n"+ worksheet[index+1, 1+colOffset]
+        worksheet[index+1+row_offset, 1+colOffset]= "#{DateTime::now} #{value} \n"+ worksheet[index+1+row_offset, 1+colOffset]
     end
     worksheet.save
   end
@@ -87,10 +87,15 @@ class GoogleSheetsConnect
       data.each do |row|
         data2 << row.first(columns)
       end
+      #puts data2.join(':')
+      #puts "dropping rows"
+      #puts skip_rows
+      #data2.drop(skip_rows)
+      #puts data2.join(':')
     else
       data2 = data
     end
-    data2
+    data2.drop(skip_rows)
   end
 
   def unfreeze_array(arrayIn2d)

data/lib/recon_tools/version.rb

@@ -1,3 +1,3 @@
 module ReconTool
-  VERSION = '0.1.0'
+  VERSION = '0.1.4'
 end

data/recon_tools.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email                 = ['coder-chris-github@gmail.com']
   spec.summary               = 'recon_tools: Tools to support importing, exporting and reconciliation of data'
   spec.description           = 'recon_tools: Tools to support importing, exporting and reconciliation of data from JIRA, GoogleSheets and more..'
-  spec.homepage              = 'https://github.com/coder-chris/recon_recontool'
+  spec.homepage              = 'https://github.com/coder-chris/recon_tools'
   spec.license               = 'MIT'
   spec.platform              = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.5.0'
@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
   else
     spec.add_development_dependency 'rails', ENV['TEST_RAILS_VERSION'].to_s
   end
+
+
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'rubocop', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recon_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Rowe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,7 +141,7 @@ files:
 - lib/recon_tools/jira_connect.rb
 - lib/recon_tools/version.rb
 - recon_tools.gemspec
-homepage: https://github.com/coder-chris/recon_recontool
+homepage: https://github.com/coder-chris/recon_tools
 licenses:
 - MIT
 metadata: {}