recon_tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f0db2e7ea5e0d7a2185aac328d78592aeaa3afb6a3ccba223026100c6138c4
-  data.tar.gz: 0160d608bf9fe5a5e208d00124fef5436bb27d5cb8e4bcf45defe59fb3d78a78
+  metadata.gz: 11f906981bb982590d5280cde04b01460e4bcbf65b268c6c04dd103c708ae9c7
+  data.tar.gz: f16cbb67a08713d220e5bf62ce8e1449222dc3e75cb12b9bf9ecbe44db392f50
 SHA512:
-  metadata.gz: d837abca27ae1bd9b8b10cd161f305756697bf5246850b6280c5d1d1ce49625c92ee3713ca46be09c88faee77b86a4b87479fa1c9134426bb8fc9fb4ee826e60
-  data.tar.gz: 8f205e8192cd3581b1c1bec7ba31454817d8176d041583cfc7ab94a06c28b4142b5285d492ef9b6e8b9bf5e7b1a0e4584fc449e0352638b23c450a29707ad307
+  metadata.gz: 3cd1c7e80f985baa73342d498d5325d13eebf50bae643c62bc46c8295cbbacc7124ef92a5c65dd70572610a79a20a7340665ea1a96d9eefec9bd443e04deabb9
+  data.tar.gz: fb67b77cf6a838e793ab05f96f9153d671d0ed3863d2060c61a3049c1de1c5a33690c2c41ce272e67cc50f2ac6638341a3016e45d44f2b203f75f8894759bfe7

data/lib/recon_services.rb

@@ -4,7 +4,7 @@ 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)
@@ -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, 0, 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.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recon_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Rowe