embulk 0.7.11 → 0.8.0

data/test/helper.rb

@@ -19,3 +19,5 @@ SimpleCov.start 'embulk'
 
 require 'embulk/java/bootstrap'
 require 'embulk'
+
+Embulk.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.8.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0.0
+        version: 9.0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0.0
+        version: 9.0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,10 +107,11 @@ files:
 - classpath/bval-jsr303-0.5.jar
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-core-0.7.11.jar
-- classpath/embulk-standards-0.7.11.jar
+- classpath/embulk-core-0.8.0.jar
+- classpath/embulk-standards-0.8.0.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
+- classpath/guice-bootstrap-0.1.1.jar
 - classpath/guice-multibindings-4.0.jar
 - classpath/jackson-annotations-2.5.3.jar
 - classpath/jackson-core-2.5.3.jar
@@ -123,6 +124,7 @@ files:
 - classpath/joda-time-2.8.1.jar
 - classpath/logback-classic-1.1.3.jar
 - classpath/logback-core-1.1.3.jar
+- classpath/msgpack-core-0.8.1.jar
 - classpath/netty-buffer-5.0.0.Alpha1.jar
 - classpath/netty-common-5.0.0.Alpha1.jar
 - classpath/slf4j-api-1.7.12.jar
@@ -162,6 +164,7 @@ files:
 - embulk-core/src/main/java/org/embulk/config/TaskValidator.java
 - embulk-core/src/main/java/org/embulk/config/UserDataException.java
 - embulk-core/src/main/java/org/embulk/config/UserDataExceptions.java
+- embulk-core/src/main/java/org/embulk/config/YamlTagResolver.java
 - embulk-core/src/main/java/org/embulk/exec/BulkLoader.java
 - embulk-core/src/main/java/org/embulk/exec/ConfigurableGuessInputPlugin.java
 - embulk-core/src/main/java/org/embulk/exec/ExecModule.java
@@ -172,7 +175,6 @@ files:
 - embulk-core/src/main/java/org/embulk/exec/ForSystemConfig.java
 - embulk-core/src/main/java/org/embulk/exec/GuessExecutor.java
 - embulk-core/src/main/java/org/embulk/exec/LocalExecutorPlugin.java
-- embulk-core/src/main/java/org/embulk/exec/LocalThreadExecutor.java
 - embulk-core/src/main/java/org/embulk/exec/LoggerProvider.java
 - embulk-core/src/main/java/org/embulk/exec/NoSampleException.java
 - embulk-core/src/main/java/org/embulk/exec/PartialExecutionException.java
@@ -186,15 +188,6 @@ files:
 - embulk-core/src/main/java/org/embulk/exec/SystemConfigModule.java
 - embulk-core/src/main/java/org/embulk/exec/TempFileAllocator.java
 - embulk-core/src/main/java/org/embulk/exec/TransactionStage.java
-- embulk-core/src/main/java/org/embulk/guice/Bootstrap.java
-- embulk-core/src/main/java/org/embulk/guice/CloseableInjector.java
-- embulk-core/src/main/java/org/embulk/guice/InjectorProxy.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleInjector.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleInjectorProxy.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleManager.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleMethods.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleMethodsMap.java
-- embulk-core/src/main/java/org/embulk/guice/LifeCycleModule.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyPluginSource.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyScriptingModule.java
 - embulk-core/src/main/java/org/embulk/plugin/BuiltinPluginSourceModule.java
@@ -255,6 +248,9 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/TransactionalFileInput.java
 - embulk-core/src/main/java/org/embulk/spi/TransactionalFileOutput.java
 - embulk-core/src/main/java/org/embulk/spi/TransactionalPageOutput.java
+- embulk-core/src/main/java/org/embulk/spi/json/JsonParseException.java
+- embulk-core/src/main/java/org/embulk/spi/json/JsonParser.java
+- embulk-core/src/main/java/org/embulk/spi/json/RubyValueApi.java
 - embulk-core/src/main/java/org/embulk/spi/time/DateTimeZoneSerDe.java
 - embulk-core/src/main/java/org/embulk/spi/time/JRubyTimeParserHelper.java
 - embulk-core/src/main/java/org/embulk/spi/time/JRubyTimeParserHelperFactory.java
@@ -267,6 +263,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/type/AbstractType.java
 - embulk-core/src/main/java/org/embulk/spi/type/BooleanType.java
 - embulk-core/src/main/java/org/embulk/spi/type/DoubleType.java
+- embulk-core/src/main/java/org/embulk/spi/type/JsonType.java
 - embulk-core/src/main/java/org/embulk/spi/type/LongType.java
 - embulk-core/src/main/java/org/embulk/spi/type/StringType.java
 - embulk-core/src/main/java/org/embulk/spi/type/TimestampType.java
@@ -306,6 +303,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/BooleanColumnSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/DefaultValueSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/DoubleColumnSetter.java
+- embulk-core/src/main/java/org/embulk/spi/util/dynamic/JsonColumnSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/LongColumnSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/NullDefaultValueSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/SkipColumnSetter.java
@@ -411,7 +409,6 @@ files:
 - embulk-docs/src/release/release-0.7.0.rst
 - embulk-docs/src/release/release-0.7.1.rst
 - embulk-docs/src/release/release-0.7.10.rst
-- embulk-docs/src/release/release-0.7.11.rst
 - embulk-docs/src/release/release-0.7.2.rst
 - embulk-docs/src/release/release-0.7.3.rst
 - embulk-docs/src/release/release-0.7.4.rst
@@ -420,6 +417,7 @@ files:
 - embulk-docs/src/release/release-0.7.7.rst
 - embulk-docs/src/release/release-0.7.8.rst
 - embulk-docs/src/release/release-0.7.9.rst
+- embulk-docs/src/release/release-0.8.0.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java
@@ -464,6 +462,8 @@ files:
 - lib/embulk/data/new/README.md.erb
 - lib/embulk/data/new/gitignore.erb
 - lib/embulk/data/new/java/build.gradle.erb
+- lib/embulk/data/new/java/config/checkstyle/checkstyle.xml
+- lib/embulk/data/new/java/config/checkstyle/default.xml
 - lib/embulk/data/new/java/decoder.java.erb
 - lib/embulk/data/new/java/encoder.java.erb
 - lib/embulk/data/new/java/file_input.java.erb
@@ -526,6 +526,7 @@ files:
 - lib/embulk/schema.rb
 - lib/embulk/version.rb
 - settings.gradle
+- test/guess/test_csv_guess.rb
 - test/guess/test_schema_guess.rb
 - test/guess/test_time_format_guess.rb
 - test/helper.rb
@@ -555,6 +556,7 @@ signing_key:
 specification_version: 4
 summary: Embulk, a plugin-based parallel bulk data loader
 test_files:
+- test/guess/test_csv_guess.rb
 - test/guess/test_schema_guess.rb
 - test/guess/test_time_format_guess.rb
 - test/helper.rb

data/embulk-core/src/main/java/org/embulk/exec/LocalThreadExecutor.java

@@ -1,34 +0,0 @@
-package org.embulk.exec;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.google.inject.Inject;
-import org.embulk.config.ConfigSource;
-
-/*
- * Injected in SINGLETON scope at ExecModule
- */
-public class LocalThreadExecutor
-{
-    private final ExecutorService executor;
-
-    @Inject
-    public LocalThreadExecutor(@ForSystemConfig ConfigSource systemConfig)
-    {
-        int defaultMaxThreads = Runtime.getRuntime().availableProcessors() * 2;
-        int maxThreads = systemConfig.get(Integer.class, "max_threads", defaultMaxThreads);
-        this.executor = Executors.newFixedThreadPool(maxThreads,
-                new ThreadFactoryBuilder()
-                        .setNameFormat("embulk-executor-%d")
-                        .setDaemon(true)
-                        .build());
-    }
-
-    public ExecutorService getExecutorService()
-    {
-        return executor;
-    }
-
-    // TODO shutdown
-}

data/embulk-core/src/main/java/org/embulk/guice/Bootstrap.java

@@ -1,157 +0,0 @@
-/*
- * Copyright 2015 Sadayuki Furuhashi
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.embulk.guice;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.annotations.Beta;
-
-import com.google.inject.Binder;
-import com.google.inject.Guice;
-import com.google.inject.Module;
-import com.google.inject.Stage;
-import com.google.inject.Injector;
-import java.util.Arrays;
-import java.util.List;
-
-@Beta
-public class Bootstrap
-{
-    private List<Module> modules;
-
-    private boolean requireExplicitBindings = true;
-
-    private boolean started;
-
-    public Bootstrap(Module... modules)
-    {
-        this(Arrays.asList(modules));
-    }
-
-    public Bootstrap(Iterable<? extends Module> modules)
-    {
-        this.modules = ImmutableList.copyOf(modules);
-    }
-
-    public Bootstrap requireExplicitBindings(boolean requireExplicitBindings)
-    {
-        this.requireExplicitBindings = requireExplicitBindings;
-        return this;
-    }
-
-    public Bootstrap addModules(Module... additionalModules)
-    {
-        return addModules(Arrays.asList(additionalModules));
-    }
-
-    public Bootstrap addModules(Iterable<? extends Module> additionalModules)
-    {
-        modules = ImmutableList.copyOf(Iterables.concat(modules, additionalModules));
-        return this;
-    }
-
-    //public Bootstrap onPreDestroy()
-    //{
-    //}
-
-    //public Bootstrap onPreDestroyException()
-    //{
-    //}
-
-    //public Bootstrap onStop()
-    //{
-    //}
-
-    //public Bootstrap forEachModule(Consumer<? super Module> function)
-    //{
-    //    for (Module module : modules) {
-    //        function.accept(module);
-    //    }
-    //    return this;
-    //}
-
-    //public <T> Bootstrap forEachModule(Class<T> ifClass, Consumer<? super T> function)
-    //{
-    //    for (Module module : modules) {
-    //        if (ifClass.instance(module) {
-    //            function.accept(module);
-    //        }
-    //    }
-    //    return this;
-    //}
-
-    public Bootstrap overrideModules(Function<? super List<Module>, ? extends Iterable<? extends Module>> function)
-    {
-        modules = ImmutableList.copyOf(function.apply(modules));
-        return this;
-    }
-
-    public LifeCycleInjector initialize()
-    {
-        return build(true);
-    }
-
-    public CloseableInjector initializeCloseable()
-    {
-        return build(false);
-    }
-
-    private LifeCycleInjectorProxy build(boolean destroyOnShutdownHook)
-    {
-        Injector injector = start();
-        LifeCycleManager lifeCycleManager = injector.getInstance(LifeCycleManager.class);
-        if (destroyOnShutdownHook) {
-            lifeCycleManager.destroyOnShutdownHook();
-        }
-        return new LifeCycleInjectorProxy(injector, lifeCycleManager);
-    }
-
-    private Injector start()
-    {
-        if (started) {
-            throw new IllegalStateException("System already initialized");
-        }
-        started = true;
-
-        ImmutableList.Builder<Module> moduleList = ImmutableList.builder();
-
-        moduleList.addAll(modules);
-
-        moduleList.add(new Module()
-        {
-            @Override
-            public void configure(Binder binder)
-            {
-                binder.disableCircularProxies();
-                if (requireExplicitBindings) {
-                    binder.requireExplicitBindings();
-                }
-            }
-        });
-
-        moduleList.add(new LifeCycleModule());
-
-        Injector injector = Guice.createInjector(Stage.PRODUCTION, moduleList.build());
-
-        LifeCycleManager lifeCycleManager = injector.getInstance(LifeCycleManager.class);
-        if (lifeCycleManager.size() > 0) {
-            lifeCycleManager.start();
-        }
-
-        return injector;
-    }
-}

data/embulk-core/src/main/java/org/embulk/guice/CloseableInjector.java

@@ -1,22 +0,0 @@
-/*
- * Copyright 2015 Sadayuki Furuhashi
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.embulk.guice;
-
-import com.google.inject.Injector;
-
-public interface CloseableInjector
-        extends LifeCycleInjector, AutoCloseable
-{ }

data/embulk-core/src/main/java/org/embulk/guice/InjectorProxy.java

@@ -1,145 +0,0 @@
-/*
- * Copyright 2015 Sadayuki Furuhashi
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.embulk.guice;
-
-import com.google.inject.Binding;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.MembersInjector;
-import com.google.inject.Module;
-import com.google.inject.Provider;
-import com.google.inject.Scope;
-import com.google.inject.TypeLiteral;
-import com.google.inject.spi.TypeConverterBinding;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-abstract class InjectorProxy
-        implements Injector
-{
-    protected abstract Injector injector();
-
-    @Override
-    public void injectMembers(Object instance)
-    {
-        injector().injectMembers(instance);
-    }
-
-    @Override
-    public <T> MembersInjector<T> getMembersInjector(TypeLiteral<T> typeLiteral)
-    {
-        return injector().getMembersInjector(typeLiteral);
-    }
-
-    @Override
-    public <T> MembersInjector<T> getMembersInjector(Class<T> type)
-    {
-        return injector().getMembersInjector(type);
-    }
-
-    @Override
-    public Map<Key<?>, Binding<?>> getBindings()
-    {
-        return injector().getBindings();
-    }
-
-    @Override
-    public Map<Key<?>, Binding<?>> getAllBindings()
-    {
-        return injector().getAllBindings();
-    }
-
-    @Override
-    public <T> Binding<T> getBinding(Key<T> key)
-    {
-        return injector().getBinding(key);
-    }
-
-    @Override
-    public <T> Binding<T> getBinding(Class<T> type)
-    {
-        return injector().getBinding(type);
-    }
-
-    @Override
-    public <T> Binding<T> getExistingBinding(Key<T> key)
-    {
-        return injector().getExistingBinding(key);
-    }
-
-    @Override
-    public <T> List<Binding<T>> findBindingsByType(TypeLiteral<T> type)
-    {
-        return injector().findBindingsByType(type);
-    }
-
-    @Override
-    public <T> Provider<T> getProvider(Key<T> key)
-    {
-        return injector().getProvider(key);
-    }
-
-    @Override
-    public <T> Provider<T> getProvider(Class<T> type)
-    {
-        return injector().getProvider(type);
-    }
-
-    @Override
-    public <T> T getInstance(Key<T> key)
-    {
-        return injector().getInstance(key);
-    }
-
-    @Override
-    public <T> T getInstance(Class<T> type)
-    {
-        return injector().getInstance(type);
-    }
-
-    @Override
-    public Injector getParent()
-    {
-        return injector().getParent();
-    }
-
-    @Override
-    public Injector createChildInjector(Iterable<? extends Module> modules)
-    {
-        return injector().createChildInjector(modules);
-    }
-
-    @Override
-    public Injector createChildInjector(Module... modules)
-    {
-        return injector().createChildInjector(modules);
-    }
-
-    @Override
-    public Map<Class<? extends Annotation>, Scope> getScopeBindings()
-    {
-        return injector().getScopeBindings();
-    }
-
-    @Override
-    public Set<TypeConverterBinding> getTypeConverterBindings()
-    {
-        return injector().getTypeConverterBindings();
-    }
-}