redstorm 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -52,3 +52,8 @@
 - gem path is always in target/gems for both local and cluster context
 - temp fix for slf4j dependencies conflict (issue #36)
 - Storm 0.7.4
+
+# 0.6.2, 07-10-2012
+- issue #39, spout on_receive block will not be evaluated if :emit => false
+- issue #40, bolt fail method missing
+- integration tests support

data/README.md

@@ -1,4 +1,4 @@
-# RedStorm v0.6.1 - JRuby on Storm
+# RedStorm v0.6.2 - JRuby on Storm
 
 [![build status](https://secure.travis-ci.org/colinsurprenant/redstorm.png)](http://travis-ci.org/colinsurprenant/redstorm)
 
@@ -58,7 +58,7 @@ $ redstorm local|cluster [--1.8|--1.9] ...
 
   ``` ruby
   source :rubygems
-  gem "redstorm", "~> 0.6.1"
+  gem "redstorm", "~> 0.6.2"
   ```
 
 ## Usage overview

data/bin/redstorm

@@ -5,11 +5,11 @@ require 'rake'
 
 begin
   # will work from gem, since lib dir is in gem require_paths
-  require 'red_storm'
+  require 'red_storm/application'
 rescue LoadError
   # will work within RedStorm dev project
   $:.unshift './lib'
-  require 'red_storm'
+  require 'red_storm/application'
 end
 
-RedStorm::Application.new.run(ARGV.dup)
+RedStorm::Application.run(ARGV.dup)

data/lib/red_storm.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'red_storm/environment'
 require 'red_storm/version'
 require 'red_storm/configuration'
-require 'red_storm/application'
 require 'red_storm/simple_bolt'
 require 'red_storm/simple_spout'
 require 'red_storm/simple_topology'

data/lib/red_storm/application.rb

@@ -1,10 +1,40 @@
+require 'red_storm/version'
+require 'red_storm/environment'
+
+CWD = Dir.pwd
+TARGET_DIR = "#{CWD}/target"
+TARGET_LIB_DIR = "#{TARGET_DIR}/lib"
+TARGET_SRC_DIR = "#{TARGET_DIR}/src"
+TARGET_GEM_DIR = "#{TARGET_DIR}/gems/gems"
+TARGET_SPECS_DIR = "#{TARGET_DIR}/gems/specifications"
+TARGET_CLASSES_DIR = "#{TARGET_DIR}/classes"  
+TARGET_DEPENDENCY_DIR = "#{TARGET_DIR}/dependency"
+TARGET_DEPENDENCY_UNPACKED_DIR = "#{TARGET_DIR}/dependency-unpacked"
+TARGET_CLUSTER_JAR = "#{TARGET_DIR}/cluster-topology.jar"
+
+REDSTORM_JAVA_SRC_DIR = "#{RedStorm::REDSTORM_HOME}/src/main"
+REDSTORM_LIB_DIR = "#{RedStorm::REDSTORM_HOME}/lib"
+
+SRC_EXAMPLES = "#{RedStorm::REDSTORM_HOME}/examples"
+DST_EXAMPLES = "#{CWD}/examples"
+
+
 module RedStorm
   
   class Application 
     TASKS_FILE = "#{RedStorm::REDSTORM_HOME}/lib/tasks/red_storm.rake" 
 
-    def usage
-      puts("usage: redstorm install")
+    def self.local_storm_command(class_file, ruby_mode = nil)
+      "java -Djruby.compat.version=#{RedStorm.jruby_mode_token(ruby_mode)} -cp \"#{TARGET_CLASSES_DIR}:#{TARGET_DEPENDENCY_DIR}/*\" redstorm.TopologyLauncher local #{class_file}"
+    end
+
+    def self.cluster_storm_command(class_file, ruby_mode = nil)
+      "storm jar #{TARGET_CLUSTER_JAR} -Djruby.compat.version=#{RedStorm.jruby_mode_token(ruby_mode)} redstorm.TopologyLauncher cluster #{class_file}"
+    end
+    
+    def self.usage
+      puts("usage: redstorm version")
+      puts("       redstorm install")
       puts("       redstorm deps")
       puts("       redstorm build")
       puts("       redstorm examples")
@@ -15,9 +45,12 @@ module RedStorm
       exit(1)
     end
 
-    def run(args)
+    def self.run(args)
       if args.size > 0
-        if ["install", "examples", "jar", "bundle", "deps", "build"].include?(args[0])
+        if args[0] == "version"
+          puts("RedStorm v#{VERSION}")
+          exit
+        elsif ["install", "examples", "jar", "bundle", "deps", "build"].include?(args[0])
           load(TASKS_FILE)
           Rake::Task[args.shift].invoke(args.join(":"))
           exit

data/lib/red_storm/simple_bolt.rb

@@ -53,10 +53,15 @@ module RedStorm
       @collector.ack(tuple)
     end
 
+    def fail(tuple)
+      @collector.fail(tuple)
+    end
+
     # Bolt proxy interface
 
     def execute(tuple)
-      if (output = instance_exec(tuple, &self.class.on_receive_block)) && self.class.emit?
+      output = instance_exec(tuple, &self.class.on_receive_block)
+      if output && self.class.emit?
         values_list = !output.is_a?(Array) ? [[output]] : !output.first.is_a?(Array) ? [output] : output
         values_list.each{|values| self.class.anchor? ? anchored_emit(tuple, *values) : unanchored_emit(*values)}
         @collector.ack(tuple) if self.class.ack?

data/lib/red_storm/version.rb

@@ -1,3 +1,3 @@
 module RedStorm
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/tasks/red_storm.rake

@@ -2,27 +2,11 @@ require 'ant'
 require 'jruby/jrubyc'
 require 'pompompom'
 require 'red_storm'
- 
+require 'red_storm/application'
+
 INSTALL_STORM_VERSION = "0.7.4"
 INSTALL_JRUBY_VERSION = "1.6.7.2"
 
-CWD = Dir.pwd
-TARGET_DIR = "#{CWD}/target"
-TARGET_LIB_DIR = "#{TARGET_DIR}/lib"
-TARGET_SRC_DIR = "#{TARGET_DIR}/src"
-TARGET_GEM_DIR = "#{TARGET_DIR}/gems/gems"
-TARGET_SPECS_DIR = "#{TARGET_DIR}/gems/specifications"
-TARGET_CLASSES_DIR = "#{TARGET_DIR}/classes"  
-TARGET_DEPENDENCY_DIR = "#{TARGET_DIR}/dependency"
-TARGET_DEPENDENCY_UNPACKED_DIR = "#{TARGET_DIR}/dependency-unpacked"
-TARGET_CLUSTER_JAR = "#{TARGET_DIR}/cluster-topology.jar"
-
-REDSTORM_JAVA_SRC_DIR = "#{RedStorm::REDSTORM_HOME}/src/main"
-REDSTORM_LIB_DIR = "#{RedStorm::REDSTORM_HOME}/lib"
-
-SRC_EXAMPLES = "#{RedStorm::REDSTORM_HOME}/examples"
-DST_EXAMPLES = "#{CWD}/examples"
-
 module JavaZip
   import 'java.util.zip.ZipFile'
 end
@@ -33,13 +17,13 @@ task :launch, :env, :ruby_mode, :class_file do |t, args|
   
   command = case args[:env]
   when "local"
-    "java -Djruby.compat.version=#{version_token} -cp \"#{TARGET_CLASSES_DIR}:#{TARGET_DEPENDENCY_DIR}/*\" redstorm.TopologyLauncher local #{args[:class_file]}"
+    RedStorm::Application.local_storm_command(args[:class_file], args[:ruby_mode])
   when "cluster"
     unless File.exist?(TARGET_CLUSTER_JAR)
       puts("cluster jar file #{TARGET_CLUSTER_JAR} not found. Generate it using $redstorm jar DIR1 [DIR2, ...]")
       exit(1)
     end
-    "storm jar #{TARGET_CLUSTER_JAR} -Djruby.compat.version=#{version_token} redstorm.TopologyLauncher cluster #{args[:class_file]}"
+    RedStorm::Application.cluster_storm_command(args[:class_file], args[:ruby_mode])
   end
 
   puts("launching #{command}")

metadata

@@ -2,14 +2,14 @@
 name: redstorm
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Colin Surprenant
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec