txgh 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500294b033cfebc1c6c9c52a28b75cc5e564bd13
-  data.tar.gz: 5a3b866c7976246ec5e0c5532c69d044ff7b7dc2
+  metadata.gz: fefc92295bf9e5460cce6c06f8f849f79efd567f
+  data.tar.gz: 92bce889063a906f1a462c5cef402fbd52892802
 SHA512:
-  metadata.gz: 56e81d08e7020c5c9aa292d5eb7801da5afab2d28509cffbe8b261c0248d0e48c9dea7aeb694b7694f6a8e689efa480454d325e6570caaeb1a4a386086d9ade2
-  data.tar.gz: c2b1b2ff73af79c5aa0bfd0acc29e7fbfba37ef839c30ef7c4c7c90241fc9024e280f33fc1bb2eba007368fb47cf323cb65e37297dd04276c920c9796ef022aa
+  metadata.gz: f633fc680b9e5b37676b0cb5e3b9c0425fd3f7f45eb6a666f9d2f9d97d89d4047ae5712f1c9612e41cfcf1b067e022d23e68bbc9a2d02987d20e5722fcd068ae
+  data.tar.gz: e79103fdac87e6ba1a03172932c988acafddb8b4f11060a0e25d19a3df7985f65f9a77d72074a1029e9a2a2c0c2159f7ffc19cedfbf80cab6131194072db6436

data/lib/txgh/config/key_manager.rb

@@ -36,18 +36,31 @@ module Txgh
 
         def base_config
           scheme, payload = split_uri(raw_config)
-          provider_for(scheme).load(payload)
+
+          if provider = provider_for(scheme)
+            provider.load(payload)
+          else
+            raise Txgh::InvalidProviderError,
+              "Couldn't find a provider for the '#{scheme}' scheme. Please "\
+              "make sure txgh is configured properly."
+          end
         end
 
         def project_config_for(project_name)
           if config = base_config['transifex']['projects'][project_name]
             config.merge('name' => project_name)
+          else
+            raise Txgh::ProjectConfigNotFoundError,
+              "Couldn't find any configuration for the '#{project_name}' project."
           end
         end
 
         def repo_config_for(repo_name)
           if config = base_config['github']['repos'][repo_name]
             config.merge('name' => repo_name)
+          else
+            raise Txgh::RepoConfigNotFoundError,
+              "Couldn't find any configuration for the '#{repo_name}' repo."
           end
         end
       end

data/lib/txgh/config/providers/git_provider.rb

@@ -36,7 +36,7 @@ module Txgh
         def download
           github_repo.api.download(github_repo.name, payload, ref)
         rescue Octokit::NotFound
-          raise ConfigNotFoundError, "Config file #{payload} not found in #{ref}"
+          raise Txgh::GitConfigNotFoundError, "Config file #{payload} not found in #{ref}"
         end
 
         def ref

data/lib/txgh/errors.rb

@@ -5,5 +5,11 @@ module Txgh
   class TransifexApiError < StandardError; end
   class TransifexNotFoundError < TransifexApiError; end
   class TransifexUnauthorizedError < TransifexApiError; end
+
+  class InvalidProviderError < StandardError; end
+
   class ConfigNotFoundError < StandardError; end
+  class ProjectConfigNotFoundError < ConfigNotFoundError; end
+  class RepoConfigNotFoundError < ConfigNotFoundError; end
+  class GitConfigNotFoundError < ConfigNotFoundError; end
 end

data/lib/txgh/handlers/github/push_handler.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'set'
 
 module Txgh
   module Handlers
@@ -14,11 +15,12 @@ module Txgh
             logger.info('found branch in github request')
 
             tx_resources = tx_resources_for(branch)
+
             modified_resources = added_and_modified_resources_for(tx_resources)
-            modified_resources.merge!(l10n_resources_for(tx_resources))
+            modified_resources += l10n_resources_for(tx_resources)
 
             if repo.github_config_branch.include?('tags/')
-              modified_resources.merge!(tag_resources_for(tx_resources))
+              modified_resources += tag_resources_for(tx_resources)
             end
 
             # Handle DBZ 'L10N' special case
@@ -33,9 +35,10 @@ module Txgh
 
             updater = ResourceUpdater.new(project, repo, logger)
             categories = { 'author' => payload['head_commit']['committer']['name'] }
+            ref = repo.api.get_ref(repo.name, branch)
 
-            modified_resources.each_pair do |resource, commit_sha|
-              updater.update_resource(resource, commit_sha, categories)
+            modified_resources.each do |resource|
+              updater.update_resource(resource, ref[:object][:sha], categories)
             end
           end
 
