redstorm 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -41,7 +41,14 @@
 - issue #30, add redstorm cluster command for remote topology submission
 - issue #31, added support for localOrShuffleGrouping
 - issue #33, avoid forking or shelling out on redstorm commands
+- issue #35, automatically set JRuby 1.8/1.9 mode in remote cluster context
 - JRuby 1.6.7.2
 - better handling of JRuby 1.8/1.9 mode
 - topology gems are now specified using a Bundler group in the project Gemfile
-- refactored environment/paths handling for local vs cluster context
+- refactored environment/paths handling for local vs cluster context
+
+# 0.6.1, 07-07-2012
+- issue #38, added support for spout reliable emit
+- 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

data/README.md

@@ -1,4 +1,4 @@
-# RedStorm v0.6.0 - JRuby on Storm
+# RedStorm v0.6.1 - JRuby on Storm
 
 [![build status](https://secure.travis-ci.org/colinsurprenant/redstorm.png)](http://travis-ci.org/colinsurprenant/redstorm)
 
@@ -16,7 +16,7 @@ Chances are new versions of RedStorm will introduce changes that will break comp
 
 ## Dependencies
 
-Tested on OSX 10.6.8 and Linux 10.04 & 11.10 using Storm 0.7.3 and JRuby 1.6.7.2
+Tested on OSX 10.6.8 and Linux 10.04 & 11.10 using Storm 0.7.4 and JRuby 1.6.7.2
 
 ## Notes about 1.8/1.9 JRuby compatibility
 
@@ -58,7 +58,7 @@ $ redstorm local|cluster [--1.8|--1.9] ...
 
   ``` ruby
   source :rubygems
-  gem "redstorm", "~> 0.6.0"
+  gem "redstorm", "~> 0.6.1"
   ```
 
 ## Usage overview
@@ -125,7 +125,7 @@ By defaut, a topology will be executed in the **same mode** as the interpreter r
 
 ### Run on production cluster
 
-1. download and unpack the [Storm 0.7.3 distribution](https://github.com/downloads/nathanmarz/storm/storm-0.7.3.zip) locally and **add** the Storm `bin/` directory to your path
+1. download and unpack the [Storm 0.7.4 distribution](https://github.com/downloads/nathanmarz/storm/storm-0.7.4.zip) locally and **add** the Storm `bin/` directory to your path
 
 2. generate `target/cluster-topology.jar`. This jar file will include your sources directory plus the required dependencies
 

data/Rakefile

@@ -1,10 +1,11 @@
-require 'rubygems'
 require 'rspec/core/rake_task'
 
-load 'lib/tasks/red_storm.rake'
 
 RSpec::Core::RakeTask.new(:spec) do
   system("ruby -v")
+  module RedStorm; SPECS_CONTEXT = true; end
 end
 
 task :default => :spec
+
+load 'lib/tasks/red_storm.rake'

data/lib/red_storm/environment.rb

@@ -7,14 +7,17 @@ module RedStorm
     BASE_PATH = File.expand_path(LAUNCH_PATH + '/..')
     REDSTORM_HOME = BASE_PATH
     TARGET_PATH = BASE_PATH
-
-    GEM_PATH = "#{TARGET_PATH}/gems/"
-    ENV["GEM_PATH"] = GEM_PATH
   else
     BASE_PATH = Dir.pwd
     REDSTORM_HOME = File.expand_path(LAUNCH_PATH + '/../..')
     TARGET_PATH = "#{BASE_PATH}/target"
   end
+  
+  unless defined?(SPECS_CONTEXT)
+    GEM_PATH = "#{TARGET_PATH}/gems/"
+    ENV["GEM_PATH"] = GEM_PATH
+    ENV["GEM_HOME"] = GEM_PATH
+  end
 
   def current_ruby_mode
     RUBY_VERSION =~ /(\d+\.\d+)(\.\d+)*/

data/lib/red_storm/simple_spout.rb

@@ -53,9 +53,14 @@ module RedStorm
 
     # DSL instance methods
 
-    def emit(*values)
+    def reliable_emit(message_id, *values)
+      @collector.emit(Values.new(*values), message_id) 
+    end
+
+    def unreliable_emit(*values)
       @collector.emit(Values.new(*values)) 
     end
+    alias_method :emit, :unreliable_emit
 
     def log
       self.class.log
@@ -68,7 +73,12 @@ module RedStorm
       if self.class.emit?
         if output
           values = [output].flatten
-          @collector.emit(Values.new(*values))
+          if self.class.reliable?
+            message_id = values.shift
+            reliable_emit(message_id, *values)
+          else
+            unreliable_emit(*values)
+          end
         else
           sleep(0.1)
         end
@@ -159,11 +169,15 @@ module RedStorm
     end
 
     def self.send_options
-      @send_options ||= {:emit => true}
+      @send_options ||= {:emit => true, :reliable => false}
     end
 
     def self.emit?
       !!self.send_options[:emit]
     end
+
+    def self.reliable?
+      !!self.send_options[:reliable]
+    end
   end
 end

data/lib/red_storm/topology_launcher.rb

@@ -34,6 +34,7 @@ class TopologyLauncher
     launch_path = Dir.pwd
     $:.unshift File.expand_path(launch_path)
     $:.unshift File.expand_path(launch_path + '/lib')
+    $:.unshift File.expand_path(launch_path + '/target/lib')
 
     require "#{class_path}" 
 

data/lib/red_storm/version.rb

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

data/lib/tasks/red_storm.rake

@@ -3,7 +3,7 @@ require 'jruby/jrubyc'
 require 'pompompom'
 require 'red_storm'
  
-INSTALL_STORM_VERSION = "0.7.3"
+INSTALL_STORM_VERSION = "0.7.4"
 INSTALL_JRUBY_VERSION = "1.6.7.2"
 
 CWD = Dir.pwd
@@ -141,7 +141,6 @@ task :deps => :setup do
     :repositories => {:clojars => 'http://clojars.org/repo/', :sonatype => "http://oss.sonatype.org/content/groups/public/"},
     :dependencies => [
       "storm:storm:#{INSTALL_STORM_VERSION}|type_filter=jar",
-      "org.slf4j:slf4j-api:1.5.8|type_filter=jar",
       "org.slf4j:slf4j-log4j12:1.5.8|type_filter=jar",
       "org.jruby:jruby-complete:#{INSTALL_JRUBY_VERSION}|transitive=false,type_filter=jar",
     ],
@@ -150,6 +149,9 @@ task :deps => :setup do
 
   installer = PomPomPom::Runner.new(configuration)
   installer.run
+
+  # tmp hack to clenup a dependency weirdness (issue #36)
+  FileUtils.rm("#{TARGET_DEPENDENCY_DIR}/slf4j-api-1.6.3-jar.jar")
 end
 
 task :build => [:setup, :copy_red_storm] do

metadata

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