txgh 5.3.4 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9913740e9d673d5e128e9347ab27f2402e605ad1
-  data.tar.gz: 8dc303dd112a95c897131e974d61d74cd45725f0
+  metadata.gz: eb6e3463432f659922924f0e8772d52ff629d56e
+  data.tar.gz: b2ae04fce6e467c3e288f4719fa6b21428e21458
 SHA512:
-  metadata.gz: 84eb6e77456cf413c8da184260d10534497701b7869567ba0b275ce1faa3d1e2b93fd3be7ecbd57e8e6e4fda2a99351568ec7efe2ebf6f668a584eaca2e787b8
-  data.tar.gz: 73f36c4560a70a016d416570b417782d066c410ce813caa5f1fa971ae3a4af3d67c111440ef37bc188afb1af2bd7a5968ad3569f4f29bbdcc4b29f0f6ecc8df5
+  metadata.gz: ea6b213e8f7b13a610324114f192542f22ab018697373b12d5299d590f680c6cf25da29fe699a21ae8d4c391980c04ecbe89c6e97bfb615ecbaffa95a74fce4b
+  data.tar.gz: 00e05c87d887ce50b9fd26f252950bc7acde5511e73b29065f09197838e4d74468feebd9d2568e98771b4890df652b32543c17c49887cd6c283c3cbbd47616d7

data/lib/txgh/resource_deleter.rb

@@ -0,0 +1,50 @@
+module Txgh
+  class ResourceDeleter
+    include Txgh::CategorySupport
+
+    attr_reader :project, :repo, :branch
+
+    def initialize(project, repo, branch, options = {})
+      @project = project
+      @repo = repo
+      @branch = branch
+    end
+
+    def delete_resources
+      tx_resources.each do |tx_resource|
+        project.api.delete_resource(tx_resource)
+      end
+    end
+
+    private
+
+    def tx_resources
+      project.api.get_resources(project.name).map do |resource_hash|
+        categories = deserialize_categories(resource_hash['categories'])
+        resource_branch = Txgh::Utils.absolute_branch(categories['branch'])
+
+        if resource_branch == branch
+          tx_branch_resource_from(resource_hash, branch)
+        end
+      end.compact
+    end
+
+    def tx_branch_resource_from(resource_hash, branch)
+      Txgh::TxBranchResource.new(
+        tx_resource_from(resource_hash, branch), branch
+      )
+    end
+
+    # project_slug, resource_slug, type, source_lang, source_file, lang_map, translation_file
+    def tx_resource_from(resource_hash, branch)
+      Txgh::TxResource.new(
+        project.name,
+        Txgh::TxBranchResource.deslugify(resource_hash['slug'], branch),
+        resource_hash['i18n_type'],
+        resource_hash['source_language_code'],
+        resource_hash['name'],
+        '', nil
+      )
+    end
+  end
+end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '5.3.4'
+  VERSION = '5.4.0'
 end

data/lib/txgh.rb

@@ -2,7 +2,6 @@ require 'txgh/errors'
 require 'yaml'
 
 module Txgh
-  autoload :Application,           'txgh/app'
   autoload :CategorySupport,       'txgh/category_support'
   autoload :Config,                'txgh/config'
   autoload :DiffCalculator,        'txgh/diff_calculator'
@@ -10,23 +9,19 @@ module Txgh
   autoload :Events,                'txgh/events'
   autoload :GithubApi,             'txgh/github_api'
   autoload :GithubRepo,            'txgh/github_repo'
-  autoload :GithubRequestAuth,     'txgh/github_request_auth'
   autoload :GithubStatus,          'txgh/github_status'
-  autoload :Handlers,              'txgh/handlers'
-  autoload :Hooks,                 'txgh/app'
   autoload :MergeCalculator,       'txgh/merge_calculator'
   autoload :ParseConfig,           'txgh/parse_config'
   autoload :Puller,                'txgh/puller'
   autoload :Pusher,                'txgh/pusher'
   autoload :ResourceCommitter,     'txgh/resource_committer'
   autoload :ResourceContents,      'txgh/resource_contents'
+  autoload :ResourceDeleter,       'txgh/resource_deleter'
   autoload :ResourceDownloader,    'txgh/resource_downloader'
   autoload :ResourceUpdater,       'txgh/resource_updater'
   autoload :ResponseHelpers,       'txgh/response_helpers'
   autoload :TransifexApi,          'txgh/transifex_api'
   autoload :TransifexProject,      'txgh/transifex_project'
-  autoload :TransifexRequestAuth,  'txgh/transifex_request_auth'
-  autoload :Triggers,              'txgh/app'
   autoload :TxBranchResource,      'txgh/tx_branch_resource'
   autoload :TxLogger,              'txgh/tx_logger'
   autoload :TxResource,            'txgh/tx_resource'

data/spec/resource_deleter_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'helpers/standard_txgh_setup'
+
+include Txgh
+
+describe ResourceDeleter do
+  include StandardTxghSetup
+
+  # process all branches
+  let(:branch) { 'heads/master' }
+
+  let(:deleter) do
+    ResourceDeleter.new(transifex_project, github_repo, branch)
+  end
+
+  let(:resource_api_response) do
+    [resource.to_api_h.merge('categories' => ["branch:#{branch}"])]
+  end
+
+  let(:resource) { tx_config.resources.first }
+
+  let(:resource_slug_with_branch) do
+    "#{resource_slug}-#{Txgh::Utils.slugify(ref)}"
+  end
+
+  it 'deletes the correct resource from transifex' do
+    expect(transifex_api).to(
+      receive(:get_resources).and_return(resource_api_response)
+    )
+
+    expect(transifex_api).to receive(:delete_resource) do |tx_resource|
+      expect(tx_resource.project_slug).to eq(project_name)
+      expect(tx_resource.resource_slug).to eq(resource_slug_with_branch)
+    end
+
+    deleter.delete_resources
+  end
+
+  it "does not delete resources that don't have a matching branch" do
+    deleter = ResourceDeleter.new(transifex_project, github_repo, 'heads/fake')
+    expect(transifex_api).to(
+      receive(:get_resources).and_return(resource_api_response)
+    )
+
+    expect(transifex_api).to_not receive(:delete)
+    deleter.delete_resources
+  end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ require 'pry-byebug'
 require 'rake'
 require 'rspec'
 require 'txgh'
-require 'vcr'
-require 'webmock'
 require 'yaml'
 
 require 'helpers/test_events'
@@ -24,15 +22,9 @@ end
 RSpec.configure do |config|
   config.filter_run(focus: true)
   config.run_all_when_everything_filtered = true
-  config.filter_run_excluding(integration: true) unless ENV['FULL_SPEC']
   config.include(SpecHelpers)
 
   config.before(:each) do
     Txgh.instance_variable_set(:@events, TestEvents.new)
   end
 end
-
-VCR.configure do |config|
-  config.cassette_library_dir = 'spec/integration/cassettes'
-  config.hook_into :webmock
-end

data/txgh.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email    = ['mattjjacko@gmail.com', 'camertron@gmail.com']
   s.homepage = 'https://github.com/lumoslabs/txgh'
 
-  s.description = s.summary = 'A server that automatically syncs translation resources between Github and Transifex.'
+  s.description = s.summary = 'A library for syncing translation resources between Github and Transifex.'
 
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
@@ -17,12 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'json', '~> 1.8'
-  s.add_dependency 'mime-types', '~> 2.0'
   s.add_dependency 'octokit', '~> 4.2'
   s.add_dependency 'parseconfig', '~> 1.0'
-  s.add_dependency 'sinatra', '~> 1.4'
-  s.add_dependency 'sinatra-contrib', '~> 1.4'
-  s.add_dependency 'rubyzip', '>= 1.0', '<= 1.1.2'
 
   s.require_path = 'lib'
   s.files = Dir['{lib,spec}/**/*', 'README.md', 'txgh.gemspec', 'LICENSE']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.4.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -109,56 +95,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-description: A server that automatically syncs translation resources between Github
-  and Transifex.
+description: A library for syncing translation resources between Github and Transifex.
 email:
 - mattjjacko@gmail.com
 - camertron@gmail.com
@@ -168,9 +105,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/ext/zipline/output_stream.rb
 - lib/txgh.rb
-- lib/txgh/app.rb
 - lib/txgh/category_support.rb
 - lib/txgh/config.rb
 - lib/txgh/config/config_pair.rb
@@ -189,45 +124,24 @@ files:
 - lib/txgh/events.rb
 - lib/txgh/github_api.rb
 - lib/txgh/github_repo.rb
-- lib/txgh/github_request_auth.rb
 - lib/txgh/github_status.rb
-- lib/txgh/handlers.rb
-- lib/txgh/handlers/download_handler.rb
-- lib/txgh/handlers/github.rb
-- lib/txgh/handlers/github/delete_handler.rb
-- lib/txgh/handlers/github/handler.rb
-- lib/txgh/handlers/github/ping_handler.rb
-- lib/txgh/handlers/github/push_handler.rb
-- lib/txgh/handlers/github/request_handler.rb
-- lib/txgh/handlers/response.rb
-- lib/txgh/handlers/stream_response.rb
-- lib/txgh/handlers/tgz_stream_response.rb
-- lib/txgh/handlers/transifex.rb
-- lib/txgh/handlers/transifex/hook_handler.rb
-- lib/txgh/handlers/transifex/request_handler.rb
-- lib/txgh/handlers/triggers.rb
-- lib/txgh/handlers/triggers/handler.rb
-- lib/txgh/handlers/triggers/pull_handler.rb
-- lib/txgh/handlers/triggers/push_handler.rb
-- lib/txgh/handlers/zip_stream_response.rb
 - lib/txgh/merge_calculator.rb
 - lib/txgh/parse_config.rb
 - lib/txgh/puller.rb
 - lib/txgh/pusher.rb
 - lib/txgh/resource_committer.rb
 - lib/txgh/resource_contents.rb
+- lib/txgh/resource_deleter.rb
 - lib/txgh/resource_downloader.rb
 - lib/txgh/resource_updater.rb
 - lib/txgh/response_helpers.rb
 - lib/txgh/transifex_api.rb
 - lib/txgh/transifex_project.rb
-- lib/txgh/transifex_request_auth.rb
 - lib/txgh/tx_branch_resource.rb
 - lib/txgh/tx_logger.rb
 - lib/txgh/tx_resource.rb
 - lib/txgh/utils.rb
 - lib/txgh/version.rb
-- spec/app_spec.rb
 - spec/category_support_spec.rb
 - spec/config/config_pair_spec.rb
 - spec/config/key_manager_spec.rb
@@ -239,41 +153,21 @@ files:
 - spec/events_spec.rb
 - spec/github_api_spec.rb
 - spec/github_repo_spec.rb
-- spec/github_request_auth_spec.rb
 - spec/github_status_spec.rb
-- spec/handlers/download_handler_spec.rb
-- spec/handlers/github/delete_handler_spec.rb
-- spec/handlers/github/ping_handler_spec.rb
-- spec/handlers/github/push_handler_spec.rb
-- spec/handlers/tgz_stream_response_spec.rb
-- spec/handlers/transifex/hook_handler_spec.rb
-- spec/handlers/zip_stream_response_spec.rb
-- spec/helpers/github_payload_builder.rb
-- spec/helpers/integration_setup.rb
 - spec/helpers/nil_logger.rb
 - spec/helpers/standard_txgh_setup.rb
 - spec/helpers/test_events.rb
 - spec/helpers/test_provider.rb
-- spec/integration/cassettes/github_l10n_hook_endpoint.yml
-- spec/integration/cassettes/pull.yml
-- spec/integration/cassettes/push.yml
-- spec/integration/cassettes/transifex_hook_endpoint.yml
-- spec/integration/config/tx.config
-- spec/integration/hooks_spec.rb
-- spec/integration/payloads/github_postbody.json
-- spec/integration/payloads/github_postbody_l10n.json
-- spec/integration/payloads/github_postbody_release.json
-- spec/integration/triggers_spec.rb
 - spec/merge_calculator_spec.rb
 - spec/parse_config_spec.rb
 - spec/resource_committer_spec.rb
 - spec/resource_contents_spec.rb
+- spec/resource_deleter_spec.rb
 - spec/resource_downloader_spec.rb
 - spec/resource_updater_spec.rb
 - spec/spec_helper.rb
 - spec/transifex_api_spec.rb
 - spec/transifex_project_spec.rb
-- spec/transifex_request_auth_spec.rb
 - spec/tx_branch_resource_spec.rb
 - spec/tx_resource_spec.rb
 - spec/txgh_spec.rb
@@ -301,6 +195,5 @@ rubyforge_project:
 rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
-summary: A server that automatically syncs translation resources between Github and
-  Transifex.
+summary: A library for syncing translation resources between Github and Transifex.
 test_files: []

data/lib/ext/zipline/output_stream.rb

@@ -1,62 +0,0 @@
-# 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/app.rb

@@ -1,140 +0,0 @@
-require 'sinatra'
-require 'sinatra/json'
-require 'sinatra/reloader'
-require 'sinatra/streaming'
-
-module Txgh
-  module RespondWith
-    def respond_with(resp)
-      env['txgh.response'] = resp
-
-      if resp.streaming?
-        response.headers.merge!(resp.headers)
-
-        stream do |out|
-          begin
-            resp.write_to(out)
-          rescue => e
-            Txgh.events.publish_error(e)
-            raise e
-          end
-        end
-      else
-        status resp.status
-        json resp.body
-      end
-    end
-  end
-
-  class Application < Sinatra::Base
-    include Txgh::Handlers
-
-    helpers Sinatra::Streaming
-    helpers RespondWith
-
-    configure do
-      set :logging, nil
-      logger = Txgh::TxLogger.logger
-      set :logger, logger
-    end
-
-    def initialize(app = nil)
-      super(app)
-    end
-
-    get '/health_check' do
-      respond_with(
-        Response.new(200, {})
-      )
-    end
-
-    get '/config' do
-      config = Txgh::Config::KeyManager.config_from_project(params[:project_slug])
-      branch = Utils.absolute_branch(params[:branch])
-
-      begin
-        tx_config = Txgh::Config::TxManager.tx_config(
-          config.transifex_project, config.github_repo, branch
-        )
-
-        data = tx_config.to_h
-        data.merge!(branch_slug: Utils.slugify(branch)) if branch
-
-        status 200
-        json data: data
-      rescue ConfigNotFoundError => e
-        status 404
-        json [{ error: e.message }]
-      rescue => e
-        status 500
-        json [{ error: e.message }]
-      end
-    end
-
-    get '/download.:format' do
-      respond_with(
-        DownloadHandler.handle_request(request, settings.logger)
-      )
-    end
-  end
-
-  # Hooks are protected endpoints used for data integration between Github and
-  # Transifex. They live under the /hooks namespace (see config.ru)
-  class Hooks < Sinatra::Base
-    include Txgh::Handlers
-
-    helpers RespondWith
-
-    configure do
-      set :logging, nil
-      logger = Txgh::TxLogger.logger
-      set :logger, logger
-    end
-
-    configure :development do
-      register Sinatra::Reloader
-    end
-
-    def initialize(app = nil)
-      super(app)
-    end
-
-    post '/transifex' do
-      respond_with(
-        Transifex::RequestHandler.handle_request(request, settings.logger)
-      )
-    end
-
-    post '/github' do
-      respond_with(
-        Github::RequestHandler.handle_request(request, settings.logger)
-      )
-    end
-  end
-
-  class Triggers < Sinatra::Base
-    helpers RespondWith
-
-    configure do
-      set :logging, nil
-      logger = Txgh::TxLogger.logger
-      set :logger, logger
-    end
-
-    configure :development do
-      register Sinatra::Reloader
-    end
-
-    patch '/push' do
-      respond_with(
-        Txgh::Handlers::Triggers::PushHandler.handle_request(request, settings.logger)
-      )
-    end
-
-    patch '/pull' do
-      respond_with(
-        Txgh::Handlers::Triggers::PullHandler.handle_request(request, settings.logger)
-      )
-    end
-  end
-end

data/lib/txgh/github_request_auth.rb

@@ -1,28 +0,0 @@
-require 'openssl'
-
-module Txgh
-  class GithubRequestAuth
-    HMAC_DIGEST = OpenSSL::Digest.new('sha1')
-    RACK_HEADER = 'HTTP_X_HUB_SIGNATURE'
-    GITHUB_HEADER = 'X-Hub-Signature'
-
-    class << self
-      def authentic_request?(request, secret)
-        request.body.rewind
-        expected_signature = header_value(request.body.read, secret)
-        actual_signature = request.env[RACK_HEADER]
-        actual_signature == expected_signature
-      end
-
-      def header_value(content, secret)
-        "sha1=#{digest(content, secret)}"
-      end
-
-      private
-
-      def digest(content, secret)
-        OpenSSL::HMAC.hexdigest(HMAC_DIGEST, secret, content)
-      end
-    end
-  end
-end