lib/site_hook/sender.rb in site_hook-0.8.2 vs lib/site_hook/sender.rb in site_hook-0.9.3

@@ -1,13 +1,10 @@
 require 'open3'
 require 'site_hook/logger'
 require 'git'
 require 'paint'
-require 'site_hook/persist'
 module SiteHook
-  autoload :Logs, 'site_hook/log'
-
   module Senders
     class Jekyll
       attr :jekyll_source, :build_dest
 
       class Build
@@ -28,12 +25,12 @@
             Process.kill('INT', Process.pid)
           end
         end
 
         def do_pull
-          fakelog = SiteHook::HookLogger::FakeLog.new
-          reallog = SiteHook::HookLogger::GitLog.new(SiteHook::Logs.log_levels['git']).log
+          fakelog = SiteHook::Log.fake
+          reallog = SiteHook::Log.git
           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
           fakelog.entries.each do |level, entries|
@@ -44,11 +41,11 @@
         def do_build
           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|
-            # pid = thr.pid
+            pid = thr.pid
 
             outerr = outerr_io.read.lines
             outerr.each do |line|
               line = Paint.unpaint(line)
               line.squish!
@@ -87,15 +84,13 @@
         @jekyll_source = jekyll_source
         @build_dest = build_dest
         @log = logger
         @options = options
         instance = self::Build.new(options)
-        meths = [instance.do_grab_version, instance.do_pull, instance.do_build]
+        meths = [:do_grab_version, :do_pull, :do_build]
         begin
           meths.each do |m|
-            @log.debug("Running #{m}")
             instance.send(m)
-            @log.debug("Ran #{m}")
           end
           return {message: 'success', status: 0}
         rescue TypeError => e
           return {message: "#{e}", status: -1}
         rescue KeyError => e