site_hook 0.9.16 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 786e1546d93c5e357e19e206bff9d97d4bd0e532ef20f56a9f5e7c9228d11784
-  data.tar.gz: 1169f46321516951906709d22b06e52bc848352167eb5454736e60b3dbc27e21
+  metadata.gz: '058b74bd66b905452e634bc863c081ed25db2c6168f23f82044aea362b1c2c11'
+  data.tar.gz: f80b40ceaa541a84b7ce423e71aa44cc4630c15625e5a9fb93dc65683f18c017
 SHA512:
-  metadata.gz: 336543b8d3cea8ad7f938de0eb971bc0a3fc0b9f513a6fc0f39b1834fd540c7423ce83c394d8d0d5e49cc2f34d77781653e357505e663405e3108c32743feafa
-  data.tar.gz: 014aaa2535911ba5cff4f0bb136294ad8ecea24bacdec6d6b2d7f7611c38b04d1e38aaef33ee821eef75e3a984ccdd857ae34319c2adbac35c6d242d3ac0c809
+  metadata.gz: fc442471bf2b8a7b689da756dfd5a054623d528fe94cf005e7025f820355ba30b37cc6e0c5b766450c5d0e423fb067584d2303f5c2fbd59e07a8539df123e56a
+  data.tar.gz: a290167d52b5e3985653d5bb0290156d3b7a4cf176c48f493cc90bb356aefbcc6e9b95b8d55a57f6cc11a6297884cb80bf16afe97707be54f19c2011dda1456d

data/lib/site_hook/cli.rb

@@ -26,6 +26,8 @@ module SiteHook
     subcommand('server', SiteHook::Commands::ServerClass)
     desc 'jekyll [subcommand] [options]', 'run jekyll actions'
     subcommand('jekyll', SiteHook::Commands::JekyllClass)
+    desc 'init [subcommand] [options]', 'run init actions'
+    subcommand('init', SiteHook::Commands::InitClass)
 
   end
 end

data/lib/site_hook/commands/config_class.rb

@@ -1,50 +1,27 @@
-require 'thor'
-require 'random_password'
-require 'site_hook/config_sections'
+require "thor"
+require "random_password"
+require "site_hook/config_sections"
+
 module SiteHook
   module Commands
-
     class ConfigClass < Thor
       # def __version
       # puts SiteHook::VERSION
       # end
       # map ['-v', '--version'] => __version
 
-      desc 'gen [-o]', 'generate a sample config, -o will output to STDOUT instead of to the default config location'
-      method_option(:output, type: :boolean, default: false, aliases: '-o')
-      def gen
-        unless SiteHook::Paths.default_config.exist?
-          if options[:output] == true
-            say SiteHook::ConfigSections.all_samples
-          else 
-            File.open(SiteHook::Paths.config, 'w+') do |file|
-              file.puts SiteHook::ConfigSections.all_samples
-            end
-          end
-        else
-          if options[:output] == true
-            say SiteHook::ConfigSections.all_samples
-          end
-          if !SiteHook::Paths.default_config.exist?
-            File.open(SiteHook::Paths.config, 'w+') do |file|
-              file.puts SiteHook::ConfigSections.all_samples
-            end
-          end
-        end
-
-      end
-
-      desc 'mkpass [options]', 'create a hook password'
-      method_option(:length, type: :numeric, banner: 'LENGTH', aliases: ['-l'], default: 20)
+      desc "mkpass [options]", "create a hook password"
+      method_option(:length, type: :numeric, banner: "LENGTH", aliases: ["-l"], default: 20)
 
       def mkpass
         puts RandomPassword.new(length: options[:length]).generate
       end
 
-      desc 'inspect [options]', 'output the configuration'
+      desc "inspect [options]", "output the configuration"
+
       def inspect
         puts SiteHook::Config.new.inspect
       end
     end
   end
-end
+end

data/lib/site_hook/commands/init_class.rb

@@ -0,0 +1,38 @@
+require "thor"
+require "random_password"
+require "site_hook/paths"
+require "site_hook/config_sections"
+require "tty-file"
+
+module SiteHook
+  module Commands
+    class InitClass < Thor
+      include Thor::Actions
+      desc("all", "generate sample config and directories")
+
+      def all
+        invoke :create_shrc_dir
+        invoke :create_shrc_logs_dir
+        invoke :create_config_sample
+      end
+
+      desc "create_shrc_dir", "create the .shrc directory"
+
+      def create_shrc_dir
+        TTY::File.create_dir(SiteHook::Paths.dir)
+      end
+
+      desc "create_shrc_logs_dir", "create the .shrc/logs directory"
+
+      def create_shrc_logs_dir
+        TTY::File.create_dir(SiteHook::Paths.logs)
+      end
+
+      desc "create_config_sample", "create the config sample"
+
+      def create_config_sample
+        TTY::File.create_file(SiteHook::Paths.config, SiteHook::ConfigSections.all_samples)
+      end
+    end
+  end
+end

data/lib/site_hook/commands/server_class.rb

@@ -14,8 +14,8 @@ module SiteHook
       # puts SiteHook::VERSION
       # end
       # map ['-v', '--version'] => __version
-      method_option(:host, banner: 'HOST', aliases: ['-h'], type: :string, default: SiteHook::Config.new.class.webhook.host)
-      method_option(:port, banner: 'PORT', aliases: ['-p'], type: :numeric, default: SiteHook::Config.new.class.webhook.port)
+#      method_option(:host, banner: 'HOST', aliases: ['-h'], type: :string, default: SiteHook::Config.webhook.host)
+#      method_option(:port, banner: 'PORT', aliases: ['-p'], type: :numeric, default: SiteHook::Config.webhook.port)
       desc 'listen [options]', ''
       def listen
         $threads << Thread.new do

data/lib/site_hook/config.rb

@@ -1,7 +1,8 @@
-require 'site_hook/paths'
-require 'yaml'
-require 'site_hook/string_ext'
-require 'site_hook/prelogger'
+require "site_hook/paths"
+require "yaml"
+require "site_hook/string_ext"
+require "site_hook/prelogger"
+
 module SiteHook
   class Config
     @@config = {}
@@ -47,14 +48,14 @@ module SiteHook
     # end
 
     def inspect
-      meths    = %i[webhook log_levels cli projects]
+      meths = %i[webhook log_levels cli projects]
       sections = {}
       meths.each do |m|
         sections[m] = self.class.send(m).inspect
       end
       secs = []
       sections.each { |name, instance| secs << "#{name}=#{instance}" }
-      "#<SiteHook::Config #{secs.join(' ')}>"
+      "#<SiteHook::Config #{secs.join(" ")}>"
     end
 
     def self.reload!
@@ -70,64 +71,65 @@ module SiteHook
     end
 
     def initialize
-      @@config   = {}
+      @@config = {}
       @@filename = SiteHook::Paths.default_config
       begin
         @@config = YAML.load_file(@@filename)
       rescue Errno::ENOENT
+        PreLogger.error "ENOENT"
         raise SiteHook::NoConfigError.new @@filename
       rescue NoMethodError
-        @@filename.empty?
+        PreLogger.error @@filename.empty?
       end
-    rescue NoConfigError
-      #SiteHook::Commands::ConfigClass.invoke()
-      say SiteHook::Commands::ConfigClass.methods
-    rescue NeitherConfigError
-      #SiteHook::Commands::ConfigClass.invoke(:gen)
-      say SiteHook::Commands::ConfigClass.methods
     end
 
     # @return [Webhook]
     def self.webhook
-      Webhook.new(@@config['webhook'])
+      Webhook.new(@@config["webhook"])
     end
 
     # @return [Projects]
     def self.projects
-      Projects.new(@@config['projects'])
+      Projects.new(@@config["projects"])
     end
 
     # @return [Cli]
     def self.cli
-      Cli.new(@@config['cli'])
+      Cli.new(@@config["cli"])
     end
 
     # @return [LogLevels]
     def self.log_levels
-      LogLevels.new(@@config['log_levels'])
+      LogLevels.new(@@config["log_levels"])
     end
   end
+
   class Webhook
     def initialize(config)
       config.each do |option, value|
         sec = StrExt.mkatvar(option)
         self.instance_variable_set(:"#{sec}", value)
+        sec2 = StrExt.mkatatvar(option)
+        self.class_variable_set(:"#{sec2}", value)
       end
     end
 
+    def self.host
+    end
+
     def host
-      @host
+      @host || "0.0.0.0"
     end
 
     def port
-      @port
+      @port || 9090
     end
 
     def inspect
       "#<SiteHook::Webhook host=#{host} port=#{port}>"
     end
-
   end
+
   class Projects
     def initialize(config)
       config.each do |project, options|
@@ -136,12 +138,11 @@ module SiteHook
     end
 
     def inspect
-
       output = []
       instance_variables.each do |project|
         output << "#{StrExt.rematvar(project)}=#{instance_variable_get(project).inspect}"
       end
-      "#<SiteHook::Projects #{output.join(' ')}"
+      "#<SiteHook::Projects #{output.join(" ")}"
     end
 
     def find_project(name)
@@ -157,7 +158,6 @@ module SiteHook
       rescue NameError
         nil
       end
-
     end
 
     def get(project)
@@ -181,7 +181,7 @@ module SiteHook
     #
     # Collect project names that meet certain criteria
     def collect_public
-      public_vars     = instance_variables.reject do |project_var|
+      public_vars = instance_variables.reject do |project_var|
         instance_variable_get(project_var).private
       end
       public_projects = []
@@ -198,14 +198,13 @@ module SiteHook
         %i[src dst repo host private].each do |option|
           projects[project.name][option] = project.instance_variable_get(StrExt.mkatvar(option))
         end
-
       end
       projects
     end
 
     def each(&block)
       len1 = instance_variables.length
-      x    = 0
+      x = 0
       while x < len1
         base = self
         yield instance_variable_get(instance_variables[x])
@@ -217,11 +216,11 @@ module SiteHook
       instance_variables.length
     end
   end
+
   class LogLevels
     attr :app, :hook, :build, :git
 
     def initialize(config)
-
       LogLevels.defaults.each do |type, level|
         if config.fetch(type.to_s, nil)
           level(type.to_s, config.fetch(type.to_s))
@@ -233,7 +232,7 @@ module SiteHook
 
     def to_h
       output_hash = {}
-      wanted      = %i[app hook build git]
+      wanted = %i[app hook build git]
       wanted.each do |logger|
         output_hash.store(logger, instance_variable_get(StrExt.mkatvar(logger)))
       end
@@ -245,7 +244,7 @@ module SiteHook
       instance_variables.each do |var|
         levels << "#{StrExt.rematvar(var)}=#{self.instance_variable_get(var)}"
       end
-      "#<SiteHook::LogLevels #{levels.join(' ')}>"
+      "#<SiteHook::LogLevels #{levels.join(" ")}>"
     end
 
     def fetch(key)
@@ -254,10 +253,10 @@ module SiteHook
 
     def self.defaults
       {
-          app:   'info',
-          hook:  'info',
-          build: 'info',
-          git:   'info',
+        app: "info",
+        hook: "info",
+        build: "info",
+        git: "info",
       }
     end
 
@@ -265,18 +264,19 @@ module SiteHook
       instance_variable_set(:"@#{type}", level)
     end
   end
+
   class Cli
     SECTIONS = {
-        config: {
-            mkpass: [:length, :symbols]
-        },
-        server: {
-            # no host or port since those are set via Webhook
-            # webhook:
-            #   host: 127.0.0.1
-            #   port: 9090
-            #
-            # TODO: Find options to put here
+      config: {
+        mkpass: [:length, :symbols],
+      },
+      server: {
+ # no host or port since those are set via Webhook
+               # webhook:
+               #   host: 127.0.0.1
+               #   port: 9090
+               #
+               # TODO: Find options to put here
         },
     }
 
@@ -296,12 +296,12 @@ module SiteHook
     end
 
     def inspect
-      wanted  = instance_variables
+      wanted = instance_variables
       outputs = []
       wanted.each do |meth|
         outputs << "#{StrExt.rematvar(meth)}=#{instance_variable_get(meth)}"
       end
-      "#<SiteHook::Cli #{outputs.join(' ')}>"
+      "#<SiteHook::Cli #{outputs.join(" ")}>"
     end
   end
 
@@ -323,12 +323,12 @@ module SiteHook
         if instance_variable_get(StrExt.mkatvar(:config))
           # variable exists in configuration
         else
-          instance_variable_set(StrExt.mkatvar(:config), '_config.yml')
+          instance_variable_set(StrExt.mkatvar(:config), "_config.yml")
         end
-        if config.fetch('private', nil)
+        if config.fetch("private", nil)
           instance_variable_set(StrExt.mkatvar(option), value) unless instance_variables.include?(:@private)
         else
-          instance_variable_set(StrExt.mkatvar('private'), false)
+          instance_variable_set(StrExt.mkatvar("private"), false)
         end
       end
     end
@@ -338,9 +338,10 @@ module SiteHook
       instance_variables.each do |sym|
         outputs << "#{StrExt.rematvar(sym)}=#{instance_variable_get(sym)}"
       end
-      "#<SiteHook::Project #{outputs.join(' ')}>"
+      "#<SiteHook::Project #{outputs.join(" ")}>"
     end
   end
+
   class CliClasses
     class Config
       def initialize(config)
@@ -359,9 +360,10 @@ module SiteHook
         @configured_commands.each do |m, body|
           outputs << "#{m}=#{body}"
         end
-        "#<SiteHook::Cli::Config #{outputs.join(' ')}>"
+        "#<SiteHook::Cli::Config #{outputs.join(" ")}>"
       end
     end
+
     class Server
       def initialize(config)
         @configured_commands = {}
@@ -379,9 +381,10 @@ module SiteHook
         @configured_commands.each do |m, body|
           outputs << "#{m}=#{body}"
         end
-        "#<SiteHook::Cli::Server #{outputs.join(' ')}>"
+        "#<SiteHook::Cli::Server #{outputs.join(" ")}>"
       end
     end
+
     class Command
       attr_reader :name
 
@@ -390,7 +393,6 @@ module SiteHook
         options.each do |option, value|
           self.class.define_method(option.to_sym) do
             return value
-
           end
         end
       end
@@ -399,9 +401,10 @@ module SiteHook
         # Bleh
       end
     end
+
     class CommandOption
       def initialize(option, value)
       end
     end
   end
-end
+end

data/lib/site_hook/deprecate.rb

@@ -1,7 +1,9 @@
 require 'paint/util'
 module SiteHook
 
+  # @returns SiteHook::DeprecationError
   class DeprecationError < SiteHookError
+    # @params [String] msg message to return
     def initialize(msg)
       super(msg, 99)
     end
@@ -9,7 +11,7 @@ module SiteHook
   class Deprecation
 
     def self.deprecate(command, situation, instructions, continue)
-      @@exe_name = command.topmost_ancestor.parent.exe_name
+      @@exe_name = command 
       @@str = "▼▼▼ [#{Paint['DEPRECATION ERROR', 'red', :bold]}] —— #{Paint['The following situation is deprecated', 'yellow', :bold, :blink]}! ▼▼▼"
       @@situation = situation
       @@str << "\n#{@@situation}"
@@ -22,8 +24,8 @@ module SiteHook
       return self.deprecate(
           command,
           "'#{Paint[SiteHook::Paths.old_config.to_s, 'red']}' is deprecated in favor of '#{Paint[SiteHook::Paths.config, 'green']}'",
-          <<~INSTRUCT,
-              Please run `#{Paint["#{command.topmost_ancestor.parent.exe_name} config upgrade-shrc", 'red', :blink]}` to rectify this.
+          <<-INSTRUCT,
+              Please run `site_hook config upgrade-shrc", 'red', :blink]}` to rectify this.
               Once version 1.0.0 is released, '#{Paint["#{SiteHook::Paths.config}", 'green']}' will
               be the only config file option, and '#{Paint["#{SiteHook::Paths.old_config}", 'orange']}' will not be allowed.
               any existance of '#{Paint["#{Dir.home}/.jph", 'red']}' after the #{Paint['1.0.0', :bold]} release will result in an Exception being raised.
@@ -41,7 +43,7 @@ module SiteHook
 
     def initialize(command)
       @command_object = command
-      @exe_name = @command_object.topmost_ancestor.parent.exe_name
+      @exe_name = 'site_hook'
       @output_string = "Command `#{@exe_name} #{command.name_for_help.join(' ')}"
     end
     def self.declare(command)

data/lib/site_hook/exceptions.rb

@@ -1,33 +1,45 @@
-require 'paint'
+require "paint"
+
 module SiteHook
   class SiteHookError < StandardError
+    attr :err, :status
+
     def initialize(msg, err)
+      @err = err
+      @status = @err
       super(msg)
-      exit err
     end
   end
+
   class ConfigExistsError < SiteHookError
   end
+
   class NoConfigError < SiteHookError
     attr_reader :path
+
     def initialize(path)
-      @str = "Config path '#{Paint[path, 'red']}' does not exist!"
-      @path = path
-      super(@str,98)
+      @str = "Config path '#{Paint[path, "red"]}' does not exist!"
+      @path = Pathname.new(path)
+      super(@str, 98)
     end
   end
+
   class NeitherConfigError < SiteHookError
     attr_reader :paths
+
     def initialize
       @str = "Neither '#{SiteHook::Paths.old_config}' nor '#{SiteHook::Paths.config}'"
+      super(@str, 99)
     end
   end
+
   class NoLogsError < SiteHookError
     attr_reader :path
+
     def initialize(path)
-      @str = "Log path '#{Paint[path, 'red']}' does not exist!"
-      @path = path
-      super(@str,97)
+      @str = "Log path '#{Paint[path, "red"]}' does not exist!"
+      @path = Pathname.new(path)
+      super(@str, 97)
     end
   end
 end

data/lib/site_hook/logger.rb

@@ -1,90 +1,89 @@
-require 'logger'
-require 'recursive_open_struct'
-require 'site_hook/loggers'
-require 'site_hook/paths'
-require 'yaml'
-require 'site_hook/string_ext'
+require "logger"
+require "recursive_open_struct"
+require "site_hook/loggers"
+require "site_hook/paths"
+require "yaml"
+require "site_hook/string_ext"
 #require 'site_hook/configs'
 module SiteHook
   class Log
     def self.defaults
       RecursiveOpenStruct.new(
-          {
-              Hook:   {
-                  level: 'info'
-              },
-              App:    {
-                  level: 'info'
-              },
-              Build:  {
-                  level: 'info'
-              },
-              Git:    {
-                  level: 'info'
-              },
-              Access: {
-                  level: nil
-              },
-              Fake:   {
-                  level: nil
-              }
-          })
+        {
+          Hook: {
+            level: "info",
+          },
+          App: {
+            level: "info",
+          },
+          Build: {
+            level: "info",
+          },
+          Git: {
+            level: "info",
+          },
+          Access: {
+            level: nil,
+          },
+          Fake: {
+            level: nil,
+          },
+        }
+      )
     end
 
     def self.validate(config)
-      invalid_types            = []
-      valid_config_log_types   = [
-          'hook',
-          'git',
-          'app',
-          'build'
+      invalid_types = []
+      valid_config_log_types = [
+        "hook",
+        "git",
+        "app",
+        "build",
       ]
       invalid_config_log_types = [
-          'access',
-          'fake'
+        "access",
+        "fake",
       ]
-      config                   = config['log_levels']
-      is_config_valid          = config.all? do |x|
+      config = config["log_levels"]
+      is_config_valid = config.all? do |x|
         if valid_config_log_types.include? x
           true
+        elsif invalid_config_log_types.include? x
+          invalid_types << x
+          false
         else
-          if invalid_config_log_types.include? x
-            invalid_types << x
-            false
-          end
+          false
         end
       end
+
       unless is_config_valid
-        raise ArgumentError "invalid log type(s) in config, [#{invalid_types.join(', ')}]"
+        raise ArgumentError "invalid log type(s) in config, [#{invalid_types.join(", ")}]"
       end
     end
 
     def inspect
-      meths    = %i[hook build git app fake access]
+      meths = %i[hook build git app fake access]
       sections = {}
       meths.each do |m|
         sections[m] = self.class.send(m).inspect
       end
       secs = []
       sections.each { |name, instance| secs << "#{name}=#{instance}" }
-      "#<SiteHook::Log #{secs.join(' ')}>"
+      "#<SiteHook::Log #{secs.join(" ")}>"
     end
 
     def initialize(input, output, errput)
-
       begin
         @@config = SiteHook::Config.log_levels
       rescue Errno::ENOENT
         raise NoConfigError path
       rescue NoMethodError
-
       end
-
     end
 
     # @return [Access]
     def self.access
-      Loggers::Access.new(base: 'SiteHook::Log::Access')
+      Loggers::Access.new(base: "SiteHook::Log::Access")
     end
 
     # @return [Loggers::Fake]
@@ -94,22 +93,22 @@ module SiteHook
 
     # @return [Loggers::Hook]
     def self.hook
-      Loggers::Hook.new(level: @@config.hook, base: 'SiteHook::Log::Hook')
+      Loggers::Hook.new(level: @@config.hook, base: "SiteHook::Log::Hook")
     end
 
     # @return [Loggers::Git]
     def self.git
-      Loggers::Git.new(level: @@config.git, base: 'SiteHook::Log::Git')
+      Loggers::Git.new(level: @@config.git, base: "SiteHook::Log::Git")
     end
 
     # @return [Loggers::Build]
     def self.build
-      Loggers::Build.new(level: @@config.build, base: 'SiteHook::Log::Build')
+      Loggers::Build.new(level: @@config.build, base: "SiteHook::Log::Build")
     end
 
     # @return [Loggers::App]
     def self.app
-      Loggers::App.new(level: @@config.app, base: 'SiteHook::Log::App')
+      Loggers::App.new(level: @@config.app, base: "SiteHook::Log::App")
     end
   end
-end
+end

data/lib/site_hook/methods.rb

@@ -1,14 +1,34 @@
-require 'site_hook/config'
+require "site_hook/config"
+
 module SiteHook
   class Methods
     def self.mklogdir
-      path = SiteHook::Paths.default_logs
+      path = SiteHook::Paths.logs
       if path.exist?
+        STDERR.puts "'#{path}' exists, skipping.."
         # Path exists, don't do anything
       else
+        STDERR.puts "'#{path}' does not exist. Creating..."
         FileUtils.mkpath(path.to_s)
       end
     end
+    def self.mkconfdir
+      path = SiteHook::Paths.dir
+      if path.exist?
+        STDERR.puts "'#{path}' exists, skipping.."
+      else
+        STDERR.puts "'#{path}' does not exist. Creating..."
+      end
+    end
+    def self.mkconf
+      path = SiteHook::Paths.config
+      if path.exist?
+        STDERR.puts "'#{path}' exists, skipping.."
+      else
+        STDERR.puts "'#{path}' does not exist. Creating..."
+        TTY::File.create_file(path, SiteHook::ConfigSections.all_samples)
+      end
+    end
 
     # @param [String] hook_name the hook name as defined in the projects:... directive
     def self.find_hook(hook_name)
@@ -23,4 +43,4 @@ module SiteHook
       end
     end
   end
-end
+end

data/lib/site_hook/paths.rb

@@ -6,75 +6,68 @@
 # -> Copyright (c) 2018 Ken Spencer
 # -> License: MIT
 ##########
-require 'site_hook/methods'
-require 'site_hook/exceptions'
-require 'site_hook/version'
+require "site_hook/methods"
+require "site_hook/exceptions"
+require "site_hook/version"
+
 module SiteHook
   # Paths: Paths to gem resources and things
   class Paths
     def self.old_dir
-      Pathname(Dir.home).join('.jph')
+      Pathname(Dir.home).join(".jph")
     end
     def self.old_config
-      Pathname(Dir.home).join('.jph', 'config')
+      Pathname(Dir.home).join(".jph", "config")
     end
     def self.old_logs
-      Pathname(Dir.home).join('.jph', 'logs')
+      Pathname(Dir.home).join(".jph", "logs")
     end
     def self.dir
-      Pathname(Dir.home).join('.shrc')
+      Pathname(Dir.home).join(".shrc")
     end
     def self.config
-      Pathname(Dir.home).join('.shrc', 'config')
+      Pathname(Dir.home).join(".shrc", "config")
     end
 
     def self.logs
-      Pathname(Dir.home).join('.shrc', 'logs')
+      Pathname(Dir.home).join(".shrc", "logs")
     end
     def self.default_config(old_exists = self.old_config.exist?, new_exists = self.config.exist?)
-      path = ''
-      begin 
+      path = ""
+      begin
         if old_exists
-          path = self.old_config
+          SiteHook::Deprecation.deprecate_config("")
         else
           if new_exists
             path = self.config
           else
-            raise SiteHook::NeitherConfigError.new 
+            raise SiteHook::NoConfigError.new self.config
           end
         end
-      rescue SiteHook::NeitherConfigError
-        if self.dir.exist?
-          path = self.config
-        end
       end
       path
     end
     def self.default_logs(old_exists = self.old_logs.exist?, new_exists = self.logs.exist?)
-      path = ''
-      begin 
-        if old_exists
-          path = self.old_logs
+      path = ""
+
+      if old_exists
+        path = self.old_logs
+      else
+        if new_exists
+          path = self.logs
         else
-          if new_exists
-            path = self.logs
-          else
-            raise SiteHook::NoLogsError.new path
-          end
+          path = self.logs
+          STDERR.puts "#{path} does not exist"
         end
-      rescue SiteHook::NoLogsError
-        path = self.logs
       end
-      path
     end
 
     def self.lib_dir
-      if ENV['BUNDLE_GEMFILE']
-        Pathname(ENV['BUNDLE_GEMFILE']).dirname.join('lib')
+      if ENV["BUNDLE_GEMFILE"]
+        Pathname(ENV["BUNDLE_GEMFILE"]).dirname.join("lib")
       else
-        Pathname(::Gem.user_dir).join('gems', "site_hook-#{SiteHook::VERSION}", 'lib')
+        Pathname(::Gem.user_dir).join("gems", "site_hook-#{SiteHook::VERSION}", "lib")
       end
-
     end
     def self.make_log_name(klass, level = nil, old_exists = self.old_logs.exist?, new_exists = self.logs.exist?)
       if level
@@ -82,8 +75,12 @@ module SiteHook
       end
       case old_exists
       when true
-        path = self.old_logs
-        self.old_logs.join("#{klass.to_s.safe_log_name}#{level}.log")
+        SiteHook::Deprecation.deprecate(
+          "",
+          "The '.jph/**' directory and contents are now deprecated, and will start erroring and exiting.",
+          "Please use 'site_hook config upgrade-shrc' to upgrade your config to the newer '.shrc/**' folder style.",
+          false
+        )
       when false
         if new_exists
           self.logs.join("#{klass.to_s.safe_log_name}#{level}.log")
@@ -91,10 +88,7 @@ module SiteHook
           path ||= SiteHook::Paths.logs
           raise SiteHook::NoLogsError.new path
         end
-
       end
-    rescue Errno::ENOENT => e
-
     end
   end
 end

data/lib/site_hook/prelogger.rb

@@ -9,6 +9,9 @@
 require 'site_hook/paths'
 module SiteHook
   class PreLogger
+    @@loggers = {}
+    @@levels = {}
+    
     def initialize(input, output, errput)
       self.class.set_base_default
       @@levels  = {

data/lib/site_hook/runner.rb

@@ -1,36 +1,48 @@
-require 'site_hook'
-require 'site_hook/logger'
+require "site_hook"
+require "site_hook/logger"
+
 module SiteHook
   class Runner
     def initialize(argv = ARGV, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
       @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
     end
+
     def execute!
-      exit_code = begin
-        $stderr = @stderr
-        $stdin = @stdin
-        $stdout = @stdout
+      begin
         SiteHook::PreLogger.new($stdin, $stdout, $stderr)
         SiteHook::Config.new
-        SiteHook::Log.new($stdin, $stdout, $stderr)
-        SiteHook::CLI.start(@argv)
-        0
-
-      rescue StandardError => e
-        b = e.backtrace
-        STDERR.puts("#{b.shift}: #{e.message} (#{e.class})")
-        STDERR.puts(b.map{|s| "\tfrom #{s}"}.join("\n"))
-        1
-      rescue SystemExit => e
-        STDERR.puts e.status
-        1
-      ensure
-
-        $stderr = STDERR
-        $stdin = STDIN
-        $stdout = STDOUT
+      rescue SiteHook::NoLogsError => e
+        FileUtils.mkpath(e.path)
+      rescue SiteHook::NoConfigError => e
+        TTY::File.create_file(e.path, SiteHook::ConfigSections.all_samples)
       end
+      exit_code = begin
+                    $stderr = @stderr
+                    $stdin = @stdin
+                    $stdout = @stdout
+                    SiteHook::PreLogger.new($stdin, $stdout, $stderr)
+                    SiteHook::Config.new
+                    SiteHook::Log.new($stdin, $stdout, $stderr)
+                    SiteHook::CLI.start(@argv)
+                    0
+                  rescue StandardError => e
+                    b = e.backtrace
+                    unless e.class == SiteHook::NoConfigError
+                      STDERR.puts("#{b.shift}: #{e.message} (#{e.class})")
+                      STDERR.puts(b.map { |s| "\tfrom #{s}" }.join("\n"))
+                      1
+                    end
+                    0
+                  rescue SystemExit => e
+                    STDERR.puts e.backtrace
+                    STDERR.puts e.status
+                    1
+                  ensure
+                    $stderr = STDERR
+                    $stdin = STDIN
+                    $stdout = STDOUT
+                  end
       @kernel.exit(exit_code)
     end
   end
-end
+end

data/lib/site_hook/templates/log_header.rb

@@ -0,0 +1,19 @@
+require 'super_callbacks'
+module SiteHook
+  module Templates
+    class Logs
+      include SuperCallbacks
+      before :created_log_log_header do 
+        @@time = Time.now.utc.localtime.strftime("%Y%m%dT%H%M%SZ%Z")
+      end
+      ###
+      # Puts the log header to the start of the log files
+      # @param [String,File,Pathname] file file to  
+      # @return NilClass
+      ###
+      def created_log_log_header
+        header = "### Log file created at #{@@time}"
+      end
+    end
+  end
+end

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = '0.9.16'
+  VERSION = '0.9.19'
 end

data/site_hook.gemspec

@@ -33,16 +33,17 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
   spec.add_dependency 'git', '~> 1.3'
-  spec.add_dependency 'highline', '~> 2.0.1'
-  spec.add_dependency 'grape', '~> 1.2.3'
+  spec.add_dependency 'grape-raketasks'
   spec.add_dependency 'grape-route-helpers', '~> 2.1'
+  spec.add_dependency 'grape', '~> 1.2.3'
+  spec.add_dependency 'highline', '~> 2.0.1'
   spec.add_dependency 'paint', '~> 2.0'
   spec.add_dependency 'random_password', '~> 0.1.1'
   spec.add_dependency 'recursive-open-struct', '~> 1.1'
   spec.add_dependency 'super_callbacks', '~> 1.3.1'
-  spec.add_dependency 'thor', '~> 0.20.3'
-  spec.add_dependency 'grape-raketasks'
   spec.add_dependency 'thin'
+  spec.add_dependency 'thor', '~> 0.20.3'
+  spec.add_dependency 'tty-file', '~> 0.8.0'
   spec.add_development_dependency 'rspec', '3.8.0'
   spec.add_development_dependency 'aruba', '~> 0.14.8'
   spec.add_development_dependency 'bundler', '~> 1.17.3', '< 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.19
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: grape-raketasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: grape-route-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
-  name: grape-route-helpers
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -123,47 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: grape-raketasks
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.3
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: tty-file
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +278,7 @@ files:
 - lib/site_hook.rb
 - lib/site_hook/cli.rb
 - lib/site_hook/commands/config_class.rb
+- lib/site_hook/commands/init_class.rb
 - lib/site_hook/commands/jekyll_class.rb
 - lib/site_hook/commands/server_class.rb
 - lib/site_hook/config.rb
@@ -288,6 +303,7 @@ files:
 - lib/site_hook/runner.rb
 - lib/site_hook/sender.rb
 - lib/site_hook/string_ext.rb
+- lib/site_hook/templates/log_header.rb
 - lib/site_hook/version.rb
 - lib/site_hook/webhook.rb
 - site_hook.gemspec
@@ -326,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Catch a POST request from a git service push webhook and build a jekyll site.