txgh 6.0.6 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09a127e480f748597f205e922b8010f1ec4fc5a
-  data.tar.gz: 9cf2e06fab1d3cf62292a4a54df2155dcc6a044c
+  metadata.gz: b8ae06a79685c5a616fd334f7c4148b54377b840
+  data.tar.gz: f10e42acd8b9300f96182ebe1dc8786def18a224
 SHA512:
-  metadata.gz: a5eb1b5415dac949bcf25b5d21607824614d57d45a7d66cf08583887096a260151ad0b3db142b7238d222de1fc08acca580c7a1d0cf87c080cb46d2e3eda6f72
-  data.tar.gz: 18591ac6ed42c03c7920f0ac16b47d1d067c74696aab6936601deefd5605aaee7751880138389f811f19c53c7f9c94e8e32457890c4bc28645f697a38195cc72
+  metadata.gz: 5f8cfe3fe65b5e0c637e115c4f45d52cb4fc184fe581fabd4259b60060578c430f476fe3b9f13d0f184d620f1fa9657057a35f24ab915349563b2af9ab7519ea
+  data.tar.gz: d09b4cd10c3ee78012536adafc821806e5e9d7f35f043635b4de3a5e26b77d5fe47f58f845dfd7f18fe9c1800e3dcc66df3b3d3dcf0708dae42bd7c02e2f7a13

data/lib/txgh.rb

@@ -45,18 +45,6 @@ module Txgh
       @events ||= Events.new
     end
 
-    def update_status_callback(options)
-      project = options.fetch(:project)
-      repo = options.fetch(:repo)
-      resource = options.fetch(:resource)
-
-      GithubStatus.new(project, repo, resource).update(options.fetch(:sha))
-    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 env
       ENV.fetch('TXGH_ENV', DEFAULT_ENV)
     end
@@ -70,12 +58,4 @@ module Txgh
   # default set of base config providers
   key_manager.register_provider(providers::FileProvider, YAML)
   key_manager.register_provider(providers::RawProvider,  YAML)
-
-  events.subscribe('transifex.resource.updated') do |options|
-    update_status_callback(options)
-  end
-
-  events.subscribe('github.resource.committed') do |options|
-    update_status_callback(options)
-  end
 end

data/lib/txgh/github_status.rb

@@ -1,3 +1,5 @@
+require 'celluloid/current'
+
 module Txgh
   class GithubStatus
     class State
@@ -15,19 +17,29 @@ module Txgh
     end
 
     ALL_COMPLETE_DESCRIPTION = "Translations complete!"
-    TARGET_URL_TEMPLATE = "https://www.transifex.com/%{organization}/%{project_slug}/%{resource_slug}/"
+    TARGET_URL_TEMPLATE = "https://www.transifex.com/%{organization}/%{project_slug}/content"
     DESCRIPTION_TEMPLATE = "%{complete}/%{total} translations complete."
     CONTEXT = 'continuous-localization/txgh'
 
-    attr_reader :project, :repo, :tx_resource
+    class << self
+      def update(project, repo, branch)
+        new(project, repo, branch).update
+      end
+    end
 
-    def initialize(project, repo, tx_resource)
+    attr_reader :project, :repo, :branch
+
+    def initialize(project, repo, branch)
       @project = project
       @repo = repo
-      @tx_resource = tx_resource
+      @branch = branch
     end
 
