redstorm 0.6.6.beta2 → 0.6.6

data/CHANGELOG.md

@@ -91,7 +91,10 @@
 - improved DSL performance by refactoring closures invocation, see [redstorm-benchmark](https://github.com/colinsurprenant/redstorm-benchmark/)
 - fixed FFI support
 - exposed topology builder for specs
-- [issue #11](https://github.com/colinsurprenant/redstorm/issues/11), [#17](https://github.com/colinsurprenant/redstorm/issues/17) -  example specs using the Storm testing API see [redstorm-starter](https://github.com/colinsurprenant/redstorm-starter/)
+- [issue #11](https://github.com/colinsurprenant/redstorm/issues/11), [#17](https://github.com/colinsurprenant/redstorm/issues/17) -  example specs using the Storm testing API see [redstorm-starter](https://github.com/colinsurprenant/redsto  rm-starter/)
 
 # 0.6.6.beta2, 07-20-2013
-- [issue #76](https://github.com/colinsurprenant/redstorm/issues/76) - avoid shelling out to storm jar command for cluster submission
+- [issue #76](https://github.com/colinsurprenant/redstorm/issues/76) - avoid shelling out to storm jar command for cluster submission
+
+# 0.6.6, 07-25-2013
+- updated example Kafka topology for new dependencies for Storm KafkaSpout

data/README.md

@@ -1,4 +1,4 @@
-# RedStorm v0.6.6.beta2 - JRuby on Storm
+# RedStorm - JRuby on Storm
 
 [![build status](https://secure.travis-ci.org/colinsurprenant/redstorm.png)](http://travis-ci.org/colinsurprenant/redstorm)
 
@@ -13,11 +13,12 @@ Check also these related projects:
 
 ## Documentation
 
+<!--
 ---
-This is the documentation for the **current WIP version of RedStorm** - the **[latest released Gem is v0.6.5](wiki/RedStorm-Gem-v0.6.5-Documentation)**
+This is the documentation for the **current 0.6.6-beta2 version of RedStorm** - the **[latest released Gem is v0.6.5](https://github.com/colinsurprenant/redstorm/wiki/RedStorm-Gem-v0.6.5-Documentation)**
 
 ---
-
+-->
 Chances are new versions of RedStorm will introduce changes that will break compatibility or change the developement workflow. To prevent out-of-sync documentation, per version specific documentation are kept [in the wiki](https://github.com/colinsurprenant/redstorm/wiki) when necessary.
 
 ## Dependencies
@@ -29,14 +30,14 @@ Tested on **OSX 10.8.3** and **Ubuntu Linux 12.10** using **Storm 0.9.0-wip16**
 - RubyGems
 
   ``` sh
-  $ gem install redstorm --pre
+  $ gem install redstorm
   ```
 
 - Bundler
 
   ``` ruby
   source "https://rubygems.org"
-  gem "redstorm", "~> 0.6.6.beta2"
+  gem "redstorm", "~> 0.6.6"
   ```
 
 ## Usage
@@ -140,7 +141,7 @@ You can supply custom `storm` and `topology` dependencies by creating `ivy/storm
 
   ``` xml
   <?xml version="1.0"?>
-  <ivy-module version="2.0">
+  <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
     <info organisation="redstorm" module="storm-deps"/>
     <dependencies>
       <dependency org="storm" name="storm" rev="0.9.0-wip16" conf="default" transitive="true" />
@@ -153,10 +154,18 @@ You can supply custom `storm` and `topology` dependencies by creating `ivy/storm
 
   ``` xml
   <?xml version="1.0"?>
-  <ivy-module version="2.0">
+  <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
     <info organisation="redstorm" module="topology-deps"/>
     <dependencies>
       <dependency org="org.jruby" name="jruby-core" rev="1.7.4" conf="default" transitive="true"/>
+
+      <!-- explicitely specify jffi to also fetch the native jar. make sure to update jffi version matching jruby-core version -->
+      <!-- this is the only way I found using Ivy to fetch the native jar -->
+      <dependency org="com.github.jnr" name="jffi" rev="1.2.5" conf="default" transitive="true">
+        <artifact name="jffi" type="jar" />
+        <artifact name="jffi" type="jar" m:classifier="native"/>
+      </dependency>
+
     </dependencies>
   </ivy-module>
   ```
@@ -172,9 +181,9 @@ The jars repositories can be configured by adding the `ivy/settings.xml` file in
     <resolvers>
       <chain name="repositories">
         <ibiblio name="ibiblio" m2compatible="true"/>
-        <ibiblio name="maven2" root="http://repo.maven.apache.org/maven2/" m2compatible="true"/>
         <ibiblio name="sonatype" root="http://repo.maven.apache.org/maven2/" m2compatible="true"/>
         <ibiblio name="clojars" root="http://clojars.org/repo/" m2compatible="true"/>
+        <ibiblio name="conjars" root="http://conjars.org/repo/" m2compatible="true"/>
       </chain>
     </resolvers>
   </ivysettings>
@@ -189,7 +198,7 @@ $ redstorm local <sources_directory_path/topology_class_file_name.rb>
 note that the topology can also be launched with the following command:
 
 ``` sh
-$ java -Djruby.compat.version=RUBY1_9 -cp "target/classes:target/dependency/storm/default/*:target/dependency/topology/default/*:<sources_directory_path>" redstorm.TopologyLauncher local <sources_directory_path/topology_class_file_name.rb>
+$ java -cp "target/classes:target/dependency/storm/default/*:target/dependency/topology/default/*:<sources_directory_path>" redstorm.TopologyLauncher local <sources_directory_path/topology_class_file_name.rb>
 ```
 
 **See examples below** to run examples in local mode or on a production cluster.

data/bin/redstorm

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'rubygems' 
+unless RUBY_PLATFORM =~ /java/
+  puts("error: RedStorm requires JRuby. Check http://jruby.org/ or https://github.com/sstephenson/rbenv or https://rvm.io/")
+  exit(1)
+end
+
+require 'rubygems'
 require 'rake'
 
 begin

data/examples/dsl/kafka_topology.rb

@@ -1,7 +1,6 @@
-java_import 'storm.kafka.KafkaConfig'
 java_import 'storm.kafka.SpoutConfig'
-java_import 'storm.kafka.StringScheme'
 java_import 'storm.kafka.KafkaSpout'
+java_import 'storm.kafka.KafkaConfig'
 
 require 'red_storm'
 
@@ -12,28 +11,37 @@ require 'red_storm'
 # dependencies in the "ivy/topology_dependencies.xml" file in the root of your RedStorm project:
 #
 # <?xml version="1.0"?>
-# <ivy-module version="2.0">
+# <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
 #   <info organisation="redstorm" module="topology-deps"/>
 #   <dependencies>
 #     <dependency org="org.jruby" name="jruby-core" rev="1.7.4" conf="default" transitive="true"/>
-#     <dependency org="org.scala-lang" name="scala-library" rev="2.8.0" conf="default" transitive="false"/>
-#     <dependency org="storm" name="kafka" rev="0.7.0-incubating" conf="default" transitive="false"/>
-#     <dependency org="storm" name="storm-kafka" rev="0.8.0-wip4" conf="default" transitive="false"/>
+
+#     <dependency org="org.scala-lang" name="scala-library" rev="2.9.2" conf="default" transitive="false"/>
+#     <dependency org="com.twitter" name="kafka_2.9.2" rev="0.7.0" conf="default" transitive="false"/>
+#     <dependency org="storm" name="storm-kafka" rev="0.9.0-wip16a-scala292" conf="default" transitive="true"/>
+
+#     <!-- explicitely specify jffi to also fetch the native jar. make sure to update jffi version matching jruby-core version -->
+#     <!-- this is the only way I found using Ivy to fetch the native jar -->
+#     <dependency org="com.github.jnr" name="jffi" rev="1.2.5" conf="default" transitive="true">
+#       <artifact name="jffi" type="jar" />
+#       <artifact name="jffi" type="jar" m:classifier="native"/>
+#     </dependency>
+
 #   </dependencies>
 # </ivy-module>
 
+class SplitStringBolt < RedStorm::DSL::Bolt
+  on_receive {|tuple| tuple[0].split.map{|w| [w]}}
+end
+
 class KafkaTopology < RedStorm::DSL::Topology
+
   spout_config = SpoutConfig.new(
     KafkaConfig::ZkHosts.new("localhost:2181", "/brokers"),
     "words",        # topic to read from
-    "/kafkastorm",  # Zookeeper root path to store the consumer offsets
-    "discovery"     # Zookeeper consumer id to store the consumer offsets
+    "/kafkaspout",  # Zookeeper root path to store the consumer offsets
+    "someid"        # Zookeeper consumer id to store the consumer offsets
   )
-  spout_config.scheme = StringScheme.new
-
-  class SplitStringBolt < RedStorm::DSL::Bolt
-    on_receive {|tuple| tuple[0].split.map{|w| [w]}}
-  end
 
   spout KafkaSpout, [spout_config]
 

data/examples/dsl/redis_word_count_topology.rb

@@ -38,7 +38,7 @@ module RedStorm
     class RedisWordCountTopology < DSL::Topology
       spout RedisWordSpout
 
-      bolt WordCountBolt, :parallelism => 3 do
+      bolt WordCountBolt, :parallelism => 2 do
         source RedisWordSpout, :fields => ["word"]
       end
 
@@ -46,10 +46,10 @@ module RedStorm
         debug true
         case env
         when :local
-          max_task_parallelism 3
+          max_task_parallelism 2
         when :cluster
-          max_task_parallelism 5
-          num_workers 20
+          max_task_parallelism 2
+          num_workers 2
           max_spout_pending(1000)
         end
       end

data/ivy/settings.xml

@@ -4,9 +4,9 @@
   <resolvers>
     <chain name="repositories">
       <ibiblio name="ibiblio" m2compatible="true"/>
-      <ibiblio name="maven2" root="http://repo.maven.apache.org/maven2/" m2compatible="true"/> 
-      <ibiblio name="sonatype" root="http://repo.maven.apache.org/maven2/" m2compatible="true"/> 
-      <ibiblio name="clojars" root="http://clojars.org/repo/" m2compatible="true"/> 
+      <ibiblio name="sonatype" root="http://repo.maven.apache.org/maven2/" m2compatible="true"/>
+      <ibiblio name="clojars" root="http://clojars.org/repo/" m2compatible="true"/>
+      <ibiblio name="conjars" root="http://conjars.org/repo/" m2compatible="true"/>
     </chain>
   </resolvers>
 </ivysettings>

data/lib/red_storm/application.rb

@@ -1,33 +1,6 @@
 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"
-
-SRC_IVY_DIR = "#{RedStorm::REDSTORM_HOME}/ivy"
-DST_IVY_DIR = "#{CWD}/ivy"
-DEFAULT_IVY_SETTINGS = "#{SRC_IVY_DIR}/settings.xml"
-CUSTOM_IVY_SETTINGS = "#{DST_IVY_DIR}/settings.xml"
-DEFAULT_IVY_STORM_DEPENDENCIES = "#{SRC_IVY_DIR}/storm_dependencies.xml"
-CUSTOM_IVY_STORM_DEPENDENCIES = "#{DST_IVY_DIR}/storm_dependencies.xml"
-DEFAULT_IVY_TOPOLOGY_DEPENDENCIES = "#{SRC_IVY_DIR}/topology_dependencies.xml"
-CUSTOM_IVY_TOPOLOGY_DEPENDENCIES = "#{DST_IVY_DIR}/topology_dependencies.xml"
-
-DEFAULT_STORM_CONF_FILE = File.expand_path("~/.storm/storm.yaml")
 
 module RedStorm
 

data/lib/red_storm/environment.rb

@@ -2,30 +2,57 @@ require 'java'
 java_import 'java.lang.System'
 
 module RedStorm
+  CWD = Dir.pwd
 
-  LAUNCH_PATH = File.expand_path(File.dirname(__FILE__))
-  JAR_CONTEXT = !!(LAUNCH_PATH =~ /\.jar!\/red_storm$/)
+  launch_path = File.expand_path(File.dirname(__FILE__))
+  jar_context = !!(launch_path =~ /\.jar!\/red_storm$/)
 
-  if JAR_CONTEXT
-    BASE_PATH = File.expand_path(LAUNCH_PATH + '/..')
+  if jar_context
+    BASE_PATH = File.expand_path(launch_path + '/..')
     REDSTORM_HOME = BASE_PATH
-    TARGET_PATH = BASE_PATH
+    GEM_PATH = "#{REDSTORM_HOME}/gems/"
   else
-    BASE_PATH = Dir.pwd
-    REDSTORM_HOME = File.expand_path(LAUNCH_PATH + '/../..')
-    TARGET_PATH = "#{BASE_PATH}/target"
+    BASE_PATH = CWD
+    REDSTORM_HOME = File.expand_path(launch_path + '/../..')
+    GEM_PATH = "#{BASE_PATH}/target/gems/"
   end
 
   unless defined?(SPECS_CONTEXT)
-    GEM_PATH = "#{TARGET_PATH}/gems/"
     ENV["GEM_PATH"] = GEM_PATH
     ENV["GEM_HOME"] = GEM_PATH
   end
 
+  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_HOME}/src/main"
+  REDSTORM_LIB_DIR = "#{REDSTORM_HOME}/lib"
+
+  SRC_EXAMPLES = "#{REDSTORM_HOME}/examples"
+  DST_EXAMPLES = "#{CWD}/examples"
+
+  SRC_IVY_DIR = "#{REDSTORM_HOME}/ivy"
+  DST_IVY_DIR = "#{CWD}/ivy"
+  DEFAULT_IVY_SETTINGS = "#{SRC_IVY_DIR}/settings.xml"
+  CUSTOM_IVY_SETTINGS = "#{DST_IVY_DIR}/settings.xml"
+  DEFAULT_IVY_STORM_DEPENDENCIES = "#{SRC_IVY_DIR}/storm_dependencies.xml"
+  CUSTOM_IVY_STORM_DEPENDENCIES = "#{DST_IVY_DIR}/storm_dependencies.xml"
+  DEFAULT_IVY_TOPOLOGY_DEPENDENCIES = "#{SRC_IVY_DIR}/topology_dependencies.xml"
+  CUSTOM_IVY_TOPOLOGY_DEPENDENCIES = "#{DST_IVY_DIR}/topology_dependencies.xml"
+
+  DEFAULT_STORM_CONF_FILE = File.expand_path("~/.storm/storm.yaml")
+
   def current_ruby_mode
-    RUBY_VERSION =~ /(\d+\.\d+)(\.\d+)*/
-    raise("unknown Ruby version #{$1}") unless $1 == "1.8" || $1 == "1.9"
-    $1
+    version = RUBY_VERSION[/(\d+\.\d+)(\.\d+)*/, 1]
+    raise("unknown Ruby version #{$1}") unless ["1.8", "1.9"].include?(version)
+    version
   end
 
   def jruby_mode_token(ruby_version = nil)
@@ -34,7 +61,7 @@ module RedStorm
   end
 
   def java_runtime_version
-    System.properties["java.runtime.version"].to_s =~ /^(\d+\.\d+).[^\s]+$/ ? $1 : "1.7"
+    System.properties["java.runtime.version"].to_s[/^(\d+\.\d+).[^\s]+$/, 1] || raise("unknown java runtime version #{System.properties["java.runtime.version"].to_s}")
   end
 
   module_function :current_ruby_mode, :jruby_mode_token, :java_runtime_version

data/lib/red_storm/version.rb

@@ -1,3 +1,3 @@
 module RedStorm
-  VERSION = '0.6.6.beta2'
+  VERSION = '0.6.6'
 end

data/lib/tasks/red_storm.rake

@@ -1,8 +1,8 @@
 begin
   require 'ant'
 rescue
-  puts("ERROR: unable to load Ant, make sure Ant is installed, in your PATH and $ANT_HOME is defined properly")
-  puts("\nerror detail:\n#{$!}")
+  puts("error: unable to load Ant, make sure Ant is installed, in your PATH and $ANT_HOME is defined properly")
+  puts("\nerror details:\n#{$!}")
   exit(1)
 end
 
@@ -10,7 +10,9 @@ require 'jruby/jrubyc'
 require 'red_storm/environment'
 require 'red_storm/application'
 
-INSTALL_IVY_VERSION = "2.3.0"
+module RedStorm
+  INSTALL_IVY_VERSION = "2.3.0"
+end
 
 task :launch, :env, :storm_conf, :ruby_mode, :class_file do |t, args|
   # use ruby mode parameter or default to current interpreter version
@@ -20,8 +22,8 @@ task :launch, :env, :storm_conf, :ruby_mode, :class_file do |t, args|
   when "local"
     RedStorm::Application.local_storm_command(args[:class_file], args[:ruby_mode])
   when "cluster"
-    unless File.exist?(TARGET_CLUSTER_JAR)
-      puts("error: cluster jar file #{TARGET_CLUSTER_JAR} not found. Generate it using $redstorm jar DIR1 [DIR2, ...]")
+    unless File.exist?(RedStorm::TARGET_CLUSTER_JAR)
+      puts("error: cluster jar file #{RedStorm::TARGET_CLUSTER_JAR} not found. Generate it using $redstorm jar DIR1 [DIR2, ...]")
       exit(1)
     end
     unless File.exist?(args[:storm_conf])
@@ -38,50 +40,50 @@ task :launch, :env, :storm_conf, :ruby_mode, :class_file do |t, args|
 end
 
 task :clean do
-  ant.delete 'dir' => TARGET_DIR
+  ant.delete 'dir' => RedStorm::TARGET_DIR
 end
 
 task :clean_jar do
-  ant.delete 'file' => TARGET_CLUSTER_JAR
+  ant.delete 'file' => RedStorm::TARGET_CLUSTER_JAR
 end
 
 task :setup do
   puts("\n--> Setting up target directories")
-  ant.mkdir 'dir' => TARGET_DIR
-  ant.mkdir 'dir' => TARGET_CLASSES_DIR
-  ant.mkdir 'dir' => TARGET_DEPENDENCY_DIR
-  ant.mkdir 'dir' => TARGET_SRC_DIR
-  ant.mkdir 'dir' => TARGET_GEM_DIR
-  ant.mkdir 'dir' => TARGET_SPECS_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_CLASSES_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_DEPENDENCY_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_SRC_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_GEM_DIR
+  ant.mkdir 'dir' => RedStorm::TARGET_SPECS_DIR
   ant.path 'id' => 'classpath' do
-    fileset 'dir' => TARGET_DEPENDENCY_DIR
-    fileset 'dir' => TARGET_CLASSES_DIR
+    fileset 'dir' => RedStorm::TARGET_DEPENDENCY_DIR
+    fileset 'dir' => RedStorm::TARGET_CLASSES_DIR
   end
 end
 
 desc "install dependencies and compile proxy classes"
 task :install, [:jvm_version] => [:deps, :build] do |t, args|
-  puts("\nRedStorm install completed. All dependencies installed in #{TARGET_DIR}")
+  puts("\nRedStorm install completed. All dependencies installed in #{RedStorm::TARGET_DIR}")
 end
 
 desc "locally install examples"
 task :examples do
-  if File.identical?(SRC_EXAMPLES, DST_EXAMPLES)
+  if File.identical?(RedStorm::SRC_EXAMPLES, RedStorm::DST_EXAMPLES)
     STDERR.puts("error: cannot copy examples into itself")
     exit(1)
   end
-  if File.exist?(DST_EXAMPLES)
-    STDERR.puts("error: directory #{DST_EXAMPLES} already exists")
+  if File.exist?(RedStorm::DST_EXAMPLES)
+    STDERR.puts("error: directory #{RedStorm::DST_EXAMPLES} already exists")
     exit(1)
   end
 
-  puts("\n--> Installing examples into #{DST_EXAMPLES}")
-  FileUtils.mkdir(DST_EXAMPLES)
-  FileUtils.cp_r(Dir["#{SRC_EXAMPLES}/*"], DST_EXAMPLES)
+  puts("\n--> Installing examples into #{RedStorm::DST_EXAMPLES}")
+  FileUtils.mkdir(RedStorm::DST_EXAMPLES)
+  FileUtils.cp_r(Dir["#{RedStorm::SRC_EXAMPLES}/*"], RedStorm::DST_EXAMPLES)
 end
 
 task :copy_red_storm do
-  FileUtils.cp_r(REDSTORM_LIB_DIR, TARGET_DIR)
+  FileUtils.cp_r(RedStorm::REDSTORM_LIB_DIR, RedStorm::TARGET_DIR)
 end
 
 desc "compile JRuby and Java proxy classes"
@@ -89,22 +91,22 @@ task :build, [:jvm_version] => [:setup, :copy_red_storm] do |t, args|
   jvm_version = args[:jvm_version].to_s =~ /--(1.\d)/ ? $1 : RedStorm.java_runtime_version
 
   # compile the JRuby proxy classes to Java
-  build_jruby("#{REDSTORM_LIB_DIR}/red_storm/proxy")
+  build_jruby("#{RedStorm::REDSTORM_LIB_DIR}/red_storm/proxy")
 
   # compile the generated Java proxy classes
-  build_java_dir("#{TARGET_SRC_DIR}", jvm_version)
+  build_java_dir("#{RedStorm::TARGET_SRC_DIR}", jvm_version)
 
   # generate the JRuby topology launcher
-  build_jruby("#{REDSTORM_LIB_DIR}/red_storm/topology_launcher.rb")
+  build_jruby("#{RedStorm::REDSTORM_LIB_DIR}/red_storm/topology_launcher.rb")
 
   # compile the JRuby proxy classes
-  build_java_dir("#{REDSTORM_JAVA_SRC_DIR}", jvm_version)
+  build_java_dir("#{RedStorm::REDSTORM_JAVA_SRC_DIR}", jvm_version)
 
   # compile the JRuby proxy classes
-  build_java_dir("#{TARGET_SRC_DIR}", jvm_version)
+  build_java_dir("#{RedStorm::TARGET_SRC_DIR}", jvm_version)
 end
 
-desc "package topology gems into #{TARGET_GEM_DIR}"
+desc "package topology gems into #{RedStorm::TARGET_GEM_DIR}"
 task :bundle, [:groups] => :setup do |t, args|
   require 'bundler'
   defaulted_args = {:groups => 'default'}.merge(args.to_hash.delete_if{|k, v| v.to_s.empty?})
@@ -113,9 +115,9 @@ task :bundle, [:groups] => :setup do |t, args|
     next if spec.name == 'bundler'
 
     # try to avoid infinite recursion
-    next if TARGET_GEM_DIR.start_with?(spec.full_gem_path)
+    next if RedStorm::TARGET_GEM_DIR.start_with?(spec.full_gem_path)
 
-    destination_path = "#{TARGET_GEM_DIR}/#{spec.full_name}"
+    destination_path = "#{RedStorm::TARGET_GEM_DIR}/#{spec.full_name}"
     next if File.directory?(destination_path)
 
     puts("installing gem #{spec.full_name} into #{destination_path}")
@@ -124,7 +126,7 @@ task :bundle, [:groups] => :setup do |t, args|
     # copy the evaluated gemspec into the specifications/ dir (we
     # may not have enough info to reconstruct once we delete the
     # .git directory)
-    File.open(File.join(TARGET_SPECS_DIR, File.basename(spec.loaded_from)), 'w'){|f| f.write(spec.to_ruby)}
+    File.open(File.join(RedStorm::TARGET_SPECS_DIR, File.basename(spec.loaded_from)), 'w'){|f| f.write(spec.to_ruby)}
     # strip the .git directory from git dependencies, it can be huge
     FileUtils.rm_rf("#{destination_path}/.git")
   end
@@ -132,17 +134,17 @@ end
 
 namespace :ivy do
   task :download do
-    mkdir_p DST_IVY_DIR
+    mkdir_p RedStorm::DST_IVY_DIR
     ant.get({
-      'src' => "http://repo1.maven.org/maven2/org/apache/ivy/ivy/#{INSTALL_IVY_VERSION}/ivy-#{INSTALL_IVY_VERSION}.jar",
-      'dest' => "#{DST_IVY_DIR}/ivy-#{INSTALL_IVY_VERSION}.jar",
+      'src' => "http://repo1.maven.org/maven2/org/apache/ivy/ivy/#{RedStorm::INSTALL_IVY_VERSION}/ivy-#{RedStorm::INSTALL_IVY_VERSION}.jar",
+      'dest' => "#{RedStorm::DST_IVY_DIR}/ivy-#{RedStorm::INSTALL_IVY_VERSION}.jar",
       'usetimestamp' => true,
     })
   end
 
   task :install => :download do
     ant.path 'id' => 'ivy.lib.path' do
-      fileset 'dir' => DST_IVY_DIR, 'includes' => '*.jar'
+      fileset 'dir' => RedStorm::DST_IVY_DIR, 'includes' => '*.jar'
     end
 
     ant.taskdef({
@@ -154,44 +156,44 @@ namespace :ivy do
 end
 
 task :ivy_config do
-  ant.configure 'file' => File.exists?(CUSTOM_IVY_SETTINGS) ? CUSTOM_IVY_SETTINGS : DEFAULT_IVY_SETTINGS
+  ant.configure 'file' => File.exists?(RedStorm::CUSTOM_IVY_SETTINGS) ? RedStorm::CUSTOM_IVY_SETTINGS : RedStorm::DEFAULT_IVY_SETTINGS
 end
 
 task :storm_deps => ["ivy:install", :ivy_config] do
   puts("\n--> Installing Storm dependencies")
 
-  ant.resolve 'file' => File.exists?(CUSTOM_IVY_STORM_DEPENDENCIES) ? CUSTOM_IVY_STORM_DEPENDENCIES : DEFAULT_IVY_STORM_DEPENDENCIES
-  ant.retrieve 'pattern' => "#{TARGET_DEPENDENCY_DIR}/storm/[conf]/[artifact](-[classifier])-[revision].[ext]", 'sync' => "true"
+  ant.resolve 'file' => File.exists?(RedStorm::CUSTOM_IVY_STORM_DEPENDENCIES) ? RedStorm::CUSTOM_IVY_STORM_DEPENDENCIES : RedStorm::DEFAULT_IVY_STORM_DEPENDENCIES
+  ant.retrieve 'pattern' => "#{RedStorm::TARGET_DEPENDENCY_DIR}/storm/[conf]/[artifact](-[classifier])-[revision].[ext]", 'sync' => "true"
 end
 
 task :topology_deps => ["ivy:install", :ivy_config] do
   puts("\n--> Installing topology dependencies")
 
-  ant.resolve 'file' => File.exists?(CUSTOM_IVY_TOPOLOGY_DEPENDENCIES) ? CUSTOM_IVY_TOPOLOGY_DEPENDENCIES : DEFAULT_IVY_TOPOLOGY_DEPENDENCIES
-  ant.retrieve 'pattern' => "#{TARGET_DEPENDENCY_DIR}/topology/[conf]/[artifact](-[classifier])-[revision].[ext]", 'sync' => "true"
+  ant.resolve 'file' => File.exists?(RedStorm::CUSTOM_IVY_TOPOLOGY_DEPENDENCIES) ? RedStorm::CUSTOM_IVY_TOPOLOGY_DEPENDENCIES : RedStorm::DEFAULT_IVY_TOPOLOGY_DEPENDENCIES
+  ant.retrieve 'pattern' => "#{RedStorm::TARGET_DEPENDENCY_DIR}/topology/[conf]/[artifact](-[classifier])-[revision].[ext]", 'sync' => "true"
 end
 
-desc "install storm and topology dependencies in #{TARGET_DEPENDENCY_DIR}"
+desc "install storm and topology dependencies in #{RedStorm::TARGET_DEPENDENCY_DIR}"
 task :deps => ["ivy:install", :ivy_config, :storm_deps, :topology_deps] do
 end
 
-desc "generate #{TARGET_CLUSTER_JAR}"
+desc "generate #{RedStorm::TARGET_CLUSTER_JAR}"
 task :jar, [:include_dir] => [:clean_jar] do |t, args|
-  puts("\n--> Generating JAR file #{TARGET_CLUSTER_JAR}")
+  puts("\n--> Generating JAR file #{RedStorm::TARGET_CLUSTER_JAR}")
 
-  ant.jar 'destfile' => TARGET_CLUSTER_JAR do
+  ant.jar 'destfile' => RedStorm::TARGET_CLUSTER_JAR do
     # rejar all topology jars
     Dir["target/dependency/topology/default/*.jar"].each do |jar|
       puts("Extracting #{jar}")
       zipfileset 'src' => jar, 'includes' => "**/*"
     end
-    fileset 'dir' => TARGET_DIR do
+    fileset 'dir' => RedStorm::TARGET_DIR do
       include 'name' => "gems/**"
     end
-    fileset 'dir' => TARGET_CLASSES_DIR
+    fileset 'dir' => RedStorm::TARGET_CLASSES_DIR
     # red_storm.rb and red_storm/* must be in root of jar so that "require 'red_storm'"
     # in bolts/spouts works in jar context
-    fileset 'dir' => TARGET_LIB_DIR do
+    fileset 'dir' => RedStorm::TARGET_LIB_DIR do
       exclude 'name' => "tasks/**"
     end
     if args[:include_dir]
@@ -209,7 +211,7 @@ task :jar, [:include_dir] => [:clean_jar] do |t, args|
       end
 
       # include complete source dir tree (note we don't care about potential duplicated resources dir)
-      fileset 'dir' => CWD do
+      fileset 'dir' => RedStorm::CWD do
         dirs.each{|dir| include 'name' => "#{dir}/**/*"}
       end
     end
@@ -217,14 +219,14 @@ task :jar, [:include_dir] => [:clean_jar] do |t, args|
       attribute 'name' => "Main-Class", 'value' => "redstorm.TopologyLauncher"
     end
   end
-  puts("\nRedStorm generated JAR file #{TARGET_CLUSTER_JAR}")
+  puts("\nRedStorm generated JAR file #{RedStorm::TARGET_CLUSTER_JAR}")
 end
 
 def build_java_dir(source_folder, jvm_version)
   puts("\n--> Compiling Java for JVM #{jvm_version}")
   ant.javac(
     'srcdir' => source_folder,
-    'destdir' => TARGET_CLASSES_DIR,
+    'destdir' => RedStorm::TARGET_CLASSES_DIR,
     'classpathref' => 'classpath',
     'source' => jvm_version,
     'target' => jvm_version,
@@ -242,13 +244,13 @@ def build_jruby(source_path)
   puts("\n--> Compiling JRuby")
   Dir.chdir(RedStorm::REDSTORM_HOME) do
     argv = []
-    argv << '-t' << TARGET_SRC_DIR
+    argv << '-t' << RedStorm::TARGET_SRC_DIR
     argv << '--verbose'
     argv << '--java'
-    Dir["#{TARGET_DEPENDENCY_DIR}/storm/default/*.jar"].each do |jar|
+    Dir["#{RedStorm::TARGET_DEPENDENCY_DIR}/storm/default/*.jar"].each do |jar|
       argv << '-c' << %("#{jar}")
     end
-    argv << '-c' << %("#{TARGET_CLASSES_DIR}")
+    argv << '-c' << %("#{RedStorm::TARGET_CLASSES_DIR}")
     argv << source_path
     status =  JRuby::Compiler::compile_argv(argv)
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redstorm
 version: !ruby/object:Gem::Version
-  version: 0.6.6.beta2
-  prerelease: 6
+  version: 0.6.6
+  prerelease:
 platform: ruby
 authors:
 - Colin Surprenant
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -131,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: redstorm