embulk-input-ftp 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b2889d8502aead956ce72dc5fcd2af263634b0
-  data.tar.gz: 2b053e4f95a51e3e83763424c4decd225be5710d
+  metadata.gz: 00c4a9fb76f69fd4c8cc0364d0204286c8fc00c8
+  data.tar.gz: 3c1c4545a7b51ae7832708b93af859fd12f5195a
 SHA512:
-  metadata.gz: 6078f18994e29b8f3fcf914a8ec2eec0d94ae942403c834176ab088b060e03a9f341ff6087e34e4405c11e77bfcf2d9f33f59e8b6e063c3490ad2c8c597a830c
-  data.tar.gz: 1ab2c9a1d5564565cfcf7da5ff08b36c376b341ba8f176687ac65a8fc6c5290e3ffed7076dff3ee035c83582b677ceeff253b2aae29c0adc444ad9752f07cd25
+  metadata.gz: 7bb065f223aceb3519b07eaef2454f92dbd4832f795a5177fbb1a0fb5fcd28bb794fa59b28baead1c98b547e119737f0e3acec1dc2bf326731e590d333672c7c
+  data.tar.gz: 45dc1c461576924388e9ee025ce9cc0a86536d07cba5e0daa69df11c152e767bc43002e291a69be2baaecaab2acb64ed076fbedad75192a9ff8599ca87face6b

data/build.gradle

@@ -1,59 +1,8 @@
-plugins {
-    id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
-    id "java"
-    id "jacoco"
-}
-import com.github.jrubygradle.JRubyExec
-repositories {
-    mavenCentral()
-    jcenter()
-}
-configurations {
-    provided
-}
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-version = "0.1.5"
-
 dependencies {
-    compile  "org.embulk:embulk-core:0.7.0"
-    provided "org.embulk:embulk-core:0.7.0"
-    compile files("libs/ftp4j-1.7.2.jar")
-    compile "org.bouncycastle:bcpkix-jdk15on:1.52"
-    testCompile "junit:junit:4.+"
-}
-
-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: ["gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "${project.name}.gemspec"
-    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
-}
-
-task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
-    script "pkg/${project.name}-${project.version}.gem"
-}
-
-task "package"(dependsOn: ["gemspec", "classpath"]) << {
-    println "> Build succeeded."
-    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+    compile project(":embulk-util-ftp")
 }
 
