txgh-server 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e58e68da42392ba7ad13d0bbe7fe8240062a4ca
-  data.tar.gz: 83cb94af972bd003c0fcbe6c57718a4a9b6716f7
+  metadata.gz: 9e75d11d351052dcae4752db36b41f3bfe213b7c
+  data.tar.gz: 26d3a5ace61faa39884854fc336e70490fbb1bd6
 SHA512:
-  metadata.gz: 212276130dac852ac0083f4070c20beb4824418a1e36f2d2baafd0c210f6fa3a49f819a0f581dd5eb777cd18ae3efbf7cbdf9cb7638ea70f3f22547b79a5adec
-  data.tar.gz: aa3c2d6acccc503f41a5cb1f0faacf5b93ab0aa349f9eb0566562f830df55ff81081ea3542d45b10d2d1b32c5b8bd3e6390612f665cd018ab7ec1f3fda99ec0e
+  metadata.gz: 9a230bc3d628166f714d41a4705c85b1331c44f267b9c593e5049903149f91ca379d050a5f8e7ed31b09ac52eebaa01ae0bc903c235044ed10c6a322e9df1b9a
+  data.tar.gz: 2c594d254994d92586b44653448387e450e52931719f6819e0657a7dc7e472a375c72a55bac7abdf00652f837e268d5d9824b2cb310c1e0a8e0e96b45e8e9bdc

data/lib/txgh-server/application.rb

@@ -15,8 +15,7 @@ module TxghServer
           begin
             resp.write_to(out)
           rescue => e
-            Txgh.events.publish_error(e)
-            raise e
+            Txgh.events.publish_error!(e)
           end
         end
       else

data/lib/txgh-server/triggers/pull_handler.rb

@@ -1,14 +1,26 @@
+require 'octokit'
+require 'txgh'
+
 module TxghServer
   module Triggers
     class PullHandler < Handler
 
       def execute
         puller.pull_slug(resource_slug)
+        update_github_status
         respond_with(200, true)
       end
 
       private
 
+      def update_github_status
+        Txgh::GithubStatus.update(project, repo, branch)
+      rescue Octokit::UnprocessableEntity
+        # raised because we've tried to create too many statuses for the commit
+      rescue Txgh::TransifexNotFoundError
+        # raised if transifex resource can't be found
+      end
+
       def puller
         @puller ||= Txgh::Puller.new(project, repo, branch)
       end

data/lib/txgh-server/triggers/push_handler.rb

@@ -1,14 +1,26 @@
+require 'octokit'
+require 'txgh'
+
 module TxghServer
   module Triggers
     class PushHandler < Handler
 
       def execute
         pusher.push_slug(resource_slug)
+        update_github_status
         respond_with(200, true)
       end
 
       private
 
+      def update_github_status
+        Txgh::GithubStatus.update(project, repo, branch)
+      rescue Octokit::UnprocessableEntity
+        # raised because we've tried to create too many statuses for the commit
+      rescue Txgh::TransifexNotFoundError
+        # raised if transifex resource can't be found
+      end
+
       def pusher
         @pusher ||= Txgh::Pusher.new(project, repo, branch)
       end

data/lib/txgh-server/version.rb

@@ -1,3 +1,3 @@
 module TxghServer
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/txgh-server/webhooks/github/delete_attributes.rb

@@ -3,7 +3,7 @@ module TxghServer
     module Github
       class DeleteAttributes
         ATTRIBUTES = [
-          :repo_name, :ref, :ref_type
+          :event, :repo_name, :ref, :ref_type
         ]
 
         class << self
@@ -15,6 +15,10 @@ module TxghServer
             )
           end
 
+          def event(payload)
+            'delete'
+          end
+
           def repo_name(payload)
             payload.fetch('repository').fetch('full_name')
           end

data/lib/txgh-server/webhooks/github/push_attributes.rb

@@ -1,11 +1,9 @@
-require 'set'
-
 module TxghServer
   module Webhooks
     module Github
       class PushAttributes
         ATTRIBUTES = [
-          :repo_name, :ref, :before, :after,
+          :event, :repo_name, :ref, :before, :after,
           :added_files, :modified_files, :author
         ]
 
@@ -18,6 +16,10 @@ module TxghServer
             )
           end
 
+          def event(payload)
+            'push'
+          end
+
           def repo_name(payload)
             payload.fetch('repository').fetch('full_name')
           end

data/lib/txgh-server/webhooks/github/push_handler.rb

@@ -1,4 +1,6 @@
 require 'set'
+require 'octokit'
+require 'txgh'
 
 module TxghServer
   module Webhooks
@@ -23,12 +25,12 @@ module TxghServer
           if should_process?
             logger.info('found branch in github request')
 
-            updater = Txgh::ResourceUpdater.new(project, repo, logger)
-            categories = { 'author' => attributes.author }
-
-            added_and_modified_resources.each do |resource|
-              updater.update_resource(resource, categories)
+            pusher.push_resources(added_and_modified_resources) do |tx_resource|
+              # block should return categories for the passed-in resource
+              { 'author' => attributes.author }
             end
+
+            update_github_status
           end
 
           respond_with(200, true)
@@ -36,9 +38,21 @@ module TxghServer
 
         private
 
+        def update_github_status
+          Txgh::GithubStatus.update(project, repo, branch)
+        rescue Octokit::UnprocessableEntity
+          # raised because we've tried to create too many statuses for the commit
+        rescue Txgh::TransifexNotFoundError
+          # raised if transifex resource can't be found
+        end
+
+        def pusher
+          @pusher ||= Txgh::Pusher.new(project, repo, branch)
+        end
+
         # finds the resources that were updated in each commit
         def added_and_modified_resources
-          attributes.files.each_with_object(Set.new) do |file, ret|
+          @amr ||= attributes.files.each_with_object(Set.new) do |file, ret|
             logger.info("processing added/modified file: #{file}")
 
             if tx_resources.include?(file)

data/lib/txgh-server/webhooks/transifex/hook_handler.rb

@@ -1,4 +1,6 @@
 require 'logger'
+require 'txgh'
+require 'octokit'
 
 module TxghServer
   module Webhooks
@@ -21,14 +23,26 @@ module TxghServer
           logger.info(resource_slug)
 
           check_error_response || begin
-            committer = Txgh::ResourceCommitter.new(project, repo, logger)
-            committer.commit_resource(tx_resource, branch, language)
+            puller.pull_resource(tx_resource, [language])
+            update_github_status
             respond_with(200, true)
           end
         end
 
         private
 
+        def update_github_status
+          Txgh::GithubStatus.update(project, repo, branch)
+        rescue Octokit::UnprocessableEntity
+          # raised because we've tried to create too many statuses for the commit
+        rescue Txgh::TransifexNotFoundError
+          # raised if transifex resource can't be found
+        end
+
+        def puller
+          @puller ||= Txgh::Puller.new(project, repo, branch)
+        end
+
         def check_error_response
           check_supported_language || check_tx_config || check_tx_resource
         end

data/spec/application_spec.rb

@@ -277,9 +277,8 @@ describe TxghServer::TriggerEndpoints do
       updater = double(:updater)
       expect(Txgh::ResourceUpdater).to receive(:new).and_return(updater)
       expect(Txgh::GithubApi).to receive(:new).and_return(github_api)
-      expect(github_api).to receive(:get_ref).and_return(object: { sha: 'abc123' })
 
-      expect(updater).to receive(:update_resource) do |resource, sha|
+      expect(updater).to receive(:update_resource) do |resource, categories|
         expected_branch = Txgh::Utils.absolute_branch(branch)
         expect(resource.branch).to eq(expected_branch)
         expect(resource.project_slug).to eq(project_name)
@@ -288,6 +287,8 @@ describe TxghServer::TriggerEndpoints do
         )
       end
 
+      expect(Txgh::GithubStatus).to receive(:update)
+
       patch '/push', params
       expect(last_response).to be_ok
     end
@@ -313,16 +314,15 @@ describe TxghServer::TriggerEndpoints do
 
     it 'updates translations (in all locales) in the expected repo' do
       committer = double(:committer)
-      languages = [{ 'language_code' => 'pt' }, { 'language_code' => 'ja' }]
-      project_config['languages'] = %w(pt ja)
+      languages = %w(pt ja)
+      project_config['languages'] = languages
       expect(Txgh::ResourceCommitter).to receive(:new).and_return(committer)
       expect(Txgh::TransifexApi).to receive(:new).and_return(transifex_api)
-      expect(transifex_api).to receive(:get_languages).and_return(languages)
 
       languages.each do |language|
         expect(committer).to receive(:commit_resource) do |resource, branch, lang|
           expect(branch).to eq(branch)
-          expect(lang).to eq(language['language_code'])
+          expect(lang).to eq(language)
           expect(resource.branch).to eq(branch)
           expect(resource.project_slug).to eq(project_name)
           expect(resource.resource_slug).to(
@@ -331,6 +331,8 @@ describe TxghServer::TriggerEndpoints do
         end
       end
 
+      expect(Txgh::GithubStatus).to receive(:update)
+
       patch '/pull', params
       expect(last_response).to be_ok
     end

data/spec/integration/cassettes/pull.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://txgh.bot:<TRANSIFEX_PASSWORD>@www.transifex.com/api/2/project/test-project-88/languages/
+    uri: https://txgh.bot:<TRANSIFEX_PASSWORD>@www.transifex.com/api/2/project/test-project-88/resources/
     body:
       encoding: US-ASCII
       string: ''
@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx
       Date:
-      - Wed, 28 Sep 2016 18:33:51 GMT
+      - Tue, 04 Oct 2016 21:42:30 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
@@ -31,17 +31,254 @@ http_interactions:
       Vary:
       - Accept-Encoding
       - Authorization, Host, Accept-Language, Cookie
+      Content-Language:
+      - en
+      Expires:
+      - Tue, 04 Oct 2016 21:42:30 GMT
+      Last-Modified:
+      - Tue, 04 Oct 2016 21:42:30 GMT
+      Cache-Control:
+      - max-age=0
       X-Frame-Options:
       - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: "[\n    {\n        \"source_language_code\": \"en\", \n        \"name\":
+        \"sample.po\", \n        \"i18n_type\": \"PO\", \n        \"priority\": \"1\",
+        \n        \"slug\": \"samplepo-heads_master\", \n        \"categories\": [\n
+        \           \"\"\n        ]\n    }, \n    {\n        \"source_language_code\":
+        \"en\", \n        \"name\": \"sample.po\", \n        \"i18n_type\": \"PO\",
+        \n        \"priority\": \"0\", \n        \"slug\": \"samplepo\", \n        \"categories\":
+        [\n            \"branch:refs/tags/L10N\", \n            \"author:Txgh Bot\"\n
+        \       ]\n    }, \n    {\n        \"source_language_code\": \"en\", \n        \"name\":
+        \"test.yml\", \n        \"i18n_type\": \"YML\", \n        \"priority\": \"1\",
+        \n        \"slug\": \"testyml-heads_change_some_shizz\", \n        \"categories\":
+        [\n            \"author:Cameron_Dutro branch:heads/change_some_shizz\"\n        ]\n
+        \   }, \n    {\n        \"source_language_code\": \"en\", \n        \"name\":
+        \"test.yml\", \n        \"i18n_type\": \"YML\", \n        \"priority\": \"0\",
+        \n        \"slug\": \"testyml-heads_master\", \n        \"categories\": [\n
+        \           \"branch:heads/master\"\n        ]\n    }\n]"
+    http_version: 
+  recorded_at: Tue, 04 Oct 2016 21:42:30 GMT
+- request:
+    method: get
+    uri: https://api.github.com/repos/txgh-bot/txgh-test-resources/git/refs/heads/master
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.3.0
+      Content-Type:
+      - application/json
+      Authorization:
+      - token <GITHUB_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Tue, 04 Oct 2016 21:42:30 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4999'
+      X-Ratelimit-Reset:
+      - '1475620950'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      Etag:
+      - W/"a5fe675407899fa4460005cce07b9fe2"
+      Last-Modified:
+      - Mon, 11 Jan 2016 23:45:43 GMT
+      X-Poll-Interval:
+      - '300'
+      X-Oauth-Scopes:
+      - public_repo
+      X-Accepted-Oauth-Scopes:
+      - ''
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Security-Policy:
+      - default-src 'none'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Served-By:
+      - 9000e9eef7bb1e89f22030c676da140e
+      X-Github-Request-Id:
+      - 04358C36:6823:3A08A0E:57F42246
+    body:
+      encoding: UTF-8
+      string: '{"ref":"refs/heads/master","url":"https://api.github.com/repos/txgh-bot/txgh-test-resources/git/refs/heads/master","object":{"sha":"f3edb21f027b70974750649ba29b0090e410ecde","type":"commit","url":"https://api.github.com/repos/txgh-bot/txgh-test-resources/git/commits/f3edb21f027b70974750649ba29b0090e410ecde"}}'
+    http_version: 
+  recorded_at: Tue, 04 Oct 2016 21:42:30 GMT
+- request:
+    method: get
+    uri: https://txgh.bot:<TRANSIFEX_PASSWORD>@www.transifex.com/api/2/project/test-project-88/resource/samplepo/stats/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 04 Oct 2016 21:42:31 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      - Authorization, Host, Accept-Language, Cookie
       Content-Language:
       - en
+      Expires:
+      - Tue, 04 Oct 2016 21:42:31 GMT
+      Last-Modified:
+      - Tue, 04 Oct 2016 21:42:31 GMT
+      Cache-Control:
+      - max-age=0
+      X-Frame-Options:
+      - SAMEORIGIN
       X-Content-Type-Options:
       - nosniff
     body:
       encoding: UTF-8
-      string: "[\n    {\n        \"coordinators\": [\n            \"txgh.bot\"\n        ],
-        \n        \"language_code\": \"el_GR\", \n        \"translators\": [], \n
-        \       \"reviewers\": []\n    }\n]"
+      string: "{\n    \"el_GR\": {\n        \"reviewed_percentage\": \"0%\", \n        \"completed\":
+        \"0%\", \n        \"untranslated_words\": 10, \n        \"last_commiter\":
+        \"\", \n        \"reviewed\": 0, \n        \"translated_entities\": 0, \n
+        \       \"translated_words\": 0, \n        \"last_update\": \"2016-01-19 19:08:25\",
+        \n        \"untranslated_entities\": 10\n    }, \n    \"ru\": {\n        \"reviewed_percentage\":
+        \"0%\", \n        \"completed\": \"0%\", \n        \"untranslated_words\":
+        10, \n        \"last_commiter\": \"txgh.bot\", \n        \"reviewed\": 0,
+        \n        \"translated_entities\": 0, \n        \"translated_words\": 0, \n
+        \       \"last_update\": \"2016-04-01 05:36:37\", \n        \"untranslated_entities\":
+        10\n    }, \n    \"en\": {\n        \"reviewed_percentage\": \"0%\", \n        \"completed\":
+        \"100%\", \n        \"untranslated_words\": 0, \n        \"last_commiter\":
+        \"txgh.bot\", \n        \"reviewed\": 0, \n        \"translated_entities\":
+        10, \n        \"translated_words\": 10, \n        \"last_update\": \"2016-01-19
+        19:08:25\", \n        \"untranslated_entities\": 0\n    }\n}"
+    http_version: 
+  recorded_at: Tue, 04 Oct 2016 21:42:31 GMT
+- request:
+    method: post
+    uri: https://api.github.com/repos/txgh-bot/txgh-test-resources/statuses/f3edb21f027b70974750649ba29b0090e410ecde
+    body:
+      encoding: UTF-8
+      string: '{"context":"continuous-localization/txgh","target_url":"https://www.transifex.com//test-project-88/content","description":"10/30
+        translations complete.","state":"pending"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.3.0
+      Content-Type:
+      - application/json
+      Authorization:
+      - token <GITHUB_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Tue, 04 Oct 2016 21:42:31 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '1259'
+      Status:
+      - 201 Created
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4998'
+      X-Ratelimit-Reset:
+      - '1475620950'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      Etag:
+      - '"592996d2e58de58405c11218b79e486a"'
+      X-Oauth-Scopes:
+      - public_repo
+      X-Accepted-Oauth-Scopes:
+      - ''
+      Location:
+      - https://api.github.com/repos/txgh-bot/txgh-test-resources/statuses/f3edb21f027b70974750649ba29b0090e410ecde
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Security-Policy:
+      - default-src 'none'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Served-By:
+      - cee4c0729c8e9147e7abcb45b9d69689
+      X-Github-Request-Id:
+      - 04358C36:6817:11C8B83:57F42247
+    body:
+      encoding: UTF-8
+      string: '{"url":"https://api.github.com/repos/txgh-bot/txgh-test-resources/statuses/f3edb21f027b70974750649ba29b0090e410ecde","id":785751432,"state":"pending","description":"10/30
+        translations complete.","target_url":"https://www.transifex.com//test-project-88/content","context":"continuous-localization/txgh","created_at":"2016-10-04T21:42:31Z","updated_at":"2016-10-04T21:42:31Z","creator":{"login":"txgh-bot","id":16723366,"avatar_url":"https://avatars.githubusercontent.com/u/16723366?v=3","gravatar_id":"","url":"https://api.github.com/users/txgh-bot","html_url":"https://github.com/txgh-bot","followers_url":"https://api.github.com/users/txgh-bot/followers","following_url":"https://api.github.com/users/txgh-bot/following{/other_user}","gists_url":"https://api.github.com/users/txgh-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/txgh-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/txgh-bot/subscriptions","organizations_url":"https://api.github.com/users/txgh-bot/orgs","repos_url":"https://api.github.com/users/txgh-bot/repos","events_url":"https://api.github.com/users/txgh-bot/events{/privacy}","received_events_url":"https://api.github.com/users/txgh-bot/received_events","type":"User","site_admin":false}}'
     http_version: 
-  recorded_at: Wed, 28 Sep 2016 18:33:51 GMT
+  recorded_at: Tue, 04 Oct 2016 21:42:31 GMT
 recorded_with: VCR 3.0.3