@@ -45,35 +48,34 @@ module Txgh
         private
 
         def tag_resources_for(tx_resources)
-          payload['head_commit']['modified'].each_with_object({}) do |modified, ret|
+          payload['head_commit']['modified'].each_with_object(Set.new) do |modified, ret|
             logger.info("processing modified file: #{modified}")
 
             if tx_resources.include?(modified)
-              ret[tx_resources[modified]] = payload['head_commit']['id']
+              ret << tx_resources[modified]
             end
           end
         end
 
         def l10n_resources_for(tx_resources)
-          payload['head_commit']['modified'].each_with_object({}) do |modified, ret|
+          payload['head_commit']['modified'].each_with_object(Set.new) do |modified, ret|
             if tx_resources.include?(modified)
               logger.info("setting new resource: #{tx_resources[modified].L10N_resource_slug}")
-              ret[tx_resources[modified]] = payload['head_commit']['id']
+              ret << tx_resources[modified]
             end
           end
         end
 
-        # Finds the updated resources and maps the most recent commit in which
-        # each was modified
+        # finds the resources that were updated in each commit
         def added_and_modified_resources_for(tx_resources)
-          payload['commits'].each_with_object({}) do |commit, ret|
+          payload['commits'].each_with_object(Set.new) do |commit, ret|
             logger.info('processing commit')
 
             (commit['modified'] + commit['added']).each do |file|
               logger.info("processing added/modified file: #{file}")
 
               if tx_resources.include?(file)
-                ret[tx_resources[file]] = commit['id']
+                ret << tx_resources[file]
               end
             end
           end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

data/spec/config/key_manager_spec.rb

@@ -18,6 +18,23 @@ describe KeyManager do
       expect(config.project_config).to eq(project_config)
       expect(config.repo_config).to eq(repo_config)
     end
+
+    it "raises an error if config can't be found" do
+      expect { KeyManager.config_from_project('justkidding') }.to(
+        raise_error(Txgh::ProjectConfigNotFoundError)
+      )
+    end
+
+    it "raises an error if the scheme can't be recognized" do
+      # remove the scheme
+      allow(Txgh::Config::KeyManager).to(
+        receive(:raw_config).and_return(YAML.dump(base_config))
+      )
+
+      expect { KeyManager.config_from_project(project_name) }.to(
+        raise_error(Txgh::InvalidProviderError)
+      )
+    end
   end
 
   describe '.config_from_repo' do
@@ -31,6 +48,23 @@ describe KeyManager do
       expect(config.project_config).to eq(project_config)
       expect(config.repo_config).to eq(repo_config)
     end
+
+    it "raises an error if config can't be found" do
+      expect { KeyManager.config_from_repo('hahayeahright') }.to(
+        raise_error(Txgh::RepoConfigNotFoundError)
+      )
+    end
+
+    it "raises an error if the scheme can't be recognized" do
+      # remove the scheme
+      allow(Txgh::Config::KeyManager).to(
+        receive(:raw_config).and_return(YAML.dump(base_config))
+      )
+
+      expect { KeyManager.config_from_repo(repo_name) }.to(
+        raise_error(InvalidProviderError)
+      )
+    end
   end
 
   describe '.config_from' do

data/spec/config/tx_manager_spec.rb

@@ -32,7 +32,7 @@ describe TxManager do
       it "raises an error if the git repo doesn't contain the requested config file" do
         expect(repo.api).to receive(:download).and_raise(Octokit::NotFound)
         expect { TxManager.tx_config(project, repo, 'my_branch') }.to(
-          raise_error(ConfigNotFoundError)
+          raise_error(GitConfigNotFoundError)
         )
       end
 

data/spec/handlers/github/push_handler_spec.rb

@@ -48,6 +48,12 @@ describe PushHandler do
           expect(categories).to eq('author' => 'Test User')
         end
       )
+
+      expect(github_api).to(
+        receive(:get_ref).with(repo_name, ref).and_return(
+          object: { sha: payload.head_commit[:id] }
+        )
+      )
     end
 
     response = handler.execute
@@ -68,6 +74,12 @@ describe PushHandler do
         )
       )
 
+      expect(github_api).to(
+        receive(:get_ref).with(repo_name, ref).and_return(
+          object: { sha: payload.head_commit[:id] }
+        )
+      )
+
       response = handler.execute
       expect(response.status).to eq(200)
       expect(response.body).to eq(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad