site_hook 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99430b340e0a3ac2c311d2e7688289fb9252598ec0bdc752566f41394503161
-  data.tar.gz: a258fbcacc3b2a918b807530c64c0efab06adde90e910ade3915c33d297c97c0
+  metadata.gz: 2c688959a65b681e22e43dc8a5ee1f7739e290a6da65c013865afe3084a2d1de
+  data.tar.gz: d7d741ffb673055a21fc9f9f7783af0f0a8db828cd7bdcf5151f190f6118ca9c
 SHA512:
-  metadata.gz: b62d2d23daeca75c2d03a63d0bd11b3f55a3206e1355f4946d2c22470fbe1b4f273760732484e135565db78085aa4d579b40dabd266ec59ecc8980f61f64e0a6
-  data.tar.gz: 8365b6eebe10b49633b4e070ebb491f6d2fea1b94774c2127b000a58130271227415229eb459bf9fc648c16c565b20a70a23a87b2e0e08cc320ea539b3249714
+  metadata.gz: c165e9f3ea256ba6eb55fdd8cc3bdbab0d57c4d768d6a5d5e6fef1dd0e64143481a59862791b8d265a255358c4ae280041800327cdd071e7bbb03e5c621443ed
+  data.tar.gz: 69cddc75e16872cca759c9af4c16f54eb8b1c1ec48457dff20db767964a6cde6fb8e781032683385a0b55e9109401f2311bb4782db72a4561247486321ef95a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    site_hook (0.6.8)
+    site_hook (0.6.9)
       activesupport (~> 5.1)
       git (~> 1.3)
       haml (~> 5.0)

data/lib/site_hook.rb

@@ -19,7 +19,6 @@ module SiteHook
   autoload :Logs, 'site_hook/log'
   autoload :Gem, 'site_hook/gem'
   autoload :Paths, 'site_hook/paths'
-  # rubocop:disable Metrics/ClassLength, Metrics/LineLength, MethodLength, BlockLength
   # class SassHandler (inherits from Sinatra::Base)
   class SassHandler < Sinatra::Base
     set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'sass').to_s
@@ -36,7 +35,4 @@ module SiteHook
       coffee filename.to_sym
     end
   end
-  # class Webhook (inherits from Sinatra::Base)
-
-  # rubocop:enable Metrics/ClassLength, Metrics/LineLength, MethodLength, BlockLength
 end

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

data/lib/site_hook/webhook.rb

@@ -96,6 +96,10 @@ module SiteHook
       plaintext = false
       signature = nil
       event = nil
+      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
+      unless gogs.nil?
+        event = 'push' if gogs == 'push'
+      end
       github = request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
       unless github.nil?
         event = 'push' if github == 'push'
@@ -104,11 +108,11 @@ module SiteHook
       unless gitlab.nil?
         event = 'push' if gitlab == 'push'
       end
-      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
-      unless gogs.nil?
-        event = 'push' if gogs == 'push'
-      end
+
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Ken Spencer