site_hook 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa8b1808f36f0c69588f9590568133fb9b2a6288a3077d9aba94d197786c3ee
-  data.tar.gz: 1972b2bb6b896b69b06b9967a9e21faf175e0f1dff4165859a7a71bec018098c
+  metadata.gz: a6a341dfc4c29d1ba33d5674d7b21fa24745a87d604aae643ffc941ed240d8f9
+  data.tar.gz: be30f028fd77aae806735990684028730a4a7f22662c1ecdb43cb56e7b4dc4c7
 SHA512:
-  metadata.gz: 1dce31e06943728aa637c941bedc4baac41bed34010d1bc90b5749d509605a048400e926a42dd1392577b216e2fde6cc93bb80a1b875529f8fdcbe46bde8f96e
-  data.tar.gz: 8b4948f0045924d7b2b802accd893d7da2c2978daa75966253e55284cbaa8584296854c12b81b1b000650761d087de1b243977750074d11ea018527fbbd7215e
+  metadata.gz: bef8e3ca33ea496f5ee60fad7a5c050a8d05acce7fbdfad5a79d855652825c2d8797c0aa342c5c925892abe52e4417a820a78da1ce2817daf172f9b91ae4e46b
+  data.tar.gz: fb3a74d336c1c6e7c5297b2ef6c6ef1edcf475c9f15e1f7e2c17b4704a4af24d55fab584e5e42b5f8d08d06fc44bd0233b1e34c46dfd5c0c57e70d8a4cf49a4d

data/.gitignore

@@ -11,4 +11,6 @@
 /vendor
 # rspec failure tracking
 .rspec_status
-Gemfile.lock
+Gemfile.lock
+vendor/
+/.scannerwork

data/Gemfile

@@ -1,6 +1,8 @@
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
+group :dev do
+  gem 'pry', '~> 0.12.2'
+end
 # Specify your gem's dependencies in site_hook.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:test)
 
-task :default => :spec
+task :default => :test

data/bin/site_hook

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-
 require 'site_hook'
-SiteHook::CLI.start(ARGV)
+exit SiteHook::App.run(ARGV)

data/lib/site_hook.rb

@@ -10,7 +10,6 @@ require 'recursive-open-struct'
 require 'site_hook/cli'
 require 'sinatra'
 require 'haml'
-require 'sass'
 require 'json'
 require 'sinatra/json'
 require 'yaml'
@@ -19,18 +18,6 @@ module SiteHook
   autoload :Logs, 'site_hook/log'
   autoload :Gem, 'site_hook/gem'
   autoload :Paths, 'site_hook/paths'
-  # class SassHandler (inherits from Sinatra::Base)
-  module_function
-  def self.set_options(name, value)
-    SiteHook.const_set("#{name.upcase}", value)
-  end
-  class SassHandler < Sinatra::Base
-    set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'sass').to_s
-    get '/css/*.css' do
-      filename = params[:splat].first
-      scss filename.to_sym, cache: false
-    end
-  end
   # class CoffeeHandler (inherits from Sinatra::Base)
   class CoffeeHandler < Sinatra::Base
     set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'coffee').to_s

data/lib/site_hook/{static/sass/styles.scss → assets/css/styles.css}

@@ -10,17 +10,17 @@ h1 {
 .list-group-item {
   background-color: rgb(0, 51, 2);
   border-radius: 5px;
-  &:hover {
+}
+.list-group-item:hover {
     background-color: #3a3a3a;
-  }
 }
 a {
   color: darkgreen !important;
   text-decoration-color: darkgreen !important;
-  &:hover {
-    color: green !important;
-  }
-  &:focus {
-    color: green !important;
-  }
+}
+a:hover {
+  color: green !important;
+}
+a:focus {
+  color: green !important;
 }

data/lib/site_hook/cli.rb

@@ -1,32 +1,48 @@
-require 'thor'
-require 'site_hook/config_class'
-require 'site_hook/server_class'
-#require 'site_hook/debug_class'
+require 'gli'
+require 'highline'
+require 'paint'
+require 'pathname'
+require 'site_hook/exceptions'
+require 'site_hook/deprecate'
 module SiteHook
-  class CLI < Thor
-    map %w[--version -v] => :__print_version
-    desc '--version, -v', 'Print the version'
-
-    # Prints version string
-    # @return [NilClass] nil
-    def __print_version
-      puts "Version: v#{SiteHook::VERSION}"
+  class App
+    extend GLI::App
+    version SiteHook::VERSION
+    # don't use config_file just use ~/.shrc/config's cli:...
+    # projects are in .shrc/config
+    commands_from 'site_hook/commands'
+    desc 'Print info on the gem.'
+    command 'gem-info' do |c|
+      c.action do |global_options, options, arguments|
+        @hl.say "Gem Name: #{SiteHook::Gem::Info.name}"
+        @hl.say "Gem Constant: #{SiteHook::Gem::Info.constant_name}"
+        @hl.say "Gem Author: #{SiteHook::Gem::Info.author}"
+        @hl.say "Gem Version: v#{SiteHook::VERSION}"
+      end
     end
-
-    map %w(--gem-info --info --about) => :__gem_info
-    desc '--gem-info, --info, --about', 'Print info on the gem.'
-    def __gem_info
-      say "Gem Name: #{SiteHook::Gem::Info.name}"
-      say "Gem Constant: #{SiteHook::Gem::Info.constant_name}"
-      say "Gem Author: #{SiteHook::Gem::Info.author}"
-      say "Gem Version: v#{SiteHook::VERSION}"
+    around do |global_options, command, options, args, code|
+      @config_hash = YAML.load_file(SiteHook::Paths.config) || YAML.load_file(SiteHook::Paths.old_config)
+      @hl = HighLine.new(STDIN, STDOUT, 80, 1, 2, 0)
+      code.call
     end
-    desc 'config SUBCOMMAND [OPTIONS]', 'Configure site_hook options'
-    subcommand('config', SiteHook::ConfigClass)
-    desc 'server SUBCOMMAND [OPTIONS]', 'Start the server'
-    subcommand('server', SiteHook::ServerClass)
-    #desc 'debug SUBCOMMAND [OPTIONS]', 'Debug the Gem'
-    #subcommand('debug', SiteHook::DebugClass)
+    pre do |global_options, command, options, args|
+      if SiteHook::Paths.old_config.exist?
+        continue = SiteHook::Deprecation.deprecate(
+            "#{SiteHook::Paths.old_config.to_s} is deprecated in favor of #{SiteHook::Paths.config}",
+            <<~INSTRUCT,
+              Please run `#{exe_name} config upgrade-shrc` to rectify this.
+              Once version 1.0.0 is released, #{SiteHook::Paths.config} will
+              be the only config file option, and #{SiteHook::Paths.old_config} will not be allowed.
+              any existance of ~/.jph after the 1.0.0 release will result in an Exception being raised.
+              Once the exception is raised, site_hook will exit and return a 99 status code.
+            INSTRUCT
+                                 true
 
+        )
+        continue
+      else
+        # don't do anything
+      end
+    end
   end
 end

data/lib/site_hook/commands/config_class.rb

@@ -0,0 +1,81 @@
+require 'gli'
+require 'highline'
+require 'random_password'
+require 'yaml'
+require 'site_hook/config'
+module SiteHook
+
+
+  # *ConfigClass*
+  #
+  # Holds all of the commands for the config subcommand
+  class App
+    extend GLI::App
+
+    desc 'Configure site_hook options'
+
+    # rubocop:disable Metrics/AbcSize
+    command 'config' do |c|
+      c.command 'gen' do |gen|
+        gen.desc "Generate a example config file if one doesn't exist"
+        gen.action do |global_options, options, arguments|
+
+          yaml = [
+              '# fatal, error, warn, info, debug',
+              'log_levels:',
+              '  hook: info',
+              '  build: info',
+              '  git: info',
+              '  app: info',
+
+          ]
+          shrc = SiteHook::Paths.config
+          if shrc.exist?
+            puts "#{shrc} exists. Will not overwrite."
+          else
+            File.open(shrc, 'w') do |f|
+              yaml.each do |line|
+                f.puts line
+              end
+            end
+            say "Created #{shrc}"
+            say "You can now edit #{shrc} and add your projects."
+          end
+        end
+      end
+      desc 'generates a project block'
+      c.command 'gen-project' do |gen_project|
+        gen_project.action do |global_options, options, arguments|
+          SiteHook::NotImplemented.declare(gen_project)
+          # puts tpl
+        end
+      end
+      c.command 'add-project' do |add_project|
+        add_project.action do |global_options, options, arguments|
+          # @config_hash = SiteHook::Config::Set.new(SiteHook::Paths.config)
+          SiteHook::NotImplemented.declare(add_project)
+        end
+      end
+
+      c.command 'mkpass' do |mkpass|
+        mkpass.flag('symbol-amt', arg_name: 'AMT', type: Integer, default_value: 0)
+        mkpass.flag('length', arg_name: 'LENGTH', type: Integer, default_value: 10)
+        mkpass.action do |global_options, options, arguments|
+
+          if (8..255).include?(options[:length])
+            if (0..128).member?(options[:'symbol-amt'])
+              puts RandomPassword.generate(length: options[:length], symbols: options['symbol-amt'])
+            else
+              help_now! "Symbols amount must be between '0' and '128'."
+            end
+          else
+            help_now! "Length must be a positive 'Integer' between '8' and '255'"
+          end
+        end
+      end
+    end
+  end
+end
+
+
+# rubocop:enable Metrics/AbcSize

data/lib/site_hook/{debug_class.rb → commands/debug_class.rb}

@@ -6,23 +6,24 @@
 # -> Copyright (c) 2018 Ken Spencer
 # -> License: MIT
 ##########
-require 'thor'
+require 'gli'
 
 module SiteHook
-  class FileExistsError < Exception
+  class FileExistsError < StandardError
   end
 
   # *DebugClass*
   #
-  # Holds all of the commands for the config subcommand
-  class DebugClass < Thor
+  # Holds all of the commands for the debug subcommand
+  class App
+    extend GLI::App
 
-    desc 'paths [options]', "Return current paths for running site_hook"
+    desc "Return current paths for running site_hook"
     def paths
       home_gem_path = ENV['GEM_HOME']
       puts home_gem_path
       puts Pathname(::Gem.default_path.first).join('lib', 'site_hook')
-      puts .exist?
+      # puts .exist?
     end
   end
 end

data/lib/site_hook/commands/server_class.rb

@@ -0,0 +1,39 @@
+##########
+# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/config_class.1.rb
+# -> Project: site_hook
+# -> Author: Ken Spencer <me@iotaspencer.me>
+# -> Last Modified: 1/10/2018 21:45:36
+# -> Copyright (c) 2018 Ken Spencer
+# -> License: MIT
+##########
+require 'site_hook/persist'
+require 'site_hook/paths'
+require 'site_hook/const'
+require 'gli'
+module SiteHook
+  autoload :Webhook, 'site_hook/webhook'
+  SHRC = YAML.load_file(SiteHook::Paths.config) || YAML.load_file(SiteHook::Paths.old_config)
+  # *ServerClass*
+  #
+  # Holds all of the commands for the config subcommand
+  class App
+    extend GLI::App
+
+    command 'server' do |c|
+      c.desc 'Start the server'
+      c.command 'listen' do |listen|
+        listen.desc 'Start SiteHook'
+        listen.flag :log_levels, type: :hash, arg_name: 'LEVELS', default: SiteHook::Logs.log_levels
+        listen.flag :host, type: :string, arg_name: 'BINDHOST', default: SHRC.fetch('host', '127.0.0.1')
+        listen.flag :port, type: :numeric, arg_name: 'BINDPORT', default: SHRC.fetch('port', 9090)
+        listen.action do |global_options, options, arguments|
+          SiteHook::Webhook.set_options(options[:host], options[:port])
+          SiteHook.mklogdir unless SiteHook::Paths.logs.exist?
+          SiteHook::Webhook.run!
+        end
+      end
+    end
+
+  end
+end
+# rubocop:enable Metrics/AbcSize

data/lib/site_hook/config.rb

@@ -0,0 +1,24 @@
+require 'site_hook/paths'
+require 'recursive_open_struct'
+
+module SiteHook
+  class Config
+    class Get
+      attr_reader :raw_config, :parsed_config, :config
+      def initialize(cfg_path = Pathname.new(SiteHook::Paths.config || SiteHook::Paths.old_config))
+        @filename = cfg_path
+        @raw_config = YAML.load_file(cfg_path)
+        @parsed_config = RecursiveOpenStruct.new(@raw_config, recurse_over_arrays: true, preserve_original_keys: true)
+        @config = @parsed_config
+      end
+
+    end
+    class Set
+      attr_reader :filename
+      def initialize(cfg_path)
+        @filename = cfg_path
+        @config = YAML.load_file(@filename)
+      end
+    end
+  end
+end

data/lib/site_hook/config_sections.rb

@@ -0,0 +1,13 @@
+require 'yaml'
+module SiteHook
+  module ConfigSections
+    autoload :Cli, 'site_hook/config_sections/cli'
+    autoload :LogLevels, 'site_hook/config_sections/log_levels'
+    autoload :Projects, 'site_hook/config_sections/projects'
+    module_function
+    def print_example_config
+      full_config = [Cli.example, LogLevels.example, Projects.example].flatten(1)
+      puts full_config
+    end
+  end
+end

data/lib/site_hook/config_sections/cli.rb

@@ -0,0 +1,24 @@
+module SiteHook
+  module ConfigSections
+    class Cli
+
+      def self.example
+        [
+            'cli:',
+            '  config:',
+            '    mkpass:',
+            '      symbols: 0',
+            '      length: 8',
+            '    gen-project:',
+            '      config-file: _config.yml',
+            '    add-project:',
+            '    gen:'
+
+
+
+
+        ]
+      end
+    end
+  end
+end

data/lib/site_hook/config_sections/log_levels.rb

@@ -0,0 +1,15 @@
+module SiteHook
+  module ConfigSections
+    class LogLevels
+      def self.example
+        [
+            'log_levels:',
+            '  app: info',
+            '  build: info',
+            '  git: info',
+            '  hook: info'
+        ]
+      end
+    end
+  end
+end

data/lib/site_hook/config_sections/projects.rb

@@ -0,0 +1,22 @@
+module SiteHook
+  module ConfigSections
+    class Projects
+      def self.example
+        [
+            'projects:',
+            '  PROJECT.NAME:',
+            "    config: _config.yml",
+            "    src: /path/2/site/source",
+            "    dst: /path/2/destination/",
+            "    host: git*.com",
+            "    repo: USER/REPO",
+            "    hookpass: SOMERANDOMSTRING",
+            "    private: true/false"
+        ]
+      end
+      def initialize(**answers)
+        @answers = answers
+      end
+    end
+  end
+end

data/lib/site_hook/const.rb

@@ -0,0 +1,10 @@
+require 'site_hook/log'
+require 'site_hook/logger'
+module SiteHook
+  class Consts
+    HOOKLOG = SiteHook::HookLogger::HookLog.new(SiteHook::Logs.log_levels['hook']).log
+    BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook::Logs.log_levels['build']).log
+    APPLOG = SiteHook::HookLogger::AppLog.new(SiteHook::Logs.log_levels['app']).log
+    SHRC = YAML.load_file(Pathname(Dir.home).join('.jph', 'config'))
+  end
+end

data/lib/site_hook/deprecate.rb

@@ -0,0 +1,32 @@
+module SiteHook
+  class Deprecation
+    attr_reader :instructions
+    def initialize(message, situation, instructions)
+      @str = "▼▼▼ [#{Paint['DEPRECATION ERROR', :red, :bold]}] —— The following situation is deprecated! ▼▼▼"
+      @situation = situation
+      @str << "\n#{@situation}"
+      @instructions = instructions
+      @str << "\n#{@instructions}"
+    end
+    def self.deprecate(situation, instructions, continue)
+      puts @str if @str
+      return continue
+    end
+  end
+  class NotImplemented
+    attr_reader :command_object
+
+    def initialize(command)
+      @command_object = command
+      @exe_name = @command_object.parent.parent.exe_name
+      @output_string = "Command `#{@exe_name} #{command.name_for_help.join(' ')}"
+    end
+    def self.declare(command)
+      instance = self.new(command)
+      instance.instance_variable_set(
+          :'@output_string',
+          "#{instance.instance_variable_get(:'@output_string')}` is not implemented currently")
+      puts instance.instance_variable_get(:'@output_string')
+    end
+  end
+end

data/lib/site_hook/exceptions.rb

@@ -0,0 +1,9 @@
+require 'paint'
+module SiteHook
+  class SiteHookError < StandardError
+  end
+  class ConfigExistsError < SiteHookError
+  end
+
+
+end

data/lib/site_hook/logger.rb

@@ -17,10 +17,11 @@ Logging.color_scheme(
     :logger  => :cyan,
     :message => :green,
     )
-
+PATTERN = '[%d] %-5l %c: %m\n'
+DATE_PATTERN = '%Y-%m-%d %H:%M:%S'
 layout = Logging.layouts.pattern \
-  :pattern      => '[%d] %-5l %c: %m\n',
-  :date_pattern => '%Y-%m-%d %H:%M:%S',
+  :pattern      => PATTERN,
+  :date_pattern => DATE_PATTERN,
   :color_scheme => 'bright'
 
 Logging.appenders.stdout \
@@ -30,6 +31,7 @@ module SiteHook
   def mklogdir
     path = Pathname(Dir.home).join('.jph', 'logs')
     if path.exist?
+      # Path exists, don't do anything
     else
       FileUtils.mkpath(path.to_s)
     end
@@ -52,7 +54,7 @@ module SiteHook
       flayout = Logging.appenders.rolling_file \
         Pathname(Dir.home).join('.jph', 'logs', "#{SiteHook.safe_log_name(self)}-#{@log_level}.log").to_s,
         :age     => 'daily',
-        :pattern => '[%d] %-5l %c: %m\n'
+        :pattern => PATTERN
       @log.add_appenders 'stdout', flayout
       @log.level = log_level
     end
@@ -77,7 +79,7 @@ module SiteHook
         flayout = Logging.appenders.rolling_file \
           Pathname(Dir.home).join('.jph', 'logs', "#{SiteHook.safe_log_name(self)}-#{@log_level}.log").to_s,
           :age     => 'daily',
-          :pattern => '[%d] %-5l %c: %m\n'
+          :pattern => PATTERN
         @log.add_appenders 'stdout', flayout
         @log.level = log_level
         LL.debug "Initialized #{SiteHook.safe_log_name(self)}"
@@ -96,7 +98,7 @@ module SiteHook
         flayout = Logging.appenders.rolling_file \
           Pathname(Dir.home).join('.jph', 'logs', "#{SiteHook.safe_log_name(self)}-#{@log_level}.log").to_s,
           :age     => 'daily',
-          :pattern => '[%d] %-5l %c: %m\n'
+          :pattern => PATTERN
         @log.add_appenders 'stdout', flayout
         @log.level = @log_level
         LL.debug "Initialized #{SiteHook.safe_log_name(self)}"
@@ -115,7 +117,7 @@ module SiteHook
         flayout = Logging.appenders.rolling_file \
           Pathname(Dir.home).join('.jph', 'logs', "#{SiteHook.safe_log_name(self)}-#{@log_level}.log").to_s,
           :age     => 'daily',
-          :pattern => '[%d] %-5l %c: %m\n'
+          :pattern => PATTERN
         @log.add_appenders 'stdout', flayout
         @log.level = log_level
 
@@ -135,7 +137,7 @@ module SiteHook
         flayout = Logging.appenders.rolling_file \
           Pathname(Dir.home).join('.jph', 'logs', "#{SiteHook.safe_log_name(self)}-#{@log_level}.log").to_s,
           :age     => 'daily',
-          :pattern => '[%d] %-5l %c: %m\n'
+          :pattern => PATTERN
         @log.add_appenders 'stdout', flayout
         @log.level = log_level
         LL.debug "Initialized #{SiteHook.safe_log_name(self)}"
@@ -171,6 +173,8 @@ module SiteHook
               @info_output << "Pulling via #{$2}/#{$3} on #{$1}."
             when msg =~ /\* branch (.*?) -> .*/
               @info_output << "Using #{$1} branch"
+            else
+              @debug_output << msg
             end
           end
         else

data/lib/site_hook/paths.rb

@@ -10,12 +10,15 @@
 module SiteHook
   # Paths: Paths to gem resources and things
   class Paths
-    def self.config
+    def self.old_config
       Pathname(Dir.home).join('.jph', 'config')
     end
+    def self.config
+      Pathname(Dir.home).join('.shrc', 'config')
+    end
 
     def self.logs
-      Pathname(Dir.home).join('.jph', 'logs')
+      Pathname(Dir.home).join('.shrc', 'logs')
     end
     def self.lib_dir
       Pathname(::Gem.user_dir).join('gems', "site_hook-#{SiteHook::VERSION}", 'lib')

data/lib/site_hook/persist.rb

@@ -0,0 +1,14 @@
+require 'site_hook/const'
+
+module SiteHook
+  class Options
+    def self.set_options(global, local)
+      global.each do |option, value|
+        Options.class_variable_set(:"@@global-#{option}", value)
+      end
+      local.each do |option, value|
+        Options.class_variable_set(:"@@local-#{option}", value)
+      end
+    end
+  end
+end

data/lib/site_hook/prompts/gen_config.rb

@@ -0,0 +1,48 @@
+module SiteHook
+  class GenConfig
+    # @param [HighLine]
+    def initialize(hl)
+      @hl = hl
+
+    end
+    def prompt_project
+      @hl.say "First What's the name of the project?"
+      project_name = @hl.ask('> ')
+
+      @hl.say "What's the source path? e.g. /home/#{ENV['USER']}/sites/site.tld"
+      source_path = @hl.ask('> ')
+
+      @hl.say 'Where is the web root? e.g. /var/www/sites/site.tld'
+      dest_path = @hl.ask('> ')
+
+      @hl.say 'The next things are for the public webhook list.'
+      @hl.say "\n"
+      @hl.say "\n"
+      @hl.say "What's the hostname of the git service? e.g. github.com,"
+      @hl.say "gitlab.com, git.domain.tld"
+      git_host = @hl.ask('> ')
+
+      @hl.say "What's the repo path? e.g. UserName/SiteName, UserName/site, etc."
+      repo_path = @hl.ask('> ')
+
+      @hl.say 'Is this repo allowed to be shown publically?'
+      is_private = @hl.agree('> ', true) ? true : false
+
+      @hl.say "Generating a hook password for you. If this one isn't wanted"
+      @hl.say "then just change it afterwards using '#{exe_name} config mkpass'."
+      hook_pass = RandomPassword.new(length: 20, symbols: 0).generate
+      @hl.say 'Done.'
+      @hl.say 'Outputting...'
+      [
+          "  #{project_name}:",
+          "    src: #{source_path}",
+          "    dst: #{dest_path}",
+          "    hookpass: #{hook_pass}",
+          "    host: #{git_host}",
+          "    repo: #{repo_path}",
+          "    private: #{is_private}"
+      ]
+
+    end
+  end
+end

data/lib/site_hook/sender.rb

@@ -2,6 +2,7 @@ require 'open3'
 require 'site_hook/logger'
 require 'git'
 require 'paint'
+require 'site_hook/persist'
 module SiteHook
   autoload :Logs, 'site_hook/log'
 
@@ -10,9 +11,14 @@ module SiteHook
       attr :jekyll_source, :build_dest
 
       class Build
+        def initialize(options)
+          @options = options
+        end
+
+        JEKYLL_SOURCE_VAR = '@jekyll_source'
 
         def do_grab_version
-          jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
+          jekyll_source = Jekyll.instance_variable_get(JEKYLL_SOURCE_VAR)
           log = Jekyll.instance_variable_get('@log')
           begin
             stdout_str, status = Open3.capture2({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "jekyll --version --source #{jekyll_source}")
@@ -26,7 +32,7 @@ module SiteHook
         def do_pull
           fakelog = SiteHook::HookLogger::FakeLog.new
           reallog = SiteHook::HookLogger::GitLog.new(SiteHook::Logs.log_levels['git']).log
-          jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
+          jekyll_source = Jekyll.instance_variable_get(JEKYLL_SOURCE_VAR)
           # build_dest = Jekyll.instance_variable_get('@build_dest')
           g = Git.open(jekyll_source, log: fakelog)
           g.pull
@@ -36,7 +42,7 @@ module SiteHook
         end
 
         def do_build
-          jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
+          jekyll_source = Jekyll.instance_variable_get(JEKYLL_SOURCE_VAR)
           build_dest = Jekyll.instance_variable_get('@build_dest')
           log = Jekyll.instance_variable_get('@log')
           Open3.popen2e({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "bundle exec jekyll build --source #{Pathname(jekyll_source).realdirpath.to_path} --destination #{Pathname(build_dest).to_path} --config #{Pathname(jekyll_source).join(@options[:config])}") { |in_io, outerr_io, thr|
@@ -58,17 +64,17 @@ module SiteHook
               case
               when line =~ /done in .*/
                 log.info(line)
-              when line =~ /Generating/
+              when line =~ /Generating.../
                 log.info(line)
               when line =~ /Configuration file:|Source:|Destination:/
                 log.debug(line)
-              when line =~ /Incremental|Auto-regeneration/
+              when line =~ /Incremental build: disabled.|Auto-regeneration/
                 print ''
               else
                 log.debug line
               end
             end
-            exit_status = thr.value
+            thr.value
           }
 
         end
@@ -82,12 +88,12 @@ module SiteHook
         @build_dest = build_dest
         @log = logger
         @options = options
-        instance = self::Build.new
+        instance = self::Build.new(options)
         meths = [instance.do_grab_version, instance.do_pull, instance.do_build]
         begin
           meths.each do |m|
             @log.debug("Running #{m}")
-            instance.method(m).call
+            instance.send(m)
             @log.debug("Ran #{m}")
           end
           return {message: 'success', status: 0}

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/site_hook/webhook.rb

@@ -6,38 +6,30 @@
 # -> Copyright (c) 2018 Ken Spencer
 # -> License: MIT
 ##########
-
+require 'site_hook/persist'
+require 'site_hook/const'
 require 'sinatra'
 
 module SiteHook
   class Webhook < Sinatra::Base
-    HOOKLOG = SiteHook::HookLogger::HookLog.new(SiteHook::Logs.log_levels['hook']).log
-    BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook::Logs.log_levels['build']).log
-    APPLOG = SiteHook::HookLogger::AppLog.new(SiteHook::Logs.log_levels['app']).log
-    JPHRC = YAML.load_file(Pathname(Dir.home).join('.jph', 'config'))
-    def self.set_bind(host, port, config)
-      self.set port: port
-      self.set bind: host
-      if config == '_config.yml'
-        SiteHook.set_options(:BUILD_CONFIG, '_config.yml')
-      else
-        SiteHook.set_options(:BUILD_CONFIG, config)
-      end
 
-    end
     set server: %w[thin]
     set quiet: true
     set raise_errors: true
     set views: Pathname(SiteHook::Paths.lib_dir).join('site_hook', 'views')
-    set :public_folder, Pathname(SiteHook::Paths.lib_dir).join('site_hook', 'static')
-    use SassHandler
+    set :public_folder, Pathname(SiteHook::Paths.lib_dir).join('site_hook', 'assets')
     use CoffeeHandler
+    def self.set_options(host, port)
+      self.set bind: host.to_s
+      self.set port: port.to_i
+    end
 
-#
+    #
     # @param [String] body JSON String of body
     # @param [String] sig Signature or token from git service
     # @param [String] secret User-defined verification token
     # @param [Boolean] plaintext Whether the verification is plaintext
+    # @param [String] service service name
     def self.verified?(body, sig, secret, plaintext:, service:)
       if plaintext
         sig == secret
@@ -53,57 +45,60 @@ module SiteHook
             APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
             true
           end
+        else
+          # This shouldn't happen
         end
 
       end
     end
 
+    CONTENT_TYPE = 'Content-Type'
     get '/' do
-      halt 403, { 'Content-Type' => 'text/html' }, '<h1>See <a href="/webhooks/">here</a> for the active webhooks</h1>'
+      halt 403, {CONTENT_TYPE => 'text/html'}, '<h1>See <a href="/webhooks/">here</a> for the active webhooks</h1>'
     end
 
+    APPLICATION_JSON = 'application/json'
     get '/webhooks.json', provides: :json do
-      content_type 'application/json'
+      content_type APPLICATION_JSON
       public_projects = JPHRC['projects'].select do |_project, hsh|
-        (hsh.fetch('private', nil) == false) || hsh.fetch('private', nil).nil?
+        !hsh.fetch('private')
       end
-      result = {}
+      result          = {}
       public_projects.each do |project, hsh|
         result[project] = {}
         hsh.delete('hookpass')
         result[project].merge!(hsh)
       end
-      headers 'Content-Type' => 'application/json', 'Accept' => 'application/json'
+      headers CONTENT_TYPE => APPLICATION_JSON, 'Accept' => APPLICATION_JSON
       json result, layout: false
     end
 
     get '/webhooks/?' do
-      haml :webhooks, locals: { 'projects' => JPHRC['projects'] }
+      haml :webhooks, locals: {'projects' => JPHRC['projects']}
     end
 
     get '/webhook/*' do
       if params[:splat]
         pass
       else
-        halt 405, { 'Content-Type' => 'application/json' }, { message: 'GET not allowed' }.to_json
+        halt 405, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'GET not allowed'}.to_json
       end
     end
     post '/webhook/:hook_name/?' do
       service = nil
       request.body.rewind
       req_body = request.body.read
-      js = RecursiveOpenStruct.new(JSON.parse(req_body))
+      js       = RecursiveOpenStruct.new(JSON.parse(req_body))
 
       projects = JPHRC['projects']
-      begin
-        project = projects.fetch(params[:hook_name])
-      rescue KeyError => e
-        halt 404, { 'Content-Type' => 'application/json' }, { message: 'no such project', status: 1 }.to_json
+      project = projects.fetch(params[:hook_name], nil)
+      if project.nil?
+        halt 404, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'no such project', status: 1}.to_json
       end
       plaintext = false
       signature = nil
-      event = nil
-      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
+      event     = nil
+      gogs      = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
       unless gogs.nil?
         event = 'push' if gogs == 'push'
       end
@@ -116,27 +111,25 @@ module SiteHook
         event = 'push' if gitlab == 'push'
       end
 
-      events = { 'github' => github, 'gitlab' => gitlab, 'gogs' => gogs }
+      events = {'github' => github, 'gitlab' => gitlab, 'gogs' => gogs}
       if events['github'] && events['gogs']
         events['github'] = nil
       end
       events_m_e = events.values.one?
       case events_m_e
       when true
-        event = 'push'
+        event   = 'push'
         service = events.select { |_key, value| value }.keys.first
       when false
-        halt 400, { 'Content-Type': 'application/json' }, { message: 'events are mutually exclusive', status: 'failure' }.to_json
+        halt 400, {CONTENT_TYPE: APPLICATION_JSON}, {message: 'events are mutually exclusive', status: 'failure'}.to_json
 
       else
         halt 400,
-             { 'Content-Type': 'application/json' },
+             {CONTENT_TYPE: APPLICATION_JSON},
              'status': 'failure', 'message': 'something weird happened'
       end
-      if event != 'push'
-        if event.nil?
-          halt 400, { 'Content-Type': 'application/json' }, { message: 'no event header' }.to_json
-        end
+      if event != 'push' && event.nil?
+        halt 400, {CONTENT_TYPE: APPLICATION_JSON}, {message: 'no event header'}.to_json
       end
       case service
       when 'gitlab'
@@ -149,34 +142,36 @@ module SiteHook
       when 'gogs'
         signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
         plaintext = false
+      else
+        # This shouldn't happen
       end
       if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
         BUILDLOG.info 'Building...'
         begin
-          jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG, options: {config: SiteHook::BUILD_CONFIG})
-          jekyll_status = jekyllbuild
+          jekyll_status = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG, options: {config: project['config']})
           case jekyll_status
 
           when 0
             status 200
-            headers 'Content-Type' => 'application/json'
-            body { { 'status': 'success' }.to_json }
+            headers CONTENT_TYPE => APPLICATION_JSON
+            body { {'status': 'success'}.to_json }
           when -1, -2, -3
-            halt 400, { 'Content-Type' => 'application/json' }, { 'status': 'exception', error: jekyll_status.fetch(:message).to_s }
-
+            halt 400, {CONTENT_TYPE => APPLICATION_JSON}, {'status': 'exception', error: jekyll_status.fetch(:message).to_s}
+          else
+            # This shouldn't happen
           end
 
         rescue => e
-          halt 500, { 'Content-Type' => 'application/json' }, { 'status': 'exception', error: e.to_s}
+          halt 500, {CONTENT_TYPE => APPLICATION_JSON}, {'status': 'exception', error: e.to_s}
 
         end
 
       else
-        halt 403, { 'Content-Type' => 'application/json' }, { message: 'incorrect secret', 'status': 'failure' }.to_json
+        halt 403, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'incorrect secret', 'status': 'failure'}.to_json
       end
     end
     post '/webhook/?' do
-      halt 403, { 'Content-Type' => 'application/json' }, { message: 'pick a hook', error: 'root webhook hit', 'status': 'failure' }.to_json
+      halt 403, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'pick a hook', error: 'root webhook hit', 'status': 'failure'}.to_json
     end
   end
 end

data/site_hook.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
     'tutorial_uri' => 'https://iotaspencer.me/projects/site_hook/'
   }
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(spec)/})
+    f.match(%r{^(tests)/})
   end
   spec.bindir = 'bin'
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -34,12 +34,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'paint', '~> 2.0'
   spec.add_runtime_dependency 'random_password', '~> 0.1.1'
   spec.add_runtime_dependency 'recursive-open-struct', '~> 1.1'
-  spec.add_runtime_dependency 'sass', '~> 3.5'
+  spec.add_runtime_dependency 'redis', '~> 4.1.0'
   spec.add_runtime_dependency 'sinatra', '~> 2.0.2', '>= 2.0.5'
   spec.add_runtime_dependency 'sinatra-contrib', '~> 2.0', '>= 2.0.5'
   spec.add_runtime_dependency 'thin', '~> 1.7'
-  spec.add_runtime_dependency 'thor', '~> 0.20.3'
+  spec.add_runtime_dependency 'gli', '~> 2.18.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'minitest', '~> 5.11.3'
+
+  spec.post_install_message
 end

data/sonar-project.properties

@@ -0,0 +1,4 @@
+sonar.projectKey=ElectroCode-Gems_site_hook
+sonar.organization=electrocode-gems
+sonar.sources=./lib
+sonar.projectBaseDir=/home/ken/everygit/site_hook

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -197,19 +197,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 2.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,19 +239,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.11.3
 description: 
 email:
 - me@iotaspencer.me
@@ -274,22 +274,33 @@ files:
 - bin/console
 - bin/site_hook
 - lib/site_hook.rb
+- lib/site_hook/assets/css/styles.css
 - lib/site_hook/cli.rb
-- lib/site_hook/config_class.rb
-- lib/site_hook/debug_class.rb
+- lib/site_hook/commands/config_class.rb
+- lib/site_hook/commands/debug_class.rb
+- lib/site_hook/commands/server_class.rb
+- lib/site_hook/config.rb
+- lib/site_hook/config_sections.rb
+- lib/site_hook/config_sections/cli.rb
+- lib/site_hook/config_sections/log_levels.rb
+- lib/site_hook/config_sections/projects.rb
+- lib/site_hook/const.rb
+- lib/site_hook/deprecate.rb
+- lib/site_hook/exceptions.rb
 - lib/site_hook/gem.rb
 - lib/site_hook/log.rb
 - lib/site_hook/logger.rb
 - lib/site_hook/paths.rb
+- lib/site_hook/persist.rb
+- lib/site_hook/prompts/gen_config.rb
 - lib/site_hook/sender.rb
-- lib/site_hook/server_class.rb
 - lib/site_hook/spinner.rb
-- lib/site_hook/static/sass/styles.scss
 - lib/site_hook/version.rb
 - lib/site_hook/views/layout.haml
 - lib/site_hook/views/webhooks.haml
 - lib/site_hook/webhook.rb
 - site_hook.gemspec
+- sonar-project.properties
 homepage: https://iotaspencer.me/projects/site_hook/
 licenses:
 - MIT

data/lib/site_hook/config_class.rb

@@ -1,92 +0,0 @@
-require 'thor'
-require 'highline'
-require 'random_password'
-require 'yaml'
-require 'recursive-open-struct'
-module SiteHook
-  class FileExistsError < Exception
-  end
-
-  # *ConfigClass*
-  #
-  # Holds all of the commands for the config subcommand
-  class ConfigClass < Thor
-
-    desc 'gen [options]', "Generate a example config file if one doesn't exist"
-    # rubocop:disable Metrics/AbcSize
-    def gen
-      yaml = [
-        '# fatal, error, warn, info, debug',
-        'log_levels:',
-        '  hook: info',
-        '  build: info',
-        '  git: info',
-        '  app: info',
-        'projects:',
-        '  PROJECT.NAME:  # Use the name you put as your webhook url',
-        '  # https://jekyllhook.example.com/webhook/PROJECT.NAME',
-        "    src: /path/2/site/source   # Directory you 'git pull' into",
-        '    dst: /path/2/destination/  # The web root will be this folder',
-        "    host: git*.com             # The git service you're using for vcs",
-        '    repo: USER/REPO            # The repo path on the git service',
-        '    hookpass: SOMERANDOMSTRING # Gitlab-Token or GitHub secret, etc.',
-        '    private: true/false        # hidden from the public list',
-        ''
-      ]
-      jphrc = SiteHook::Paths.config
-      if jphrc.exist?
-        puts "#{jphrc} exists. Will not overwrite."
-      else
-        File.open(jphrc, 'w') do |f|
-          yaml.each do |line|
-            f.puts line
-          end
-        end
-        say "Created #{jphrc}"
-        say "You can now edit #{jphrc} and add your projects."
-      end
-    end
-    desc 'gen-project [options]', 'generates a project block'
-    def gen_project
-      hl = HighLine.new
-      hl.say "First What's the name of the project?"
-      project_name = hl.ask('> ')
-
-      hl.say "What's the source path? e.g. /home/#{ENV['USER']}/sites/site.tld"
-      source_path = hl.ask('> ')
-
-      hl.say 'Where is the web root? e.g. /var/www/sites/site.tld'
-      dest_path = hl.ask('> ')
-
-      hl.say 'The next things are for the public webhook list.'
-      hl.say "\n"
-      hl.say "\n"
-      hl.say "What's the hostname of the git service? e.g. github.com,"
-      hl.say "gitlab.com, git.domain.tld"
-      git_host = hl.ask('> ')
-
-      hl.say "What's the repo path? e.g. UserName/SiteName, UserName/site, etc."
-      repo_path = hl.ask('> ')
-
-      hl.say 'Is this repo allowed to be shown publically?'
-      is_private = hl.agree('> ', true) ? true : false
-
-      hl.say "Generating a hook password for you. If this one isn't wanted"
-      hl.say 'then just change it afterwards.'
-      hook_pass = RandomPassword.new(length: 20, symbols: 0).generate
-      hl.say 'Done.'
-      hl.say 'Outputting...'
-      tpl = [
-        "  #{project_name}:",
-        "    src: #{source_path}",
-        "    dst: #{dest_path}",
-        "    hookpass: #{hook_pass}",
-        "    host: #{git_host}",
-        "    repo: #{repo_path}",
-        "    private: #{is_private}"
-      ]
-      puts tpl
-    end
-  end
-end
-# rubocop:enable Metrics/AbcSize

data/lib/site_hook/server_class.rb

@@ -1,29 +0,0 @@
-##########
-# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/config_class.1.rb
-# -> Project: site_hook
-# -> Author: Ken Spencer <me@iotaspencer.me>
-# -> Last Modified: 1/10/2018 21:45:36
-# -> Copyright (c) 2018 Ken Spencer
-# -> License: MIT
-##########
-require 'thor'
-module SiteHook
-  autoload :Webhook, 'site_hook/webhook'
-  JPHRC = YAML.load_file(Pathname(Dir.home).join('.jph', 'config'))
-  # *ServerClass*
-  #
-  # Holds all of the commands for the config subcommand
-  class ServerClass < Thor
-    method_option(:log_levels, type: :hash, banner: 'LEVELS', default: SiteHook::Logs.log_levels)
-    method_option :host, type: :string, banner: 'BINDHOST', default: JPHRC.fetch('host', '127.0.0.1')
-    method_option :port, type: :string, banner: 'BINDPORT', default: JPHRC.fetch('port', 9090)
-    method_option :config, type: :string, banner: 'CONFIGFILE', default: '_config.yml'
-    desc 'listen', 'Start SiteHook'
-    def listen
-      SiteHook.mklogdir unless SiteHook::Paths.logs.exist?
-      SiteHook::Webhook.set_options(options[:host], options[:port], options[:config])
-      SiteHook::Webhook.run!
-    end
-  end
-end
-# rubocop:enable Metrics/AbcSize