txgh 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 165b2501e313014a2fd9e0103d08a3ebd4799673
-  data.tar.gz: 0a44161e943e917a9a100515e6f4b4bfb2336df8
+  metadata.gz: 9badcf50c28fbfa108cb28d46e8ef1ab30124c90
+  data.tar.gz: 630fa6728dc82d464d612b93e026d1d7b11a2ab3
 SHA512:
-  metadata.gz: f6e04ae04fd22e0007a272821f7a7a861678117c2ec19cc6402ffad054d1ede439511608bee093c0d39e9d2c4a9e353be14840773b59bd0ee35346d066b667ba
-  data.tar.gz: 658d4e3a4c6cfe4ef831895e9e0c9568b1f123d7212e324cd14e27a2928e3bcad11b2af7b2ecfa504f05699d9b120126b6dcc66e1085c7730422229692674106
+  metadata.gz: fa347e54e198f0f0ba725d82976c8b7fbbd3ca68a3b189a4c0dca453d07894568f7717f3617e3b141046cca416e6e49dec5410267e7da2939b1a6f7c67844b65
+  data.tar.gz: a455b27ede3021c35852d08153e4a22407530ee4eec6e8c479cfb1f7bc139e1864ba75a784962848dc6ac7c67c0efdfcf72aa12591bcc7b8115b01d8e93e332e

data/lib/txgh/handlers/triggers/handler.rb

@@ -46,20 +46,6 @@ module Txgh
           @logger = options[:logger]
         end
 
-        private
-
-        def branch_resource
-          @branch_resource ||= TxBranchResource.new(resource, branch)
-        end
-
-        def resource
-          @resource ||= tx_config.resource(resource_slug)
-        end
-
-        def tx_config
-          @tx_config ||= Txgh::Config::TxManager.tx_config(project, repo, branch)
-        end
-
       end
     end
   end

data/lib/txgh/handlers/triggers/pull_handler.rb

@@ -4,25 +4,14 @@ module Txgh
       class PullHandler < Handler
 
         def execute
-          languages.each do |language|
-            next unless project.supported_language?(language['language_code'])
-
-            committer.commit_resource(
-              branch_resource, branch, language['language_code']
-            )
-          end
-
+          puller.pull_slug(resource_slug)
           respond_with(200, true)
         end
 
         private
 
-        def committer
-          @committer ||= Txgh::ResourceCommitter.new(project, repo, logger)
-        end
-
-        def languages
-          @languages ||= project.api.get_languages(project.name)
+        def puller
+          @puller ||= Txgh::Puller.new(project, repo, branch)
         end
 
       end

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

@@ -4,15 +4,14 @@ module Txgh
       class PushHandler < Handler
 
         def execute
-          ref = repo.api.get_ref(repo.name, branch)
-          updater.update_resource(branch_resource, ref[:object][:sha])
+          pusher.push_slug(resource_slug)
           respond_with(200, true)
         end
 
         private
 
-        def updater
-          @updater ||= Txgh::ResourceUpdater.new(project, repo, logger)
+        def pusher
+          @pusher ||= Txgh::Pusher.new(project, repo, branch)
         end
 
       end

data/lib/txgh/puller.rb

@@ -0,0 +1,57 @@
+module Txgh
+  class Puller
+    attr_reader :project, :repo, :branch
+
+    def initialize(project, repo, branch = nil)
+      @project = project
+      @repo = repo
+      @branch = branch
+    end
+
+    def pull
+      tx_config.resources.each do |tx_resource|
+        if repo.process_all_branches?
+          tx_resource = Txgh::TxBranchResource.new(tx_resource, branch)
+        end
+
+        pull_resource(tx_resource)
+      end
+    end
+
+    def pull_resource(tx_resource)
+      each_language do |language_code|
+        committer.commit_resource(tx_resource, branch, language_code)
+      end
+    end
+
+    def pull_slug(resource_slug)
+      pull_resource(tx_config.resource(resource_slug, branch))
+    end
+
+    private
+
+    def committer
+      @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
+
+    def tx_config
+      @tx_config ||= Txgh::Config::TxManager.tx_config(project, repo, branch)
+    end
+  end
+end

data/lib/txgh/pusher.rb

@@ -0,0 +1,40 @@
+module Txgh
+  class Pusher
+    attr_reader :project, :repo, :branch
+
+    def initialize(project, repo, branch = nil)
+      @project = project
+      @repo = repo
+      @branch = branch
+    end
+
+    def push
+      tx_config.resources.each do |tx_resource|
+        if repo.process_all_branches?
+          tx_resource = Txgh::TxBranchResource.new(tx_resource, branch)
+        end
+
+        push_resource(tx_resource)
+      end
+    end
+
+    def push_resource(tx_resource)
+      ref = repo.api.get_ref(repo.name, branch || repo.branch)
+      updater.update_resource(tx_resource, ref[:object][:sha])
+    end
+
+    def push_slug(resource_slug)
+      push_resource(tx_config.resource(resource_slug, branch))
+    end
+
+    private
+
+    def updater
+      @updater ||= Txgh::ResourceUpdater.new(project, repo)
+    end
+
+    def tx_config
+      @tx_config ||= Txgh::Config::TxManager.tx_config(project, repo, branch)
+    end
+  end
+end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/lib/txgh.rb

@@ -16,6 +16,8 @@ module Txgh
   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 :ResourceDownloader,    'txgh/resource_downloader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -212,6 +212,8 @@ files:
 - 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_downloader.rb