past_yer_eyes 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18495e807b2ce25602f8aa69a49244221f94eb3
-  data.tar.gz: 5a7ae5401634428f61835934c5e71c28a133a09a
+  metadata.gz: 333fad456bbf57ba8052aac6fc2376e776817ece
+  data.tar.gz: ee28f4d78a8cd09a4acd9e2fb7fd314f607a689e
 SHA512:
-  metadata.gz: cdb39c2f08f957aa4225a277a67791f71e04c9e097a961f292a52caef7fd8a5c73bf6adb3f32cbdcaf77072857b43cede625d545cf6fc6aeb168d508a1d8580c
-  data.tar.gz: 75d921c89fb9b0b8efdcc91ac96cd7d15c3d7e7a48cf9754849dcb079c7f4c9005ca36086d4be4816487a9335524ea7797adb339ec3d5d61f5cce920ee0a5212
+  metadata.gz: 90e29fc54c05e511f1a1713be3f54cd03073e3836b25952c103f3f316422cbc4c30d6e485ce9ece06827b9cac90c7a839951106dee7666741ad54ea974d9f766
+  data.tar.gz: ebed44de77d1d32b27e5b32e708e83a9f75d79d5e0c516c033055cdda338f0136c48cbc2aaa02d6d321582cab29673c150ed02bdc3b40587d2e945a5e098cbc5

data/lib/past_yer_eyes/batch_record.rb

@@ -0,0 +1,28 @@
+module PastYerEyes
+  class BatchRecord
+    attr_accessor :name, :guid, :status, :duration, :base_temperature, :batch_key, :events
+
+    def self.parse(key, data)
+      record = ::PastYerEyes::BatchRecord.new
+      record.batch_key = key
+      record.guid = data.fetch("guid", "")
+      record.status = data.fetch("status", "")
+      record.duration = data.fetch("duration", "")
+      record.base_temperature = data.fetch("base_temperature")
+      record.name = data.fetch("name", "")
+
+      record.events = data["events"].map do |key, value|
+        ::PastYerEyes::BatchEvent.parse(key, value)
+      end
+
+      record
+    end
+  end
+
+  class BatchEvent < Struct.new(:guid, :data_point, :data_type, :timestamp)
+    def self.parse(key, event_hash)
+      ::PastYerEyes::BatchEvent.new(key, event_hash["data"], event_hash["name"], event_hash["timestamp"])
+    end
+  end
+end
+

data/lib/past_yer_eyes/cli.rb

@@ -20,16 +20,18 @@ module PastYerEyes
     option :log_name, :type => :string, :default => "./pasteurization.json", :aliases => "-l"
     option :sheet_name, :type => :string, :aliases => "-s"
     option :session, :type => :string, :default => "./session.json", :aliases => "-e"
-
+    option :exclude, :type => :boolean, :default => false
     def create_spreadsheet
       spreadsheet_name = options.fetch(:log_name, default_spreadsheet_name)
       logfile_name = options[:log_name]
       session_file = options[:session]
+      filter_options = {}
+      filter_options[:completed] = options[:exclude]
 
       fail "#{session_file} does not exist" unless File.exist?(session_file)
       fail "#{logfile_name} does not exist" unless File.exist?(logfile_name)
 
-      ::PastYerEyes::LogParser.parse(session_file, logfile_name, spreadsheet_name)
+      ::PastYerEyes::LogParser.parse(filter_options, session_file, logfile_name, spreadsheet_name)
     end
 
     default_task :create_spreadsheet

data/lib/past_yer_eyes/log_parser.rb

@@ -1,61 +1,19 @@
 require "json"
-require "google/api_client"
-require "google_drive"
-
-TIMESTAMP_COL = 1
-READING_COL = 2
-DATA_COL = 3
+require "pry"
+require "awesome_print"
 
 module PastYerEyes
   class LogParser
-    def self.parse(session_file, logfile_name, spreadsheet_name)
-      session = GoogleDrive.saved_session(session_file)
-
-      sheet = session.create_spreadsheet(spreadsheet_name)
-
+    def self.parse(options, session_file, logfile_name, spreadsheet_name)
       file = File.read(logfile_name)
 
       records = JSON.parse(file)
 
