embulk-output-azure_blob_storage 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c7205b0ee914070c15b48038ec9afd82134136
-  data.tar.gz: 1173936e3234bd114085b28545f1fc6df1e1cec3
+  metadata.gz: ccdaca1700220ec52d0b259d437f287606fa6d92
+  data.tar.gz: da45aa15412af0702c12c1ffb8dbc01039f81137
 SHA512:
-  metadata.gz: 8d19051e9154907145766a16215242996ca51abf3a968d2cfea6861c278f5bcfa6730d9e12fccaa9b97d90d7542bf08a75a8f408889b47c5e7f913c087d26f6f
-  data.tar.gz: db41bfb30ec06404c9d3d6691f0d2b12cb080f227ca37b2559db10dc4fa0dd2544474b0da7ff65756164c5d65adda6a14889bbd0a54f14280ea128ee4837d65f
+  metadata.gz: d97b14a501714e14e7783d1df01930b2a47b465b4ef3a0ed96da435054062a0ca4d4249b65551e57124203aec81bd2ec8c54e41845da781ffb3f6e46caf4a98a
+  data.tar.gz: 441367911e739ec536725211a55bc6b776ff27b7a2dec694138dd87f3c74c42a983a447238a31fbd4f9786cbdc2f65d03c48e489298ef3dc4b0a6f893a6901c8

data/.travis.yml

@@ -1,5 +1,16 @@
 language: java
+
 jdk:
-- oraclejdk7
+  - oraclejdk8
+
+env:
+  global:
+    - AZURE_ACCOUNT_NAME=sakamatest
+    - AZURE_CONTAINER=blobcontainers
+    - AZURE_CONTAINER_DIRECTORY=unittests
+    - secure: "Fi2RdoSEHzTieSs3+Bw6pJ/K3nM3Hwnhdd9qQaXbhVEjTh9ZQ7lEzJj8eJqbItH1Fwh7AlFnZoF587rtHGXRPRjLANSvisiBBXQrPx6knGUq0iK/i0PEia2X3Ki1M6mNLuDzcDex7gWwjDXBVIFW43mM8TJkR/awuJHG/8/Xj7iplxKB6B1lwDVjIdAoMwTeauy3Jcnpute4FwwizxWPqHlPlsRJBEDbyBLsxOVePXT6pxS6o8TJEGN9gP5LVdh62v+9X4cB9+VsQv2imP932wj9UONQBqdjn0kwuvtVEOwCqtGOFVDDxXGozNwz0PWd6FphUB1UNWMg+PrWnvnXnTVC5P+y9YlE/bTnF8aKkRAn4WcRZXQ/vVnLZibisuKCmHV/kswVmMXX+FazYrxUMZmfsyDlPEVsE/l3Bjfhvq9lxAQUjhc17aKDBhrwSs5ZSWlWgBzL0IYumky8S9os+hnZYINXLD7q7QqqBIA7QozCim2S2dPlWDzIBVVY8mQ6zqkr3y4iA/fKPvL7ugwU4l35y+6FcC5TRRN8+RjuCnVrCqU+bBqpHtu8cqVefYeIwaIInRsFCE0fXCA9xO3AfFiB0KDStp3SNi6gYn+IlBcRXqbeQPx/2AtmtTjpf4grT4xJ0YVArF2Fd6Ecl3ZkJ7gZeERGNzwq8hyeLEyYPtE="
+
 script:
-- ./gradlew --info check jacocoTestReport
+  - ./gradlew gem
+  - ./gradlew --info check jacocoTestReport
+

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.6 - 2018-10-18
+* [maintenance]  Fix bug that happens while deleting temporary files on Windows [#12](https://github.com/sakama/embulk-output-azure_blob_storage/pull/12)
+
 ## 0.1.5 - 2016-04-06
 
 * [maintenance] Refactoring codes [#8](https://github.com/sakama/embulk-output-azure_blob_storage/pull/8)

data/README.md

@@ -1,4 +1,5 @@
 # Azure Blob Storage file output plugin for Embulk
+[![Build Status](https://travis-ci.org/embulk/embulk-output-azure_blob_storage.svg?branch=master)](https://travis-ci.org/embulk/embulk-output-azure_blob_storage)
 
 [Embulk](http://www.embulk.org/) file output plugin stores files on [Microsoft Azure](https://azure.microsoft.com/) [Blob Storage](https://azure.microsoft.com/en-us/documentation/articles/storage-introduction/#blob-storage)
 

data/appveyor.yml

@@ -0,0 +1,25 @@
+version: "{branch} {build}"
+
+build:
+  verbosity: detailed
+
+# To avoid call-selfrun.bat FileNotFound exception, it installs and uses handle.exe as workaround provided by AppVeyor support.
+# see http://help.appveyor.com/discussions/problems/5975-the-process-cannot-access-the-file-because-it-is-being-used-by-another-process
+build_script:
+- gradlew.bat --info --no-daemon check
+
+cache:
+- C:\Users\appveyor\.gradle
+
+environment:
+  matrix:
+  - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  AZURE_ACCOUNT_NAME: sakamatest
+  AZURE_CONTAINER: blobcontainers
+  AZURE_CONTAINER_DIRECTORY: unittests_appveyor
+  # Encrypted value created on AppVeyor console https://ci.appveyor.com/tools/encrypt
+  AZURE_ACCOUNT_KEY:
+    secure: jrgzEWXOp3+c6r1clT8fRH9ck/aIdnBdVpqQWAwEH/t6w6mGzvBxIt2p0O7dMOowntuIEQBZZ3sIZXT1WzcgGLr11lShl73Y5c93NZJ9oZ7NK1vT4FXaWkRdT4jnAeIn
+
+matrix:
+  fast_finish: true

data/build.gradle

@@ -14,20 +14,20 @@ configurations {
     provided
 }
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
-version = "0.1.5"
+version = "0.1.6"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.2"
-    provided "org.embulk:embulk-core:0.8.2"
+    compile  "org.embulk:embulk-core:0.9.8"
+    provided "org.embulk:embulk-core:0.9.8"
 
-    compile "com.microsoft.azure:azure-storage:4.0.0"
+    compile "com.microsoft.azure:azure-storage:8.0.0"
 
     testCompile "junit:junit:4.12"
-    testCompile "org.embulk:embulk-core:0.8.2:tests"
-    testCompile "org.embulk:embulk-standards:0.8.2"
+    testCompile "org.embulk:embulk-core:0.9.8:tests"
+    testCompile "org.embulk:embulk-standards:0.9.8"
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 13 12:41:02 JST 2016
+#Sun Jan 08 00:35:58 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

data/gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

data/src/main/java/org/embulk/output/azure_blob_storage/AzureBlobStorageFileOutputPlugin.java

@@ -162,7 +162,7 @@ public class AzureBlobStorageFileOutputPlugin
                     suffix = "." + suffix;
                 }
                 filePath = pathPrefix + String.format(sequenceFormat, taskIndex, fileIndex) + suffix;
-                file = File.createTempFile(filePath, ".tmp");
+                file = Exec.getTempFileSpace().createTempFile(filePath, ".tmp");
                 log.info("Writing local file {}", file.getAbsolutePath());
                 output = new BufferedOutputStream(new FileOutputStream(file));
             }
@@ -222,9 +222,8 @@ public class AzureBlobStorageFileOutputPlugin
                                     log.info("Upload start {} to {}", file.getAbsolutePath(), filePath);
                                     blob.upload(new BufferedInputStream(new FileInputStream(file)), file.length());
                                     log.info("Upload completed {} to {}", file.getAbsolutePath(), filePath);
-                                    log.info("Delete completed local file {}", file.getAbsolutePath());
-                                    if (!file.delete()) {
-                                        throw new ConfigException("Couldn't delete local file " + file.getAbsolutePath());
+                                    if (file.exists() && !file.delete()) {
+                                        log.warn("Couldn't delete local file " + file.getAbsolutePath());
                                     }
                                     return null;
                                 }

data/src/test/java/org/embulk/output/azure_blob_storage/TestAzureBlobStorageFileOutputPlugin.java

@@ -129,7 +129,8 @@ public class TestAzureBlobStorageFileOutputPlugin
     @Test
     public void testTransactionCreateNonexistsContainer() throws Exception
     {
-        String container = "non-exists-container";
+        // Azure Container can't be created 30 seconds after deletion.
+        String container = "non-exists-container-" + System.currentTimeMillis();
         deleteContainerIfExists(container);
 
         assertEquals(false, isExistsContainer(container));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-azure_blob_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +49,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - README.md
+- appveyor.yml
 - build.gradle
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
@@ -61,10 +62,11 @@ files:
 - src/test/java/org/embulk/output/azure_blob_storage/TestAzureBlobStorageFileOutputPlugin.java
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
-- classpath/azure-storage-4.0.0.jar
-- classpath/commons-lang3-3.4.jar
-- classpath/embulk-output-azure_blob_storage-0.1.5.jar
-- classpath/jackson-core-2.6.0.jar
+- classpath/azure-storage-8.0.0.jar
+- classpath/guava-20.0.jar
+- classpath/azure-keyvault-core-1.0.0.jar
+- classpath/jackson-core-2.9.4.jar
+- classpath/embulk-output-azure_blob_storage-0.1.6.jar
 homepage: https://github.com/embulk/embulk-output-azure_blob_storage
 licenses:
 - Apache-2.0