embulk 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf78740441995394000d1ada6d8ca939cda77754
-  data.tar.gz: 9da2b0b76a8b702dffa2063fcc626e1ea25698af
+  metadata.gz: 2aebc5b785b1d7e303dd69fe4b7922abdce2954e
+  data.tar.gz: 99189534152199abb9b280b7f7ce5511691098e7
 SHA512:
-  metadata.gz: 12cec9ae89bab146559eaa68e2cc57a6ac71a48e18b81b3c393077842dc7f30b7fb8ea41502538c23d1ae0ca2e64f428cacd534e04f06d59d39d6e096b9b2d79
-  data.tar.gz: 513f463830ac564a873bf11a0a58905f57c4de91f4415718b428721cc836ca54d25c3293869b1974652189c9c29f4969c120d8ce1ada72e5d55e7025e7108234
+  metadata.gz: fafcf2fcaadaa263619c3f56e90f7a3abf5fa6b257c4ab8338ab0e84130e47ecec5fb3bc09c45b4ccbb7ec207123b1f4517324605000de2525a7632f32ae187f
+  data.tar.gz: 7b72ad6d02f613583624265608ebda2201159b28aaefeed8d5fd9e1a553c2ff361078b4e68d5a2a7f242dc4329536c58925ee4b20739274f9dafb2ba81761d93

data/.travis.yml

@@ -2,15 +2,14 @@ language: java
 jdk:
   - oraclejdk8
 sudo: false
-addons:
-  apt_packages:
-    - sphinx
-    - yardoc
+install:
+  - pip install --user sphinx
 script:
   - ./gradlew check
-  - ./embulk-docs/push-gh-pages.sh
+after_success:
+  - PATH="$HOME/.local/bin:$PATH" ./embulk-docs/push-gh-pages.sh
 env:
   global:
-    GIT_USER_NAME: travis
-    GIT_USER_NAME: travis@embulk.org
-    secure: ZiDtC073/oAXtPkXZYP9MoVBidLrrjeAV8PeXICtTzVMxR4Td5QDifiTy2NNStVLT+1g6NgzjSK9XFpDyVFb2cNy+9EOP+FoSC6Q0gRD/9nIrvB/LAtiDDfLqRtUrvPjN6U8BF3Zm2IvwTP77ml8bZZy3SH9ob4NQhxxEXVtynI=
+    - GIT_USER_NAME=travis
+    - GIT_USER_EMAIL=travis@embulk.org
+    - secure: K5qT2PcCP/40dNW+1H4NZ6y1+GAZbyP/lMQ1tSMsAICGkMQ/A+Mp5wtnIGIsAf6JGcJ1PvpCoLE1V6wKFL5fEwxi4SRcTnZTh9PkeAk8dgezOMoX4EqeZiQAYv4MM2zKL+Gr6QivjmRA7I5jrZCo8JyaA5XfQ7ygjICKNJy8NaE=

data/README.md

@@ -24,7 +24,7 @@ You can release plugins to share your efforts of data cleaning, error handling,
 The single-file package is the simplest way to try Embulk. You can download the latest embulk-VERSION.jar from [the releases page](https://bintray.com/embulk/maven/embulk/view#files) and run it with java:
 
 ```
-wget https://bintray.com/artifact/download/embulk/maven/embulk-0.3.2.jar -O embulk.jar
+wget https://bintray.com/artifact/download/embulk/maven/embulk-0.4.1.jar -O embulk.jar
 java -jar embulk.jar --help
 ```
 
@@ -47,7 +47,7 @@ java -jar embulk.jar gem install embulk-plugin-postgres-json
 java -jar embulk.jar gem list
 ```
 
-You can search plugins on RubyGems: [search for "embulk-plugin"](https://rubygems.org/search?utf8=%E2%9C%93&query=embulk-plugin).
+You can search plugins on RubyGems: [search for "embulk"](https://rubygems.org/search?utf8=%E2%9C%93&query=embulk).
 
 ### Using plugin bundle
 

data/build.gradle

@@ -9,12 +9,53 @@ plugins {
 
 allprojects {
     group = 'org.embulk'
-    version = '0.4.0'
-}
+    version = '0.4.1'
 
-subprojects {
     apply plugin: 'maven'  // install jar files to the local repo: $ gradle install
+    apply plugin: 'maven-publish'
+    apply plugin: 'com.jfrog.bintray'
     apply plugin: 'java'
+
+    // upload artifacts to Bintray: $ gradle bintrayUpload
+    bintray {
+        // write at your bintray user name and api key to ~/.gradle/gradle.properties file:
+        // bintray_user=frsyuki
+        // bintray_api_key=xxxxxxxxxxx
+        user = project.hasProperty('bintray_user') ? bintray_user : ''
+        key = project.hasProperty('bintray_api_key') ? bintray_api_key : ''
+
+        publications = ['mavenJava']
+
+        dryRun = false
+        publish = false  // TODO automate uploading embulk.jar and make this true
+
+        pkg {
+            userOrg = 'embulk'
+            repo = 'maven'
+            name = 'embulk'
+            desc = 'Embulk, a plugin-based parallel bulk data loader'
+            websiteUrl = 'https://github.com/embulk/embulk'
+            issueTrackerUrl = 'https://github.com/embulk/embulk/issues'
+            vcsUrl = 'https://github.com/embulk/embulk.git'
+            licenses = ['Apache-2.0']
+            labels = ['embulk', 'ruby', 'java']
+            publicDownloadNumbers = true
+
+            version {
+                name = project.version
+                // TODO
+                //mavenCentralSync {
+                //    sync = true
+                //    user = 'userToken'
+                //    password = 'paasword'
+                //    close = '1'
+                //}
+            }
+        }
+    }
+}
+
+subprojects {
     apply plugin: 'findbugs'
     apply plugin: 'jacoco'
 
@@ -78,6 +119,13 @@ subprojects {
         ignoreFailures = true
     }
 
+    javadoc {
+        options {
+            locale = 'en_US'
+            encoding = 'UTF-8'
+        }
+    }
+
     // add javadoc/source jar tasks as artifacts to be released
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'
@@ -91,47 +139,17 @@ subprojects {
         archives sourcesJar, javadocJar
     }
 
-    javadoc {
-        options {
-            locale = 'en_US'
-            encoding = 'UTF-8'
-        }
-    }
-
-    // upload artifacts to Bintray: $ gradle bintrayUpload
-    bintray {
-        // write at your bintray user name and api key to ~/.gradle/gradle.properties file:
-        // bintray_user=frsyuki
-        // bintray_api_key=xxxxxxxxxxx
-        user = project.hasProperty('bintray_user') ? bintray_user : ''
-        key = project.hasProperty('bintray_api_key') ? bintray_api_key : ''
-
-        publications = ['mavenJava']
-
-        dryRun = false
-        publish = false  // TODO automate uploading embulk.jar and make this true
-
-        pkg {
-            userOrg = 'embulk'
-            repo = 'maven'
-            name = 'embulk'
-            desc = 'Embulk, a plugin-based parallel bulk data loader'
-            websiteUrl = 'https://github.com/embulk/embulk'
-            issueTrackerUrl = 'https://github.com/embulk/embulk/issues'
-            vcsUrl = 'https://github.com/embulk/embulk.git'
-            licenses = ['Apache-2.0']
-            labels = ['embulk', 'ruby', 'java']
-            publicDownloadNumbers = true
-
-            version {
-                name = project.version
-                // TODO
-                //mavenCentralSync {
-                //    sync = true
-                //    user = 'userToken'
-                //    password = 'paasword'
-                //    close = '1'
-                //}
+    publishing {
+        publications {
+            if (!project.name.equals("embulk-docs")) {
+                mavenJava(MavenPublication) {
+                    groupId project.group
+                    artifactId project.name
+                    version project.version
+                    from components.java
+                    artifact sourcesJar
+                    artifact javadocJar
+                }
             }
         }
     }

data/embulk-docs/build.gradle

@@ -1,3 +1,9 @@
+apply plugin: 'com.github.jruby-gradle.base'
+
+dependencies {
+    jrubyExec 'rubygems:yard:0.8.7.6'
+}
+
 task sphinx_html(type: Exec) {
     workingDir '.'
     commandLine 'make'
@@ -10,10 +16,11 @@ task javadoc_html(type: Copy, dependsOn: [':embulk-core:javadoc']) {
     into 'build/html/javadoc'
 }
 
-task rdoc_html(type: Exec) {
+import com.github.jrubygradle.JRubyExec
+task rdoc_html(type: JRubyExec) {
     workingDir '..'
-    commandLine 'yardoc'
-    args '-o', 'embulk-docs/build/html/rdoc', 'lib'
+    jrubyArgs '-ryard', '-eYARD::CLI::Yardoc.run(*ARGV)', '--', '-o', 'embulk-docs/build/html/rdoc'
+    script 'lib'
 }
 
 task site(type: Copy, dependsOn: ['sphinx_html', 'rdoc_html', 'javadoc_html']) {

data/embulk-docs/push-gh-pages.sh

@@ -1,29 +1,49 @@
 #!/bin/bash
 
-set -e
+function re() {
+    r "$@"
+    if [ $? -ne 0 ];then
+        exit $?
+    fi
+}
+
+function r() {
+    echo "$@"
+    "$@"
+}
+
 [ "$TRAVIS_PULL_REQUEST" != "false" ] && exit 0
+[ "$TRAVIS_BRANCH" != "master" ] && exit 0
 
 revision="$(git rev-parse HEAD)"
-remote="$(git config remote.origin.url | sed "s+^git:+http://+")"
-./gradlew site
+remote="$(git config remote.origin.url | sed "s+^git:+https:+")"
+re ./gradlew site
+
+r git fetch --unshallow || echo "using complete repository."
+
+re rm -rf gh_pages
+re git clone . gh_pages
+re cd gh_pages
 
-rm -rf gh_pages
-git clone . gh_pages
-cd gh_pages
+re git remote add travis_push "$remote"
+re git fetch travis_push
 
-git remote add travis_push "$remote"
-git fetch travis_push
+re git checkout -b gh-pages travis_push/gh-pages
+re rm -rf docs
+re cp -a ../embulk-docs/build/html docs
+re git add --all docs
 
-git checkout -b gh-pages travis_push/gh-pages
-rm -rf docs
-cp -a ../embulk-docs/build/html docs
-git add docs
+re git config user.name "$GIT_USER_NAME"
+re git config user.email "$GIT_USER_EMAIL"
+r git commit -m "Updated document $revision"
 
-git config user.name "$GIT_USER_NAME"
-git config user.email "$GIT_USER_EMAIL"
-git commit -m "Updated document $revision" || exit 0
+git show | grep -E '^[+-] ' | grep -Eqv 'Generated by|Generated on|Search.setIndex|meta name="date" content='
+if [ $? -ne 0 ];then
+    echo "No document changes."
+    exit 0
+fi
 
-git config credential.helper "store --file=.git_credential_helper"
-echo "https://$GITHUB_TOKEN:@github.com" > "$HOME/.git_credential_helper"
-trap "rm -rf $HOME/.git_credential_helper" EXIT
-git push travis_push gh-pages
+re git config credential.helper "store --file=$HOME/.git_credentials"
+echo "https://$GITHUB_TOKEN:@github.com" > "$HOME/.git_credentials"
+trap "rm -rf $HOME/.git_credentials" EXIT
+re git push travis_push gh-pages

data/embulk-docs/src/release/release-0.4.1.rst

@@ -0,0 +1,18 @@
+Release 0.4.0
+==================================
+
+CLI
+------------------
+
+* ``--version`` exists with code=0 (@yuskesh++)
+
+General Changes
+------------------
+
+* Fixed a build script problem where it uploads corrupted CLI jar file
+* Updated document build script to not depend on externally installed "yardoc" command
+
+
+Release Date
+------------------
+2015-02-15

data/lib/embulk/command/embulk_run.rb

@@ -20,7 +20,7 @@ module Embulk
     if argv.include?('--version')
       require 'embulk/version'
       puts "embulk #{Embulk::VERSION}"
-      exit 1
+      exit 0
     end
 
     i = argv.find_index {|arg| arg !~ /^\-/ }

data/lib/embulk/plugin_registry.rb

@@ -25,9 +25,9 @@ module Embulk
         if value = @map[type]
           return value
         end
-        raise PluginLoadError, "Unknown #{@category} plugin '#{type}'. Succeeded found #{@search_prefix}#{type}.rb from installed gems but it did not correctly register plugin."
+        raise PluginLoadError, "Unknown #{@category} plugin '#{type}'. #{@search_prefix}#{type}.rb is installed but it does not correctly register plugin."
       else
-        raise PluginLoadError, "Unknown #{@category} plugin '#{type}'. #{@search_prefix}#{type}.rb is not installed. Run 'gem search -rd embulk-#{@category}' command to find the plugin gem."
+        raise PluginLoadError, "Unknown #{@category} plugin '#{type}'. #{@search_prefix}#{type}.rb is not installed. Run 'embulk gem search -rd embulk-#{@category}' command to find plugins."
       end
     end
 

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -266,6 +266,7 @@ files:
 - embulk-docs/src/release/release-0.3.1.rst
 - embulk-docs/src/release/release-0.3.2.rst
 - embulk-docs/src/release/release-0.4.0.rst
+- embulk-docs/src/release/release-0.4.1.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
@@ -360,8 +361,8 @@ 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.4.0.jar
-- classpath/embulk-standards-0.4.0.jar
+- classpath/embulk-core-0.4.1.jar
+- classpath/embulk-standards-0.4.1.jar
 - classpath/guava-18.0.jar
 - classpath/guice-3.0.jar
 - classpath/guice-multibindings-3.0.jar