-      records.each do |record|
-        print_record(sheet, record)
-      end
-    end
-
-    def self.print_footer(ws, row, batch_name, batch_record)
-      ws[row, 1] = "Batch Name"
-      ws[row, 2] = batch_name
-      row += 1
-      ws[row, 1] = "Duration"
-      ws[row, 2] = batch_record['duration']
-      row += 1
-      ws[row, 1] = "Base Temperature"
-      ws[row, 2] = batch_record['base_temperature']
-      row += 1
-      ws[row, 1] = "Status"
-      ws[row, 2] = batch_record['status']
-      ws.save
-    end
-
-    def self.print_record(sheet, record)
-      batch_name = record.first
-      batch_record = record[1]
-
-      ws = sheet.add_worksheet("#{batch_record['name']}: #{batch_record['status']}")
-
-      ws[1,TIMESTAMP_COL] = "Timestamp"
-      ws[1,READING_COL] = "Reading"
-      ws[1,DATA_COL] = "Value"
-
-      row = 2
-      batch_record['events'].each do |key, value|
-        ws[row, TIMESTAMP_COL] = value["timestamp"]
-        ws[row, READING_COL] = value["name"]
-        ws[row, DATA_COL] = value["data"]
-        row += 1
+      batches = records["batches"].map do |key, value|
+        ::PastYerEyes::BatchRecord.parse(key, value)
       end
 
-      print_footer(ws, row + 1, batch_name, batch_record)
+      SpreadsheetWriter.write_spreadsheet(options, session_file, spreadsheet_name, batches)
     end
   end
 end

data/lib/past_yer_eyes/spreadsheet_writer.rb

@@ -0,0 +1,66 @@
+require "google/api_client"
+require "google_drive"
+
+module PastYerEyes
+  TIMESTAMP_COL = 1
+  READING_COL = 2
+  DATA_COL = 3
+
+  class SpreadsheetWriter
+    def self.suppress_record(options, record)
+      if options[:completed]
+        return record.status != "Completed"
+      end
+
+      false
+    end
+
+    def self.write_spreadsheet(options, session_file, spreadsheet_name, records)
+      session = GoogleDrive.saved_session(session_file)
+
+      puts "Creating Spreadsheet #{spreadsheet_name}"
+      sheet = session.create_spreadsheet(spreadsheet_name)
+
+      records.each do |record|
+        print_record(sheet, record) unless suppress_record(options, record)
+      end
+    end
+
+    def self.print_footer(ws, row, record)
+      ws[row, 1] = "Batch Name"
+      ws[row, 2] = record.name
+      row += 1
+      ws[row, 1] = "Duration"
+      ws[row, 2] = record.duration
+      row += 1
+      ws[row, 1] = "Base Temperature"
+      ws[row, 2] = record.base_temperature
+      row += 1
+      ws[row, 1] = "Status"
+      ws[row, 2] = record.status
+      ws.save
+    end
+
+    def self.print_record(sheet, record)
+      worksheet_name = "#{record.name}: #{record.status}"
+      puts "Creating worksheet for #{worksheet_name}"
+      ws = sheet.add_worksheet(worksheet_name)
+
+      ws[1,TIMESTAMP_COL] = "Timestamp"
+      ws[1,READING_COL] = "Reading"
+      ws[1,DATA_COL] = "Value"
+
+      row = 2
+
+      record.events.each do |event|
+        ws[row, TIMESTAMP_COL] = event.timestamp
+        ws[row, READING_COL] = event.data_type
+        ws[row, DATA_COL] = event.data_point unless event.data_point == 0
+        row += 1
+      end
+
+      print_footer(ws, row + 1, record)
+    end
+  end
+end
+

data/lib/past_yer_eyes/version.rb

@@ -1,3 +1,3 @@
 module PastYerEyes
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/past_yer_eyes.rb

@@ -1,5 +1,7 @@
 require "past_yer_eyes/cli"
+require "past_yer_eyes/batch_record"
 require "past_yer_eyes/log_parser"
+require "past_yer_eyes/spreadsheet_writer"
 
 require "past_yer_eyes/version"
 

data/past_yer_eyes.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.19"
   spec.add_dependency "google_drive", "~> 1.0"
 
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "awesome_print", "~> 1.6"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: past_yer_eyes
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Steve Newell
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +128,10 @@ files:
 - bin/past_yer_eyes
 - bin/setup
 - lib/past_yer_eyes.rb
+- lib/past_yer_eyes/batch_record.rb
 - lib/past_yer_eyes/cli.rb
 - lib/past_yer_eyes/log_parser.rb
+- lib/past_yer_eyes/spreadsheet_writer.rb
 - lib/past_yer_eyes/version.rb
 - past_yer_eyes.gemspec
 homepage: