shiftzilla 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b96fe5e59a6af07ab19279d5c88d5f77404b9ebaf7ad16c7ca7036dfbe9030
-  data.tar.gz: e748c09421a5cae2ee28188f63d8e92cbc3f8910fcb852afca4b27c2a8e7df88
+  metadata.gz: ae4dbe018b36c63cdd3bb19d6c565bfed278e2f2b2ff5fef0b1df41ae675acd8
+  data.tar.gz: dbab134260f9393364479e4ee6ad6f5a32f5e11c9265996316f366e8cd0b5246
 SHA512:
-  metadata.gz: 89952488ce6929e7bdad90fa7c020efcea98c37abc1c11dce547df73abc62e2c6bc5727e11fcef44129f9c2a393a2f4b3a0ab036f3b593445feb53489413fe46
-  data.tar.gz: bfe2ab32dab27b347b09d388eef5b7f2f6b8f3aec3f7cb33d3194d8368356deb35e14504f9cc110d71377320ede0b4ad7b0433482efd8ec3816f453459c8a4cb
+  metadata.gz: 71239194891c4c9ace39e0d1365f103b507ce2543588f313a53fbe7cf711fc7998e147d35c93e827f25c689aa7e6f68e4ebfe1cf2b81af9bb9dbf780a501c7ab
+  data.tar.gz: b9f876b0802f27c1d08b48cba882f69251a8f5dd2e63ebed7d4bb2b4ffc97d0e424570faa972dadd61eab22e901f7498db737030e59badfa89b843a7b4f38f34

data/bin/shiftzilla

@@ -45,7 +45,8 @@ Description:
 
 Options:
 EOF
-    opt :purge, "After querying for bug data - if we already have data ffor today, clear it out before loading new data", :default => false
+    opt :purge, "After querying for bug data - if we already have data for today, clear it out before loading new data", :default => false
+    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'build'
   Trollop::options do
@@ -61,6 +62,7 @@ Options:
 EOF
     opt :local_preview, "Don't publish, just show the report locally", :default => false
     opt :quiet, "For cron use; don't print anything to STDOUT.", :default => false
+    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'purge'
   Trollop::options do
@@ -73,6 +75,7 @@ Description:
 
 Options:
 EOF
+    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'triage'
   Trollop::options do
@@ -86,6 +89,7 @@ Description:
 
 Options:
 EOF
+    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
   end
 when 'help'
   Trollop::educate
@@ -94,6 +98,12 @@ when 'version'
   exit 0
 end
 
+if cmd_opts.has_key?(:configdir)
+  set_sza_dir(cmd_opts[:configdir])
+else
+  set_sza_dir(DEFAULT_DIR)
+end
+
 # Check for the config info
 check_config
 

data/lib/shiftzilla/engine.rb

@@ -10,14 +10,14 @@ include Shiftzilla::Helpers
 module Shiftzilla
   module Engine
     def check_config
-      if not File.directory?(SZA_DIR)
+      if not File.directory?(Shiftzilla::SZA_DIR)
         choose do |menu|
-          menu.header = 'You don\'t have a Shiftzilla config directory at $HOME/.shiftzilla. Should I create one?'
+          menu.header = "You don't have a Shiftzilla config directory at #{Shiftzilla::SZA_DIR}. Should I create one?"
           menu.prompt = 'Choice?'
           menu.choice(:yes) {
             say('Okay. Creating config directory.')
-            Dir.mkdir(SZA_DIR)
-            Dir.mkdir(ARCH_DIR)
+            Dir.mkdir(Shiftzilla::SZA_DIR)
+            Dir.mkdir(Shiftzilla::ARCH_DIR)
           }
           menu.choice(:no) {
             say('Okay. Exiting Shiftzilla.')
@@ -25,17 +25,17 @@ module Shiftzilla
           }
         end
       end
-      if not File.directory?(ARCH_DIR)
-        puts 'You don\'t have an archive directory at $HOME/.shiftzilla/archive. Creating it.'
-        Dir.mkdir(ARCH_DIR)
+      if not File.directory?(Shiftzilla::ARCH_DIR)
+        puts "You don't have an archive directory at #{Shiftzilla::ARCH_DIR}. Creating it."
+        Dir.mkdir(Shiftzilla::ARCH_DIR)
       end
-      if not File.exists?(CFG_FILE)
+      if not File.exists?(Shiftzilla::CFG_FILE)
         choose do |menu|
-          menu.header = "\nYou don't have a shiftzilla_cfg.yml file in $HOME/.shiftzilla. Should I create one?"
+          menu.header = "\nYou don't have a shiftzilla_cfg.yml file in #{Shiftzilla::SZA_DIR}. Should I create one?"
           menu.prompt = 'Choice?'
           menu.choice(:yes) {
             say('Okay. Creating shiftzilla_cfg.yml')
-            FileUtils.cp(CFG_TMPL,CFG_FILE)
+            FileUtils.cp(CFG_TMPL,Shiftzilla::CFG_FILE)
           }
           menu.choice(:no) {
             say('Okay. Exiting Shiftzilla.')
@@ -43,9 +43,9 @@ module Shiftzilla
           }
         end
       end
-      if not File.exists?(DB_FPATH)
+      if not File.exists?(Shiftzilla::DB_FPATH)
         choose do |menu|
-          menu.header = "\nYou don't have a shiftzilla.sqlite file in $HOME/.shiftzilla.\nI can create it for you, but it is very important for you to\nconfigure Shiftzilla by puttng the proper settings in\n$HOME/.shiftzilla/shiftzilla_cfg.yml first. Do you want me to proceed with creating the database?"
+          menu.header = "\nYou don't have a shiftzilla.sqlite file in #{Shiftzilla::SZA_DIR}.\nI can create it for you, but it is very important for you to\nconfigure Shiftzilla by puttng the proper settings in\n#{Shiftzilla::CFG_FILE} first.\nDo you want me to proceed with creating the database?"
           menu.prompt = 'Choice?'
           menu.choice(:yes) {
             say('Okay. Creating shiftzilla.sqlite')

data/lib/shiftzilla/helpers.rb

@@ -8,17 +8,14 @@ require 'yaml'
 
 module Shiftzilla
   module Helpers
-    BZ_URL     = 'https://bugzilla.redhat.com/show_bug.cgi?id='
-    SZA_DIR    = File.join(ENV['HOME'],'.shiftzilla')
-    ARCH_DIR   = File.join(SZA_DIR,'archive')
-    CFG_FILE   = File.join(SZA_DIR,'shiftzilla_cfg.yml')
-    DB_FNAME   = 'shiftzilla.sqlite'
-    DB_FPATH   = File.join(SZA_DIR,DB_FNAME)
-    THIS_PATH  = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-    HAML_TMPL  = File.expand_path(File.join(File.dirname(THIS_PATH), '../../template.haml'))
-    CFG_TMPL   = File.expand_path(File.join(File.dirname(THIS_PATH), '../../shiftzilla_cfg.yml.tmpl'))
-    SQL_TMPL   = File.expand_path(File.join(File.dirname(THIS_PATH), '../../shiftzilla.sql.tmpl'))
-    VENDOR_DIR = File.expand_path(File.join(File.dirname(THIS_PATH), '../../vendor'))
+    BZ_URL      = 'https://bugzilla.redhat.com/show_bug.cgi?id='
+    DB_FNAME    = 'shiftzilla.sqlite'
+    DEFAULT_DIR = File.join(ENV['HOME'],'.shiftzilla')
+    THIS_PATH   = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+    HAML_TMPL   = File.expand_path(File.join(File.dirname(THIS_PATH), '../../template.haml'))
+    CFG_TMPL    = File.expand_path(File.join(File.dirname(THIS_PATH), '../../shiftzilla_cfg.yml.tmpl'))
+    SQL_TMPL    = File.expand_path(File.join(File.dirname(THIS_PATH), '../../shiftzilla.sql.tmpl'))
+    VENDOR_DIR  = File.expand_path(File.join(File.dirname(THIS_PATH), '../../vendor'))
 
     GRAPH_DIMENSIONS = '800x400'
     GRAPH_THEME      = {
@@ -38,16 +35,23 @@ module Shiftzilla
       :background_image  => nil,
     }
 
+    def set_sza_dir(sza_dir)
+      Shiftzilla.const_set('SZA_DIR',sza_dir)
+      Shiftzilla.const_set('ARCH_DIR',File.join(Shiftzilla::SZA_DIR,'archive'))
+      Shiftzilla.const_set('CFG_FILE',File.join(Shiftzilla::SZA_DIR,'shiftzilla_cfg.yml'))
+      Shiftzilla.const_set('DB_FPATH',File.join(Shiftzilla::SZA_DIR,DB_FNAME))
+    end
+
     def tmp_dir
       @tmp_dir ||= Dir.mktmpdir('shiftzilla-reports-')
     end
 
     def cfg_file
-      @cfg_file ||= validated_config_file(YAML.load_file(CFG_FILE))
+      @cfg_file ||= validated_config_file(YAML.load_file(Shiftzilla::CFG_FILE))
     end
 
     def dbh
-      @dbh ||= SQLite3::Database.new(DB_FPATH)
+      @dbh ||= SQLite3::Database.new(Shiftzilla::DB_FPATH)
     end
 
     def haml_engine
@@ -67,7 +71,7 @@ module Shiftzilla
     def backup_db
       unless db_backed_up
         today = Date.today.strftime('%Y-%m-%d')
-        tpath = File.join(ARCH_DIR,today)
+        tpath = File.join(Shiftzilla::ARCH_DIR,today)
         unless Dir.exists?(tpath)
           Dir.mkdir(tpath)
         end
@@ -79,7 +83,7 @@ module Shiftzilla
           break unless File.exists?(apath)
           copy_idx += 1
         end
-        FileUtils.cp DB_FPATH, apath
+        FileUtils.cp Shiftzilla::DB_FPATH, apath
         puts "Backed up the database."
         @db_backed_up = true
       end

data/lib/shiftzilla/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - N. Harrison Ripps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler