gitall 1.1.20 → 1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63df4d0ad03f2a22db3768a65c13245b26ca9191a0316acce90cbc5dcff80564
-  data.tar.gz: 880a73ade68f6d468c9fe5095826d8c1ae772a3e22638fe0b3057b349da8ee26
+  metadata.gz: d70f1c9c6f9ddbad7270a887e973ccead3e2bfdf5e221948bf2bcb6c137be1a7
+  data.tar.gz: c077267d0532827b53e97a8540ddee4226aa071140fa553f55e97696be62130b
 SHA512:
-  metadata.gz: f76603d2500cc79bf91ca4c62e1803a8c4da59cd21035007c16a49cee3c7383c68f77ceae168786ff5be8fae69c68c52f1e3576140457604c2df48ea7a469d82
-  data.tar.gz: ed7c586fbb911273009a178c4d272285ffa54c442634f31e36661684f6020c8ad7f253af093689c10b4d009bad0e0b3a45c2d9050632ef1237710ae8683dff12
+  metadata.gz: ce918931c2b39ea02f80c50893b4a24344e4f9b61493453c98750158eb478e1507f93a6f3bd499061a4f3a4855cf3b6ab946cb289f0352e4b8642f597fe77575
+  data.tar.gz: b582287fbef7b67bae3139ca4f8b3f3f3545d5465b78a3b1f32250c8133cb1c863735e9227713df50670f7887fd361b099b1db64a01e0983d0574e8b830ef635

data/lib/gitall.rb

@@ -170,7 +170,7 @@ module GitAll
     set :port, 8008
     set :bind, '127.0.0.1'
     set :environment, 'production'
-    set :threaded, false
+    set :threaded, true
     post '/hook/?' do
       request.body.rewind
       payload = request.body.read
@@ -181,7 +181,7 @@ module GitAll
         repo = j.project.path_with_namespace.to_s.downcase
         resp = GitLabParser.parse json
         phash = GitAll::PROJECTS[repo.downcase]
-        if phash['token'] == request.env['HTTP_X_GITLAB_TOKEN']
+        if phash[:token] == request.env['HTTP_X_GITLAB_TOKEN']
           channels = phash['channels']
           channels.each do |channet|
             channel = channet.split(',')[0]
@@ -192,11 +192,8 @@ module GitAll
           end
         end
       elsif request.env.key? 'HTTP_X_HUB_SIGNATURE'
-        if !j.repository.full_name.nil?
+        unless j.repository.full_name.nil?
           repo = j.repository.full_name.downcase
-        elsif !j.organization.login.nil?
-          repo = j.organization.login.downcase
-        else
         end
         # phash includes orgs and repos
         phash = GitAll::PROJECTS[repo.downcase]
@@ -206,41 +203,13 @@ module GitAll
         resp = GitHubParser.parse json, request.env['HTTP_X_GITHUB_EVENT']
         if signature.to_s == sent_token.to_s
           channels = phash['channels'.to_sym]
-          channels.each {
-              |channet|
-            channel = channet.split(',')[0]
-            network = channet.split(',')[1]
-            resp.each {
-                |n|
-              GitAll::Bot::Bots.bots[network].Channel(channel).send("#{n}")
-            }
-          }
-        end
-
-      elsif request.env.key?('HTTP_X_GOGS_EVENT')
-        if !j.repository.full_name.nil?
-          repo = j.repository.full_name
-        elsif !j.organization.login.nil?
-          repo = j.organization.login
-        else
-        end
-        # phash includes orgs and repos
-        phash = GitAll::PROJECTS[repo.to_sym]
-        token = phash['token']
-        sent_token = request.env['HTTP_X_HUB_SIGNATURE']
-        signature = "sha1=#{OpenSSL::HMAC.hexdigest('sha1', token, payload.strip).chomp}"
-        resp = GitHubParser.parse json, request.env['HTTP_X_GITHUB_EVENT']
-        if signature.to_s == sent_token.to_s
-          channels = phash['channels'.to_sym]
-          channels.each {
-              |channet|
+          channels.each do |channet|
             channel = channet.split(',')[0]
             network = channet.split(',')[1]
-            resp.each {
-                |n|
+            resp.each do |n|
               GitAll::Bot::Bots.bots[network].Channel(channel).send("#{n}")
-            }
-          }
+            end
+          end
         end
       elsif request.env.key?('HTTP_X_EVENT_KEY')
         # BitBucket's Webhooks

data/lib/gitall/version.rb

@@ -1,3 +1,3 @@
 module GitAll
-  VERSION = '1.1.20'
+  VERSION = '1.1.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitall
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Git Based Webservices Webhook Receiver