embulk 0.6.13 → 0.6.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/build.gradle +1 -1
  4. data/embulk-core/src/main/java/org/embulk/config/CommitReport.java +3 -0
  5. data/embulk-core/src/main/java/org/embulk/config/ConfigDiff.java +3 -0
  6. data/embulk-core/src/main/java/org/embulk/config/ConfigSource.java +3 -0
  7. data/embulk-core/src/main/java/org/embulk/config/DataSource.java +2 -0
  8. data/embulk-core/src/main/java/org/embulk/config/DataSourceImpl.java +8 -1
  9. data/embulk-core/src/main/java/org/embulk/config/TaskSource.java +3 -0
  10. data/embulk-core/src/main/java/org/embulk/spi/ColumnConfig.java +28 -6
  11. data/embulk-core/src/main/java/org/embulk/spi/PageFormat.java +3 -3
  12. data/embulk-core/src/main/java/org/embulk/spi/ProcessTask.java +12 -77
  13. data/embulk-core/src/main/java/org/embulk/spi/Schema.java +35 -2
  14. data/embulk-core/src/main/java/org/embulk/spi/SchemaConfig.java +42 -0
  15. data/embulk-core/src/main/java/org/embulk/spi/SchemaConfigException.java +22 -0
  16. data/embulk-core/src/main/java/org/embulk/spi/time/TimestampFormat.java +2 -0
  17. data/embulk-core/src/main/java/org/embulk/spi/time/TimestampFormatter.java +40 -2
  18. data/embulk-core/src/main/java/org/embulk/spi/time/TimestampParser.java +43 -4
  19. data/embulk-core/src/main/java/org/embulk/spi/type/TimestampType.java +2 -0
  20. data/embulk-core/src/test/java/org/embulk/spi/PageTestUtils.java +1 -22
  21. data/embulk-core/src/test/java/org/embulk/spi/TestFileInputRunner.java +10 -10
  22. data/embulk-core/src/test/java/org/embulk/spi/TestFileOutputRunner.java +12 -12
  23. data/embulk-core/src/test/java/org/embulk/spi/TestPageBuilderReader.java +49 -31
  24. data/embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParser.java +15 -19
  25. data/embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParserDeprecated.java +67 -0
  26. data/embulk-docs/src/built-in.rst +18 -0
  27. data/embulk-docs/src/release.rst +1 -0
  28. data/embulk-docs/src/release/release-0.6.14.rst +47 -0
  29. data/embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java +26 -10
  30. data/embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java +21 -6
  31. data/embulk-standards/src/test/java/org/embulk/standards/TestCsvFormatterPlugin.java +3 -0
  32. data/embulk-standards/src/test/java/org/embulk/standards/TestCsvParserPlugin.java +3 -0
  33. data/embulk-standards/src/test/java/org/embulk/standards/TestCsvTokenizer.java +4 -6
  34. data/lib/embulk/guess/csv.rb +9 -5
  35. data/lib/embulk/plugin_registry.rb +15 -11
  36. data/lib/embulk/version.rb +1 -1
  37. metadata +7 -4
@@ -66,7 +66,7 @@ module Embulk
66
66
  specs = specs.sort_by {|spec| spec.version }
67
67
  if spec = specs.last
68
68
  spec.require_paths.each do |lib|
69
- require_and_show "#{spec.full_gem_path}/#{lib}/#{name}"
69
+ require_and_show "#{spec.full_gem_path}/#{lib}/#{name}", spec
70
70
  end
71
71
  return true
72
72
  end
@@ -75,17 +75,21 @@ module Embulk
75
75
  return false
76
76
  end
77
77
 
78
- def require_and_show(name)
79
- require name
80
- show_loaded_gems
81
- end
82
-
83
- def show_loaded_gems
84
- Gem.loaded_specs.each do |name,spec|
85
- if !@loaded_gems[name] && name =~ /^embulk/
86
- Embulk.logger.info "Loaded plugin #{name} (#{spec.version})"
87
- @loaded_gems[name] = true
78
+ def require_and_show(path, spec=nil)
79
+ require path
80
+ unless spec
81
+ name, spec = Gem.loaded_specs.find {|name,spec|
82
+ #spec.files.include?(path)
83
+ spec.contains_requirable_file?(path)
84
+ }
85
+ end
86
+ if spec
87
+ unless @loaded_gems[spec.name]
88
+ Embulk.logger.info "Loaded plugin #{spec.name} (#{spec.version})"
89
+ @loaded_gems[spec.name]
88
90
  end
91
+ else
92
+ Embulk.logger.info "Loaded plugin #{path} from a load path"
89
93
  end
90
94
  end
91
95
  end
@@ -1,3 +1,3 @@
1
1
  module Embulk
2
- VERSION = '0.6.13'
2
+ VERSION = '0.6.14'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: embulk
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.13
4
+ version: 0.6.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-26 00:00:00.000000000 Z
11
+ date: 2015-06-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -190,6 +190,7 @@ files:
190
190
  - embulk-core/src/main/java/org/embulk/spi/ProcessTask.java
191
191
  - embulk-core/src/main/java/org/embulk/spi/Schema.java
192
192
  - embulk-core/src/main/java/org/embulk/spi/SchemaConfig.java
193
+ - embulk-core/src/main/java/org/embulk/spi/SchemaConfigException.java
193
194
  - embulk-core/src/main/java/org/embulk/spi/TaskState.java
194
195
  - embulk-core/src/main/java/org/embulk/spi/Transactional.java
195
196
  - embulk-core/src/main/java/org/embulk/spi/TransactionalFileInput.java
@@ -269,6 +270,7 @@ files:
269
270
  - embulk-core/src/test/java/org/embulk/spi/TestPageBuilderReader.java
270
271
  - embulk-core/src/test/java/org/embulk/spi/time/TestTimestamp.java
271
272
  - embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParser.java
273
+ - embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParserDeprecated.java
272
274
  - embulk-core/src/test/java/org/embulk/spi/type/TestTypeSerDe.java
273
275
  - embulk-core/src/test/java/org/embulk/spi/unit/TestByteSize.java
274
276
  - embulk-core/src/test/java/org/embulk/spi/util/TestLineDecoder.java
@@ -315,6 +317,7 @@ files:
315
317
  - embulk-docs/src/release/release-0.6.11.rst
316
318
  - embulk-docs/src/release/release-0.6.12.rst
317
319
  - embulk-docs/src/release/release-0.6.13.rst
320
+ - embulk-docs/src/release/release-0.6.14.rst
318
321
  - embulk-docs/src/release/release-0.6.2.rst
319
322
  - embulk-docs/src/release/release-0.6.3.rst
320
323
  - embulk-docs/src/release/release-0.6.4.rst
@@ -431,8 +434,8 @@ files:
431
434
  - classpath/bval-jsr303-0.5.jar
432
435
  - classpath/commons-beanutils-core-1.8.3.jar
433
436
  - classpath/commons-lang3-3.1.jar
434
- - classpath/embulk-core-0.6.13.jar
435
- - classpath/embulk-standards-0.6.13.jar
437
+ - classpath/embulk-core-0.6.14.jar
438
+ - classpath/embulk-standards-0.6.14.jar
436
439
  - classpath/guava-18.0.jar
437
440
  - classpath/guice-4.0.jar
438
441
  - classpath/guice-multibindings-4.0.jar