txgh 5.5.0 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e50a7507eac0482d0fabdbdcbad319fcdd93d605
-  data.tar.gz: 58a5c723849579e212366c40b0400d253de0997b
+  metadata.gz: a63c65881f6f00e2479a19d8ff925581cc8b2c10
+  data.tar.gz: e309c3690f95a66a36f5d9b3e743e160dc8a78f4
 SHA512:
-  metadata.gz: ec756e7c971f476d6764b834928eee25b35f98e3d9491a1cb861d781e883b0d5918ff22b92d70405ae04dc28db31b0c19a28389525a28d8961fce90e1df32e0a
-  data.tar.gz: af7377cfef99d9b2908f52a69d888d1b6e7ca8a361c99da3b17da2fd21ccaa3c65b1afe58791d0fa07394ebf0d4e5bc2dcaf1e8e467b16891bce1ef4ec03207d
+  metadata.gz: c41e8fc0e628f7c00078046a2cc467fbd62777ba7ff848eafcce1503bdc37c05dc5ac7a5aaa342c01636ca7feae4ee04e9848bb10203862db9f5c4b440819df6
+  data.tar.gz: 254e2b871687f9023df759b2df134976a93270eb179c9a1471c11bfc4d6f34933ff9771678868f668a2ef9914bc5144330544d718ab17798e8fde8bcc15c2ba0

data/README.md

@@ -0,0 +1,334 @@
+Transifex Txgh (Lumos Labs fork)
+====
+
+[![Build Status](https://travis-ci.org/lumoslabs/txgh.svg?branch=master)](https://travis-ci.org/lumoslabs/txgh)
+
+Txgh, a mashup of "Transifex" and "Github", is a lightweight server that connects Transifex and Github via webhooks. It enables automatic translation of new content pushed to your Github repository, and supports single-resource as well as branch-based git workflows.
+
+
+How Does it Work?
+---
+
+1. When a source file is pushed to Github, the Txgh service will update the corresponding Transifex resource with the contents of the new file. Configuration options exist to process only certain branches and tags.
+
+2. When a resource in Transifex reaches 100% translated, the Txgh service will download the translations and commit them to the target repository. Configuration options exist to protect certain branches or tags from automatic commits.
+
+<br>
+For the more visually inclined:
+![Txgh Use Cases](https://www.gliffy.com/go/publish/image/9483799/L.png)
+<br>
+<br>
+
+Supported Workflows
+---
+
+Use the following table to determine if Txgh will work for your git and translation workflow:
+
+|Workflow|Comments|
+|:--------|:----------|
+|**Basic**<br>* You maintain one master version of your translations<br>* Translations may not be under source control<br>* New content is translated before each release and does not change until the next release|This is the default. Txgh <br> can also be configured to only<br> listen for changes that happen<br> on a certain branch or tag.|
+|**Multi-branch**<br>* Your team is small or everyone works from the same branch<br>* Translations should change when code changes|You might want to consider <br>multi-branch with diffs (below)<br> since your translators may see<br> a number of duplicate strings<br> in Transifex using this workflow.|
+|**Multi-branch with Diffs**<br>* Your team uses git branches for feature development<br>* Translations should change when code changes|This is the recommended workflow<br> if you'd like to manage translations<br> in an agile way, i.e. "continuous<br> translation." Only new and changed<br> phrases are uploaded to Transifex.|
+
+Getting Started
+---
+
+Txgh supports a significant number of configuration options, and you'll need to familiarize yourself with them to ensure you're setting Txgh up to serve your particular needs. That said, we've whipped up a couple of templates with sensible defaults to get you started more quickly. If you're thinking about deploying with Docker, take a look at our [Docker template](https://github.com/lumoslabs/txgh-docker-template). If you want more flexibility (i.e. the ability to add custom middleware, etc), take a look at our [ruby template](https://github.com/lumoslabs/txgh-ruby-template). The rest of the setup steps below assume you're using one of these templates.
+
+1. Open a terminal window and run `./bin/configure`. Follow the instructions to add a new project to `config.yml`. You'll need to have some version of Ruby installed on your system to run the configuration script. Refer to the section marked "Configuring Txgh" below for a detailed explanation of each option.
+
+2. Create a file in your repository named `.tx/config` and add appropriate tx config. Txgh uses this information to know which files should be watched for changes. Refer to the section marked "Tx Config" below for more information.
+
+3. If you've configured Txgh to upload diffs, visit your project's page in Transifex and upload each of the files described in your tx config. Use Transifex's categories feature to add a category of `branch:heads/master` to each resource. These full resources will provide the base set of translations for your project.
+
+3. At this point, you're ready to deploy Txgh. There are a number of ways to do this, including using a host like AWS or Heroku. It's important your Txgh instance is publicly accessible over the Internet, because the next few steps involve setting up webhooks, which rely on being able to reach it.
+
+4. Visit the settings page for your Github repository, click on "Webhooks and Services," then click the "Add webhook" button. Under payload URL, fill in the URL of your publicly accessible Txgh instance and the path to the Github hook. For example, `http://mytxgh.herokuapp.com/hooks/github`. Fill in the "Secret" field with the Github `webhook_secret` generated for you in `config.yml`. Make sure to enable the "push" event, and also the "delete" event if you have configured Txgh to automatically delete resources. When the webhook is first created, Github will send your Txgh instance a "ping" test event. Your Txgh instance should respond with a 200 OK.
+
+5. Visit the Manage -> Edit Project page for your Transifex project. Scroll down to the "Features" header and look for the "Web Hook URL" field. Fill it in with the URL of your publicly accessible Txgh instance and the path to the Transifex hook. For example, `http://mytxgh.herokuapp.com/hooks/transifex`. Fill in the "Secret Key" field with the Transifex `webhook_secret` generated for you in `config.yml`.
+
+6. Congratulations, you now have a running, fully configured Txgh instance! Note that the configuration script you ran in step 1 automatically configured Txgh to process all branches, so you should be able to create a test branch, modify some translations, and push your changes. Txgh is configured correctly if a new resource appears in Transifex with the new branch name attached.
+
+Available Endpoints
+---
+
+Txgh exposes the following endpoints:
+
+* **`POST /hooks/github`**: Receives and processes Github webhook requests. Request body is expected to be a Github webhook payload in JSON format. Uploads any modified translatable content to Transifex. This endpoint is protected by shared secret signature authorization.
+
+* **`POST /hooks/transifex`**: Receives and processes Transifex webhook requests. Request body is expected to be a Transifex webhook payload in JSON format. Commits translations back to the Github repository. This endpoint is protected by shared secret signature authorization.
+
+* **`PATCH /push?project_slug=[slug]&branch=[branch]`**: Causes translatable content from Github to be pushed to Transifex. This endpoint is designed to emulate receiving a Github webhook, but doesn't require the usual massive Github webhook payload. Currently this endpoint is not protected (but it should be).
+
+* **`PATCH /pull?project_slug=[slug]&branch=[branch]`**: Causes translations from Transifex to be committed to Github. This endpoint is designed to emulate receiving a Transifex webhook, but doesn't require the usual Transifex webhook payload. Currently this endpoint is not protected (but it should be).
+
+* **`GET /config?project_slug=[slug]&branch=[branch]`**: Returns the tx config in JSON format for the given project and branch.
+
+* **`GET /health_check`**: Simply returns an HTTP 200 OK.
+
+Configuring Txgh
+---
+
+Config is written in the YAML markup language and is comprised of two sections, one for Github options and one for Transifex options:
+
+```yaml
+github:
+  repos:
+    organization/repo:
+      api_username: github username
+      api_token: abcdefghijklmnopqrstuvwxyz github api token
+      push_source_to: transifex project slug
+      branch: branch to watch for changes, or "all" to watch all of them
+      tag: tag to watch for changes, or "all" to watch all of them
+      webhook_secret: 123abcdef456ghi github webhook secret
+      diff_point: branch to diff against (usually master)
+transifex:
+  projects:
+    project-slug:
+      tx_config: map of transifex resources to file paths
+      api_username: transifex username
+      api_password: transifex password (transifex doesn't support token-based auth)
+      push_translations_to: organization/repo
+      protected_branches: branches that should not receive automatic commits
+      webhook_secret: 123abcdef456ghi transifex webhook secret
+      auto_delete_resources: 'true' to delete resource when branch is deleted
+```
+
+### Github Configuration
+
+* **`api_username`**: Your Github account username. You might want to create a new dev Github account for Txgh to use instead of providing someone's actual credentials here. Keep in mind that the username you specify must have access to the repository in question, or Github will reject all Txgh's API requests.
+
+* **`api_token`**: A valid Github access token. The token should be generated by the username specified by `api_username`. In Github, visit your account settings and generate a personal access token. Give the token all the "repo" permissions.
+
+* **`push_source_to`**: The slug of the Transifex project you want to push new translatable content to. The slug is basically the name of the project, but with URL-unfriendly characters removed. You can find the slug of your project by inspecting the URL on any Transifex project page.
+
+* **`branch`**: The Github branch to watch for new translatable content. If you want Txgh to watch all branches, use the special value "all". By default, branch is `master`.
+
+* **`tag`**: The Github tag to watch for new translatable content. If you want Txgh to watch all tags, use the special value "all".
+
+* **`webhook_secret`**: A user-defined string that Github will use to sign webhook requests. If present, Txgh will use this value to verify the authenticity of these webhook requests and reject those that are improperly signed. Make sure you use this same value when configuring the webhook in the Github UI.
+
+* **`diff_point`**: The branch to compare against when submitting new translatable content to Transifex, usually `master`. Set this option to enable diffing. If not set, Txgh will upload changed files in their entirety.
+
+### Transifex Configuration
+
+* **`tx_config`**: Configuration specifying which files to watch for changes. See the section labeled "Tx Config" below for more information.
+
+* **`api_username`**: Your Transifex account username. You might want to create a new dev Transifex account for Txgh to use instead of providing someone's actual credentials here. Keep in mind that the username you specify must have access to the project in question, or Transifex will reject all Txgh's API requests.
+
+* **`api_password`**: The Transifex account password associated with `api_username`. Transifex does not support token-based authentication or OAuth.
+
+* **`push_translations_to`**: The Github repository to commit completed translations to. If configured to process a branch or branches, Txgh will commit translations back to the branch they came from.
+
+* **`protected_branches`**: A comma-separated list of branches Txgh should never make automatic commits on. It can be useful to blacklist certain branches so as not to disrupt a release cycle or surprise your QA team.
+
+* **`webhook_secret`**: A user-defined string that Transifex will use to sign webhook requests. If present, Txgh will use this value to verify the authenticity of these webhook requests and reject those that are improperly signed. Make sure to use this same value when configuring the webhook in the Transifex UI.
+
+* **`auto_delete_resources`**: If set to "true", Txgh will automatically delete Transifex resources when the corresponding branch is deleted from git.
+
+### Loading Config
+
+Txgh supports two different ways of accessing configuration, raw text and a file path. In both cases, config is passed via the `TXGH_CONFIG` environment variable. Prefix the raw text or file path with the appropriate scheme, `raw://` or `file://`, to indicate which strategy Txgh should use.
+
+#### Raw Config
+
+Passing raw config to Txgh can be done like this:
+
+```bash
+export TXGH_CONFIG="raw://big_yaml_string_here"
+```
+
+When Txgh starts up, it will use the YAML payload that starts after `raw://`.
+
+#### File Config
+
+It might make more sense to store all your config in a file. Pass the path to Txgh like this:
+
+```bash
+export TXGH_CONFIG="file://path/to/config.yml"
+```
+
+When Txgh runs, it will read and parse the file at the path that comes after `file://`.
+
+Of course, in both the file and the raw cases, environment variables can be specified via `export` or inline when starting Txgh. See the "Running Txgh" section below for more information.
+
+Tx Config
+---
+
+In addition to the YAML configuration described above, Txgh needs to know which files to watch for changes. Txgh uses the same [ini-style config format](http://docs.transifex.com/client/config/#txconfig) as the Transifex CLI client, meaning you can simply point Txgh at this existing config and things will Just Work™. If you don't already have the CLI client configured, then keep reading.
+
+You'll probably have to do some research to find out which formats Transifex supports in order to put together your tx config. You'll also need to know which files contain translatable content. Once you have all this information, constructing your tx config should be fairly straightforward.
+
+### Format
+
+By way of example, the tx config for a basic Rails app might look like this:
+
+```ini
+[main]
+host = https://www.transifex.com
+lang_map =
+
+# Create one such section per file/resource
+[myproject.enyml]
+file_filter = config/locales/<lang>.yml
+source_file = config/locales/en.yml
+source_lang = en
+type = YML
+```
+
+For every file you'd like Txgh to watch for changes, add another section to the config. The section header enclosed in square brackets is comprised of the project slug, a period, and the resource slug. The project slug can be found by inspecting the URL on Transifex project pages, while the resource slug is something you can make up. Keep in mind that resource slugs in the same project must be unique. Try to choose a name that makes it easy to identify the resource at-a-glance later.
+
+Here's a description of each of the fields:
+
+* **`file_filter`**: I'm not sure why this field is called `file_filter` since a more appropriate name would be "translation\_file" or "translation\_path\_template". Basically this field is a template that indicates where translations should be saved. The `<lang>` part functions as a placeholder and gets swapped out for a language code. The Spanish translation file for example would be written to config/locales/es.yml.
+
+* **`source_file`**: The file to watch for changes.
+
+* **`source_lang`**: The language the strings inside the `source_file` are written in.
+
+* **`type`**: The format the strings in both the `source_file` and `file_filter` are stored in. This format must be supported by Transifex. For a full list of supported i18n types, see the [Transifex documentation](http://docs.transifex.com/formats/). Rails stores translations in the YAML file format. For a JavaScript project you might store translations in JSON and choose the KEYVALUEJSON i18n type. For Android XML, the ANDROID i18n type, etc.
+
+### Loading Tx Config
+
+Tx config is loaded in a similar fashion to Txgh config. There are three supported schemes, `raw`, `file`, and `git`. Both `raw` and `file` behave the same as their Txgh config counterparts, but the `git` scheme is different. It allows tx config to be downloaded dynamically from a git repository instead of read from a static string or file. This means you can store tx config in your git repository itself, where it can be versioned and changed on a per-branch basis. There are several benefits to this. First, any time you add a file to the tx config in a feature branch, that file will be identified and uploaded for that branch only without any additional configuration changes. Second, it places the responsibility of maintaining translated resources with the engineers working in the repo itself rather than on the engineers maintaining your translation infrastructure.
+
+Loading tx config from git is straightforward. Use the `git://` scheme followed by the path to the config file inside the repository, eg. `git://.tx/config`.
+
+For example, the Transifex section of your Txgh config might look like this:
+
+```yaml
+transifex:
+  projects:
+    project-slug:
+      tx_config: git://.tx/config
+      ...
+```
+
+Every time a request is made, Txgh will download `.tx/config` from the given branch and use it to identify changed files.
+
+Running Txgh
+---
+
+Txgh is distributed as a [Docker image](https://quay.io/repository/lumoslabs/txgh) and as a [Rubygem](https://rubygems.org/gems/txgh). You can choose to run it via Docker, install and run it as a Rubygem, or run it straight from a local clone of this repository.
+
+### With Docker
+
+Using Docker to run Txgh is pretty straightforward (keep in mind you'll need to have the Docker server set up wherever you want to run Txgh).
+
+NOTE: You might consider using this [Docker template](https://github.com/lumoslabs/txgh-docker-template) instead of following the instructions below. The template contains all the files and scripts you need to get up and running quickly.
+
+First, pull the Txgh image:
+
+```bash
+docker pull quay.io/lumoslabs/txgh:latest
+```
+
+Run the image in a new container:
+
+```bash
+docker run
+  -p 9292:9292
+  -e "TXGH_CONFIG=raw://$(cat path/to/config.yml)"
+  quay.io/lumoslabs/txgh:latest
+```
+
+At this point, Txgh should be up and running. To test it, try hitting the `health_check` endpoint. You should get a 200 response:
+
+```bash
+curl -v localhost:9292/health_check
+....
+< HTTP/1.1 200 OK
+```
+
+Note that Txgh might not be available on localhost depending on how your Docker client is configured. On a Mac with [docker-machine](https://docs.docker.com/machine/) for instance, you might try this instead:
+
+```bash
+curl -v 192.168.99.100:9292/health_check
+```
+
+(Where 192.168.99.100 is the IP of your docker machine instance).
+
+### From Rubygems
+
+Docker is by far the easiest way to run Txgh, but a close runner-up is via Rubygems. You'll need to have at least Ruby 2.1 installed as well as the [bundler gem](http://bundler.io/). Installing ruby and bundler are outside the scope of this README, but I'd suggest using a ruby installer like [rbenv](https://github.com/rbenv/rbenv) or [rvm](https://rvm.io/) to get the job done. Once ruby is installed, executing `gem install bundler` should be enough to install the bundler gem.
+
+NOTE: You might consider using this [ruby template](https://github.com/lumoslabs/txgh-ruby-template) instead of following the instructions below. The template contains all the files and scripts you need to get up and running quickly.
+
+1. Create a new directory for your Txgh instance.
+
+2. Inside the new directory, create a file named `Gemfile`. This file is a manifest of  all your ruby dependencies.
+
+3. Inside `Gemfile`, add the following lines:
+
+  ```ruby
+  source 'http://rubygems.org'
+  gem 'txgh', '~> 1.0'
+  ```
+  When bundler parses this file, it will know to fetch dependencies from rubygems.org, the most popular and ubiquitous gem host. It will also know to fetch and install the txgh gem.
+4. Create another file next to `Gemfile` named `config.ru`. This file describes how to run the Txgh server, including where to mount the various endpoints.
+5. Inside `config.ru` add the following lines:
+
+  ```ruby
+  require 'txgh'
+
+  map '/' do
+    use Txgh::Application
+    use Txgh::Triggers
+    run Sinatra::Base
+  end
+
+  map '/hooks' do
+    use Txgh::Hooks
+    run Sinatra::Base
+  end
+  ```
+
+  Where each endpoint is mounted is entirely configurable inside this file, as is any additional middleware or your own custom endpoints you might want to add. Txgh is built on the [Rack](http://rack.github.io/) webserver stack, meaning the wide world of Rack is available to you inside this file. The `map`, `use`, and `run` methods are part of Rack's builder syntax.
+
+6. Run `bundle install` to install gem dependencies.
+
+7. Run `TXGH_CONFIG=file://path/to/config.yml bundle exec rackup`. The Txgh instance should start running in the foreground.
+
+8. Test your Txgh instance by hitting the `health_check` endpoint as described above in the "With Docker" section, i.e. `curl -v localhost:9292/health_check`. You should get an HTTP 200 response.
+
+### Local Clone
+
+Running Txgh from a local copy of the source code requires almost the same setup as running it from Rubygems. Notably however the `config.ru` file has already been written for you.
+
+Refer to the "From Rubygems" section above to get ruby and bundler installed before continuing.
+
+1. Clone Txgh locally:
+
+  ```bash
+  git clone git@github.com:lumoslabs/txgh.git
+  ```
+
+2. Change directory into the newly cloned repo (`cd txgh`) and run `bundle install` to install gem dependencies.
+3. Run `TXGH_CONFIG=file://path/to/config.yml bundle exec rackup`. The Txgh instance should start running in the foreground.
+
+4. Test your Txgh instance by hitting the `health_check` endpoint as described above in the "With Docker" section, i.e. `curl -v localhost:9292/health_check`. You should get an HTTP 200 response.
+
+Running Tests
+---
+
+Txgh uses the popular RSpec test framework and has a comprehensive set of unit and integration tests. To run the full test suite, run `bundle exec rake spec:full`, or alternatively `FULL_SPEC=true bundle exec rspec`. To run only the unit tests (which is faster), run `bundle exec rspec`.
+
+Requirements
+---
+
+Txgh requires an Internet connection to run, since its primary function is to connect two web services via webhooks and API calls. Other than that, it does not have any other external requirements like a database or cache.
+
+Compatibility
+---
+
+Txgh was developed with Ruby 2.1.6, but is probably compatible with all versions between 2.0 and 2.3, and maybe even 1.9. Your mileage may vary when running on older versions.
+
+Authors
+---
+
+This repository is a fork of Transifex's [original](https://github.com/transifex/txgh) and is maintained by [Cameron Dutro](https://github.com/camertron) from Lumos Labs.
+
+License
+---
+
+Licensed under the Apache License, Version 2.0. See the LICENSE file included in this repository for the full text.

data/lib/ext/zipline/output_stream.rb

@@ -0,0 +1,62 @@
+# Taken from https://github.com/fringd/zipline
+# Didn't include zipline gem b/c it depends directly on rails and brings in a
+# ton of useless dependencies
+
+require 'stringio'
+require 'zip'
+
+# a ZipOutputStream that never rewinds output
+# in order for that to be possible we store only uncompressed files
+module Zipline
+  class OutputStream < Zip::OutputStream
+
+    #we need to be able to hand out own custom output in order to stream to browser
+    def initialize(io)
+      # Create an io stream thing
+      super StringIO.new, true
+      # Overwrite it with my own
+      @output_stream = io
+    end
+
+    def stream
+      @output_stream
+    end
+
+    def put_next_entry(entry_name, size)
+      new_entry = Zip::Entry.new(@file_name, entry_name)
+
+      #THIS IS THE MAGIC, tells zip to look after data for size, crc
+      new_entry.gp_flags = new_entry.gp_flags | 0x0008
+
+      super(new_entry)
+
+      # Uncompressed size in the local file header must be zero when bit 3
+      # of the general purpose flags is set, so set the size after the header
+      # has been written.
+      new_entry.size = size
+    end
+
+    # just reset state, no rewinding required
+    def finalize_current_entry
+      if current_entry
+        entry = current_entry
+        super
+        write_local_footer(entry)
+      end
+    end
+
+    def write_local_footer(entry)
+      @output_stream << [ 0x08074b50, entry.crc, entry.compressed_size, entry.size].pack('VVVV')
+    end
+
+    #never need to do this because we set correct sizes up front
+    def update_local_headers
+      nil
+    end
+
+    # helper to deal with difference between rubyzip 1.0 and 1.1
+    def current_entry
+      @currentEntry || @current_entry
+    end
+  end
+end

data/lib/txgh/github_api.rb

@@ -90,9 +90,14 @@ module Txgh
     end
 
     def download(repo, path, branch)
-      contents = client.contents(repo, { path: path, ref: branch })
-      return contents[:content] if contents[:encoding] == 'utf-8'
-      return Base64.decode64(contents[:content])
+      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'])
+      end
     end
 
     def create_status(repo, sha, state, options = {})

data/lib/txgh/resource_contents.rb

@@ -37,7 +37,7 @@ module Txgh
 
     def phrases
       @phrases ||= extractor.from_string(raw) do |extractor|
-        extractor.extract_each(preserve_arrays: true).map do |key, value|
+        extractor.extract_each.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'], str(phrase['string'] || '')
+            phrase['key'], (phrase['string'] || '').to_s
           )
         end
       end
@@ -95,15 +95,6 @@ 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/version.rb

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

data/spec/diff_calculator_spec.rb

@@ -35,29 +35,6 @@ 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
         []
@@ -73,21 +50,6 @@ 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)')]
@@ -106,24 +68,6 @@ 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
         [

data/spec/github_api_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'base64'
 
 include Txgh
 
@@ -179,30 +178,20 @@ describe GithubApi do
   end
 
   describe '#download' do
-    let(:path) { 'path/to/file.xyz' }
-
     it 'downloads the file from the given branch' do
-      expect(client).to(
-        receive(:contents)
-          .with(repo, path: path, ref: branch)
-          .and_return(
-            content: 'content', encoding: 'utf-8'
-          )
-      )
+      path = 'path/to/file.xyz'
 
-      expect(api.download(repo, path, branch)).to eq('content')
-    end
+      expect(client).to receive(:ref).with(repo, branch).and_return(object: { sha: :branch_sha })
+      expect(client).to receive(:commit).with(repo, :branch_sha).and_return(commit: { tree: { sha: :base_tree_sha } })
+      expect(client).to receive(:tree).with(repo, :base_tree_sha, recursive: 1).and_return(
+        tree: [{ path: path, sha: :blob_sha }]
+      )
 
-    it 'automatically decodes base64-encoded content' do
-      expect(client).to(
-        receive(:contents)
-          .with(repo, path: path, ref: branch)
-          .and_return(
-            content: Base64.encode64('content'), encoding: 'base64'
-          )
+      expect(client).to receive(:blob).with(repo, :blob_sha).and_return(
+        { 'content' => :blob, 'encoding' => 'utf-8' }
       )
 
-      expect(api.download(repo, path, branch)).to eq('content')
+      expect(api.download(repo, path, branch)).to eq(:blob)
     end
   end
 end

data/spec/merge_calculator_spec.rb

@@ -46,22 +46,6 @@ describe MergeCalculator do
     end
   end
 
-  context 'with an array added in HEAD' do
-    let(:diff_point_phrases) do
-      [phrase('planet.earth', 'Human')]
-    end
-
-    let(:head_phrases) do
-      diff_point_phrases + [
-        phrase('villains', %w(Kahn Chang Valeris Shinzon))
-      ]
-    end
-
-    it 'includes the added array' do
-      expect(merge_result.phrases).to eq(head_phrases)
-    end
-  end
-
   context 'with phrases removed from HEAD' do
     let(:diff_point_phrases) do
       head_phrases + [
@@ -78,22 +62,6 @@ describe MergeCalculator do
     end
   end
 
-  context 'with an array removed from HEAD' do
-    let(:diff_point_phrases) do
-      head_phrases + [
-        phrase('villains', %w(Kahn Chang Valeris Shinzon))
-      ]
-    end
-
-    let(:head_phrases) do
-      [phrase('planet.earth', 'Human')]
-    end
-
-    it 'does not include the removed array' do
-      expect(merge_result.phrases).to eq(head_phrases)
-    end
-  end
-
   context 'with phrases modified in HEAD' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Cardassian')]
@@ -108,20 +76,6 @@ describe MergeCalculator do
     end
   end
 
-  context 'with an array modified in HEAD' do
-    let(:diff_point_phrases) do
-      [phrase('villains', %w(Kahn Chang Valeris))]
-    end
-
-    let(:head_phrases) do
-      [phrase('villains', %w(Kahn Chang Valeris Shinzon))]
-    end
-
-    it 'includes the modified phrase' do
-      expect(merge_result.phrases).to eq(head_phrases)
-    end
-  end
-
   context 'with no phrases modified, added, or removed' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Bajoran')]

data/spec/resource_contents_spec.rb

@@ -11,29 +11,18 @@ describe ResourceContents do
     )
   end
 
-  let(:default_contents) do
+  let(:raw_contents) do
     outdent(%Q(
       en:
         welcome:
-          message: "Hello!"
+          message: Hello!
         goodbye:
-          message: "Goodbye!"
-    ))
-  end
-
-  let(:array_contents) do
-    outdent(%Q(
-      en:
-        captains:
-        - "Janeway"
-        - "Picard"
-        - "Sisko"
-        - "Kirk"
+          message: Goodbye!
     ))
   end
 
   let(:contents) do
-    ResourceContents.from_string(tx_resource, default_contents)
+    ResourceContents.from_string(tx_resource, raw_contents)
   end
 
   describe '#phrases' do
@@ -43,13 +32,6 @@ describe ResourceContents do
         { 'key' => 'goodbye.message', 'string' => 'Goodbye!' }
       ])
     end
-
-    it 'preserves arrays' do
-      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
-      expect(rsrc_contents.phrases).to eq([
-        { 'key' => 'captains', 'string' => %w(Janeway Picard Sisko Kirk) }
-      ])
-    end
   end
 
   describe '#add' do
@@ -65,14 +47,13 @@ describe ResourceContents do
     it 'serializes the phrases to the given stream' do
       stream = StringIO.new
       contents.write_to(stream)
-      expect(stream.string).to eq(default_contents)
-    end
-
-    it 'serializes arrays correctly' do
-      stream = StringIO.new
-      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
-      rsrc_contents.write_to(stream)
-      expect(stream.string).to eq(array_contents)
+      expect(stream.string).to eq(outdent(%Q(
+        en:
+          welcome:
+            message: "Hello!"
+          goodbye:
+            message: "Goodbye!"
+      )))
     end
 
     it 'includes phrases that were added after the fact' do

data/txgh.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  s.add_dependency 'abroad', '~> 4.1'
+  s.add_dependency 'abroad', '~> 4.0'
   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: 5.5.0
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- README.md
+- lib/ext/zipline/output_stream.rb
 - lib/txgh.rb
 - lib/txgh/category_support.rb
 - lib/txgh/config.rb
@@ -186,12 +188,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A library for syncing translation resources between Github and Transifex.