lib/site_hook/sender.rb in site_hook-0.6.1 vs lib/site_hook/sender.rb in site_hook-0.6.2

@@ -9,36 +9,36 @@
 
       class Build
 
         def do_grab_version
           jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
-          log           = Jekyll.instance_variable_get('@log')
+          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}")
             log.info("Jekyll Version: #{stdout_str.chomp!}")
           rescue Errno::ENOENT
             log.fatal('Jekyll not installed! Gem and Webhook will not function')
             Process.kill('INT', Process.pid)
           end
         end
 
         def do_pull
-          fakelog       = SiteHook::HookLogger::FakeLog.new
-          reallog       = SiteHook::HookLogger::GitLog.new(SiteHook.log_levels['git']).log
+          fakelog = SiteHook::HookLogger::FakeLog.new
+          reallog = SiteHook::HookLogger::GitLog.new(SiteHook.log_levels['git']).log
           jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
-          build_dest    = Jekyll.instance_variable_get('@build_dest')
-          g             = Git.open(jekyll_source, :log => fakelog)
+          build_dest = Jekyll.instance_variable_get('@build_dest')
+          g = Git.open(jekyll_source, :log => fakelog)
           g.pull
           fakelog.entries.each do |level, entries|
             entries.each { |entry| reallog.send("#{level}", entry) }
           end
         end
 
         def do_build
           jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
-          build_dest    = Jekyll.instance_variable_get('@build_dest')
-          log           = Jekyll.instance_variable_get('@log')
+          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}") { |in_io, outerr_io, thr|
             pid = thr.pid
 
             outerr = outerr_io.read.lines
             outerr.each do |line|
@@ -74,33 +74,27 @@
       # @param [String,Pathname] jekyll_source Jekyll Source
       # @param [String,Pathname] build_dest Build Destination
       # @param [BuildLog] logger Build Logger Instance
       def self.build(jekyll_source, build_dest, logger)
         @jekyll_source = jekyll_source
-        @build_dest    = build_dest
-        @log           = logger
-        instance       = self::Build.new
-        meths          = instance.methods.select { |x| x =~ /^do_/ }
-        @thrs = []
+        @build_dest = build_dest
+        @log = logger
+        instance = self::Build.new
+        meths = instance.methods.select { |x| x =~ /^do_/ }
         begin
-          @thrs << Thread.new do
-            meths.each do |m|
-              @log.debug("Running #{m}")
-              instance.method(m).call
-              @log.debug("Ran #{m}")
-            end
-            Thread.exit
+          meths.each do |m|
+            @log.debug("Running #{m}")
+            instance.method(m).call
+            @log.debug("Ran #{m}")
           end
           return {message: 'success', status: 0}
         rescue TypeError => e
           return {message: "#{e}", status: -1}
         rescue KeyError => e
           return {message: "#{e}", status: -2}
         rescue ArgumentError => e
           return {message: "#{e}", status: -3}
-
         end
-
       end
     end
   end
 end