-    def update(sha)
+    def update
+      return if tx_resources.empty?
+
+      sha = repo.api.get_ref(branch)[:object][:sha]
+
       repo.api.create_status(
         sha, state, {
           context: context, target_url: target_url, description: description
@@ -42,10 +54,10 @@ module Txgh
     end
 
     def target_url
+      # assume all resources are from the same project
       TARGET_URL_TEMPLATE % {
         organization: project.organization,
-        project_slug: tx_resource.project_slug,
-        resource_slug: tx_resource.resource_slug
+        project_slug: tx_resources.first.project_slug
       }
     end
 
@@ -66,22 +78,54 @@ module Txgh
     end
 
     def all_complete?
-      stats.all? do |locale, details|
-        details['completed'] == '100%'
+      stats.all? do |resource_stats|
+        resource_stats.all? do |locale, details|
+          details['completed'] == '100%'
+        end
       end
     end
 
     def stat_totals
       @stat_totals ||= { complete: 0, total: 0 }.tap do |counts|
-        stats.each_pair do |locale, details|
-          counts[:total] += details['translated_entities'] + details['untranslated_entities']
-          counts[:complete] += details['translated_entities']
+        stats.each do |resource_stats|
+          resource_stats.each_pair do |locale, details|
+            counts[:total] += details['translated_entities'] + details['untranslated_entities']
+            counts[:complete] += details['translated_entities']
+          end
         end
       end
     end
 
     def stats
-      @stats ||= project.api.get_stats(*tx_resource.slugs)
+      @stats ||= tx_resources.map do |tx_resource|
+        Celluloid::Future.new { project.api.get_stats(*tx_resource.slugs) }
+      end.map(&:value)
+    end
+
+    def tx_resources
+      @tx_resources ||=
+        tx_config.resources.each_with_object([]) do |tx_resource, ret|
+          if repo.process_all_branches?
+            tx_resource = Txgh::TxBranchResource.new(tx_resource, branch)
+          end
+
+          next unless existing_slugs.include?(tx_resource.resource_slug)
+          ret << tx_resource
+        end
+    end
+
+    def existing_slugs
+      @existing_slugs ||= existing_resources.map do |resource|
+        resource['slug']
+      end
+    end
+
+    def existing_resources
+      @existing_resources ||= project.api.get_resources(project.name)
+    end
+
+    def tx_config
+      @tx_config ||= Txgh::Config::TxManager.tx_config(project, repo, branch)
     end
   end
 end

data/lib/txgh/puller.rb

@@ -9,23 +9,35 @@ module Txgh
     end
 
     def pull
-      tx_config.resources.each do |tx_resource|
+      existing_resources = project.api.get_resources(project.name)
+      slugs = existing_resources.map { |resource| resource['slug'] }
+
+      resources = tx_config.resources.each_with_object([]) do |tx_resource, ret|
         if repo.process_all_branches?
           tx_resource = Txgh::TxBranchResource.new(tx_resource, branch)
         end
 
-        pull_resource(tx_resource)
+        next unless slugs.include?(tx_resource.resource_slug)
+        ret << tx_resource
+      end
+
+      pull_resources(resources, &block)
+    end
+
+    def pull_resources(tx_resources, languages = nil)
+      tx_resources.each do |tx_resource|
+        pull_resource(tx_resource, languages)
       end
     end
 
-    def pull_resource(tx_resource)
-      each_language do |language_code|
-        committer.commit_resource(tx_resource, branch, language_code)
+    def pull_resource(tx_resource, languages = nil)
+      (languages || project.languages).each do |language|
+        committer.commit_resource(tx_resource, branch, language)
       end
     end
 
-    def pull_slug(resource_slug)
-      pull_resource(tx_config.resource(resource_slug, branch))
+    def pull_slug(resource_slug, languages = nil)
+      pull_resource(tx_config.resource(resource_slug, branch), languages)
     end
 
     private
@@ -34,18 +46,6 @@ module Txgh
       @committer ||= Txgh::ResourceCommitter.new(project, repo)
     end
 
-    def each_language
-      return to_enum(__method__) unless block_given?
-
-      languages.each do |language|
-        language_code = language['language_code']
-
-        if project.supported_language?(language_code)
-          yield language_code
-        end
-      end
-    end
-
     def languages
       @languages ||= project.api.get_languages(project.name)
     end

data/lib/txgh/pusher.rb

@@ -8,22 +8,35 @@ module Txgh
       @branch = branch
     end
 
-    def push
-      tx_config.resources.each do |tx_resource|
+    def push(&block)
+      existing_resources = project.api.get_resources(project.name)
+      slugs = existing_resources.map { |resource| resource['slug'] }
+
+      resources = tx_config.resources.each_with_object([]) do |tx_resource, ret|
         if repo.process_all_branches?
           tx_resource = Txgh::TxBranchResource.new(tx_resource, branch)
         end
 
-        push_resource(tx_resource)
+        next unless slugs.include?(tx_resource.resource_slug)
+        ret << tx_resource
+      end
+
+      push_resources(resources, &block)
+    end
+
+    def push_resources(tx_resources, &block)
+      tx_resources.each do |tx_resource|
+        categories = block_given? ? yield(tx_resource) : {}
+        push_resource(tx_resource, categories)
       end
     end
 
-    def push_resource(tx_resource)
-      updater.update_resource(tx_resource)
+    def push_resource(tx_resource, categories = {})
+      updater.update_resource(tx_resource, categories)
     end
 
-    def push_slug(resource_slug)
-      push_resource(tx_config.resource(resource_slug, branch))
+    def push_slug(resource_slug, categories = {})
+      push_resource(tx_config.resource(resource_slug, branch), categories)
     end
 
     private

data/lib/txgh/resource_committer.rb

@@ -12,35 +12,27 @@ module Txgh
 
     def commit_resource(tx_resource, branch, language)
       return if prevent_commit_on?(branch)
+      return if language == tx_resource.source_lang
 
-      unless language == tx_resource.source_lang
-        file_name, translations = download(tx_resource, branch, language)
-        message = commit_message_for(language, file_name)
+      file_name, translations = download(tx_resource, branch, language)
+      message = commit_message_for(language, file_name)
 
-        if translations
-          repo.api.update_contents(
-            branch, [{ path: file_name, contents: translations }], message
-          )
+      return unless translations
 
-          fire_event_for(tx_resource, branch, language)
-        end
-      end
-    end
-
-    private
-
-    def fire_event_for(tx_resource, branch, language)
-      head = repo.api.get_ref(branch)
-      sha = head[:object][:sha]
+      repo.api.update_contents(
+        branch, [{ path: file_name, contents: translations }], message
+      )
 
       Txgh.events.publish(
         'github.resource.committed', {
-          project: project, repo: repo, resource: tx_resource, sha: sha,
-          language: language
+          project: project, repo: repo, resource: tx_resource,
+          language: language, branch: branch
         }
       )
     end
 
+    private
+
     def download(tx_resource, branch, language)
       downloader = ResourceDownloader.new(
         project, repo, branch, {

data/lib/txgh/resource_updater.rb

@@ -24,24 +24,16 @@ module Txgh
         upload_whole(tx_resource, file, categories)
       end
 
-      fire_event_for(tx_resource, branch)
-    end
-
-    private
-
-    def fire_event_for(tx_resource, branch)
-      ref = repo.api.get_ref(branch)
-
       Txgh.events.publish(
         'transifex.resource.updated', {
-          project: project,
-          repo: repo,
-          resource: tx_resource,
-          sha: ref[:object][:sha]
+          project: project, repo: repo, resource: tx_resource,
+          branch: tx_resource.branch
         }
       )
     end
 
+    private
+
     def upload_whole(tx_resource, file, categories)
       if repo.process_all_branches?
         upload_by_branch(tx_resource, file[:content], categories)

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '6.0.6'
+  VERSION = '6.1.0'
 end

data/spec/github_status_spec.rb

@@ -7,8 +7,9 @@ describe GithubStatus do
   include StandardTxghSetup
 
   describe '#update' do
-    let(:status) { GithubStatus.new(transifex_project, github_repo, resource) }
+    let(:status) { GithubStatus.new(transifex_project, github_repo, branch) }
     let(:resource) { tx_config.resource(resource_slug) }
+    let(:branch) { 'heads/master' }
     let(:sha) { 'abc123shashasha' }
 
     let(:stats) do
@@ -22,6 +23,14 @@ describe GithubStatus do
 
     before(:each) do
       allow(transifex_api).to receive(:get_stats).and_return(stats)
+
+      allow(transifex_api).to receive(:get_resources).and_return(
+        [{ 'slug' => resource.resource_slug }]
+      )
+
+      allow(github_api).to receive(:get_ref).and_return(
+        object: { sha: sha }
+      )
     end
 
     context 'with all resources at 100%' do
@@ -32,11 +41,11 @@ describe GithubStatus do
           expect(options[:description]).to eq('Translations complete!')
           expect(options[:context]).to eq('continuous-localization/txgh')
           expect(options[:target_url]).to eq(
-            "https://www.transifex.com/#{organization}/#{project_name}/#{resource_slug}/"
+            "https://www.transifex.com/#{organization}/#{project_name}/content"
           )
         end
 
-        status.update(sha)
+        status.update
       end
     end
 
@@ -60,7 +69,7 @@ describe GithubStatus do
           expect(options[:description]).to eq('15/20 translations complete.')
         end
 
-        status.update(sha)
+        status.update
       end
     end
   end

data/spec/resource_committer_spec.rb

@@ -52,7 +52,7 @@ describe ResourceCommitter do
         options = event[:options]
         expect(options[:project].name).to eq(project_name)
         expect(options[:repo].name).to eq(repo_name)
-        expect(options[:sha]).to eq('abc123shashasha')
+        expect(options[:branch]).to eq(branch)
         expect(options[:resource].original_resource_slug).to eq(resource_slug)
         expect(options[:language]).to eq(language)
       end

data/spec/resource_updater_spec.rb

@@ -67,7 +67,7 @@ describe ResourceUpdater do
     options = event[:options]
     expect(options[:project].name).to eq(project_name)
     expect(options[:repo].name).to eq(repo_name)
-    expect(options[:sha]).to eq(commit_sha)
+    expect(options[:branch]).to eq(ref)
     expect(options[:resource].original_resource_slug).to eq(resource_slug)
   end
 

data/spec/txgh_spec.rb

@@ -30,30 +30,4 @@ describe Txgh do
       expect(instance.provider.scheme).to eq('raw')
     end
   end
-
-  describe '#update_status_callback' do
-    it 'handles github errors' do
-      expect_any_instance_of(Txgh::GithubStatus).to(
-        receive(:update).and_raise(Octokit::UnprocessableEntity)
-      )
-
-      expect do
-        Txgh.update_status_callback(
-          project: nil, repo: nil, resource: nil, sha: nil
-        )
-      end.to_not raise_error
-    end
-
-    it 'handles transifex errors' do
-      expect_any_instance_of(Txgh::GithubStatus).to(
-        receive(:update).and_raise(Txgh::TransifexNotFoundError)
-      )
-
-      expect do
-        Txgh.update_status_callback(
-          project: nil, repo: nil, resource: nil, sha: nil
-        )
-      end.to_not raise_error
-    end
-  end
 end

data/txgh.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency 'abroad', '~> 4.1'
+  s.add_dependency 'celluloid'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'json', '~> 1.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement