shiftzilla 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4dbe018b36c63cdd3bb19d6c565bfed278e2f2b2ff5fef0b1df41ae675acd8
-  data.tar.gz: dbab134260f9393364479e4ee6ad6f5a32f5e11c9265996316f366e8cd0b5246
+  metadata.gz: b70c6e87cb9017c6d7d978e11e8bc4c4ab1e363c20b44ca6ec3aca6c71c971e0
+  data.tar.gz: d7b4f410f27e5a63e941c295e2b493ccae41928593286bc2dfbd68dc6497334a
 SHA512:
-  metadata.gz: 71239194891c4c9ace39e0d1365f103b507ce2543588f313a53fbe7cf711fc7998e147d35c93e827f25c689aa7e6f68e4ebfe1cf2b81af9bb9dbf780a501c7ab
-  data.tar.gz: b9f876b0802f27c1d08b48cba882f69251a8f5dd2e63ebed7d4bb2b4ffc97d0e424570faa972dadd61eab22e901f7498db737030e59badfa89b843a7b4f38f34
+  metadata.gz: 2f717332b7b3835943abdb63fb206bb2766d5b3658a86948058ae34f9da189543e21d04f2711a5305f25d9682701da0e9cd6763768a20a094f01a77e6cf9ae49
+  data.tar.gz: bf2cab87b689a2f626739622c5f78da03d1786d05e7520f3f0743cdef8110273ddf6f61eb951efbce5f125447076909653a70ce4c4a3420554a54691d261522e

data/bin/shiftzilla

@@ -3,13 +3,13 @@
 require 'shiftzilla/engine'
 require 'shiftzilla/helpers'
 require 'shiftzilla/version'
-require 'trollop'
+require 'optimist'
 
 include Shiftzilla::Engine
 include Shiftzilla::Helpers
 
 SUB_COMMANDS = %w{help version load build purge triage}
-Trollop::options do
+Optimist::options do
   version Shiftzilla::VERSION
   banner <<-EOF
 Usage:
@@ -33,7 +33,7 @@ end
 cmd = ARGV.shift
 cmd_opts = case cmd
 when 'load'
-  Trollop::options do
+  Optimist::options do
     banner <<-EOF
 Usage:
   #$0 load <options>
@@ -49,7 +49,7 @@ EOF
     opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'build'
-  Trollop::options do
+  Optimist::options do
     banner <<-EOF
 Usage:
   #$0 build <options>
@@ -65,7 +65,7 @@ EOF
     opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'purge'
-  Trollop::options do
+  Optimist::options do
     banner <<-EOF
 Usage:
   #$0 purge <options>
@@ -78,7 +78,7 @@ EOF
     opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'triage'
-  Trollop::options do
+  Optimist::options do
     banner <<-EOF
 Usage:
   #$0 triage <options>
@@ -92,7 +92,7 @@ EOF
     opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'help'
-  Trollop::educate
+  Optimist::educate
 when 'version'
   puts Shiftzilla::VERSION
   exit 0

data/lib/shiftzilla/engine.rb

@@ -3,7 +3,6 @@ require 'shiftzilla/config'
 require 'shiftzilla/helpers'
 require 'shiftzilla/org_data'
 require 'terminal-table'
-require 'trollop'
 
 include Shiftzilla::Helpers
 

data/lib/shiftzilla/source.rb

@@ -15,7 +15,7 @@ module Shiftzilla
 
     def has_records_for_today?
       count = 0
-      dbh.execute("SELECT count(*) FROM #{@table} WHERE Snapshot = date('now')") do |row|
+      dbh.execute("SELECT count(*) FROM #{@table} WHERE Snapshot = date('now','localtime')") do |row|
         count = row[0].to_i
       end
       return count > 0
@@ -25,13 +25,14 @@ module Shiftzilla
       output_format = @fields.map{ |fld| "%{#{fld.to_s}}" }.join("\x1F")
       table_fields  = @fields.map{ |fld| "\"#{field_map[fld]}\"" }.join(',')
       insert_frame  = @fields.map{ |fld| '?' }.join(', ')
-      bz_command    = "bugzilla query --savedsearch #{@search} --savedsearch-sharer-id=#{@sharer} --outputformat='#{output_format}'"
+      bz_command    = "bugzilla query --savedsearch #{@search} --savedsearch-sharer-id=#{@sharer} --outputformat='#{output_format}||EOR'"
       bz_csv        = `#{bz_command}`
       retrieved     = []
-      bz_csv.split("\n").each do |row|
-        values = row.split("\x1F")
+      bz_csv.split("||EOR\n").each do |row|
+        values = row.split("\x1F").map{ |v| v.strip }
+        next unless values.length > 0
         if not @external_bugs_idx.nil?
-          if not @external_sub.nil? and values[@external_bugs_idx].include?(@external_sub)
+          if not @external_sub.nil? and not values[@external_bugs_idx].nil? and values[@external_bugs_idx].include?(@external_sub)
             values[@external_bugs_idx] = 1
           else
             values[@external_bugs_idx] = 0
@@ -51,14 +52,14 @@ module Shiftzilla
         retrieved.each do |values|
           dbh.execute("INSERT INTO #{@table} (#{table_fields}) VALUES (#{insert_frame})", values)
         end
-        dbh.execute("UPDATE #{@table} SET Snapshot = date('now') WHERE Snapshot ISNULL")
+        dbh.execute("UPDATE #{@table} SET Snapshot = date('now','localtime') WHERE Snapshot ISNULL")
         dbh.commit
       end
       return retrieved.length
     end
 
     def purge_records
-      dbh.execute("DELETE FROM #{@table} WHERE Snapshot == date('now') OR Snapshot ISNULL")
+      dbh.execute("DELETE FROM #{@table} WHERE Snapshot == date('now','localtime') OR Snapshot ISNULL")
     end
   end
 end

data/lib/shiftzilla/version.rb

@@ -1,3 +1,3 @@
 module Shiftzilla
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/shiftzilla.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json',           '~> 2.1'
   spec.add_dependency 'sqlite3',        '~> 1.3', '>= 1.3.13'
   spec.add_dependency 'terminal-table', '~> 1.8'
-  spec.add_dependency 'trollop',        '~> 2.1', '>= 2.1.2'
+  spec.add_dependency 'optimist',       '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - N. Harrison Ripps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,25 +139,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3.0'
 description: Shiftzilla is a tool for providing historical reports based on Bugzilla
   data
 email: