RubyGems - embulk-input-remote - Versions diffs - 0.3.0 → 0.3.1 - Mend

embulk-input-remote 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

checksums.yaml +4 -4
data/.circleci/config.yml +31 -0
data/.gitignore +7 -0
data/build.gradle +23 -50
data/classpath/annotations-13.0.jar +0 -0
data/classpath/embulk-input-remote-0.3.1.jar +0 -0
data/classpath/kotlin-stdlib-1.1.1.jar +0 -0
data/config/checkstyle/checkstyle.xml +128 -0
data/config/checkstyle/default.xml +108 -0
data/gradle.properties +1 -0
data/lib/embulk/input/remote.rb +1 -1
data/src/main/kotlin/org/embulk/input/{RemoteFileInputPlugin.kt → remote/RemoteFileInputPlugin.kt} +69 -76
data/src/main/kotlin/org/embulk/input/remote/SSHClient.kt +22 -21
data/src/main/kotlin/org/embulk/input/remote/extensions.kt +11 -0
data/src/test/kotlin/org/embulk/input/remote/TestRemoteFileInputPlugin.kt +186 -0
metadata +15 -12
data/.travis.yml +0 -21
data/classpath/embulk-input-remote-0.3.0.jar +0 -0
data/classpath/kotlin-runtime-1.0.6.jar +0 -0
data/classpath/kotlin-stdlib-1.0.6.jar +0 -0
data/settings.gradle +0 -3
data/src/test/kotlin/org/embulk/input/TestRemoteFileInputPlugin.kt +0 -201

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5d5ee6a70519b616bc61b9601d781f14510024
-  data.tar.gz: 2bbe3b3615fd7bc8e29be25cb4755294ad8949e2
+  metadata.gz: 1d0aeb7be6efa2a882d28d13dc4a41c4d249042b
+  data.tar.gz: 7ffcbd5214290516ac430dea0149378b5b430a3c
 SHA512:
-  metadata.gz: 0aa4e830ab9deaa103c9487797a9f4ccc4050811fd939f92789b6232c9a082b9014affc75931220d0eb52ced9cc4c4bc8e8c594315d47dc16e85153a38af1ec3
-  data.tar.gz: b5a495f9d4f84bdc1dc1490465f8d84d2e8b5e3db308a96f3a909d7b16dc26fb5ad59263be6c74dd94b99f8681497e9614d4f3f844e2602086d810bdfe6c29f0
+  metadata.gz: c2de2f136d2d4e521227c4551c299862e8554b999ba213650aee2dc53bab091cd5201cb72808985d07508c987df2ca14c426ebffdc1153063e8127023c0c1b60
+  data.tar.gz: 0f44d0e50cb93413c6d3afa0650695161a1fb4a5806e28665e29c9a566fe35f3feda6101d9df33d314b339b2b96647003adefa9fbf948b4ed158f6d0339eff0f

data/.circleci/config.yml ADDED Viewed

@@ -0,0 +1,31 @@
+version: 2
+jobs:
+  build:
+    machine:
+      enabled: true
+    working_directory: ~/embulk-input-remote
+    steps:
+      - checkout
+      - run: ssh-keygen -t ecdsa -f id_rsa_test -N ''
+      - run: docker-compose up -d
+      - run: docker-compose ps
+      - restore_cache:
+          key: embulk-input-remote-{{ checksum "build.gradle" }}
+      - run: ./gradlew checkstyle
+      - run: ./gradlew check --full-stacktrace
+      - save_cache:
+          paths:
+            - "~/.gradle"
+          key: embulk-input-remote-{{ checksum "build.gradle" }}
+      - deploy:
+          name: Push Gem to RubyGems.org and bump up
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "release" ]; then
+              curl -f -u $RUBYGEMS_USER:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
+              git checkout master
+              git reset --hard origin/master
+              ./gradlew release -Prelease.useAutomaticVersion=true
+            fi

data/.gitignore CHANGED Viewed

@@ -1,7 +1,14 @@
 *~
 /pkg/
 /tmp/
+*.gemspec
 .gradle/
 /classpath/
 build/
 .idea
+/.settings/
+/.metadata/
+.classpath
+.project
+id_rsa_test
+id_rsa_test.pub

data/build.gradle CHANGED Viewed

@@ -1,80 +1,53 @@
 buildscript {
-    ext.kotlin_version = '1.0.6'
+    ext.kotlinVersion = '1.1.1'
     repositories {
         mavenCentral()
+        jcenter()
+        maven { url 'http://kamatama41.github.com/maven-repository/repository' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "com.github.kamatama41:gradle-embulk-plugin:0.1.4"
+        classpath "net.researchgate:gradle-release:2.5.0"
     }
 }
-plugins {
-    id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
-    id "java"
-}
 apply plugin: "kotlin"
+apply plugin: "com.github.kamatama41.embulk"
+apply plugin: "net.researchgate.release"
 compileJava {
     options.compilerArgs = ['-Xlint:all']
 }
-import com.github.jrubygradle.JRubyExec
 repositories {
     mavenCentral()
-    jcenter()
-    maven { url 'http://kamatama41.github.com/embulk-test-helpers/repository' }
-}
-configurations {
-    provided
+    maven { url 'http://kamatama41.github.com/maven-repository/repository' }
 }
-version = "0.3.0"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile  "org.embulk:embulk-core:0.8.16"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     compile  "com.hierynomus:sshj:0.19.1"
     compile  "com.jcraft:jzlib:1.1.3"
-    provided "org.embulk:embulk-core:0.8.16"
-    testCompile 'com.kamatama41:embulk-test-helpers:0.1.2'
+    testCompile "com.github.kamatama41:embulk-test-helpers:0.3.2"
     testCompile "com.github.docker-java:docker-java:3.0.7"
-    // Uncomment when using local embulk-test-helpers (and settings.gradle as well)
-    //testCompile project(':embulk-test-helpers')
-}
-task classpath(type: Copy, dependsOn: ["jar"]) {
-    doFirst { file("classpath").deleteDir() }
-    from (configurations.runtime - configurations.provided + files(jar.archivePath))
-    into "classpath"
 }
-clean { delete 'classpath' }
-task gem(type: JRubyExec, dependsOn: ["build", "gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "build/gemspec"
-    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
+embulk {
+    version = "0.8.18"
+    category = "file-input"
+    name = "remote"
+    authors = ["Shinichi Ishimura"]
+    email = "shiketaudonko41@gmail.com"
+    description = "Reads files stored on Remote hosts by SCP."
+    licenses = ["MIT"]
+    homepage = "https://github.com/kamatama41/embulk-input-remote"
 }
-task gemspec << { file("build/gemspec").write($/
-Gem::Specification.new do |spec|
-  spec.name          = "${project.name}"
-  spec.version       = "${project.version}"
-  spec.authors       = ["Shinichi Ishimura"]
-  spec.summary       = %[Remote file input plugin for Embulk]
-  spec.description   = %[Reads files stored on Remote hosts by SCP.]
-  spec.email         = ["shiketaudonko41@gmail.com"]
-  spec.licenses      = ["MIT"]
-  spec.homepage      = "https://github.com/kamatama41/embulk-input-remote"
-  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
-  spec.test_files    = spec.files.grep(%r"^(test|spec)/")
-  spec.require_paths = ["lib"]
-  spec.add_development_dependency 'bundler', ['~> 1.0']
-  spec.add_development_dependency 'rake', ['>= 10.0']
-end
-/$)
+release {
+    git { requireBranch = 'master' }
 }
+afterReleaseBuild.dependsOn gemPush

data/classpath/annotations-13.0.jar ADDED Viewed

Binary file

data/classpath/embulk-input-remote-0.3.1.jar ADDED Viewed

Binary file

data/classpath/kotlin-stdlib-1.1.1.jar ADDED Viewed

Binary file

data/config/checkstyle/checkstyle.xml ADDED Viewed

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <!-- https://github.com/facebook/presto/blob/master/src/checkstyle/checks.xml -->
+    <module name="FileTabCharacter"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\r"/>
+        <property name="message" value="Line contains carriage return"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value=" \n"/>
+        <property name="message" value="Line has trailing whitespace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\{\n\n"/>
+        <property name="message" value="Blank line after opening brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\s*\}"/>
+        <property name="message" value="Blank line before closing brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\n"/>
+        <property name="message" value="Multiple consecutive blank lines"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\Z"/>
+        <property name="message" value="Blank line before end of file"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="Preconditions\.checkNotNull"/>
+        <property name="message" value="Use of checkNotNull"/>
+    </module>
+    <module name="TreeWalker">
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+            <property name="tokens" value="
+                LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
+                LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
+        </module>
+        <module name="EmptyStatement"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="allowLineBreaks" value="true"/>
+            <property name="option" value="nospace"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly">
+            <property name="option" value="nl"/>
+            <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="option" value="eol"/>
+            <property name="tokens" value="
+                 LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
+                 LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="WhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="UpperEll"/>
+        <module name="DefaultComesLast"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ModifierOrder"/>
+        <module name="OneStatementPerLine"/>
+        <module name="StringLiteralEquality"/>
+        <module name="MutableException"/>
+        <module name="EqualsHashCode"/>
+        <module name="InnerAssignment"/>
+        <module name="InterfaceIsType"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="MemberName"/>
+        <module name="LocalVariableName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="TypeName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="*,javax,java"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="tokens" value="
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
+                LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+                LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
+                LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
+                STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+        </module>
+    </module>
+</module>

data/config/checkstyle/default.xml ADDED Viewed

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<!--
+     This is a subset of ./checkstyle.xml which allows some loose styles
+-->
+<module name="Checker">
+    <module name="FileTabCharacter"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\r"/>
+        <property name="message" value="Line contains carriage return"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value=" \n"/>
+        <property name="message" value="Line has trailing whitespace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\n"/>
+        <property name="message" value="Multiple consecutive blank lines"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\Z"/>
+        <property name="message" value="Blank line before end of file"/>
+    </module>
+    <module name="TreeWalker">
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+            <property name="tokens" value="
+                LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
+                LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
+        </module>
+        <module name="EmptyStatement"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="allowLineBreaks" value="true"/>
+            <property name="option" value="nospace"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly">
+            <property name="option" value="nl"/>
+            <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="option" value="eol"/>
+            <property name="tokens" value="
+                 LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
+                 LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="WhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="UpperEll"/>
+        <module name="DefaultComesLast"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ModifierOrder"/>
+        <module name="OneStatementPerLine"/>
+        <module name="StringLiteralEquality"/>
+        <module name="MutableException"/>
+        <module name="EqualsHashCode"/>
+        <module name="InnerAssignment"/>
+        <module name="InterfaceIsType"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="MemberName"/>
+        <module name="LocalVariableName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="TypeName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="tokens" value="
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
+                LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+                LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
+                LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
+                STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+        </module>
+    </module>
+</module>

data/gradle.properties ADDED Viewed

	@@ -0,0 +1 @@
1	+ version=0.3.1

data/lib/embulk/input/remote.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 Embulk::JavaPlugin.register_input(
-  "remote", "org.embulk.input.RemoteFileInputPlugin",
+  "remote", "org.embulk.input.remote.RemoteFileInputPlugin",
   File.expand_path('../../../../classpath', __FILE__))

data/src/main/kotlin/org/embulk/input/{RemoteFileInputPlugin.kt → remote/RemoteFileInputPlugin.kt} RENAMED Viewed

@@ -1,4 +1,4 @@
-package org.embulk.input
+package org.embulk.input.remote
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.common.base.Optional
@@ -10,7 +10,6 @@ import org.embulk.config.ConfigSource
 import org.embulk.config.Task
 import org.embulk.config.TaskReport
 import org.embulk.config.TaskSource
-import org.embulk.input.remote.SSHClient
 import org.embulk.spi.BufferAllocator
 import org.embulk.spi.Exec
 import org.embulk.spi.FileInputPlugin
@@ -23,81 +22,78 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
 class RemoteFileInputPlugin : FileInputPlugin {
     interface PluginTask : Task {
-        @Config("hosts")
-        @ConfigDefault("[]")
-        fun getHosts(): List<String>
-        @Config("hosts_command")
-        @ConfigDefault("null")
-        fun getHostsCommand(): Optional<String>
+        @get:Config("hosts")
+        @get:ConfigDefault("[]")
+        val hosts: List<String>
-        @Config("hosts_separator")
-        @ConfigDefault("\" \"")
-        fun getHostsSeparator(): String
+        @get:Config("hosts_command")
+        @get:ConfigDefault("null")
+        val hostsCommand: Optional<String>
-        @Config("default_port")
-        @ConfigDefault("22")
-        fun getDefaultPort(): Int
+        @get:Config("hosts_separator")
+        @get:ConfigDefault("\" \"")
+        val hostsSeparator: String
-        @Config("path")
-        @ConfigDefault("\"\"")
-        fun getPath(): String
+        @get:Config("default_port")
+        @get:ConfigDefault("22")
+        val defaultPort: Int
-        @Config("path_command")
-        @ConfigDefault("null")
-        fun getPathCommand(): Optional<String>
+        @get:Config("path")
+        @get:ConfigDefault("\"\"")
+        val path: String
-        @Config("auth")
-        fun getAuthConfig(): AuthConfig
+        @get:Config("path_command")
+        @get:ConfigDefault("null")
+        val pathCommand: Optional<String>
-        @Config("ignore_not_found_hosts")
-        @ConfigDefault("false")
-        fun getIgnoreNotFoundHosts(): Boolean
+        @get:Config("auth")
+        val authConfig: AuthConfig
-        @Config("done_targets")
-        @ConfigDefault("[]")
-        fun getDoneTargets(): List<Target>
+        @get:Config("ignore_not_found_hosts")
+        @get:ConfigDefault("false")
+        val ignoreNotFoundHosts: Boolean
-        fun getTargets(): List<Target>
+        @get:Config("done_targets")
+        @get:ConfigDefault("[]")
+        val doneTargets: List<Target>
-        fun setTargets(targets: List<Target>)
+        var targets: List<Target>
-        @ConfigInject
-        fun getBufferAllocator(): BufferAllocator
+        @get:ConfigInject
+        val bufferAllocator: BufferAllocator
     }
     interface AuthConfig : Task {
-        @Config("type")
-        @ConfigDefault("\"public_key\"")
-        fun getType(): String
+        @get:Config("type")
+        @get:ConfigDefault("\"public_key\"")
+        val type: String
-        @Config("user")
-        @ConfigDefault("null")
-        fun getUser(): Optional<String>
+        @get:Config("user")
+        @get:ConfigDefault("null")
+        val user: Optional<String>
-        @Config("key_path")
-        @ConfigDefault("null")
-        fun getKeyPath(): Optional<String>
+        @get:Config("key_path")
+        @get:ConfigDefault("null")
+        val keyPath: Optional<String>
-        @Config("password")
-        @ConfigDefault("null")
-        fun getPassword(): Optional<String>
+        @get:Config("password")
+        @get:ConfigDefault("null")
+        val password: Optional<String>
-        @Config("skip_host_key_verification")
-        @ConfigDefault("false")
-        fun getSkipHostKeyVerification(): Boolean
+        @get:Config("skip_host_key_verification")
+        @get:ConfigDefault("false")
+        val skipHostKeyVerification: Boolean
     }
-    private val log = Exec.getLogger(javaClass)
+    private val log = getLogger()
     override fun transaction(config: ConfigSource, control: FileInputPlugin.Control): ConfigDiff {
-        val task = config.loadConfig(PluginTask::class.java)
+        val task: PluginTask = config.loadConfig()
         val targets = listTargets(task)
         log.info("Loading targets $targets")
-        task.setTargets(targets)
+        task.targets = targets
         // number of processors is same with number of targets
         val taskCount = targets.size
@@ -105,21 +101,21 @@ class RemoteFileInputPlugin : FileInputPlugin {
     }
     override fun resume(taskSource: TaskSource, taskCount: Int, control: FileInputPlugin.Control): ConfigDiff {
-        val task = taskSource.loadTask(PluginTask::class.java)
+        val task: PluginTask = taskSource.loadTask()
         control.run(taskSource, taskCount)
-        return Exec.newConfigDiff().set("done_targets", task.getTargets())
+        return Exec.newConfigDiff().set("done_targets", task.targets)
     }
     override fun cleanup(taskSource: TaskSource, taskCount: Int, successTaskReports: MutableList<TaskReport>) {
     }
     override fun open(taskSource: TaskSource, taskIndex: Int): TransactionalFileInput {
-        val task = taskSource.loadTask(PluginTask::class.java)
-        val target = task.getTargets()[taskIndex]
+        val task: PluginTask = taskSource.loadTask()
+        val target = task.targets[taskIndex]
-        return object : InputStreamTransactionalFileInput(task.getBufferAllocator(), { download(target, task) }) {
+        return object : InputStreamTransactionalFileInput(task.bufferAllocator, { download(target, task) }) {
             override fun abort() {
             }
@@ -132,36 +128,34 @@ class RemoteFileInputPlugin : FileInputPlugin {
     private fun listTargets(task: PluginTask): List<Target> {
         val hosts = listHosts(task)
         val path = getPath(task)
-        val doneTargets = task.getDoneTargets()
-        val ignoreNotFoundHosts = task.getIgnoreNotFoundHosts()
+        val doneTargets = task.doneTargets
+        val ignoreNotFoundHosts = task.ignoreNotFoundHosts
         return hosts.map {
             val split = it.split(Regex(":"))
             val host = split[0]
-            val port = if (split.size > 1) split[1].toInt() else task.getDefaultPort()
+            val port = if (split.size > 1) split[1].toInt() else task.defaultPort
             Target(host, port, path)
         }.filter {
             !doneTargets.contains(it)
         }.filter {
-            !ignoreNotFoundHosts || {
-                try {
-                    exists(it, task)
-                } catch (e: IOException) {
-                    log.warn("failed to check the file exists. $it", e)
-                    false
-                }
-            }()
+            !ignoreNotFoundHosts || try {
+                exists(it, task)
+            } catch (e: IOException) {
+                log.warn("failed to check the file exists. $it", e)
+                false
+            }
         }
     }
     private fun listHosts(task: PluginTask): List<String> {
-        return task.getHostsCommand().transform {
-            execCommand(it).split(task.getHostsSeparator().toRegex())
-        }.or(task.getHosts())
+        return task.hostsCommand.transform {
+            execCommand(it).split(task.hostsSeparator.toRegex())
+        }.or(task.hosts)
     }
     private fun getPath(task: PluginTask): String {
-        return task.getPathCommand().transform { execCommand(it) }.or(task.getPath())
+        return task.pathCommand.transform { execCommand(it) }.or(task.path)
     }
     private fun execCommand(command: String?): String {
@@ -183,9 +177,9 @@ class RemoteFileInputPlugin : FileInputPlugin {
     }
     private fun exists(target: Target, task: PluginTask): Boolean {
-        SSHClient.connect(target.host, target.port, task.getAuthConfig()).use { client ->
+        SSHClient.connect(target.host, target.port, task.authConfig).use { client ->
             val checkCmd = "ls ${target.path}"    // TODO: windows
-            val timeout = 5/* second */
+            val timeout = 5 /* seconds */
             val commandResult = client.execCommand(checkCmd, timeout)
             if (commandResult.status != 0) {
@@ -197,7 +191,7 @@ class RemoteFileInputPlugin : FileInputPlugin {
     }
     private fun download(target: Target, task: PluginTask): InputStream {
-        SSHClient.connect(target.host, target.port, task.getAuthConfig()).use { client ->
+        SSHClient.connect(target.host, target.port, task.authConfig).use { client ->
             val stream = ByteArrayOutputStream()
             client.scpDownload(target.path, stream)
             return ByteArrayInputStream(stream.toByteArray())
@@ -208,7 +202,6 @@ class RemoteFileInputPlugin : FileInputPlugin {
             @JsonProperty("host") val host: String,
             @JsonProperty("port") val port: Int,
             @JsonProperty("path") val path: String) {
         override fun toString(): String {
             return "$host:$port:$path"
         }

data/src/main/kotlin/org/embulk/input/remote/SSHClient.kt CHANGED Viewed

@@ -1,47 +1,48 @@
 package org.embulk.input.remote
 import net.schmizz.sshj.DefaultConfig
+import net.schmizz.sshj.SSHClient as SSHJ
 import net.schmizz.sshj.transport.verification.PromiscuousVerifier
 import net.schmizz.sshj.xfer.InMemoryDestFile
 import net.schmizz.sshj.xfer.LocalDestFile
-import org.embulk.input.RemoteFileInputPlugin
 import java.io.Closeable
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.concurrent.TimeUnit
-class SSHClient private constructor(val client: net.schmizz.sshj.SSHClient) : Closeable {
+class SSHClient private constructor(val client: SSHJ) : Closeable {
     companion object {
-        @JvmStatic
-        fun connect(
-                host: String, port: Int, authConfig: RemoteFileInputPlugin.AuthConfig
-        ): SSHClient {
-            val client = SSHClient(net.schmizz.sshj.SSHClient(DefaultConfig()))
+        fun connect(host: String, port: Int, authConfig: RemoteFileInputPlugin.AuthConfig): SSHClient {
+            val client = SSHClient(SSHJ(DefaultConfig()))
             client.connectToHost(host, port, authConfig)
             return client
         }
     }
     private fun connectToHost(host: String, port: Int, authConfig: RemoteFileInputPlugin.AuthConfig) {
-        if (authConfig.getSkipHostKeyVerification()) {
+        if (authConfig.skipHostKeyVerification) {
             client.addHostKeyVerifier(PromiscuousVerifier())
         }
         client.loadKnownHosts()
         client.connect(host, port)
-        val type = authConfig.getType()
-        val user = authConfig.getUser().or(System.getProperty("user.name"))
+        val type = authConfig.type
+        val user = authConfig.user.or(System.getProperty("user.name"))
-        if ("password" == type) {
-            client.authPassword(user, authConfig.getPassword().get())
-        } else if ("public_key" == type) {
-            authConfig.getKeyPath().transform {
-                client.authPublickey(user, it)
-            }.or {
-                client.authPublickey(user)
+        when (type) {
+            "password" -> {
+                client.authPassword(user, authConfig.password.get())
+            }
+            "public_key" -> {
+                authConfig.keyPath.transform {
+                    client.authPublickey(user, it)
+                }.or {
+                    client.authPublickey(user)
+                }
+            }
+            else -> {
+                throw UnsupportedOperationException("Unsupported auth type : $type")
             }
-        } else {
-            throw UnsupportedOperationException("Unsupported auth type : " + type)
         }
     }
@@ -49,13 +50,13 @@ class SSHClient private constructor(val client: net.schmizz.sshj.SSHClient) : Cl
         client.startSession().use { session ->
             val cmd = session.exec(command)
             cmd.join(timeoutSecond.toLong(), TimeUnit.SECONDS)
-            return CommandResult(cmd.exitStatus!!, cmd.inputStream)
+            return CommandResult(cmd.exitStatus, cmd.inputStream)
         }
     }
     fun scpDownload(path: String, stream: OutputStream) {
         client.useCompression()
-        client.newSCPFileTransfer().download(path, object :InMemoryDestFile() {
+        client.newSCPFileTransfer().download(path, object : InMemoryDestFile() {
             override fun getOutputStream(): OutputStream {
                 return stream
             }

data/src/main/kotlin/org/embulk/input/remote/extensions.kt ADDED Viewed

@@ -0,0 +1,11 @@
+package org.embulk.input.remote
+import org.embulk.config.ConfigSource
+import org.embulk.config.TaskSource
+import org.embulk.spi.Exec
+inline fun <reified T : Any> ConfigSource.loadConfig() = loadConfig(T::class.java)!!
+inline fun <reified T : Any> TaskSource.loadTask() = loadTask(T::class.java)!!
+fun Any.getLogger() = Exec.getLogger(javaClass)!!

data/src/test/kotlin/org/embulk/input/remote/TestRemoteFileInputPlugin.kt ADDED Viewed

@@ -0,0 +1,186 @@
+package org.embulk.input.remote
+import ch.qos.logback.classic.Level
+import ch.qos.logback.classic.Logger
+import com.github.dockerjava.core.DockerClientBuilder
+import org.embulk.config.ConfigSource
+import org.embulk.test.EmbulkPluginTest
+import org.embulk.test.TestOutputPlugin.Matcher.assertRecords
+import org.embulk.test.configFromResource
+import org.embulk.test.record
+import org.embulk.test.registerPlugin
+import org.embulk.test.set
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.slf4j.LoggerFactory
+class TestRemoteFileInputPlugin : EmbulkPluginTest() {
+    @Before fun setup() {
+        builder.registerPlugin(RemoteFileInputPlugin::class)
+        // Setup docker container
+        startContainer(CONTAINER_ID_HOST1)
+        startContainer(CONTAINER_ID_HOST2)
+        System.getenv("LOG_LEVEL")?.let {
+            // Set log level
+            val rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger
+            rootLogger.level = Level.toLevel(it)
+        }
+    }
+    @Test fun loadFromRemote() {
+        runInput(baseConfig())
+        assertRecords(record(1, "user1"))
+    }
+    @Ignore("Cannot pass on TravisCI, although pass on Local Mac OS...")
+    @Test fun loadFromRemoteViaPublicKey() {
+        val keyPath = System.getenv("KEY_PATH") ?: "./id_rsa_test"
+        val publicKeyAuth = config().set("auth" to config().set(
+                "type" to "public_key",
+                "key_path" to keyPath
+        ))
+        runInput(baseConfig().merge(publicKeyAuth))
+        assertRecords(record(1, "user1"))
+    }
+    @Test fun testMultiHosts() {
+        val multiHosts = config()
+                .set("hosts", listOf("localhost:10022", "localhost:10023"))
+        // Run
+        runInput(baseConfig().merge(multiHosts))
+        assertRecords(
+                record(1, "user1"),
+                record(2, "user2")
+        )
+    }
+    @Test fun loadAllFilesInDirectory() {
+        val directoryPath = config().set("path", "/mount")
+        runInput(baseConfig().merge(directoryPath))
+        assertRecords(
+                record(1L, "user1"),
+                record(1L, "command_user1")
+        )
+    }
+    @Test fun testDefaultPort() {
+        val defaultPort = config().set(
+                "hosts" to listOf("localhost"),
+                "default_port" to 10022
+        )
+        runInput(baseConfig().merge(defaultPort))
+        assertRecords(record(1L, "user1"))
+    }
+    @Test fun testConfDiff() {
+        val host2Config = config().set("hosts", listOf("localhost:10023"))
+        // Run
+        val runResult = runInput(baseConfig().merge(host2Config))
+        assertRecords(record(2, "user2"))
+        // Re-run with additional host1
+        val multiHost = config().set("hosts", listOf("localhost:10022", "localhost:10023"))
+        runInput(baseConfig().merge(multiHost), runResult.configDiff)
+        assertRecords(record(1, "user1"))
+    }
+    @Test fun testResume() {
+        // Stop host2 temporarily
+        stopContainer(CONTAINER_ID_HOST2)
+        // Run (but will fail)
+        val multiHost = config().set("hosts", listOf("localhost:10022", "localhost:10023"))
+        val config = baseConfig().merge(multiHost)
+        var resumableResult = resume(config)
+        assertThat(resumableResult.isSuccessful, `is`(false))
+        assertRecords(record(1, "user1"))
+        // Start host2 again
+        startContainer(CONTAINER_ID_HOST2)
+        // Resume
+        resumableResult = resume(config, resumableResult.resumeState)
+        assertThat(resumableResult.isSuccessful, `is`(true))
+        assertRecords(record(2, "user2"))
+    }
+    @Test fun testIgnoreNotFoundHosts() {
+        val ignoreNotFoundHosts = config().set(
+                "hosts" to listOf("localhost:10022", "localhost:10023"),
+                "ignore_not_found_hosts" to true
+        )
+        val config = baseConfig().merge(ignoreNotFoundHosts)
+        // Stop host2
+        stopContainer(CONTAINER_ID_HOST2)
+        // Run (host2 will be ignored)
+        val resumableResult = resume(config)
+        assertThat<Boolean>(resumableResult.isSuccessful, `is`(true))
+        assertRecords(record(1, "user1"))
+    }
+    @Test fun testCommandOptions() {
+        val ignoreNotFoundHosts = config().set(
+                "hosts_command" to "./src/test/resources/script/hosts.sh",
+                "hosts_separator" to "\n",
+                "path_command" to "echo '/mount/test_command.csv'"
+        )
+        runInput(baseConfig().merge(ignoreNotFoundHosts))
+        assertRecords(
+                record(1, "command_user1"),
+                record(2, "command_user2")
+        )
+    }
+    //////////////////////////////
+    // Helpers
+    //////////////////////////////
+    private fun baseConfig(): ConfigSource {
+        return configFromResource("yaml/base.yml")
+    }
+    companion object DockerUtils {
+        private val CONTAINER_ID_HOST1 = "embulkinputremote_host1_1"
+        private val CONTAINER_ID_HOST2 = "embulkinputremote_host2_1"
+        private val dockerClient = DockerClientBuilder.getInstance().build()
+        private fun stopContainer(containerId: String) {
+            if (isRunning(containerId)) {
+                dockerClient.stopContainerCmd(containerId).exec()
+            }
+        }
+        private fun startContainer(containerId: String) {
+            if (!isRunning(containerId)) {
+                dockerClient.startContainerCmd(containerId).exec()
+            }
+        }
+        private fun isRunning(containerId: String): Boolean {
+            return dockerClient.listContainersCmd().exec().any { container ->
+                container.names.any { name ->
+                    name.contains(containerId)
+                }
+            }
+        }
+    }
+}

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-remote
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shinichi Ishimura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -45,36 +45,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .circleci/config.yml
 - .gitignore
-- .travis.yml
 - Dockerfile
 - LICENSE.txt
 - README.md
 - build.gradle
+- config/checkstyle/checkstyle.xml
+- config/checkstyle/default.xml
 - docker-compose.yml
+- gradle.properties
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
 - gradlew.bat
 - lib/embulk/input/remote.rb
-- settings.gradle
-- src/main/kotlin/org/embulk/input/RemoteFileInputPlugin.kt
+- src/main/kotlin/org/embulk/input/remote/RemoteFileInputPlugin.kt
 - src/main/kotlin/org/embulk/input/remote/SSHClient.kt
-- src/test/kotlin/org/embulk/input/TestRemoteFileInputPlugin.kt
+- src/main/kotlin/org/embulk/input/remote/extensions.kt
+- src/test/kotlin/org/embulk/input/remote/TestRemoteFileInputPlugin.kt
 - src/test/resources/input/host1/test.csv
 - src/test/resources/input/host1/test_command.csv
 - src/test/resources/input/host2/test.csv
 - src/test/resources/input/host2/test_command.csv
 - src/test/resources/script/hosts.sh
 - src/test/resources/yaml/base.yml
-- classpath/bcpkix-jdk15on-1.51.jar
+- classpath/embulk-input-remote-0.3.1.jar
+- classpath/sshj-0.19.1.jar
 - classpath/bcprov-jdk15on-1.51.jar
-- classpath/eddsa-0.1.0.jar
-- classpath/embulk-input-remote-0.3.0.jar
 - classpath/jzlib-1.1.3.jar
-- classpath/kotlin-runtime-1.0.6.jar
-- classpath/kotlin-stdlib-1.0.6.jar
-- classpath/sshj-0.19.1.jar
+- classpath/annotations-13.0.jar
+- classpath/bcpkix-jdk15on-1.51.jar
+- classpath/eddsa-0.1.0.jar
+- classpath/kotlin-stdlib-1.1.1.jar
 homepage: https://github.com/kamatama41/embulk-input-remote
 licenses:
 - MIT

data/.travis.yml DELETED Viewed

@@ -1,21 +0,0 @@
-sudo: required
-language: java
-jdk:
-  - oraclejdk8
-env:
-  - >-
-   KEY_PATH=$PWD/id_rsa_test
-services:
-  - docker
-before_install:
-  - ssh-keygen -t ecdsa -f ${KEY_PATH} -N ''
-  - docker-compose up -d
-  - docker-compose ps
-script:
-  - ./gradlew --info check

data/classpath/embulk-input-remote-0.3.0.jar DELETED Viewed

Binary file

data/classpath/kotlin-runtime-1.0.6.jar DELETED Viewed

Binary file

data/classpath/kotlin-stdlib-1.0.6.jar DELETED Viewed

Binary file

data/settings.gradle DELETED Viewed

@@ -1,3 +0,0 @@
-// Uncomment when using local embulk-test-helpers (and build.gradle as well)
-//include ':embulk-test-helpers'
-//project(':embulk-test-helpers').projectDir = new File(settingsDir, '../embulk-test-helpers')

data/src/test/kotlin/org/embulk/input/TestRemoteFileInputPlugin.kt DELETED Viewed

@@ -1,201 +0,0 @@
-package org.embulk.input
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.Logger
-import com.github.dockerjava.core.DockerClientBuilder
-import org.embulk.config.ConfigSource
-import org.embulk.spi.InputPlugin
-import org.embulk.test.EmbulkPluginTest
-import org.embulk.test.ExtendedEmbulkTests
-import org.embulk.test.TestOutputPlugin.assertRecords
-import org.embulk.test.TestingEmbulk
-import org.embulk.test.Utils.record
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Ignore
-import org.junit.Test
-import org.slf4j.LoggerFactory
-import java.util.Arrays
-class TestRemoteFileInputPlugin : EmbulkPluginTest() {
-    private val CONTAINER_ID_HOST1 = "embulkinputremote_host1_1"
-    private val CONTAINER_ID_HOST2 = "embulkinputremote_host2_1"
-    private val dockerClient = DockerClientBuilder.getInstance().build()
-    override fun setup(builder: TestingEmbulk.Builder) {
-        builder.registerPlugin(InputPlugin::class.java, "remote", RemoteFileInputPlugin::class.java)
-        // Setup docker container
-        startContainer(CONTAINER_ID_HOST1)
-        startContainer(CONTAINER_ID_HOST2)
-        val logLevel = System.getenv("LOG_LEVEL")
-        if (logLevel != null) {
-            // Set log level
-            val rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger
-            rootLogger.level = Level.toLevel(logLevel)
-        }
-    }
-    @Test fun loadFromRemote() {
-        runInput(baseConfig())
-        assertRecords(record(1, "user1"))
-    }
-    @Ignore("Cannot pass on TravisCI, although pass on Local Mac OS...")
-    @Test fun loadFromRemoteViaPublicKey() {
-        var keyPath: String? = System.getenv("KEY_PATH")
-        if (keyPath == null) {
-            keyPath = "./id_rsa_test"
-        }
-        val publicKeyAuth = newConfig().set("auth", newConfig()
-                .set("type", "public_key")
-                .set("key_path", keyPath)
-        )
-        runInput(baseConfig().merge(publicKeyAuth))
-        assertRecords(record(1, "user1"))
-    }
-    @Test fun testMultiHosts() {
-        val multiHosts = newConfig()
-                .set("hosts", Arrays.asList("localhost:10022", "localhost:10023"))
-        val config = baseConfig().merge(multiHosts)
-        // Run
-        runInput(config)
-        assertRecords(
-                record(1, "user1"),
-                record(2, "user2")
-        )
-    }
-    @Test fun loadAllFilesInDirectory() {
-        val directoryPath = newConfig()
-                .set("path", "/mount")
-        val config = baseConfig().merge(directoryPath)
-        runInput(config)
-        assertRecords(
-                record(1L, "user1"),
-                record(1L, "command_user1")
-        )
-    }
-    @Test fun testDefaultPort() {
-        val defaultPort = newConfig()
-                .set("hosts", listOf("localhost"))
-                .set("default_port", 10022)
-        runInput(baseConfig().merge(defaultPort))
-        assertRecords(record(1L, "user1"))
-    }
-    @Test fun testConfDiff() {
-        val host2Config = newConfig()
-                .set("hosts", listOf("localhost:10023"))
-        var config = baseConfig().merge(host2Config)
-        // Run
-        val runResult = runInput(config)
-        assertRecords(record(2, "user2"))
-        // Re-run with additional host1
-        val multiHost = newConfig()
-                .set("hosts", Arrays.asList("localhost:10022", "localhost:10023"))
-        config = baseConfig().merge(multiHost)
-        runInput(config, runResult.configDiff)
-        assertRecords(record(1, "user1"))
-    }
-    @Test fun testResume() {
-        val multiHost = newConfig()
-                .set("hosts", Arrays.asList("localhost:10022", "localhost:10023"))
-        val config = baseConfig().merge(multiHost)
-        // Stop host2 temporarily
-        stopContainer(CONTAINER_ID_HOST2)
-        // Run (but will fail)
-        var resumableResult = resume(config)
-        assertThat(resumableResult.isSuccessful, `is`(false))
-        assertRecords(record(1, "user1"))
-        // Start host2 again
-        startContainer(CONTAINER_ID_HOST2)
-        // Resume
-        resumableResult = resume(config, resumableResult.resumeState)
-        assertThat(resumableResult.isSuccessful, `is`(true))
-        assertRecords(record(2, "user2"))
-    }
-    @Test fun testIgnoreNotFoundHosts() {
-        val ignoreNotFoundHosts = newConfig()
-                .set("hosts", Arrays.asList("localhost:10022", "localhost:10023"))
-                .set("ignore_not_found_hosts", true)
-        val config = baseConfig().merge(ignoreNotFoundHosts)
-        // Stop host2
-        stopContainer(CONTAINER_ID_HOST2)
-        // Run (host2 will be ignored)
-        val resumableResult = resume(config)
-        assertThat<Boolean>(resumableResult.isSuccessful, `is`(true))
-        assertRecords(record(1, "user1"))
-    }
-    @Test fun testCommandOptions() {
-        val ignoreNotFoundHosts = newConfig()
-                .set("hosts_command", "./src/test/resources/script/hosts.sh")
-                .set("hosts_separator", "\n")
-                .set("path_command", "echo '/mount/test_command.csv'")
-        val config = baseConfig().merge(ignoreNotFoundHosts)
-        runInput(config)
-        assertRecords(
-                record(1, "command_user1"),
-                record(2, "command_user2")
-        )
-    }
-    //////////////////////////////
-    // Helpers
-    //////////////////////////////
-    private fun baseConfig(): ConfigSource {
-        return ExtendedEmbulkTests.configFromResource("yaml/base.yml")
-    }
-    //////////////////////////////
-    // Methods for Docker
-    //////////////////////////////
-    private fun stopContainer(containerId: String) {
-        if (isRunning(containerId)) {
-            dockerClient.stopContainerCmd(containerId).exec()
-        }
-    }
-    private fun startContainer(containerId: String) {
-        if (!isRunning(containerId)) {
-            dockerClient.startContainerCmd(containerId).exec()
-        }
-    }
-    private fun isRunning(containerId: String): Boolean {
-        return dockerClient.listContainersCmd().exec().any { container ->
-            container.names.any { name ->
-                name.contains(containerId)
-            }
-        }
-    }
-}