txgh 6.0.0.beta1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63c65881f6f00e2479a19d8ff925581cc8b2c10
-  data.tar.gz: e309c3690f95a66a36f5d9b3e743e160dc8a78f4
+  metadata.gz: cee1db178f1ad7cdc40a20d13eb5e7f22aa8da3e
+  data.tar.gz: ad1b43ad46d06e5c2bfadb35e19e64153ce17ced
 SHA512:
-  metadata.gz: c41e8fc0e628f7c00078046a2cc467fbd62777ba7ff848eafcce1503bdc37c05dc5ac7a5aaa342c01636ca7feae4ee04e9848bb10203862db9f5c4b440819df6
-  data.tar.gz: 254e2b871687f9023df759b2df134976a93270eb179c9a1471c11bfc4d6f34933ff9771678868f668a2ef9914bc5144330544d718ab17798e8fde8bcc15c2ba0
+  metadata.gz: 76946e935626508ed67deddaa9aae76947c43eac2a776b077f848ed2e5945e52832832c8d6305f1219b171392ac71bdd1b89027a6267274fb022e3819ab41d8f
+  data.tar.gz: 4a6b2dc8948e3c03a051631f47524ee00c77c070f538cee59cd5d56516cf3b5ff19ee0803b21e538f0d0b593dc0d3884d87de69d906b12dde071c14f4baff5ed

data/lib/txgh/config/config_pair.rb

@@ -28,7 +28,7 @@ module Txgh
 
       def github_api
         @github_api ||= Txgh::GithubApi.create_from_credentials(
-          repo_config['api_username'], repo_config['api_token']
+          repo_config['api_username'], repo_config['api_token'], repo_config['name']
         )
       end
     end

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

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

data/lib/txgh/github_api.rb

@@ -4,41 +4,42 @@ require 'octokit'
 module Txgh
   class GithubApi
     class << self
-      def create_from_credentials(login, access_token)
+      def create_from_credentials(login, access_token, repo_name)
         create_from_client(
-          Octokit::Client.new(login: login, access_token: access_token)
+          Octokit::Client.new(login: login, access_token: access_token), repo_name
         )
       end
 
-      def create_from_client(client)
-        new(client)
+      def create_from_client(client, repo_name)
+        new(client, repo_name)
       end
     end
 
-    attr_reader :client
+    attr_reader :client, :repo_name
 
-    def initialize(client)
+    def initialize(client, repo_name)
       @client = client
+      @repo_name = repo_name
     end
 
-    def tree(repo, sha)
-      client.tree(repo, sha, recursive: 1)
+    def tree(sha)
+      client.tree(repo_name, sha, recursive: 1)
     end
 
-    def blob(repo, sha)
-      client.blob(repo, sha)
+    def blob(sha)
+      client.blob(repo_name, sha)
     end
 
-    def create_ref(repo, branch, sha)
-      client.create_ref(repo, branch, sha) rescue false
+    def create_ref(branch, sha)
+      client.create_ref(repo_name, branch, sha) rescue false
     end
 
-    def update_contents(repo, branch, content_map, message)
+    def update_contents(branch, content_map, message)
       content_map.each do |path, new_contents|
         branch = Utils.relative_branch(branch)
 
         file = begin
-          client.contents(repo, { path: path, ref: branch })
+          client.contents(repo_name, { path: path, ref: branch })
         rescue Octokit::NotFound
           nil
         end
@@ -49,59 +50,36 @@ module Txgh
 
         if current_sha != new_sha
           client.update_contents(
-            repo, path, message, current_sha, new_contents, options
+            repo_name, path, message, current_sha, new_contents, options
           )
         end
       end
     end
 
-    def commit(repo, branch, content_map, message, allow_empty = false)
-      parent = client.ref(repo, branch)
-      base_commit = get_commit(repo, parent[:object][:sha])
-
-      tree_data = content_map.map do |path, content|
-        blob = client.create_blob(repo, content)
-        { path: path, mode: '100644', type: 'blob', sha: blob }
-      end
-
-      tree_options = { base_tree: base_commit[:commit][:tree][:sha] }
-
-      tree = client.create_tree(repo, tree_data, tree_options)
-      commit = client.create_commit(
-        repo, message, tree[:sha], parent[:object][:sha]
-      )
-
-      # don't update the ref if the commit introduced no new changes
-      unless allow_empty
-        diff = client.compare(repo, parent[:object][:sha], commit[:sha])
-        return if diff[:files].empty?
-      end
-
-      # false means don't force push
-      client.update_ref(repo, branch, commit[:sha], false)
+    def get_commit(sha)
+      client.commit(repo_name, sha)
     end
 
-    def get_commit(repo, sha)
-      client.commit(repo, sha)
+    def get_ref(ref)
+      client.ref(repo_name, ref)
     end
 
-    def get_ref(repo, ref)
-      client.ref(repo, ref)
-    end
+    def download(path, branch)
+      file = client.contents(repo_name, { path: path, ref: branch }).to_h
 
-    def download(repo, path, branch)
-      master = client.ref(repo, branch)
-      commit = client.commit(repo, master[:object][:sha])
-      tree = client.tree(repo, commit[:commit][:tree][:sha], recursive: 1)
-
-      if found = tree[:tree].find { |t| t[:path] == path }
-        b = blob(repo, found[:sha])
-        b['encoding'] == 'utf-8' ? b['content'] : Base64.decode64(b['content'])
+      file[:content] = case file[:encoding]
+        when 'base64'
+          Base64.decode64(file[:content])
+        else
+          file[:content].force_encoding(file[:encoding])
       end
+
+      file.delete(:encoding)
+      file
     end
 
-    def create_status(repo, sha, state, options = {})
-      client.create_status(repo, sha, state, options)
+    def create_status(sha, state, options = {})
+      client.create_status(repo_name, sha, state, options)
     end
 
   end

data/lib/txgh/github_status.rb

@@ -29,7 +29,7 @@ module Txgh
 
     def update(sha)
       repo.api.create_status(
-        repo.name, sha, state, {
+        sha, state, {
           context: context, target_url: target_url, description: description
         }
       )

data/lib/txgh/pusher.rb

@@ -19,7 +19,7 @@ module Txgh
     end
 
     def push_resource(tx_resource)
-      ref = repo.api.get_ref(repo.name, branch || repo.branch)
+      ref = repo.api.get_ref(branch || repo.branch)
       updater.update_resource(tx_resource, ref[:object][:sha])
     end
 

data/lib/txgh/resource_committer.rb

@@ -19,7 +19,7 @@ module Txgh
 
         if translations
           repo.api.update_contents(
-            repo.name, branch, { file_name => translations }, message
+            branch, { file_name => translations }, message
           )
 
           fire_event_for(tx_resource, branch, language)
@@ -30,7 +30,7 @@ module Txgh
     private
 
     def fire_event_for(tx_resource, branch, language)
-      head = repo.api.get_ref(repo.name, branch)
+      head = repo.api.get_ref(branch)
       sha = head[:object][:sha]
 
       Txgh.events.publish(

data/lib/txgh/resource_contents.rb

@@ -37,7 +37,7 @@ module Txgh
 
     def phrases
       @phrases ||= extractor.from_string(raw) do |extractor|
-        extractor.extract_each.map do |key, value|
+        extractor.extract_each(preserve_arrays: true).map do |key, value|
           { 'key' => key, 'string' => value }
         end
       end
@@ -56,7 +56,7 @@ module Txgh
       serializer.from_stream(stream, language) do |serializer|
         phrases.each do |phrase|
           serializer.write_key_value(
-            phrase['key'], (phrase['string'] || '').to_s
+            phrase['key'], str(phrase['string'] || '')
           )
         end
       end
@@ -95,6 +95,15 @@ module Txgh
 
     attr_reader :raw
 
+    def str(obj)
+      case obj
+        when Array
+          obj
+        else
+          obj.to_s
+      end
+    end
+
     def extractor
       id = EXTRACTOR_MAP.fetch(tx_resource.type) do
         raise TxghInternalError,

data/lib/txgh/resource_downloader.rb

@@ -101,7 +101,7 @@ module Txgh
     end
 
     def git_download(resource, branch)
-      repo.api.download(repo.name, resource.source_file, branch)
+      repo.api.download(resource.source_file, branch)[:content]
     end
 
     def transifex_api

data/lib/txgh/resource_updater.rb

@@ -12,48 +12,36 @@ module Txgh
       @logger = logger || Logger.new(STDOUT)
     end
 
-    # For each modified resource, get its content and update the content
-    # in Transifex.
-    def update_resource(tx_resource, commit_sha, categories = {})
+    def update_resource(tx_resource, categories = {})
       # don't process the resource unless the project slugs are the same
       return unless tx_resource.project_slug == project.name
+      branch = tx_resource.branch || repo.diff_point
+      file = repo.api.download(tx_resource.source_file)
 
-      logger.info('process updated resource')
-      tree_sha = repo.api.get_commit(repo.name, commit_sha)['commit']['tree']['sha']
-      tree = repo.api.tree(repo.name, tree_sha)
-
-      tree['tree'].each do |file|
-        logger.info("process each tree entry: #{file['path']}")
-
-        if tx_resource.source_file == file['path']
-          if repo.upload_diffs?
-            upload_diff(tx_resource, file, categories)
-          else
-            upload_whole(tx_resource, file, categories)
-          end
-
-          fire_event_for(tx_resource, commit_sha)
-        end
+      if repo.upload_diffs? && tx_resource.has_branch?
+        upload_diff(tx_resource, file, categories)
+      else
+        upload_whole(tx_resource, file, categories)
       end
+
+      fire_event_for(tx_resource, file)
     end
 
     private
 
-    def fire_event_for(tx_resource, commit_sha)
+    def fire_event_for(tx_resource, file)
       Txgh.events.publish(
         'transifex.resource.updated', {
-          project: project, repo: repo, resource: tx_resource, sha: commit_sha
+          project: project, repo: repo, resource: tx_resource, sha: file[:sha]
         }
       )
     end
 
     def upload_whole(tx_resource, file, categories)
-      content = contents_of(file['sha'])
-
       if repo.process_all_branches?
-        upload_by_branch(tx_resource, content, categories)
+        upload_by_branch(tx_resource, file[:content], categories)
       else
-        upload(tx_resource, content)
+        upload(tx_resource, file[:content])
       end
     end
 
@@ -77,11 +65,11 @@ module Txgh
     end
 
     def head_content(tx_resource, file)
-      ResourceContents.from_string(tx_resource, contents_of(file['sha']))
+      ResourceContents.from_string(tx_resource, file[:content])
     end
 
     def diff_point_content(tx_resource, file)
-      raw_content = repo.api.download(repo.name, file['path'], repo.diff_point)
+      raw_content = repo.api.download(file[:path], repo.diff_point)
       ResourceContents.from_string(tx_resource, raw_content)
     end
 
@@ -108,15 +96,5 @@ module Txgh
       resource = project.api.get_resource(*tx_resource.slugs)
       deserialize_categories(Array(resource['categories']))
     end
-
-    def contents_of(sha)
-      blob = repo.api.blob(repo.name, sha)
-
-      if blob['encoding'] == 'utf-8'
-        blob['content']
-      else
-        Base64.decode64(blob['content'])
-      end
-    end
   end
 end

data/lib/txgh/tx_branch_resource.rb

@@ -5,9 +5,8 @@ module Txgh
     extend Forwardable
 
     def_delegators :@resource, *[
-      :project_slug, :type, :source_lang, :source_file, :L10N_resource_slug,
-      :translation_file, :lang_map, :translation_path, :original_resource_slug,
-      :to_h, :to_api_h
+      :project_slug, :type, :source_lang, :source_file, :translation_file,
+      :lang_map, :translation_path, :original_resource_slug, :to_h, :to_api_h
     ]
 
     attr_reader :resource, :branch
@@ -50,6 +49,10 @@ module Txgh
       )
     end
 
+    def has_branch?
+      true
+    end
+
     private
 
     def slugified_branch

data/lib/txgh/tx_resource.rb

@@ -27,10 +27,6 @@ module Txgh
       @translation_file = translation_file
     end
 
-    def L10N_resource_slug
-      "L10N#{resource_slug}"
-    end
-
     def lang_map(tx_lang)
       @lang_map.fetch(tx_lang, tx_lang)
     end
@@ -66,5 +62,9 @@ module Txgh
     def branch
       nil
     end
+
+    def has_branch?
+      false
+    end
   end
 end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '6.0.0.beta1'
+  VERSION = '6.0.0'
 end

data/spec/config/tx_manager_spec.rb

@@ -39,8 +39,8 @@ describe TxManager do
       it 'loads tx config from a git repository' do
         expect(repo.api).to(
           receive(:download)
-            .with(repo.name, './tx.config', 'my_branch')
-            .and_return("[main]\nlang_map = ko:ko_KR")
+            .with('./tx.config', 'my_branch')
+            .and_return(content: "[main]\nlang_map = ko:ko_KR")
         )
 
         config = TxManager.tx_config(project, repo, 'my_branch')

data/spec/diff_calculator_spec.rb

@@ -35,6 +35,29 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array added to HEAD' do
+      let(:head_phrases) do
+        diff_point_phrases + [
+          phrase('villains', %w(Khan Chang Valeris Shinzon))
+        ]
+      end
+
+      let(:diff_point_phrases) do
+        [
+          phrase('Bajor', 'Bajoran'),
+          phrase('Cardassia', 'Cardassian')
+        ]
+      end
+
+      it 'includes the new array' do
+        expect(diff[:added].size).to eq(1)
+        expect(diff[:modified].size).to eq(0)
+        phrase = diff[:added].first
+        expect(phrase['key']).to eq('villains')
+        expect(phrase['string']).to eq(%w(Khan Chang Valeris Shinzon))
+      end
+    end
+
     context 'with phrases removed from HEAD' do
       let(:head_phrases) do
         []
@@ -50,6 +73,21 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array removed from HEAD' do
+      let(:head_phrases) do
+        []
+      end
+
+      let(:diff_point_phrases) do
+        phrase('villains', %w(Khan Chang Valeris Shinzon))
+      end
+
+      it 'does not include the array' do
+        expect(diff[:added].size).to eq(0)
+        expect(diff[:modified].size).to eq(0)
+      end
+    end
+
     context 'with phrases modified in HEAD' do
       let(:head_phrases) do
         [phrase('TheNextGeneration', 'Jean Luc Picard (rocks)')]
@@ -68,6 +106,24 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array modified in HEAD' do
+      let(:head_phrases) do
+        [phrase('villains', %w(Khan Chang Valeris Shinzon))]
+      end
+
+      let(:diff_point_phrases) do
+        [phrase('villains', %w(Khan Chang Valeris))]
+      end
+
+      it 'includes the entire array' do
+        expect(diff[:added].size).to eq(0)
+        expect(diff[:modified].size).to eq(1)
+        phrase = diff[:modified].first
+        expect(phrase['key']).to eq('villains')
+        expect(phrase['string']).to eq(%w(Khan Chang Valeris Shinzon))
+      end
+    end
+
     context 'with no phrases modified, added, or removed' do
       let(:head_phrases) do
         [