amazon-kinesis-client-ruby 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36265265083e58844138d431b5d5e8d0d7828008
-  data.tar.gz: b479c46db0375672f956e94f3b77e232c0f33db0
+  metadata.gz: 8124a97c0e7e8ea976c9f9cc547fafff165775a7
+  data.tar.gz: 37382747dd7c3d8e9e54774c97983e392278e0d8
 SHA512:
-  metadata.gz: c2888132cf9830a89a5217d2878aaa12e6d899a75fb48cf4c703292eb2b7257115e257e7729343de5d2c065e5cc718e2601869e26d16cc8d086f33c6844d974a
-  data.tar.gz: 26c9dfa9195f7c570777c92b5c4b4506b507a450e1c9d49c14a33b50db10d6a993f196f677430a9cc05fe86807683f2712f028e49973f3b07625523cf299d001
+  metadata.gz: c3d106ff42b7fbac173f1a220156d5ad8bd7f1df57838f02fd00ec4c5dba64e2c1a832fb035e4ac1719f1dc0409251dffd491a9ae29dbeca0c580f96a468bdc6
+  data.tar.gz: 1fd05ff47e18134be1fbbebaa54f769d7772f637a33ecdff9f2531d5f0824f9044bed24001df887dcc7a5176caaa2dd1ebda7bb0c75ab95b2903fc38faaa3401

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .ruby-version
+/lib/jars/**

data/README.md

@@ -213,8 +213,8 @@ rake spec
 
 Future Roadmap
 --------------
-- dependency management for the Amazon kinesis client jar files by utilising [ruby-maven](https://github.com/mkristian/ruby-maven) (potentially).
-
+- Advanced batch record processing
+- Spec tests on the Kcl::Process to enable future refactoring
 
 Contributing
 ------------

data/Rakefile

@@ -1,9 +1,18 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'rubygems/tasks'
+require 'maven/ruby/maven'
 
 RSpec::Core::RakeTask.new :spec do |spec|
   spec.rspec_opts = '--format documentation --color'
 end
 
 RuboCop::RakeTask.new
+
+task :download_jars do
+  mvn = Maven::Ruby::Maven.new
+  mvn.exec 'generate-sources', '-f', 'pom.xml'
+end
+
+task build: :download_jars

data/amazon-kinesis-client-ruby.gemspec

@@ -13,17 +13,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = ''
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0") + Dir['lib/jars/*']
   spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.1.8'
+  spec.add_runtime_dependency 'activesupport', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.1.0'
   spec.add_development_dependency 'rubocop', '~> 0.27.1'
+  spec.add_development_dependency 'ruby-maven', '~> 3.1.1'
 
   spec.required_ruby_version = '~> 2.0'
 end

data/lib/kcl/executor.rb

@@ -27,6 +27,18 @@ module Kcl
         end
     end
 
+    def system_properties system_properties = nil
+      @system_properties = system_properties if system_properties
+
+      @system_properties || {}
+    end
+
+    def extra_class_path *extra_class_path
+      @extra_class_path = extra_class_path unless extra_class_path.empty?
+
+      @extra_class_path || []
+    end
+
     def run argv
       if argv[0] == 'exec'
         run_exec
@@ -40,7 +52,11 @@ module Kcl
     attr_reader :record_processor_callback, :configuration
 
     def run_exec
-      command = ExecutorCommandBuilder.new(config_properties_path).build
+      command = ExecutorCommandBuilder.new(
+        config_properties_path,
+        system_properties: system_properties,
+        extra_class_path: extra_class_path
+      ).build
       LOG.info "execute command:\n#{command.join ' '}"
 
       system(*command)

data/lib/kcl/executor_command_builder.rb

@@ -1,16 +1,22 @@
 module Kcl
   class ExecutorCommandBuilder
-    def initialize properties_file_path
+    def initialize properties_file_path, system_properties: {},
+                                         extra_class_path: []
       @properties_file_path = properties_file_path
+      @system_properties = system_properties
+      @extra_class_path = extra_class_path
     end
 
     def build
-      [java, '-cp', class_path, client_class, properties_file]
+      [
+        java, system_property_options, '-cp', class_path,
+        client_class, properties_file
+      ].flatten
     end
 
     private
 
-    attr_reader :properties_file_path
+    attr_reader :properties_file_path, :extra_class_path, :system_properties
 
     def java
       command = ENV.fetch('PATH_TO_JAVA', `which java`).strip
@@ -24,9 +30,9 @@ module Kcl
     end
 
     def class_path
-      jar_dir = File.expand_path '../../jars', __FILE__
-
-      (Dir["#{jar_dir}/*.jar"] << properties_file_dir).join ':'
+      (
+        Dir["#{jar_dir}/*.jar"].concat(extra_class_path) << properties_file_dir
+      ).join ':'
     end
 
     def properties_file
@@ -36,5 +42,15 @@ module Kcl
     def properties_file_dir
       @properties_file_dir ||= File.dirname properties_file_path
     end
+
+    def system_property_options
+      @system_property_options ||= system_properties.map do |key, value|
+        "-D#{key}=#{value}"
+      end
+    end
+
+    def jar_dir
+      @jar_dir ||= File.expand_path '../../jars', __FILE__
+    end
   end
 end

data/lib/kcl/version.rb

@@ -1,3 +1,3 @@
 module Kcl
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/pom.xml

@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.edh.data</groupId>
+  <artifactId>amazon-kinesis-client-ruby</artifactId>
+  <version>0.0.1</version>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+    	<groupId>com.amazonaws</groupId>
+    	<artifactId>amazon-kinesis-client</artifactId>
+    	<version>1.2.0</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/lib/jars</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

data/spec/executor_command_builder_spec.rb

@@ -58,5 +58,32 @@ describe Kcl::ExecutorCommandBuilder do
 
       it { expect(properties_file).to eq File.basename(properties_file_path) }
     end
+
+    context 'With system properties' do
+      let(:builder) {
+        system_properties = {
+          'log4j.configuration' => 'log4j.properties',
+          option2: 'test'
+        }
+
+        Kcl::ExecutorCommandBuilder.new properties_file_path,
+                                        system_properties: system_properties
+      }
+
+      it { expect(command).to include '-Dlog4j.configuration=log4j.properties' }
+
+      it { expect(command).to include '-Doption2=test' }
+    end
+
+    context 'With extra_class_path' do
+      let(:classpath) { command[2] }
+
+      let(:builder) {
+        Kcl::ExecutorCommandBuilder.new properties_file_path,
+                                        extra_class_path: ['test.jar']
+      }
+
+      it { expect(classpath).to include 'test.jar' }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-kinesis-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Soloman Weng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.27.1
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 description: Amazon Kinesis Client Library for Ruby
 email:
 - solomanw@everydayhero.com.au
@@ -103,7 +117,7 @@ files:
 - lib/jars/jackson-annotations-2.1.1.jar
 - lib/jars/jackson-core-2.1.1.jar
 - lib/jars/jackson-databind-2.1.1.jar
-- lib/jars/joda-time-2.4.jar
+- lib/jars/joda-time-2.5.jar
 - lib/kcl.rb
 - lib/kcl/action_handler.rb
 - lib/kcl/advanced_record_processor.rb
@@ -117,6 +131,7 @@ files:
 - lib/kcl/process.rb
 - lib/kcl/record_processor.rb
 - lib/kcl/version.rb
+- pom.xml
 - spec/configuration_spec.rb
 - spec/executor_command_builder_spec.rb
 - spec/executor_spec.rb