Skip to content

Commit

Permalink
Merge pull request #23 from embulk/add_path_match_pattern
Browse files Browse the repository at this point in the history
Add path match pattern to filter files by regular expression
  • Loading branch information
minidragon88 authored Nov 18, 2019
2 parents 6970494 + e58cf97 commit f74a874
Show file tree
Hide file tree
Showing 6 changed files with 317 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: required
language: java
jdk:
- oraclejdk8
- openjdk8
services:
- docker
before_script:
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Release 0.2.1 - 2019-11-19
* Add `path_match_pattern` to filter files by regular expression [#23](https://github.com/embulk/embulk-input-ftp/pull/23)

Release 0.2.0 - 2018-12-26
* Use file name output feature in Embulk core to show file name in cmdout [#20](https://github.com/embulk/embulk-input-ftp/pull/20)

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ embulk-input-ftp v0.2.0+ requires Embulk v0.9.12+
- **user**: user name to login (string, optional)
- **password**: password to login (string, default: `""`)
- **path_prefix** prefix of target files (string, required)
- **path_match_pattern**: regexp to match file paths. If a file path doesn't match with this pattern, the file will be skipped (regexp string, optional)
- **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)
Expand Down Expand Up @@ -131,7 +132,7 @@ FTP_TEST_HOST (default: localhost)
FTP_TEST_PORT (default: 11021)
FTP_TEST_SSL_PORT (default:990)
FTP_TEST_USER (default: scott)
FTP_TEST_PASSWORD (default: tigger)
FTP_TEST_PASSWORD (default: tiger)
FTP_TEST_SSL_TRUSTED_CA_CERT_FILE
FTP_TEST_SSL_TRUSTED_CA_CERT_DATA
```
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def bintrayReleaseProjects = [

allprojects {
group = 'org.embulk.input.ftp'
version = "0.2.0"
version = "0.2.1"

apply plugin: 'com.jfrog.bintray'
apply plugin: 'maven-publish'
Expand Down
Loading

0 comments on commit f74a874

Please sign in to comment.