embulk-input-jira 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37d6bfba4c1f808f3911a222698a62e87b1a6ec
-  data.tar.gz: 4348bce6dd5c2c293e090396f8375c4a520830cd
+  metadata.gz: 5e99c37b9c22a10ca74920b940eb2acf874d0676
+  data.tar.gz: b85987d31a8870a6136d14dd75f6b65605160211
 SHA512:
-  metadata.gz: e383256cdde3bb1623a7777ff4eb811842a8fb1a37a26ea8319a6c9e8f3d7ab5f9ec572b2ee55e7e648c4d923ede50655ea36b14ab3c411488b29bd6b5951923
-  data.tar.gz: 91d53c2b6ebf59b2ee8dd0888da96360c592b2b56be0349caae291dc8874fac2ed61bfab7778e1a666a410b250a4f99c4db9191bf907161eb912fcae495d3d70
+  metadata.gz: 010bff47e3e9c3a48c24d1da78ef835450f350d7b102969e5ab89c4847425e368719009bc70511f54d2f46347f70e9235883e3e383e3c54651fbfb5a86d193be
+  data.tar.gz: 6a99ada3fcfc2fc9d0b51484a40e85d6d51797a75964251714d9ebcc8d4f3b24f6f3e6f7af56097e329fd8647f9f7d9397587d827dfc10e1a273e658c9b32005

data/CHANGELOG.md

@@ -1,8 +1,13 @@
+## 0.0.3 - 2015-06-12
+* [enhancement] Limit records for guess and preview [#25](https://github.com/treasure-data/embulk-input-jira/pull/25)
+* [maintenance] Define version number as constant [#24](https://github.com/treasure-data/embulk-input-jira/pull/24)
+* [maintenance] Restructure file and class [#23](https://github.com/treasure-data/embulk-input-jira/pull/23)
+
 ## 0.0.2 - 2015-06-04
-* [maintenance] Add release:prepare task for development [#21](https://github.com/treasure-data/embulk-input-jira/pull/21) 
-* [enhancement] Add timeout and retry for JIRA API search [#20](https://github.com/treasure-data/embulk-input-jira/pull/20) 
+* [maintenance] Add release:prepare task for development [#21](https://github.com/treasure-data/embulk-input-jira/pull/21)
+* [enhancement] Add timeout and retry for JIRA API search [#20](https://github.com/treasure-data/embulk-input-jira/pull/20)
 * [enhancement] Display progress [#19](https://github.com/treasure-data/embulk-input-jira/pull/19) 
-* [maintenance] Remove needless guessed config [#18](https://github.com/treasure-data/embulk-input-jira/pull/18) 
+* [maintenance] Remove needless guessed config [#18](https://github.com/treasure-data/embulk-input-jira/pull/18)
 
 ## 0.0.1 - 2015-05-28
 

data/Rakefile

@@ -3,6 +3,7 @@ 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
@@ -16,13 +17,12 @@ namespace :release do
   desc "Add header of now version release to ChangeLog and bump up version"
   task :prepare do
     root_dir = Pathname.new(File.expand_path("../", __FILE__))
-    version_file = root_dir.join("VERSION")
     changelog_file = root_dir.join("CHANGELOG.md")
 
     system("git fetch origin")
 
     # detect merged PR
-    old_version = version_file.read.strip
+    old_version = Embulk::Input::Jira::VERSION
     pr_numbers = `git log v#{old_version}..origin/master --oneline`.scan(/#[0-9]+/)
 
     if !$?.success? || pr_numbers.empty?
@@ -38,7 +38,7 @@ namespace :release do
     pr_descriptions = pr_numbers.map do |number|
       body = open("https://api.github.com/repos/treasure-data/embulk-input-jira/issues/#{number.gsub("#", "")}").read
       payload = JSON.parse(body)
-      "* [] #{payload["title"]} [#{number}](https://github.com/treasure-data/embulk-input-jira/pull/#{number.gsub('#', '')}) "
+      "* [] #{payload["title"]} [#{number}](https://github.com/treasure-data/embulk-input-jira/pull/#{number.gsub('#', '')})"
     end.join("\n")
 
     new_changelog = <<-HEADER
@@ -51,7 +51,11 @@ HEADER
     File.open(changelog_file, "w") {|f| f.write(new_changelog) }
 
     # Update version.rb
-    File.open(version_file, "w") {|f| f.write new_version }
+    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)
+    end
 
     # Update Gemfile.lock
     system("bundle install")

data/embulk-input-jira.gemspec

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

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

@@ -0,0 +1,54 @@
+require "jiralicious"
+require "embulk/input/jira/issue"
+require "timeout"
+
+module Embulk
+  module Input
+    module Jira
+      class Api
+        SEARCH_TIMEOUT_SECONDS = 5
+        SEARCH_ISSUES_TIMEOUT_SECONDS = 60
+        DEFAULT_SEARCH_RETRY_TIMES = 10
+
+        def self.setup(&block)
+          Jiralicious.configure(&block)
+          new
+        end
+
+        def search_issues(jql, options={})
+          timeout_and_retry(SEARCH_ISSUES_TIMEOUT_SECONDS) do
+            search(jql, options).issues.map do |issue|
+              Jira::Issue.new(issue)
+            end
+          end
+        end
+
+        def search(jql, options={})
+          timeout_and_retry(SEARCH_TIMEOUT_SECONDS) do
+            Jiralicious.search(jql, options)
+          end
+        end
+
+        def total_count(jql)
+          search(jql, max_results: 1).num_results
+        end
+
+        private
+
+        def timeout_and_retry(wait, retry_times = DEFAULT_SEARCH_RETRY_TIMES, &block)
+          count = 1
+          begin
+            Timeout.timeout(wait) do
+              yield
+            end
+          rescue Timeout::Error => e
+            count += 1
+            sleep count # retry after some seconds for JIRA API perhaps under the overload
+            raise e if count > retry_times
+            retry
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+module Embulk
+  module Input
+    module Jira
+      class Issue
+        attr_reader :id, :key, :fields
+
+        def initialize(attributes)
+          @id = attributes.fetch("id")
+
+          # https://github.com/dorack/jiralicious/blob/404b7b6d5b7020f42064cf8d7a745ab02057e728/lib/jiralicious/issue.rb#L11-L12
+          @key = attributes.fetch("jira_key")
+          @fields = attributes.fetch("fields")
+        end
+
+        def [](attribute)
+          case attribute
+          when "id"
+            return id
+          when "key"
+            return key
+          end
+
+          chunk = fields
+          attribute.split('.').each do |key|
+            chunk = chunk[key]
+            return chunk if chunk.nil?
+          end
+
+          if chunk.is_a?(Array) || chunk.is_a?(Hash)
+            chunk.to_json.to_s
+          else
+            chunk
+          end
+        end
+
+        def to_record
+          record = {}
+
+          record["id"] = id
+          record["key"] = key
+
+          fields.each_pair do |key, value|
+            record_key = key
+            record_value = value.to_json.to_s
+
+            case value
+            when String
+              record_value = value
+            when Hash
+              if value.keys.include?("name")
+                record_key += ".name"
+                record_value = value["name"]
+              elsif value.keys.include?("id")
+                record_key += ".id"
+                record_value = value["id"]
+              end
+            end
+
+            record[record_key] = record_value
+          end
+
+          record
+        end
+      end
+    end
+  end
+end

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

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

data/lib/embulk/input/jira.rb

@@ -1,127 +1,9 @@
-require "embulk/input/jira-input-plugin-utils"
-require "jira/api"
-require "logger"
-require "time"
+require "embulk/input/jira_input_plugin"
+require "embulk/input/jira/version"
 
 module Embulk
   module Input
-    class JiraInputPlugin < InputPlugin
-      PER_PAGE = 50
-
-      Plugin.register_input("jira", self)
-
-      def self.version
-        File.read(File.expand_path("../../../../VERSION", __FILE__)).strip
-      end
-
-      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)[0..10].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
-        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, 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
+    module Jira
     end
   end
 end

data/lib/embulk/input/jira_input_plugin.rb

@@ -0,0 +1,135 @@
+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

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

@@ -1,14 +1,11 @@
-# TODO: move to spec/jira/api_spec.rb
-
 require "spec_helper"
-require "jira/api"
 
-describe Jira::Api do
+describe Embulk::Input::Jira::Api do
   describe ".setup" do
-    subject { Jira::Api.setup {}  }
+    subject { Embulk::Input::Jira::Api.setup {}  }
 
-    it "returns Jira::Api instance" do
-      expect(subject.is_a?(Jira::Api)).to be_truthy
+    it "returns Embulk::Input::Jira::Api instance" do
+      expect(subject.is_a?(Embulk::Input::Jira::Api)).to be_truthy
     end
 
     it "calls Jiralicious.configure" do
@@ -18,7 +15,7 @@ describe Jira::Api do
 
   describe "#search" do
     let(:jql) { "project=FOO" }
-    let(:api) { Jira::Api.new }
+    let(:api) { Embulk::Input::Jira::Api.new }
 
     subject { api.search(jql) }
 
@@ -33,7 +30,7 @@ describe Jira::Api do
       end
 
       it "retry DEFAULT_SEARCH_RETRY_TIMES times then raise error" do
-        expect(Timeout).to receive(:timeout).exactly(Jira::Api::DEFAULT_SEARCH_RETRY_TIMES)
+        expect(Timeout).to receive(:timeout).exactly(Embulk::Input::Jira::Api::DEFAULT_SEARCH_RETRY_TIMES)
         expect { subject }.to raise_error
       end
     end
@@ -70,20 +67,20 @@ describe Jira::Api do
       ]
     end
 
-    subject { Jira::Api.new.search_issues(jql) }
+    subject { Embulk::Input::Jira::Api.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 [Jira::Issue, Jira::Issue]
+      expect(subject.map(&:class)).to match_array [Embulk::Input::Jira::Issue, Embulk::Input::Jira::Issue]
     end
   end
 
   describe "#total_count" do
     subject { jira_api.total_count(jql) }
 
-    let(:jira_api) { Jira::Api.new }
+    let(:jira_api) { Embulk::Input::Jira::Api.new }
     let(:jql) { "project=FOO" }
     let(:results) { Object.new } # add mock later
     let(:results_count) { 5 }
@@ -92,7 +89,7 @@ describe Jira::Api do
       allow(results).to receive(:num_results).and_return(results_count)
     end
 
-    it "calls Jira::Api#search with proper arguments" do
+    it "calls Embulk::Input::Jira::Api#search with proper arguments" do
       expect(jira_api).to receive(:search).with(jql, max_results: 1).and_return(results)
       subject
     end
@@ -106,7 +103,7 @@ describe Jira::Api do
   describe "#timeout_and_retry" do
     let(:wait) { 1 }
     let(:retry_times) { 3 }
-    let(:jira_api) { Jira::Api.new }
+    let(:jira_api) { Embulk::Input::Jira::Api.new }
     let(:block) { proc{ "it works" } }
 
     subject { jira_api.send(:timeout_and_retry, wait, retry_times, &block) }

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

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

data/spec/embulk/input/jira-input-plugin-utils_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "embulk/input/jira-input-plugin-utils"
 
 describe Embulk::Input::JiraInputPluginUtils do
   describe ".guess_columns" do

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

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "embulk/input/jira"
 
 describe Embulk::Input::JiraInputPlugin do
   let(:username) { "jira-user" }
@@ -94,8 +93,8 @@ describe Embulk::Input::JiraInputPlugin do
 
     let(:config) { Object.new } # add mock later
 
-    let(:jira_api) { Jira::Api.new }
-    let(:jira_issues) { [Jira::Issue.new(attributes)] }
+    let(:jira_api) { Embulk::Input::Jira::Api.new }
+    let(:jira_issues) { [Embulk::Input::Jira::Issue.new(attributes)] }
     let(:attributes) do
       {
         "id" => "100",
@@ -126,7 +125,7 @@ describe Embulk::Input::JiraInputPlugin do
     end
 
     before do
-      allow(jira_api).to receive(:search_issues).and_return(jira_issues)
+      allow(jira_api).to receive(:search_issues).with(jql, max_results: Embulk::Input::JiraInputPlugin::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)
@@ -134,13 +133,13 @@ describe Embulk::Input::JiraInputPlugin do
       allow(config).to receive(:param).with("jql", :string).and_return(jql)
     end
 
-    it "setup Jira::Api" do
-      expect(Jira::Api).to receive(:setup).and_return(jira_api)
+    it "setup Embulk::Input::Jira::Api" do
+      expect(Embulk::Input::Jira::Api).to receive(:setup).and_return(jira_api)
       subject
     end
 
     it "returns guessed config" do
-      allow(Jira::Api).to receive(:setup).and_return(jira_api)
+      allow(Embulk::Input::Jira::Api).to receive(:setup).and_return(jira_api)
 
       expect(subject).to eq guessed_config
     end
@@ -151,13 +150,13 @@ describe Embulk::Input::JiraInputPlugin do
 
     subject { Embulk::Input::JiraInputPlugin.new({}, nil, nil, nil) }
 
-    it "setup Jira::Api" do
-      expect(Jira::Api).to receive(:setup)
+    it "setup Embulk::Input::Jira::Api" do
+      expect(Embulk::Input::Jira::Api).to receive(:setup)
       subject
     end
 
     it "is a Embulk::InputPlugin" do
-      allow(Jira::Api).to receive(:setup)
+      allow(Embulk::Input::Jira::Api).to receive(:setup)
       expect(subject).to be_a(Embulk::InputPlugin)
     end
   end
@@ -171,12 +170,12 @@ describe Embulk::Input::JiraInputPlugin do
       result
     end
 
-    let(:jira_api) { Jira::Api.new }
+    let(:jira_api) { Embulk::Input::Jira::Api.new }
     let(:jira_issues) do
       (1..total_count).map do |i|
         attributes = fields.merge("id" => i.to_s, "jira_key" => "FOO-#{i}")
 
-        Jira::Issue.new(attributes)
+        Embulk::Input::Jira::Issue.new(attributes)
       end
     end
 
@@ -206,8 +205,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)
+
       # TODO: create stubs without each `it` expected
-      allow(Jira::Api).to receive(:setup).and_return(jira_api)
+      allow(Embulk::Input::Jira::Api).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)]
@@ -235,15 +236,6 @@ describe Embulk::Input::JiraInputPlugin do
     end
   end
 
-  describe ".version" do
-    let(:version_file_path) { File.expand_path("../../../../VERSION", __FILE__) }
-    subject { Embulk::Input::JiraInputPlugin.version }
-
-    it "returns VERSION file content without line-break" do
-      expect(subject).to eq File.read(version_file_path).strip
-    end
-  end
-
   describe ".logger" do
     let(:logger) { Embulk::Input::JiraInputPlugin.logger }
 

data/spec/embulk_spec.rb

@@ -11,6 +11,7 @@ in:
     before do
       config_file.puts config
       config_file.close
+      allow(org.embulk.spi.Exec).to receive_message_chain(:session, :isPreview).and_return(true)
     end
 
     subject {

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ if ENV["COVERAGE"]
 end
 
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "embulk/input/jira"
 
 RSpec.configure do |config|
   config.include StdoutAndErrCapture

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -110,17 +110,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - embulk-input-jira.gemspec
-- lib/embulk/input/jira-input-plugin-utils.rb
 - lib/embulk/input/jira.rb
-- lib/jira/api.rb
-- lib/jira/issue.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_input_plugin_utils.rb
 - spec/embulk/input/jira-input-plugin-utils_spec.rb
-- spec/embulk/input/jira_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_spec.rb
-- spec/jira/issue_spec.rb
-- spec/jira_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/prepare_embulk.rb
 - spec/support/stdout_and_err_capture.rb
@@ -150,10 +151,10 @@ specification_version: 4
 summary: Jira input plugin for Embulk
 test_files:
 - spec/embulk/input/jira-input-plugin-utils_spec.rb
-- spec/embulk/input/jira_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_spec.rb
-- spec/jira/issue_spec.rb
-- spec/jira_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/prepare_embulk.rb
 - spec/support/stdout_and_err_capture.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.2

data/lib/jira/api.rb

@@ -1,50 +0,0 @@
-require "jiralicious"
-require "jira/issue"
-require "timeout"
-
-module Jira
-  class Api
-    SEARCH_TIMEOUT_SECONDS = 5
-    SEARCH_ISSUES_TIMEOUT_SECONDS = 60
-    DEFAULT_SEARCH_RETRY_TIMES = 10
-
-    def self.setup(&block)
-      Jiralicious.configure(&block)
-      new
-    end
-
-    def search_issues(jql, options={})
-      timeout_and_retry(SEARCH_ISSUES_TIMEOUT_SECONDS) do
-        search(jql, options).issues.map do |issue|
-          ::Jira::Issue.new(issue)
-        end
-      end
-    end
-
-    def search(jql, options={})
-      timeout_and_retry(SEARCH_TIMEOUT_SECONDS) do
-        Jiralicious.search(jql, options)
-      end
-    end
-
-    def total_count(jql)
-      search(jql, max_results: 1).num_results
-    end
-
-    private
-
-    def timeout_and_retry(wait, retry_times = DEFAULT_SEARCH_RETRY_TIMES, &block)
-      count = 1
-      begin
-        Timeout.timeout(wait) do
-          yield
-        end
-      rescue Timeout::Error => e
-        count += 1
-        sleep count # retry after some seconds for JIRA API perhaps under the overload
-        raise e if count > retry_times
-        retry
-      end
-    end
-  end
-end

data/lib/jira/issue.rb

@@ -1,63 +0,0 @@
-module Jira
-  class Issue
-    attr_reader :id, :key, :fields
-
-    def initialize(attributes)
-      @id = attributes.fetch("id")
-
-      # https://github.com/dorack/jiralicious/blob/404b7b6d5b7020f42064cf8d7a745ab02057e728/lib/jiralicious/issue.rb#L11-L12
-      @key = attributes.fetch("jira_key")
-      @fields = attributes.fetch("fields")
-    end
-
-    def [](attribute)
-      case attribute
-      when "id"
-        return id
-      when "key"
-        return key
-      end
-
-      chunk = fields
-      attribute.split('.').each do |key|
-        chunk = chunk[key]
-        return chunk if chunk.nil?
-      end
-
-      if chunk.is_a?(Array) || chunk.is_a?(Hash)
-        chunk.to_json.to_s
-      else
-        chunk
-      end
-    end
-
-    def to_record
-      record = {}
-
-      record["id"] = id
-      record["key"] = key
-
-      fields.each_pair do |key, value|
-        record_key = key
-        record_value = value.to_json.to_s
-
-        case value
-        when String
-          record_value = value
-        when Hash
-          if value.keys.include?("name")
-            record_key += ".name"
-            record_value = value["name"]
-          elsif value.keys.include?("id")
-            record_key += ".id"
-            record_value = value["id"]
-          end
-        end
-
-        record[record_key] = record_value
-      end
-
-      record
-    end
-  end
-end