-task gemspec {
-    ext.gemspecFile = file("${project.name}.gemspec")
-    inputs.file "build.gradle"
-    outputs.file gemspecFile
-    doLast { gemspecFile.write($/
+task gemspec << { file("build/gemspec").write($/
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
@@ -68,11 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")
   spec.require_paths = ["lib"]
 
-  #spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION']
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'rake', ['>= 10.0']
 end
 /$)
-    }
 }
-clean { delete "${project.name}.gemspec" }

data/src/main/java/org/embulk/input/FtpFileInputPlugin.java

@@ -41,10 +41,9 @@ import org.embulk.spi.util.InputStreamFileInput;
 import org.embulk.spi.util.ResumableInputStream;
 import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
-import org.embulk.input.ftp.BlockingTransfer;
-import org.embulk.input.ftp.SSLPlugins;
-import org.embulk.input.ftp.SSLPlugins.SSLPluginTask;
-import org.embulk.input.ftp.SSLPlugins.SSLPluginConfig;
+import org.embulk.util.ftp.BlockingTransfer;
+import org.embulk.util.ftp.SSLPlugins;
+import org.embulk.util.ftp.SSLPlugins.SSLPluginConfig;
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 
 public class FtpFileInputPlugin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -45,26 +45,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- ChangeLog
-- README.md
 - build.gradle
-- gradle/wrapper/gradle-wrapper.jar
-- gradle/wrapper/gradle-wrapper.properties
-- gradlew
-- gradlew.bat
 - lib/embulk/input/ftp.rb
-- libs/ftp4j-1.7.2.jar
 - src/main/java/org/embulk/input/FtpFileInputPlugin.java
-- src/main/java/org/embulk/input/ftp/BlockingTransfer.java
-- src/main/java/org/embulk/input/ftp/SSLPlugins.java
-- src/main/java/org/embulk/input/ftp/TrustManagers.java
 - src/test/java/org/embulk/input/TestFtpFileInputPlugin.java
 - classpath/bcpkix-jdk15on-1.52.jar
+- classpath/embulk-input-ftp-0.1.6.jar
 - classpath/bcprov-jdk15on-1.52.jar
-- classpath/embulk-input-ftp-0.1.5.jar
 - classpath/ftp4j-1.7.2.jar
+- classpath/embulk-util-ftp-0.1.6.jar
 homepage: https://github.com/embulk/embulk-input-ftp
 licenses:
 - Apache 2.0

data/.gitignore

@@ -1,8 +0,0 @@
-*~
-/pkg/
-/tmp/
-*.gemspec
-.gradle/
-/classpath/
-build/
-.idea

data/.travis.yml

@@ -1,5 +0,0 @@
-language: java
-jdk:
-- oraclejdk8
-script:
-- ./gradlew --info check jacocoTestReport

data/ChangeLog

@@ -1,28 +0,0 @@
-Release 0.1.5 - 2016-11-16
-
-* Added support for Java7
-
-Release 0.1.4 - 2016-11-16
-
-* Added support for FTPES(FTPS explicit) 
-* Added support for incremental option
-
-Release 0.1.3 - 2015-08-18
-
-* Upgraded embulk version to 0.7.0
-
-Release 0.1.2 - 2015-06-10
-
-* Added support for SSL certificate verification
-
-
-Release 0.1.1 - 2015-04-29
-
-* Added support for SSL
-* Fixed last_path handling
-
-
-Release 0.1.0 - 2015-04-29
-
-* First release
-

data/README.md

@@ -1,105 +0,0 @@
-# FTP file input plugin for Embulk
-
-## Overview
-
-This plugin support **FTP**, **FTPES(FTPS explicit)**, **FTPS(FTPS implicit)** and doesn't support **SFTP**.
-
-If you want to use SFTP, please use [embulk-input-sftp](https://github.com/embulk/embulk-input-sftp).
-
-
-* **Plugin type**: file input
-* **Resume supported**: yes
-* **Cleanup supported**: yes
-
-## Configuration
-
-- **host**: FTP server address (string, required)
-- **port**: FTP server port number (integer, default: `21`. `990` if `ssl` is true and `ssl_explicit` is false)
-- **user**: user name to login (string, optional)
-- **password**: password to login (string, default: `""`)
-- **path_prefix** prefix of target files (string, required)
-- **incremental** enables incremental loading(boolean, optional. default: true. If incremental loading is enabled, config diff for the next execution will include last_path parameter so that next execution skips files before the path. Otherwise, last_path will not be included.
-- **passive_mode**: use passive mode (boolean, default: true)
-- **ascii_mode**: use ASCII mode instead of binary mode (boolean, default: false)
-- **ssl**: use FTPS (SSL encryption). (boolean, default: false)
-- **ssl_explicit** use FTPS(explicit) instead of FTPS(implicit). (boolean, default:true)
-- **ssl_verify**: verify the certification provided by the server. By default, connection fails if the server certification is not signed by one the CAs in JVM's default trusted CA list. (boolean, default: true)
-- **ssl_verify_hostname**: verify server's hostname matches with provided certificate. (boolean, default: true)
-- **ssl_trusted_ca_cert_file**: if the server certification is not signed by a certificate authority, set path to the X.508 certification file (pem file) of a private CA (string, optional)
-- **ssl_trusted_ca_cert_data**: similar to `ssl_trusted_ca_cert_file` but embed the contents of the PEM file as a string value instead of path to a local file (string, optional)
-
-### FTP / FTPS default port number
-
-FTP and FTPS server usually listens following port number(TCP) as default.
-
-Please be sure to configure firewall rules.
-
-|                         | FTP | FTPS(explicit) = FTPES | FTPS(implicit) = FTPS |
-|:------------------------|----:|-----------------------:|----------------------:|
-| Control channel port    |  21 |                     21 |             990 (\*1) |
-| Data channel port (\*2) |  20 |                     20 |                   989 |
-
-1. If you're using both of FTPS(implicit) and FTP, server may also listen 21/TCP for unecnrypted FTP.
-2. If you're using `passive mode`, data channel port can be taken between 1024 and 65535.
-
-## Example
-
-Simple FTP:
-
-```yaml
-in:
-  type: ftp
-  host: ftp.example.net
-  port: 21
-  user: anonymous
-  path_prefix: /ftp/file/path/prefix
-```
-
-FTPS encryption without server certificate verification:
-
-```yaml
-in:
-  type: ftp
-  host: ftp.example.net
-  port: 21
-  user: anonymous
-  password: "mypassword"
-  path_prefix: /ftp/file/path/prefix
-
-  ssl: true
-  ssl_verify: false
-```
-
-FTPS encryption with server certificate verification:
-
-```yaml
-in:
-  type: ftp
-  host: ftp.example.net
-  port: 21
-  user: anonymous
-  password: "mypassword"
-  path_prefix: /ftp/file/path/prefix
-
-  ssl: true
-  ssl_verify: true
-
-  ssl_verify_hostname: false   # to disable server hostname verification (optional)
-
-  # if the server use self-signed certificate, or set path to the pem file (optional)
-  ssl_trusted_ca_cert_file: /path/to/ca_cert.pem
-
-  # or embed contents of the pem file here (optional)
-  ssl_trusted_ca_cert_data: |
-      -----BEGIN CERTIFICATE-----
-      MIIFV...
-      ...
-      ...
-      -----END CERTIFICATE-----
-```
-
-## Build
-
-```
-$ ./gradlew gem
-```

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue Aug 11 00:26:20 PDT 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip

data/gradlew

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"