embulk-parser-query_string 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c11fbc6c48a1093680df5f8c9c434fb8fe7a8b7
-  data.tar.gz: 081c955d594d76be409b6c070c1a7182b17a8ab0
+  metadata.gz: 5a2f6dd8e7b04e7bcb973b5b8ef66d475a2301e5
+  data.tar.gz: 7177bc35ee74ee4e4753f835b115d9fefc464ee5
 SHA512:
-  metadata.gz: e7ac576ae7d86f430ae3f466c11a62cb2dfc65aa2f7a6b260517a600c5edf0e04f3b53c7a1cab0cb03e608ccd5e7d5f39ee800fd5bb3db2cbb1797a273850788
-  data.tar.gz: 2361a39588b0eda9fa965e2f68738088ec7f50f6e0969af6697296faf7b0dadd35c4be473b226a144551bb7fe43fdef8d5046dcf186cc5b9ea2cc5672da7ca77
+  metadata.gz: 7939b0f651563a556eb28c086298c02edaeab5db3642156e360bc350b4bfbc2403683de9ab5d01ad9fae4255b08377da5697b55d04707fcdfaa0ef84f6baa193
+  data.tar.gz: 03607bea2d57d0480070877bc0e7cb2b54c2ebc2b2878d56d6ff324903940d31b3372e9ce76070640126ceb8bcfc9b4d0238aab761dfb07b1d7d61a84173f629

data/.ruby-version

@@ -0,0 +1 @@
+jruby-9.0.1.0

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
 rvm:
-- jruby-19mode
+- jruby-9000
+
+before_install:
+- rvm get head
+- rvm use jruby-9.0.1.0 --install
+
 addons:
   code_climate:
     repo_token:
@@ -12,19 +17,12 @@ jdk:
 - oraclejdk8
 
 gemfile:
-  - gemfiles/embulk-0.6.17
-  - gemfiles/embulk-0.6.18
-  - gemfiles/embulk-0.6.19
-  - gemfiles/embulk-0.6.20
-  - gemfiles/embulk-0.6.21
-  - gemfiles/embulk-0.6.22
-  - gemfiles/embulk-0.6.23
-  - gemfiles/embulk-0.6.24
-  - gemfiles/embulk-0.6.25
-  - gemfiles/embulk-0.6-latest
+  - gemfiles/embulk-0.7-latest
+  - gemfiles/embulk-0.7.2
+  - gemfiles/embulk-0.7.3
+  - gemfiles/embulk-0.7.4
   - gemfiles/embulk-latest
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/embulk-0.6.22
-    - gemfile: gemfiles/embulk-latest

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 - 2015-10-06
+
+**This version supports Embulk 0.7 or later, and drops Embulk 0.6 or earlier, so if you want to use this plugin with Embulk 0.6 or earlier, please use 0.2.1.**
+
+* [enhancement] Support Embulk 0.7 or later and drop Embulk 0.6 or earlier [#32](https://github.com/treasure-data/embulk-parser-query_string/pull/32) [#33](https://github.com/treasure-data/embulk-parser-query_string/pull/33)
+
 ## 0.2.1 - 2015-09-30
 
 * [maintenance] Suppress logger in test [#31](https://github.com/treasure-data/embulk-parser-query_string/pull/31)
@@ -9,7 +15,7 @@
 
 ## 0.2.0 - 2015-07-29
 
-This version breaks backword compatibility. With this version, if you use config created by embulk-parser-query_string 0.1.3 or earlier, you should replace `schema:` key name with `columns:` in your config file (e.g. `config.yml`) .
+**This version breaks backword compatibility.** With this version, if you use config created by embulk-parser-query_string 0.1.3 or earlier, you should replace `schema:` key name with `columns:` in your config file (e.g. `config.yml`) .
 
 * [fixed] Use "column" as key for schema in config file [#22](https://github.com/treasure-data/embulk-parser-query_string/pull/22) [[reported by @muga](https://github.com/treasure-data/embulk-parser-query_string/issues/21). Thanks!!]
 * [enhancement] Display cast error log to human [#19](https://github.com/treasure-data/embulk-parser-query_string/pull/19)

data/README.md

@@ -13,7 +13,9 @@ Currently, this plugin supports minimum case, some edge cases are unsupported as
 
 ## Overview
 
-Required Embulk version >= 0.6.17.
+Required Embulk version >= 0.7.2.
+
+**NOTE: If you use Embulk < 0.7, you should use embulk-parser-query_string <= 0.1.3.**
 
 * **Plugin type**: parser
 * **Guess supported**: yes

data/embulk-parser-query_string.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-parser-query_string"
-  spec.version       = "0.2.1"
+  spec.version       = "0.3.0"
   spec.authors       = ["yoshihara", "uu59"]
   spec.summary       = "Query String parser plugin for Embulk"
   spec.description   = "Parses Query String files read by other file input plugins."
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'embulk', [">= 0.6.10", "!= 0.6.22", "< 0.7"]
+  spec.add_development_dependency 'embulk', [">= 0.7.2", "< 1.0"]
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'everyleaf-embulk_helper'
   spec.add_development_dependency 'rake', ['>= 10.0']

data/gemfiles/{embulk-0.6.20 → embulk-0.7-latest}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.6.20"
+gem "embulk", "~> 0.7"

data/gemfiles/{embulk-0.6.17 → embulk-0.7.2}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.6.17"
+gem "embulk", "0.7.2"

data/gemfiles/{embulk-0.6.18 → embulk-0.7.3}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.6.18"
+gem "embulk", "0.7.3"

data/gemfiles/{embulk-0.6.19 → embulk-0.7.4}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.6.19"
+gem "embulk", "0.7.4"

data/gemfiles/embulk-latest

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "> 0.6.17"
+gem "embulk", "> 0.7.2"

data/test/embulk/guess/test_query_string.rb

@@ -98,7 +98,7 @@ module Embulk
         def sample_lines_with_invalid
           [
             %Q(foo=1&bar=vv&baz=3),
-            %Q(this=line=is=invalid),
+            %Q(あいうえお=is=invalid),
             %Q(foo=2&bar=ss&baz=a),
           ]
         end

data/test/embulk/parser/test_query_string.rb

@@ -70,7 +70,7 @@ module Embulk
         end
 
         def invalid_line
-          "invalid=www=form"
+          "あいうえお=invalid=form"
         end
       end
 

data/test/prepare_embulk.rb

@@ -1,16 +1,5 @@
-require "embulk/command/embulk_run"
-
-classpath_dir = Embulk.home("classpath")
-jars = Dir.entries(classpath_dir).select{|f| f =~ /\.jar$/ }.sort
-jars.each do |jar|
-  require File.join(classpath_dir, jar)
-end
-
-props = java.util.Properties.new
-props.setProperty("embulk.use_global_ruby_runtime", "true")
+require "embulk"
 
-bootstrap_model_manager = org.embulk.config.ModelManager.new(nil, com.fasterxml.jackson.databind.ObjectMapper.new)
-system_config = org.embulk.config.ConfigLoader.new(bootstrap_model_manager).fromPropertiesYamlLiteral(props, "embulk.")
-org.embulk.EmbulkService.new(system_config).injector.getInstance(java.lang.Class.forName('org.jruby.embed.ScriptingContainer'))
+Embulk.setup
 
-require "embulk"
+require "embulk/command/embulk_run"

data/test/test_embulk_run.rb

@@ -65,6 +65,9 @@ module Embulk
         f.write seed_content
       end
       dest_path = "#{@dir}/guessed.yml"
+
+      stub(STDERR).puts { guessed_content } # Embulk outputs guessed config to STDERR
+
       embulk_guess(seed_path, dest_path)
       guessed = IO.read(dest_path)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-query_string
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - yoshihara
@@ -9,38 +9,32 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.10
-    - - '!='
+        version: 0.7.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.22
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   name: embulk
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.10
-    - - '!='
+        version: 0.7.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.22
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: bundler
@@ -48,13 +42,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: everyleaf-embulk_helper
@@ -62,13 +56,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
@@ -76,13 +70,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: pry
@@ -90,13 +84,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: test-unit
@@ -104,13 +98,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: test-unit-rr
@@ -118,13 +112,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: codeclimate-test-reporter
@@ -132,7 +126,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Parses Query String files read by other file input plugins.
@@ -143,9 +137,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .travis.yml.erb
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- ".travis.yml.erb"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -153,17 +148,10 @@ files:
 - README.md
 - Rakefile
 - embulk-parser-query_string.gemspec
-- gemfiles/embulk-0.6-latest
-- gemfiles/embulk-0.6.17
-- gemfiles/embulk-0.6.18
-- gemfiles/embulk-0.6.19
-- gemfiles/embulk-0.6.20
-- gemfiles/embulk-0.6.21
-- gemfiles/embulk-0.6.22
-- gemfiles/embulk-0.6.23
-- gemfiles/embulk-0.6.24
-- gemfiles/embulk-0.6.25
-- gemfiles/embulk-0.6.26
+- gemfiles/embulk-0.7-latest
+- gemfiles/embulk-0.7.2
+- gemfiles/embulk-0.7.3
+- gemfiles/embulk-0.7.4
 - gemfiles/embulk-latest
 - gemfiles/template.erb
 - lib/embulk/guess/query_string.rb
@@ -186,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Query String parser plugin for Embulk

data/gemfiles/embulk-0.6-latest

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "~> 0.6.0"

data/gemfiles/embulk-0.6.21

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.21"

data/gemfiles/embulk-0.6.22

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.22"

data/gemfiles/embulk-0.6.23

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.23"

data/gemfiles/embulk-0.6.24

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.24"

data/gemfiles/embulk-0.6.25

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.25"

data/gemfiles/embulk-0.6.26

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-gemspec :path => '../'
-
-gem "embulk", "0.6.26"