embulk-input-jira 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c5410e3708624d8c297422cbe1e1551964fd41
-  data.tar.gz: b29d96f3a03d59786269c4e1799888761f3afb95
+  metadata.gz: 14d965de93b1ed1a36384160c678009c61e87f12
+  data.tar.gz: cc230ada4b25382dc40ce20912f9e87181e8ca72
 SHA512:
-  metadata.gz: 76b46642effb1df89e29d8a2cd7fd60ac2321dd2f0f5736fff448836d11f427239d8c829ffdd3635965a82b3e3d95b5492a4e82180cb52de3a19f92e2201e40c
-  data.tar.gz: 1a292c77fa20cef49500dadc2dde6929f6aa7bdf0be8f732e3e32049664c6eeb1815293443aa006b5546681fbde876817f667f90ff3f24dc5d7ee485a2d69ca8
+  metadata.gz: 207f74f545d0d951ef5f8644f3557d3a60d6e1599e184eb88a6bcc6d491e38c55482350c6301e73651c8faf08dc572ad53f82dc82e53ada8fe683472fb81e491
+  data.tar.gz: 9cd3d4d3b4ac8909945d6de6e67b24c309ddcf00a457410d9abc6f564bdacbf7153947fc79fd4f341808faa5876d25de6a1d745c4d7e57e2e34b6f4c9f3f0ed2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.5 - 2015-06-24
+
+**Embulk 0.6.12+ is required since this version**
+
+* [enhancement] Follow embulk 0.6.12 [#29](https://github.com/treasure-data/embulk-input-jira/pull/29)
+* [maintenance] Separate preview method [#32](https://github.com/treasure-data/embulk-input-jira/pull/32)
+* [maintenance] Restructure files [#30](https://github.com/treasure-data/embulk-input-jira/pull/30)
+
 ## 0.0.4 - 2015-06-22
 * [enhancement] Add more schema generated by guess command [#27](https://github.com/treasure-data/embulk-input-jira/pull/27)
 

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org/'
 
 # NOTE: Bundler.require(:runtime, :development) in spec_helper that require all dependencies
 #       but require 'embulk' will be failed. so separate it from gemspec ecosystem
-gem 'embulk', ">= 0.6", "< 1.0"
+gem 'embulk', ">= 0.6.12", "< 1.0"
 gem "codeclimate-test-reporter", require: nil
 
 gemspec

data/README.md

@@ -8,6 +8,8 @@ embulk-input-jira is the Embulk input plugin for [JIRA](https://www.atlassian.co
 
 ## Overview
 
+Required Embulk version >= 0.6.12
+
 * **Plugin type**: input
 * **Resume supported**: no
 * **Cleanup supported**: no

data/Rakefile

@@ -3,7 +3,6 @@ require 'rspec/core/rake_task'
 require "json"
 require "pathname"
 require "open-uri"
-require File.expand_path("../lib/embulk/input/jira/version.rb", __FILE__)
 
 
 task default: :spec
@@ -18,11 +17,12 @@ namespace :release do
   task :prepare do
     root_dir = Pathname.new(File.expand_path("../", __FILE__))
     changelog_file = root_dir.join("CHANGELOG.md")
+    gemspec_file = root_dir.join("embulk-input-jira.gemspec")
 
     system("git fetch origin")
 
     # detect merged PR
-    old_version = Embulk::Input::Jira::VERSION
+    old_version = gemspec_file.read[/spec\.version += *"([0-9]+\.[0-9]+\.[0-9]+)"/, 1]
     pr_numbers = `git log v#{old_version}..origin/master --oneline`.scan(/#[0-9]+/)
 
     if !$?.success? || pr_numbers.empty?
@@ -51,10 +51,9 @@ HEADER
     File.open(changelog_file, "w") {|f| f.write(new_changelog) }
 
     # Update version.rb
-    version_file = root_dir.join("./lib/embulk/input/jira/version.rb")
-    old_content = version_file.read
-    File.open(version_file, "w") do |f|
-      f.write old_content.gsub(old_version, new_version)
+    old_content = gemspec_file.read
+    File.open(gemspec_file, "w") do |f|
+      f.write old_content.gsub(/(spec\.version += *)".*?"/, %Q!\\1"#{new_version}"!)
     end
 
     # Update Gemfile.lock

data/embulk-input-jira.gemspec

@@ -1,8 +1,6 @@
-require File.expand_path("../lib/embulk/input/jira/version.rb", __FILE__)
-
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-jira"
-  spec.version       = Embulk::Input::Jira::VERSION
+  spec.version       = "0.0.5"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Jira input plugin for Embulk"
   spec.description   = "Loads records from Jira."

data/lib/embulk/input/jira.rb

@@ -1,9 +1,143 @@
-require "embulk/input/jira_input_plugin"
-require "embulk/input/jira/version"
+require "embulk/input/jira_input_plugin_utils"
+require "embulk/input/jira_api"
 
 module Embulk
   module Input
-    module Jira
+    class Jira < InputPlugin
+      PER_PAGE = 50
+      GUESS_RECORDS_COUNT = 10
+      PREVIEW_RECORDS_COUNT = 15
+
+      Plugin.register_input("jira", self)
+
+      def self.transaction(config, &control)
+        task = {
+          "username" => config.param("username", :string),
+          "password" => config.param("password", :string),
+          "uri" => config.param("uri", :string),
+          "jql" => config.param("jql", :string),
+        }
+
+        attributes = {}
+        columns = config.param("columns", :array).map do |column|
+          name = column["name"]
+          type = column["type"].to_sym
+          attributes[name] = type
+          Column.new(nil, name, type, column["format"])
+        end
+
+        task["attributes"] = attributes
+
+        resume(task, columns, 1, &control)
+      end
+
+      def self.resume(task, columns, count, &control)
+        commit_reports = yield(task, columns, count)
+
+        next_config_diff = {}
+        return next_config_diff
+      end
+
+      def self.guess(config)
+        # TODO: api_version should be 2 (the latest version)
+        # auth_type should be specified from config. (The future task)
+
+        username = config.param("username", :string)
+        password = config.param("password", :string)
+        uri = config.param("uri", :string)
+        api_version = "latest"
+        auth_type = "basic"
+        jql = config.param("jql", :string)
+
+        jira = JiraApi::Client.setup do |jira_config|
+          jira_config.username = username
+          jira_config.password = password
+          jira_config.uri = uri
+          jira_config.api_version = api_version
+          jira_config.auth_type = auth_type
+        end
+
+        # TODO: we use 0..10 issues to guess config?
+        records = jira.search_issues(jql, max_results: GUESS_RECORDS_COUNT).map do |issue|
+          issue.to_record
+        end
+
+        columns = JiraInputPluginUtils.guess_columns(records)
+
+        guessed_config = {
+          "columns" => columns,
+        }
+
+        return guessed_config
+      end
+
+      def init
+        @attributes = task["attributes"]
+        @jira = JiraApi::Client.setup do |config|
+          config.username = task["username"]
+          config.password = task["password"]
+          config.uri = task["uri"]
+          config.api_version = "latest"
+          config.auth_type = :basic
+        end
+        @jql = task["jql"]
+      end
+
+      def run
+        return preview if preview?
+        options = {}
+        total_count = @jira.total_count(@jql)
+        last_page = (total_count.to_f / PER_PAGE).ceil
+
+        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)
+            end
+
+            page_builder.add(values)
+          end
+        end
+
+        page_builder.finish
+
+        commit_report = {}
+        return commit_report
+      end
+
+      def self.logger
+        Embulk.logger
+      end
+
+      def logger
+        self.class.logger
+      end
+
+      private
+
+      def preview
+        logger.debug "For preview mode, JIRA input plugin fetches records at most #{PREVIEW_RECORDS_COUNT}"
+        @jira.search_issues(@jql, max_results: PREVIEW_RECORDS_COUNT).each do |issue|
+          values = @attributes.map do |(attribute_name, type)|
+            JiraInputPluginUtils.cast(issue[attribute_name], type)
+          end
+          page_builder.add(values)
+        end
+        page_builder.finish
+
+        commit_report = {}
+        return commit_report
+      end
+
+      def preview?
+        begin
+          # http://www.embulk.org/docs/release/release-0.6.12.html
+          org.embulk.spi.Exec.isPreview()
+        rescue java.lang.NullPointerException => e
+          false
+        end
+      end
     end
   end
 end

data/lib/embulk/input/jira_api.rb

@@ -0,0 +1,9 @@
+require "embulk/input/jira_api/client"
+require "embulk/input/jira_api/issue"
+
+module Embulk
+  module Input
+    module JiraApi
+    end
+  end
+end

data/lib/embulk/input/{jira/api.rb → jira_api/client.rb}

@@ -1,11 +1,11 @@
 require "jiralicious"
-require "embulk/input/jira/issue"
+require "embulk/input/jira_api/issue"
 require "timeout"
 
 module Embulk
   module Input
-    module Jira
-      class Api
+    module JiraApi
+      class Client
         SEARCH_TIMEOUT_SECONDS = 5
         SEARCH_ISSUES_TIMEOUT_SECONDS = 60
         DEFAULT_SEARCH_RETRY_TIMES = 10
@@ -18,7 +18,7 @@ module Embulk
         def search_issues(jql, options={})
           timeout_and_retry(SEARCH_ISSUES_TIMEOUT_SECONDS) do
             search(jql, options).issues.map do |issue|
-              Jira::Issue.new(issue)
+              JiraApi::Issue.new(issue)
             end
           end
         end

data/lib/embulk/input/{jira → jira_api}/issue.rb

@@ -1,6 +1,6 @@
 module Embulk
   module Input
-    module Jira
+    module JiraApi
       class Issue
         attr_reader :id, :key, :fields
 

data/spec/embulk/input/{jira/api_spec.rb → jira_api/client_spec.rb}

@@ -1,11 +1,11 @@
 require "spec_helper"
 
-describe Embulk::Input::Jira::Api do
+describe Embulk::Input::JiraApi::Client do
   describe ".setup" do
-    subject { Embulk::Input::Jira::Api.setup {}  }
+    subject { Embulk::Input::JiraApi::Client.setup {}  }
 
-    it "returns Embulk::Input::Jira::Api instance" do
-      expect(subject.is_a?(Embulk::Input::Jira::Api)).to be_truthy
+    it "returns Embulk::Input::JiraApi::Client instance" do
+      expect(subject.is_a?(Embulk::Input::JiraApi::Client)).to be_truthy
     end
 
     it "calls Jiralicious.configure" do
@@ -15,7 +15,7 @@ describe Embulk::Input::Jira::Api do
 
   describe "#search" do
     let(:jql) { "project=FOO" }
-    let(:api) { Embulk::Input::Jira::Api.new }
+    let(:api) { Embulk::Input::JiraApi::Client.new }
 
     subject { api.search(jql) }
 
@@ -30,7 +30,7 @@ describe Embulk::Input::Jira::Api do
       end
 
       it "retry DEFAULT_SEARCH_RETRY_TIMES times then raise error" do
-        expect(Timeout).to receive(:timeout).exactly(Embulk::Input::Jira::Api::DEFAULT_SEARCH_RETRY_TIMES)
+        expect(Timeout).to receive(:timeout).exactly(Embulk::Input::JiraApi::Client::DEFAULT_SEARCH_RETRY_TIMES)
         expect { subject }.to raise_error
       end
     end
@@ -67,20 +67,20 @@ describe Embulk::Input::Jira::Api do
       ]
     end
 
-    subject { Embulk::Input::Jira::Api.new.search_issues(jql) }
+    subject { Embulk::Input::JiraApi::Client.new.search_issues(jql) }
 
     it do
       allow(Jiralicious).to receive_message_chain(:search, :issues).and_return(results)
 
       expect(subject).to be_kind_of Array
-      expect(subject.map(&:class)).to match_array [Embulk::Input::Jira::Issue, Embulk::Input::Jira::Issue]
+      expect(subject.map(&:class)).to match_array [Embulk::Input::JiraApi::Issue, Embulk::Input::JiraApi::Issue]
     end
   end
 
   describe "#total_count" do
     subject { jira_api.total_count(jql) }
 
-    let(:jira_api) { Embulk::Input::Jira::Api.new }
+    let(:jira_api) { Embulk::Input::JiraApi::Client.new }
     let(:jql) { "project=FOO" }
     let(:results) { Object.new } # add mock later
     let(:results_count) { 5 }
@@ -89,7 +89,7 @@ describe Embulk::Input::Jira::Api do
       allow(results).to receive(:num_results).and_return(results_count)
     end
 
-    it "calls Embulk::Input::Jira::Api#search with proper arguments" do
+    it "calls Embulk::Input::JiraApi::Client#search with proper arguments" do
       expect(jira_api).to receive(:search).with(jql, max_results: 1).and_return(results)
       subject
     end
@@ -103,7 +103,7 @@ describe Embulk::Input::Jira::Api do
   describe "#timeout_and_retry" do
     let(:wait) { 1 }
     let(:retry_times) { 3 }
-    let(:jira_api) { Embulk::Input::Jira::Api.new }
+    let(:jira_api) { Embulk::Input::JiraApi::Client.new }
     let(:block) { proc{ "it works" } }
 
     subject { jira_api.send(:timeout_and_retry, wait, retry_times, &block) }

data/spec/embulk/input/{jira → jira_api}/issue_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Embulk::Input::Jira::Issue do
+describe Embulk::Input::JiraApi::Issue do
   describe ".initialize" do
     context "when argument has 'fields' key" do
       let(:issue_attributes) do
@@ -19,15 +19,15 @@ describe Embulk::Input::Jira::Issue do
       end
 
       it "has @id with argument['id']" do
-        expect(Embulk::Input::Jira::Issue.new(issue_attributes).id).to eq issue_attributes["id"]
+        expect(Embulk::Input::JiraApi::Issue.new(issue_attributes).id).to eq issue_attributes["id"]
       end
 
       it "has @key with argument['jira_key']" do
-        expect(Embulk::Input::Jira::Issue.new(issue_attributes).key).to eq issue_attributes["jira_key"]
+        expect(Embulk::Input::JiraApi::Issue.new(issue_attributes).key).to eq issue_attributes["jira_key"]
       end
 
       it "has @fields with argument['fields']" do
-        expect(Embulk::Input::Jira::Issue.new(issue_attributes).fields).to eq issue_attributes["fields"]
+        expect(Embulk::Input::JiraApi::Issue.new(issue_attributes).fields).to eq issue_attributes["fields"]
       end
     end
 
@@ -37,13 +37,13 @@ describe Embulk::Input::Jira::Issue do
       end
 
       it "raises error" do
-        expect { Embulk::Input::Jira::Issue.new(issue_attributes) }.to raise_error
+        expect { Embulk::Input::JiraApi::Issue.new(issue_attributes) }.to raise_error
       end
     end
   end
 
   describe "#[]" do
-    subject { Embulk::Input::Jira::Issue.new(issue_attributes)[attribute_name] }
+    subject { Embulk::Input::JiraApi::Issue.new(issue_attributes)[attribute_name] }
 
     let(:issue_attributes) do
       {
@@ -188,7 +188,7 @@ describe Embulk::Input::Jira::Issue do
 
   describe "#to_record" do
     subject do
-      Embulk::Input::Jira::Issue.new(issue_attributes).to_record
+      Embulk::Input::JiraApi::Issue.new(issue_attributes).to_record
     end
 
     shared_examples 'return guessed record' do

data/spec/embulk/input/{jira_input_plugin_spec.rb → jira_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Embulk::Input::JiraInputPlugin do
+describe Embulk::Input::Jira do
   let(:username) { "jira-user" }
   let(:password) { "password" }
   let(:uri) { "http://jira.example/" }
@@ -8,7 +8,7 @@ describe Embulk::Input::JiraInputPlugin do
   let(:project_name) { "FOO" }
 
   describe ".transaction" do
-    subject { Embulk::Input::JiraInputPlugin.transaction(config, &control) }
+    subject { described_class.transaction(config, &control) }
 
     let(:config) { Object.new } # add mock later
     let(:control) { Proc.new{|task, columns, count| } } # do nothing
@@ -50,13 +50,13 @@ describe Embulk::Input::JiraInputPlugin do
 
     # NOTE: I should check other factor, but i don't know it...
     it "calls .resume method with proper parameters" do
-      expect(Embulk::Input::JiraInputPlugin).to receive(:resume).with(task, column_structs, 1, &control)
+      expect(described_class).to receive(:resume).with(task, column_structs, 1, &control)
       subject
     end
   end
 
   describe ".resume" do
-    subject { Embulk::Input::JiraInputPlugin.resume(task, columns, count, &control) }
+    subject { described_class.resume(task, columns, count, &control) }
 
     let(:task) do
       {
@@ -89,12 +89,12 @@ describe Embulk::Input::JiraInputPlugin do
   end
 
   describe ".guess" do
-    subject { Embulk::Input::JiraInputPlugin.guess(config) }
+    subject { described_class.guess(config) }
 
     let(:config) { Object.new } # add mock later
 
-    let(:jira_api) { Embulk::Input::Jira::Api.new }
-    let(:jira_issues) { [Embulk::Input::Jira::Issue.new(attributes)] }
+    let(:jira_api) { Embulk::Input::JiraApi::Client.new }
+    let(:jira_issues) { [Embulk::Input::JiraApi::Issue.new(attributes)] }
     let(:attributes) do
       {
         "id" => "100",
@@ -127,7 +127,7 @@ describe Embulk::Input::JiraInputPlugin do
     end
 
     before do
-      allow(jira_api).to receive(:search_issues).with(jql, max_results: Embulk::Input::JiraInputPlugin::GUESS_RECORDS_COUNT).and_return(jira_issues)
+      allow(jira_api).to receive(:search_issues).with(jql, max_results: described_class::GUESS_RECORDS_COUNT).and_return(jira_issues)
 
       allow(config).to receive(:param).with("username", :string).and_return(username)
       allow(config).to receive(:param).with("password", :string).and_return(password)
@@ -135,13 +135,13 @@ describe Embulk::Input::JiraInputPlugin do
       allow(config).to receive(:param).with("jql", :string).and_return(jql)
     end
 
-    it "setup Embulk::Input::Jira::Api" do
-      expect(Embulk::Input::Jira::Api).to receive(:setup).and_return(jira_api)
+    it "setup Embulk::Input::JiraApi::Client" do
+      expect(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
       subject
     end
 
     it "returns guessed config" do
-      allow(Embulk::Input::Jira::Api).to receive(:setup).and_return(jira_api)
+      allow(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
 
       expect(subject).to eq guessed_config
     end
@@ -150,39 +150,39 @@ describe Embulk::Input::JiraInputPlugin do
   describe "#init (.new)" do
     # NOTE: InputPlugin.initialize calls #init method.
 
-    subject { Embulk::Input::JiraInputPlugin.new({}, nil, nil, nil) }
+    subject { described_class.new({}, nil, nil, nil) }
 
-    it "setup Embulk::Input::Jira::Api" do
-      expect(Embulk::Input::Jira::Api).to receive(:setup)
+    it "setup Embulk::Input::JiraApi::Client" do
+      expect(Embulk::Input::JiraApi::Client).to receive(:setup)
       subject
     end
 
     it "is a Embulk::InputPlugin" do
-      allow(Embulk::Input::Jira::Api).to receive(:setup)
+      allow(Embulk::Input::JiraApi::Client).to receive(:setup)
       expect(subject).to be_a(Embulk::InputPlugin)
     end
   end
 
   describe "#run" do
     subject do
-      result = nil
-      capture_output(:out) do
-        result = Embulk::Input::JiraInputPlugin.new(task, nil, nil, page_builder).run
+      allow(plugin).to receive(:logger).and_return(::Logger.new(File::NULL))
+      silence do
+        plugin.run
       end
-      result
     end
 
-    let(:jira_api) { Embulk::Input::Jira::Api.new }
+    let(:plugin) { described_class.new(task, nil, nil, page_builder) }
+    let(:jira_api) { Embulk::Input::JiraApi::Client.new }
     let(:jira_issues) do
       (1..total_count).map do |i|
         attributes = fields.merge("id" => i.to_s, "jira_key" => "FOO-#{i}")
 
-        Embulk::Input::Jira::Issue.new(attributes)
+        Embulk::Input::JiraApi::Issue.new(attributes)
       end
     end
 
     let(:total_count) { max_result + 10 }
-    let(:max_result) { Embulk::Input::JiraInputPlugin::PER_PAGE }
+    let(:max_result) { described_class::PER_PAGE }
 
 
     let(:page_builder) { Object.new } # add mock later
@@ -207,10 +207,10 @@ describe Embulk::Input::JiraInputPlugin do
     let(:commit_report) { {} }
 
     before do
-      allow(org.embulk.spi.Exec).to receive_message_chain(:session, :isPreview).and_return(false)
+      allow(jira_api).to receive(:preview?).and_return(false)
 
       # TODO: create stubs without each `it` expected
-      allow(Embulk::Input::Jira::Api).to receive(:setup).and_return(jira_api)
+      allow(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
 
       0.step(total_count, max_result) do |start_at|
         issues = jira_issues[start_at..(start_at + max_result - 1)]
@@ -236,22 +236,76 @@ describe Embulk::Input::JiraInputPlugin do
     it 'returns commit report' do
       expect(subject).to eq commit_report
     end
+
+  end
+
+  describe "preview" do
+    let(:plugin) { described_class.new(task, nil, nil, page_builder) }
+    let(:task) do
+      {
+        "jql" => jql,
+        "attributes" => {"project.key" => "string"}
+      }
+    end
+    let(:page_builder) { double("page_builder") }
+    let(:jira_api) { Embulk::Input::JiraApi::Client.new }
+    let(:jira_issues) { [Embulk::Input::JiraApi::Issue.new(attributes)] }
+    let(:attributes) do
+      {
+        "id" => "100",
+        "jira_key" => "FOO-100",
+        "fields" =>
+        {
+          "project" => {
+            "name" => project_name,
+            "key" => project_name,
+          },
+          "comment" => {
+            "total" => 0,
+            "comments" => []
+          }
+        }
+      }
+    end
+
+
+    subject { plugin.run }
+
+    before do
+      allow(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
+      allow(plugin).to receive(:logger).and_return(::Logger.new(File::NULL))
+      allow(plugin).to receive(:preview?).and_return(true)
+      allow(jira_api).to receive(:search_issues).and_return(jira_issues)
+      allow(page_builder).to receive(:add)
+      allow(page_builder).to receive(:finish)
+    end
+
+    it "max_results with PREVIEW_RECORDS_COUNT" do
+      expect(jira_api).to receive(:search_issues).with(jql, max_results: Embulk::Input::Jira::PREVIEW_RECORDS_COUNT)
+      subject
+    end
+
+    it "call page_builder.add and page_builder.finish" do
+      expect(page_builder).to receive(:add).exactly(jira_issues.length).times
+      expect(page_builder).to receive(:finish)
+      subject
+    end
   end
 
   describe ".logger" do
-    let(:logger) { Embulk::Input::JiraInputPlugin.logger }
+    let(:logger) { described_class.logger }
 
     subject { logger }
 
-    it { is_expected.to be_a(Logger) }
+    it { is_expected.to be_a(Embulk::Logger) }
   end
 
   describe "#logger" do
-    let(:instance) { Embulk::Input::JiraInputPlugin.new({}, nil, nil, nil) }
+    let(:instance) { described_class.new({}, nil, nil, nil) }
     let(:logger) { instance.logger }
 
     subject { logger }
 
-    it { is_expected.to be_a(Logger) }
+    it { is_expected.to be_a(Embulk::Logger) }
   end
 end

data/spec/embulk_spec.rb

@@ -11,11 +11,11 @@ in:
     before do
       config_file.puts config
       config_file.close
-      allow(org.embulk.spi.Exec).to receive_message_chain(:session, :isPreview).and_return(true)
+      allow(org.embulk.spi.Exec).to receive(:isPreview).and_return(true)
     end
 
     subject {
-      capture_output(:out) do
+      capture(:out) do
         Embulk.run ["preview", config_file.path]
       end
     }

data/spec/support/stdout_and_err_capture.rb

@@ -1,5 +1,18 @@
 module StdoutAndErrCapture
-  def capture_output(output = :out, &block)
+  def capture(output = :out, &block)
+    _, out = swap_io(output, &block)
+    out
+  end
+
+  def silence(&block)
+    block_result = nil
+    swap_io(:out) do
+      block_result,_ = swap_io(:err, &block)
+    end
+    block_result
+  end
+
+  def swap_io(output = :out, &block)
     java_import 'java.io.PrintStream'
     java_import 'java.io.ByteArrayOutputStream'
     java_import 'java.lang.System'
@@ -12,21 +25,21 @@ module StdoutAndErrCapture
     case output
     when :out
       $stdout = ruby_buf
+      System.setOut(PrintStream.new(java_buf))
     when :err
       $stderr = ruby_buf
+      System.setErr(PrintStream.new(java_buf))
     end
-    System.setOut(PrintStream.new(java_buf))
-
-    block.call
 
-    ruby_buf.string + java_buf.toString
+    [block.call, ruby_buf.string + java_buf.toString]
   ensure
-    System.setOut(java_original_stream)
     case output
     when :out
       $stdout = ruby_original_stream
+      System.setOut(java_original_stream)
     when :err
       $stderr = ruby_original_stream
+      System.setErr(java_original_stream)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -112,15 +112,14 @@ files:
 - Rakefile
 - embulk-input-jira.gemspec
 - lib/embulk/input/jira.rb
-- lib/embulk/input/jira/api.rb
-- lib/embulk/input/jira/issue.rb
-- lib/embulk/input/jira/version.rb
-- lib/embulk/input/jira_input_plugin.rb
+- lib/embulk/input/jira_api.rb
+- lib/embulk/input/jira_api/client.rb
+- lib/embulk/input/jira_api/issue.rb
 - lib/embulk/input/jira_input_plugin_utils.rb
 - spec/embulk/input/jira-input-plugin-utils_spec.rb
-- spec/embulk/input/jira/api_spec.rb
-- spec/embulk/input/jira/issue_spec.rb
-- spec/embulk/input/jira_input_plugin_spec.rb
+- spec/embulk/input/jira_api/client_spec.rb
+- spec/embulk/input/jira_api/issue_spec.rb
+- spec/embulk/input/jira_spec.rb
 - spec/embulk_spec.rb
 - spec/spec_helper.rb
 - spec/support/prepare_embulk.rb
@@ -151,9 +150,9 @@ specification_version: 4
 summary: Jira input plugin for Embulk
 test_files:
 - spec/embulk/input/jira-input-plugin-utils_spec.rb
-- spec/embulk/input/jira/api_spec.rb
-- spec/embulk/input/jira/issue_spec.rb
-- spec/embulk/input/jira_input_plugin_spec.rb
+- spec/embulk/input/jira_api/client_spec.rb
+- spec/embulk/input/jira_api/issue_spec.rb
+- spec/embulk/input/jira_spec.rb
 - spec/embulk_spec.rb
 - spec/spec_helper.rb
 - spec/support/prepare_embulk.rb

data/lib/embulk/input/jira/version.rb

@@ -1,7 +0,0 @@
-module Embulk
-  module Input
-    module Jira
-      VERSION = "0.0.4".freeze
-    end
-  end
-end

data/lib/embulk/input/jira_input_plugin.rb

@@ -1,135 +0,0 @@
-require "embulk/input/jira_input_plugin_utils"
-require "embulk/input/jira/api"
-require "logger"
-require "time"
-
-module Embulk
-  module Input
-    class JiraInputPlugin < InputPlugin
-      PER_PAGE = 50
-      GUESS_RECORDS_COUNT = 10
-      PREVIEW_RECORDS_COUNT = 15
-
-      Plugin.register_input("jira", self)
-
-      def self.transaction(config, &control)
-        task = {
-          "username" => config.param("username", :string),
-          "password" => config.param("password", :string),
-          "uri" => config.param("uri", :string),
-          "jql" => config.param("jql", :string),
-        }
-
-        attributes = {}
-        columns = config.param("columns", :array).map do |column|
-          name = column["name"]
-          type = column["type"].to_sym
-          attributes[name] = type
-          Column.new(nil, name, type, column["format"])
-        end
-
-        task["attributes"] = attributes
-
-        resume(task, columns, 1, &control)
-      end
-
-      def self.resume(task, columns, count, &control)
-        commit_reports = yield(task, columns, count)
-
-        next_config_diff = {}
-        return next_config_diff
-      end
-
-      def self.guess(config)
-        # TODO: api_version should be 2 (the latest version)
-        # auth_type should be specified from config. (The future task)
-
-        username = config.param("username", :string)
-        password = config.param("password", :string)
-        uri = config.param("uri", :string)
-        api_version = "latest"
-        auth_type = "basic"
-        jql = config.param("jql", :string)
-
-        jira = Jira::Api.setup do |jira_config|
-          jira_config.username = username
-          jira_config.password = password
-          jira_config.uri = uri
-          jira_config.api_version = api_version
-          jira_config.auth_type = auth_type
-        end
-
-        # TODO: we use 0..10 issues to guess config?
-        records = jira.search_issues(jql, max_results: GUESS_RECORDS_COUNT).map do |issue|
-          issue.to_record
-        end
-
-        columns = JiraInputPluginUtils.guess_columns(records)
-
-        guessed_config = {
-          "columns" => columns,
-        }
-
-        return guessed_config
-      end
-
-      def init
-        @attributes = task["attributes"]
-        @jira = Jira::Api.setup do |config|
-          config.username = task["username"]
-          config.password = task["password"]
-          config.uri = task["uri"]
-          config.api_version = "latest"
-          config.auth_type = :basic
-        end
-        @jql = task["jql"]
-      end
-
-      def run
-        # NOTE: This is workaround for "org.embulk.spi.Exec.isPreview"
-        # TODO: Extract process for preview command to method
-        if org.embulk.spi.Exec.session().isPreview()
-          options = {max_results: PREVIEW_RECORDS_COUNT}
-          total_count = PREVIEW_RECORDS_COUNT
-          last_page = 1
-          logger.debug "For preview mode, JIRA input plugin fetches records at most #{PREVIEW_RECORDS_COUNT}"
-        else
-          options = {}
-          total_count = @jira.total_count(@jql)
-          last_page = (total_count.to_f / PER_PAGE).ceil
-        end
-
-        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)
-            end
-
-            page_builder.add(values)
-          end
-        end
-
-        page_builder.finish
-
-        commit_report = {}
-        return commit_report
-      end
-
-      def self.logger
-        @logger ||=
-          begin
-            logger = Logger.new($stdout)
-            logger.formatter = proc do |severity, datetime, progname, msg|
-              "#{datetime.strftime("%Y-%m-%d %H:%M:%S.%L %z")} [#{severity}] #{msg}\n"
-            end
-            logger
-          end
-      end
-
-      def logger
-        self.class.logger
-      end
-    end
-  end
-end