site_hook 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a26cc7b56f7d8ec886c17291a26a31a4f12ada32c00b5aeb8e3ad7c405a0af
-  data.tar.gz: 44bc8bf34ba70851b8cdf6450e9482ed10f01a279fb6bb18ac37a9a0514be46e
+  metadata.gz: 2111c48199b164cebd109b5501f5d5917bc8ed52dadb5399948ea7b9cc7edbcf
+  data.tar.gz: 563f6850fbe028c6edbde43638b1094025d0f7e7acbc06825ce8505537ce4176
 SHA512:
-  metadata.gz: b17d9874b23b31204942c69e7a9ed7c03992793326e1eed9fd81d9f5496037106b7cc8ca2ed23c9b85a7cfd9fbe9d6174f3e001afcadc4273295542e5106e792
-  data.tar.gz: 40a8d2d7a3b2721518ee737961e4a7e26e70b179fe2d8608b52686b0091189d4422fdb3a40cabfaeb0a803988d56bd55878437e257d55980c1aa381f41a3795d
+  metadata.gz: 6bed5baa92e5e6b4e29c190b5070c081e3d5b8a3ba921d2c912e9626c580b9b5ef99b788d5d0a3a7572ab0a33be223217bea0da5807940b080dad1430356a6f8
+  data.tar.gz: 6ecb4076048ad00fcc76b98a4425e818aa6a851e902315e0a8ade024b98e104525ae4e88d16a935804f7086ea323730101133c2fb6e6a7da61bf4729b7b33c77

data/lib/site_hook/sender.rb

@@ -11,7 +11,7 @@ module SiteHook
 
         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!}")
@@ -22,11 +22,11 @@ module SiteHook
         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) }
@@ -35,8 +35,8 @@ module SiteHook
 
         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
 
@@ -76,19 +76,15 @@ module SiteHook
       # @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
@@ -97,9 +93,7 @@ module SiteHook
           return {message: "#{e}", status: -2}
         rescue ArgumentError => e
           return {message: "#{e}", status: -3}
-
         end
-
       end
     end
   end

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra