txgh-server 4.0.0.beta → 4.0.0.beta2

data/spec/integration/config/tx_gitlab.config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+lang_map =
+
+# Create one such section per resource
+[txgl-test.enyml]
+file_filter = config/locales/<lang>.yml
+source_file = config/locales/en.yml
+source_lang = en
+type = YML

data/spec/integration/hooks_spec.rb

@@ -7,8 +7,7 @@ require 'rack/test'
 require 'helpers/integration_setup'
 require 'uri'
 require 'yaml'
-
-include TxghServer
+require_relative '../../lib/txgh-server/application'
 
 describe 'hook integration tests', integration: true do
   include Rack::Test::Methods
@@ -24,43 +23,14 @@ describe 'hook integration tests', integration: true do
     end
   end
 
-  let(:base_config) do
-    {
-      'github' => {
-        'repos' => {
-          'txgh-bot/txgh-test-resources' => {
-            'api_username' => 'txgh-bot',
-            # github will auto-revoke a token if they notice it in one of your commits ;)
-            'api_token' => Base64.decode64('YjViYWY3Nzk5NTdkMzVlMmI0OGZmYjk4YThlY2M1ZDY0NzAwNWRhZA=='),
-            'push_source_to' => 'test-project-88',
-            'branch' => 'master',
-            'webhook_secret' => '18d3998f576dfe933357104b87abfd61'
-          }
-        }
-      },
-      'transifex' => {
-        'projects' => {
-          'test-project-88' => {
-            'tx_config' => 'file://./config/tx.config',
-            'api_username' => 'txgh.bot',
-            'api_password' => '2aqFGW99fPRKWvXBPjbrxkdiR',
-            'push_translations_to' => 'txgh-bot/txgh-test-resources',
-            'webhook_secret' => 'fce95b1748fd638c22174d34200f10cf',
-            'languages' => ['el_GR']
-          }
-        }
-      }
-    }
-  end
-
   before(:all) do
     VCR.configure do |config|
       config.filter_sensitive_data('<GITHUB_TOKEN>') do
-        base_config['github']['repos']['txgh-bot/txgh-test-resources']['api_token']
+        base_config[git_source]['repos']['txgh-bot/txgh-test-resources']['api_token']
       end
 
       config.filter_sensitive_data('<TRANSIFEX_PASSWORD>') do
-        base_config['transifex']['projects']['test-project-88']['api_password']
+        base_config['transifex']['projects'][project_name]['api_password']
       end
     end
   end
@@ -81,21 +51,22 @@ describe 'hook integration tests', integration: true do
     File.read(payload_path.join('github_postbody.json'))
   end
 
+  let(:gitlab_postbody) do
+    File.read(payload_path.join('gitlab_postbody.json'))
+  end
+
   let(:github_postbody_release) do
     File.read(payload_path.join('github_postbody_release.json'))
   end
 
-  let(:project_name) { 'test-project-88' }
-  let(:repo_name) { 'txgh-bot/txgh-test-resources' }
-
   let(:config) do
     Txgh::Config::KeyManager.config_from(project_name, repo_name)
   end
 
   def sign_github_request(body)
     header(
-      GithubRequestAuth::GITHUB_HEADER,
-      GithubRequestAuth.compute_signature(
+      TxghServer::GithubRequestAuth::GITHUB_HEADER,
+      TxghServer::GithubRequestAuth.compute_signature(
         body, config.git_repo.webhook_secret
       )
     )
@@ -123,38 +94,58 @@ describe 'hook integration tests', integration: true do
     expect(config.project_config).to_not be_nil
   end
 
-  it 'verifies the transifex hook endpoint works' do
-    VCR.use_cassette('transifex_hook_endpoint') do
-      params = {
-        'project' => 'test-project-88', 'resource' => 'samplepo',
-        'language' => 'el_GR', 'translated' => 100
-      }
+  context 'GitLab' do
+    let(:git_source) { 'gitlab' }
+    let(:repo_name) { 'idanci/txgl-test' }
+    let(:project_name) { 'txgl-test' }
 
-      payload = params.to_json
+    it 'verifies the gitlab hook endpoint works' do
+      VCR.use_cassette('gitlab_hook_endpoint') do
+        header 'X-Gitlab-Token', base_config[git_source]['repos'][repo_name]['webhook_secret']
+        header 'X-GitLab-Event', 'Push Hook'
+        header 'content-type', 'application/x-www-form-urlencoded'
+        post '/gitlab', gitlab_postbody
 
-      sign_transifex_request(payload)
-      post '/transifex', payload
-      expect(last_response).to be_ok
+        expect(last_response).to be_ok
+      end
     end
-  end
 
-  it 'verifies the github hook endpoint works' do
-    VCR.use_cassette('github_hook_endpoint') do
-      sign_github_request(github_postbody)
-      header 'X-GitHub-Event', 'push'
-      header 'content-type', 'application/x-www-form-urlencoded'
-      post '/github', github_postbody
-      expect(last_response).to be_ok
+    it 'verifies the transifex hook endpoint works' do
+      VCR.use_cassette('transifex_hook_endpoint') do
+        params = {
+          'project' => project_name, 'resource' => 'enyml-heads_test_hook',
+          'language' => 'de', 'translated' => 100
+        }
+
+        payload = params.to_json
+
+        sign_transifex_request(payload)
+        post '/transifex', payload
+
+        expect(last_response).to be_ok
+      end
     end
   end
 
-  it 'verifies the github release hook endpoint works' do
-    VCR.use_cassette('github_release_hook_endpoint') do
-      sign_github_request(github_postbody_release)
-      header 'X-GitHub-Event', 'push'
-      header 'content-type', 'application/x-www-form-urlencoded'
-      post '/github', github_postbody_release
-      expect(last_response).to be_ok
+  context 'GitHub' do
+    it 'verifies the github hook endpoint works' do
+      VCR.use_cassette('github_hook_endpoint') do
+        sign_github_request(github_postbody)
+        header 'X-GitHub-Event', 'push'
+        header 'content-type', 'application/x-www-form-urlencoded'
+        post '/github', github_postbody
+        expect(last_response).to be_ok
+      end
+    end
+
+    it 'verifies the github release hook endpoint works' do
+      VCR.use_cassette('github_release_hook_endpoint') do
+        sign_github_request(github_postbody_release)
+        header 'X-GitHub-Event', 'push'
+        header 'content-type', 'application/x-www-form-urlencoded'
+        post '/github', github_postbody_release
+        expect(last_response).to be_ok
+      end
     end
   end
 end

data/spec/integration/payloads/gitlab_postbody.json

@@ -0,0 +1,62 @@
+{
+  "object_kind": "push",
+  "event_name": "push",
+  "before": "d2e8cee2a4119235ea5ffd91e50dc91fe2e6632e",
+  "after": "3bf889a1310b515ec4d8d64a93542977a6dbe106",
+  "ref": "refs/heads/test_hook",
+  "checkout_sha": "3bf889a1310b515ec4d8d64a93542977a6dbe106",
+  "message": null,
+  "user_id": 745271,
+  "user_name": "Ivan Danci",
+  "user_username": "idanci",
+  "user_email": "",
+  "user_avatar": "https://secure.gravatar.com/avatar/dbda838e9b7bca615829ac151e01f3c0?s=80&d=identicon",
+  "project_id": 17514841,
+  "project": {
+    "id": 17514841,
+    "name": "txgl-test",
+    "description": "Test transifex-gitlab",
+    "web_url": "https://gitlab.com/idanci/txgl-test",
+    "avatar_url": null,
+    "git_ssh_url": "git@gitlab.com:idanci/txgl-test.git",
+    "git_http_url": "https://gitlab.com/idanci/txgl-test.git",
+    "namespace": "Ivan Danci",
+    "visibility_level": 20,
+    "path_with_namespace": "idanci/txgl-test",
+    "default_branch": "master",
+    "ci_config_path": null,
+    "homepage": "https://gitlab.com/idanci/txgl-test",
+    "url": "git@gitlab.com:idanci/txgl-test.git",
+    "ssh_url": "git@gitlab.com:idanci/txgl-test.git",
+    "http_url": "https://gitlab.com/idanci/txgl-test.git"
+  },
+  "commits": [
+    {
+      "id": "3bf889a1310b515ec4d8d64a93542977a6dbe106",
+      "message": "Test\n",
+      "title": "Test",
+      "timestamp": "2020-03-26T18:27:52+02:00",
+      "url": "https://gitlab.com/idanci/txgl-test/-/commit/3bf889a1310b515ec4d8d64a93542977a6dbe106",
+      "author": {
+        "name": "Ivan Danci",
+        "email": "bah4uk@gmail.com"
+      },
+      "added": [],
+      "modified": [
+        "config/locales/en.yml"
+      ],
+      "removed": []
+    }
+  ],
+  "total_commits_count": 1,
+  "push_options": {},
+  "repository": {
+    "name": "txgl-test",
+    "url": "git@gitlab.com:idanci/txgl-test.git",
+    "description": "Test transifex-gitlab",
+    "homepage": "https://gitlab.com/idanci/txgl-test",
+    "git_http_url": "https://gitlab.com/idanci/txgl-test.git",
+    "git_ssh_url": "git@gitlab.com:idanci/txgl-test.git",
+    "visibility_level": 20
+  }
+}

data/spec/integration/triggers_spec.rb

@@ -2,11 +2,16 @@ require 'spec_helper'
 
 require 'rack/test'
 require 'helpers/integration_setup'
+require_relative '../../lib/txgh-server/application'
 
 describe 'trigger integration tests', integration: true do
   include Rack::Test::Methods
   include IntegrationSetup
 
+  let(:git_source) { 'gitlab' }
+  let(:repo_name) { 'idanci/txgl-test' }
+  let(:project_name) { 'txgl-test' }
+
   def app
     @app ||= TxghServer::TriggerEndpoints.new
   end
@@ -20,12 +25,13 @@ describe 'trigger integration tests', integration: true do
   it 'verifies the pull endpoint works' do
     VCR.use_cassette('pull') do
       params = {
-        project_slug: 'test-project-88',
-        resource_slug: 'samplepo',
+        project_slug: project_name,
+        resource_slug: 'enyml-heads_master',
         branch: 'master'
       }
 
       patch '/pull', params
+
       expect(last_response).to be_ok
     end
   end
@@ -33,12 +39,13 @@ describe 'trigger integration tests', integration: true do
   it 'verifies the push endpoint works' do
     VCR.use_cassette('push') do
       params = {
-        project_slug: 'test-project-88',
-        resource_slug: 'samplepo',
+        project_slug: project_name,
+        resource_slug: 'enyml-heads_master',
         branch: 'master'
       }
 
       patch '/push', params
+
       expect(last_response).to be_ok
     end
   end

data/txgh-server.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra', '~> 1.4'
   s.add_dependency 'sinatra-contrib', '~> 1.4'
   s.add_dependency 'rubyzip', '>= 1.0', '<= 1.1.2'
-  s.add_dependency 'txgh', '7.0.0.beta'
+  s.add_dependency 'txgh', '7.0.0.beta2'
 
   s.require_path = 'lib'
   s.files = Dir['{lib,spec}/**/*', 'README.md', 'txgh-server.gemspec', 'LICENSE']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.beta
+        version: 7.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.beta
+        version: 7.0.0.beta2
 description: An HTTP server for interacting with txgh.
 email:
 - mattjjacko@gmail.com
@@ -150,13 +150,16 @@ files:
 - spec/helpers/gitlab_payload_builder.rb
 - spec/helpers/integration_setup.rb
 - spec/helpers/test_request.rb
+- spec/integration/cassettes/gitlab_hook_endpoint.yml
 - spec/integration/cassettes/pull.yml
 - spec/integration/cassettes/push.yml
 - spec/integration/cassettes/transifex_hook_endpoint.yml
 - spec/integration/config/tx.config
+- spec/integration/config/tx_gitlab.config
 - spec/integration/hooks_spec.rb
 - spec/integration/payloads/github_postbody.json
 - spec/integration/payloads/github_postbody_release.json
+- spec/integration/payloads/gitlab_postbody.json
 - spec/integration/triggers_spec.rb
 - spec/spec_helper.rb
 - spec/tgz_stream_response_spec.rb
@@ -196,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An HTTP server for interacting with txgh.