embulk-input-jira 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca9d7bf53b7dfbddcab977bd9eabfd501101f598
-  data.tar.gz: eb730c8f99fec521569b2e41d62f4b37259be270
+  metadata.gz: cadf45e98287f889deb94f4bfbd0e7d59f5d4d20
+  data.tar.gz: 6d984f2036a083042d1d281fcb7dd83160cc20bd
 SHA512:
-  metadata.gz: fa62f3678e0bdb883b86ef423e4d3e35a739099752f8efe990ae2cf62eba312b0774001ce29d1def0f8e91fb817938838c5278e64d7b041f4843e721728791c5
-  data.tar.gz: 2485a99590ab6e6933e8d4c8c85c83244a8037ac0afaef8979e0bf96c07e4ea72bd84a1c98424422f7725c6e2d6720b650479a5ff6a9993ad10a3a7838dad57f
+  metadata.gz: 2f80d9490c44aa09d7a1edef199cce5e9bdf28d9e42caea371a593b68c52b69bad570c3c87f6c8269b53dfca980a8d19d6c9f65d7ab7088c022002a90ee16fb6
+  data.tar.gz: 15a60a4562600873deffa9415df7bc5c8c8ab2ab3e78907e01208d521a09c3596d7a92b87190371f823c97e39ff9141ba42337e0bd302ef5cffe3303304c22d5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0 - 2015-11-09
+
+* [enhancement] Add retry options and retry handling [#41](https://github.com/treasure-data/embulk-input-jira/pull/41)
+
 ## 0.0.7 - 2015-10-06
 
 * [enhancement] Supports embulk.0.7 [#40](https://github.com/treasure-data/embulk-input-jira/pull/40)

data/README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/treasure-data/embulk-input-jira.svg)](https://travis-ci.org/treasure-data/embulk-input-jira)
 [![Code Climate](https://codeclimate.com/github/treasure-data/embulk-input-jira/badges/gpa.svg)](https://codeclimate.com/github/treasure-data/embulk-input-jira)
 [![Test Coverage](https://codeclimate.com/github/treasure-data/embulk-input-jira/badges/coverage.svg)](https://codeclimate.com/github/treasure-data/embulk-input-jira/coverage)
+[![Gem Version](https://badge.fury.io/rb/embulk-input-jira.svg)](https://badge.fury.io/rb/embulk-input-jira)
 
 # Jira input plugin for Embulk
 
@@ -22,6 +23,8 @@ Required Embulk version >= 0.6.12
 - **uri** JIRA API endpoint (string, required)
 - **jql** [JQL](https://confluence.atlassian.com/display/JIRA/Advanced+Searching) for extract target issues (string, required)
 - **columns** target issue attributes. You can generate this configuration by `guess` command (array, required)
+- **retry_initial_wait_sec**: Wait seconds for exponential backoff initial value (integer, default: 1)
+- **retry_limit**: Try to retry this times (integer, default: 5)
 
 ## Example
 

data/embulk-input-jira.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-jira"
-  spec.version       = "0.0.7"
+  spec.version       = "0.1.0"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Jira input plugin for Embulk"
   spec.description   = "Loads records from Jira."
@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'jiralicious', ['~> 0.5.0']
   spec.add_dependency 'parallel', ['~> 1.6.0']
+  spec.add_dependency 'perfect_retry', ['~> 0.2']
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'rake', ['>= 10.0']
   spec.add_development_dependency 'rspec', "~> 3.2.0"

data/lib/embulk/input/jira.rb

@@ -1,3 +1,4 @@
+require "perfect_retry"
 require "embulk/input/jira_input_plugin_utils"
 require "embulk/input/jira_api"
 
@@ -27,6 +28,8 @@ module Embulk
         end
 
         task[:attributes] = attributes
+        task[:retry_limit] = config.param(:retry_limit, :integer, default: 5)
+        task[:retry_initial_wait_sec] = config.param(:retry_initial_wait_sec, :integer, default: 1)
 
         resume(task, columns, 1, &control)
       end
@@ -79,6 +82,11 @@ module Embulk
           config.auth_type = "basic"
         end
         @jql = task[:jql]
+        @retryer = PerfectRetry.new do |config|
+          config.limit = task[:retry_limit]
+          config.sleep = proc{|n| task[:retry_initial_wait_sec] ** n}
+          config.dont_rescues = [Embulk::ConfigError]
+        end
       end
 
       def run
@@ -89,12 +97,13 @@ module Embulk
 
         0.step(total_count, PER_PAGE).with_index(1) do |start_at, page|
           logger.debug "Fetching #{page} / #{last_page} page"
-          @jira.search_issues(@jql, options.merge(start_at: start_at)).each do |issue|
-            values = @attributes.map do |(attribute_name, type)|
-              JiraInputPluginUtils.cast(issue[attribute_name], type)
+          @retryer.with_retry do
+            @jira.search_issues(@jql, options.merge(start_at: start_at)).each do |issue|
+              values = @attributes.map do |(attribute_name, type)|
+                JiraInputPluginUtils.cast(issue[attribute_name], type)
+              end
+              page_builder.add(values)
             end
-
-            page_builder.add(values)
           end
         end
 

data/spec/embulk/input/jira_spec.rb

@@ -22,7 +22,9 @@ describe Embulk::Input::Jira do
         attributes: {
           "project.key" => :string,
           "comment.total" => :long
-        }
+        },
+        retry_limit: 5,
+        retry_initial_wait_sec: 1,
       }
     end
 
@@ -46,6 +48,8 @@ describe Embulk::Input::Jira do
       allow(config).to receive(:param).with(:uri, :string).and_return(uri)
       allow(config).to receive(:param).with(:jql, :string).and_return(jql)
       allow(config).to receive(:param).with(:columns, :array).and_return(columns)
+      allow(config).to receive(:param).with(:retry_limit, :integer, default: 5).and_return(5)
+      allow(config).to receive(:param).with(:retry_initial_wait_sec, :integer, default: 1).and_return(1)
     end
 
     # NOTE: I should check other factor, but i don't know it...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  name: perfect_retry
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: