shiftzilla 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7512777af875feda57de1b110ac3969924e288d5278c343dd0eabd2ea51a1f
-  data.tar.gz: c227a3425277f86e61c1eb38254f67982959ee26d5f75883614f79a67e31d4fd
+  metadata.gz: a9e9ace955249bdb89d69b99109741b37d827b5c9dd3abb7be7c2733f615cdf1
+  data.tar.gz: 802c36f72f1571ab298cb74f4f3e72cfb2e694f40f8fe768a120fb374700d7b7
 SHA512:
-  metadata.gz: 7cf353cfb4e047d2fddc220fdeea3e9a55f3b698923777080e276dd28e351d6b848655dad6d9c32d2d8cf4b3bd467d2688870de7002657e244794861f1008097
-  data.tar.gz: 3e796a5a8134da476e308109274b9ef7b957d4392031b60dfcd4e36418175d4d0e6099e3453aa272cf5958f1a9d5cc61d2eb8272c1cba2b729328f09fc5ca874
+  metadata.gz: 737b8e19515ffe95a1228885bae143f2d26efdfef803c8ea17ce5127c1ab4028a9a9f0a4dce5ab4d1e307163b7e3a6d8d306e844445d96024db7e3c11681eafe
+  data.tar.gz: 8bba34ac2ec258cc858715c44d3c25b1dde7b1d19ac4b35f29654b3e854e33560393e27656fefaca58974b40dd6ca3349afb9d13d8f9e97c7d19d1ef1469c972

data/bin/shiftzilla

@@ -46,7 +46,9 @@ Description:
 Options:
 EOF
     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
+    opt :cfgpath, "Specify a config file for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla_cfg.yaml"
+    opt :dbpath, "Specify a database file location for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla.sqlite"
+    opt :archpath, "Specify a path to store database backups.", :default => "#{DEFAULT_DIR}/archive"
   end
 when 'build'
   Optimist::options do
@@ -62,7 +64,8 @@ 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
+    opt :cfgpath, "Specify a config file for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla_cfg.yaml"
+    opt :dbpath, "Specify a database file location for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla.sqlite"
   end
 when 'purge'
   Optimist::options do
@@ -75,7 +78,8 @@ Description:
 
 Options:
 EOF
-    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
+    opt :cfgpath, "Specify a config file for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla_cfg.yaml"
+    opt :dbpath, "Specify a database file location for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla.sqlite"
   end
 when 'triage'
   Optimist::options do
@@ -89,7 +93,8 @@ Description:
 
 Options:
 EOF
-    opt :configdir, "Specify a config directory for shiftzilla to use.", :default => DEFAULT_DIR
+    opt :cfgpath, "Specify a config file for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla_cfg.yaml"
+    opt :dbpath, "Specify a database file location for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla.sqlite"
   end
 when 'help'
   Optimist::educate
@@ -98,10 +103,14 @@ when 'version'
   exit 0
 end
 
-if cmd_opts.has_key?(:configdir)
-  set_sza_dir(cmd_opts[:configdir])
-else
-  set_sza_dir(DEFAULT_DIR)
+if cmd_opts.has_key?(:cfgpath)
+  set_sza_cfg(cmd_opts[:cfgpath])
+end
+if cmd_opts.has_key?(:dbpath)
+  set_sza_db(cmd_opts[:dbpath])
+end
+if cmd_opts.has_key?(:archpath)
+  set_sza_arch(cmd_opts[:archpath])
 end
 
 # Check for the config info

data/lib/shiftzilla/engine.rb

@@ -9,31 +9,16 @@ include Shiftzilla::Helpers
 module Shiftzilla
   module Engine
     def check_config
-      if not File.directory?(Shiftzilla::SZA_DIR)
-        choose do |menu|
-          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(Shiftzilla::SZA_DIR)
-            Dir.mkdir(Shiftzilla::ARCH_DIR)
-          }
-          menu.choice(:no) {
-            say('Okay. Exiting Shiftzilla.')
-            exit
-          }
-        end
-      end
-      if not File.directory?(Shiftzilla::ARCH_DIR)
+      if Shiftzilla.const_defined?('ARCH_DIR') and 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?(Shiftzilla::CFG_FILE)
+      if Shiftzilla.const_defined?('CFG_FILE') and not File.exists?(Shiftzilla::CFG_FILE)
         choose do |menu|
-          menu.header = "\nYou don't have a shiftzilla_cfg.yml file in #{Shiftzilla::SZA_DIR}. Should I create one?"
+          menu.header = "\nYou don't have a shiftzilla config file at #{Shiftzilla::CFG_FILE}. Should I create one?"
           menu.prompt = 'Choice?'
           menu.choice(:yes) {
-            say('Okay. Creating shiftzilla_cfg.yml')
+            say("Okay. Creating #{Shiftzilla::CFG_FILE}")
             FileUtils.cp(CFG_TMPL,Shiftzilla::CFG_FILE)
           }
           menu.choice(:no) {
@@ -42,12 +27,12 @@ module Shiftzilla
           }
         end
       end
-      if not File.exists?(Shiftzilla::DB_FPATH)
+      if Shiftzilla.const_defined?('DB_FPATH') and not File.exists?(Shiftzilla::DB_FPATH)
         choose do |menu|
-          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.header = "\nYou don't have a shiftzilla database file at #{Shiftzilla::DB_FPATH}.\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')
+            say("Okay. Creating #{Shiftzilla::DB_FPATH}")
             sql_tmpl       = File.read(SQL_TMPL)
             tgt_rel_clause = release_clause(releases)
             sql_tmpl.gsub! '$RELEASE_CLAUSE', tgt_rel_clause

data/lib/shiftzilla/helpers.rb

@@ -35,11 +35,16 @@ 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))
+    def set_sza_cfg(sza_cfg)
+      Shiftzilla.const_set('CFG_FILE',sza_cfg)
+    end
+
+    def set_sza_db(sza_db)
+      Shiftzilla.const_set('DB_FPATH',sza_db)
+    end
+
+    def set_sza_arch(sza_arch)
+      Shiftzilla.const_set('ARCH_DIR',sza_arch)
     end
 
     def tmp_dir

data/lib/shiftzilla/version.rb

@@ -1,3 +1,3 @@
 module Shiftzilla
-  VERSION = "0.2.21"
+  VERSION = "0.2.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - N. Harrison Ripps