redstorm 0.1.1 → 0.2.0

data/lib/red_storm/topology_launcher.rb

@@ -3,11 +3,11 @@ require 'rubygems'
 
 begin
   # will work from gem, since lib dir is in gem require_paths
-  require 'red_storm/version'
+  require 'red_storm'
 rescue LoadError
   # will work within RedStorm dev project
   $:.unshift './lib'
-  require 'red_storm/version'
+  require 'red_storm'
 end
 
 java_import 'backtype.storm.Config'
@@ -29,15 +29,18 @@ class TopologyLauncher
 
   java_signature 'void main(String[])'
   def self.main(args)
-    unless args.size > 0 
-      puts("Usage: redstorm topology_class_file_name")
+    unless args.size > 1 
+      puts("Usage: redstorm local|cluster topology_class_file_name")
       exit(1)
     end
-    class_path = args[0]
+    env = args[0].to_sym
+    class_path = args[1]
     clazz = camel_case(class_path.split('/').last.split('.').first)
-    puts("RedStorm v#{RedStorm::VERSION} starting topology #{clazz}")
+
+    puts("RedStorm v#{RedStorm::VERSION} starting topology #{clazz} in #{env.to_s} environment")
+
     require class_path
-    Object.module_eval(clazz).new.start(class_path)
+    Object.module_eval(clazz).new.start(class_path, env)
   end
 
   private 

data/lib/red_storm/version.rb

@@ -1,3 +1,3 @@
 module RedStorm
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/tasks/red_storm.rake

@@ -0,0 +1,151 @@
+require 'ant'
+
+begin
+  # will work from gem, since lib dir is in gem require_paths
+  require 'red_storm'
+rescue LoadError
+  # will work within RedStorm dev project
+  $:.unshift './lib'
+  require 'red_storm'
+end
+
+CWD = Dir.pwd
+TARGET_DIR = "#{CWD}/target"
+TARGET_SRC_DIR = "#{TARGET_DIR}/src"
+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"
+
+JAVA_SRC_DIR = "#{RedStorm::REDSTORM_HOME}/src/main"
+JRUBY_SRC_DIR = "#{RedStorm::REDSTORM_HOME}/lib"
+
+SRC_EXAMPLES = "#{RedStorm::REDSTORM_HOME}/examples"
+DST_EXAMPLES = "#{CWD}/examples"
+
+task :launch, :env, :class_file do |t, args|
+  gem_home = ENV["GEM_HOME"].to_s.empty? ? " -Djruby.gem.home=`gem env home`" : ""
+  command = "java -cp \"#{TARGET_CLASSES_DIR}:#{TARGET_DEPENDENCY_DIR}/*\"#{gem_home} redstorm.TopologyLauncher #{args[:env]} #{args[:class_file]}"
+  puts("launching #{command}")
+  system(command)
+end
+
+task :clean do
+  ant.delete :dir => TARGET_DIR
+end
+
+task :clean_jar do
+  ant.delete :file => TARGET_CLUSTER_JAR
+end
+
+task :setup do  
+  ant.mkdir :dir => TARGET_DIR 
+  ant.mkdir :dir => TARGET_CLASSES_DIR 
+  ant.mkdir :dir => TARGET_SRC_DIR
+  ant.path :id => 'classpath' do  
+    fileset :dir => TARGET_DEPENDENCY_DIR  
+    fileset :dir => TARGET_CLASSES_DIR  
+  end  
+end
+
+task :install => [:deps, :build] do
+  puts("\nRedStorm install completed. All dependencies installed in #{TARGET_DIR}")
+end
+
+task :unpack do
+  system("rmvn dependency:unpack -f #{RedStorm::REDSTORM_HOME}/pom.xml -DoutputDirectory=#{TARGET_DEPENDENCY_UNPACKED_DIR}")
+end
+
+task :devjar => [:unpack, :clean_jar] do
+  ant.jar :destfile => TARGET_CLUSTER_JAR do
+    fileset :dir => TARGET_CLASSES_DIR
+    fileset :dir => TARGET_DEPENDENCY_UNPACKED_DIR
+    fileset :dir => RedStorm::REDSTORM_HOME do
+      include :name => "examples/**/*"
+    end
+    fileset :dir => JRUBY_SRC_DIR do
+      exclude :name => "tasks/**"
+    end
+    manifest do
+      attribute :name => "Main-Class", :value => "redstorm.TopologyLauncher"
+    end
+  end
+  puts("\nRedStorm generated dev jar file #{TARGET_CLUSTER_JAR}")
+end
+
+task :jar, [:dir] => [:unpack, :clean_jar] do |t, args|
+  ant.jar :destfile => TARGET_CLUSTER_JAR do
+    fileset :dir => TARGET_CLASSES_DIR
+    fileset :dir => TARGET_DEPENDENCY_UNPACKED_DIR
+    fileset :dir => RedStorm::REDSTORM_HOME do
+      include :name => "examples/**/*"
+    end
+    fileset :dir => JRUBY_SRC_DIR do
+      exclude :name => "tasks/**"
+    end
+    fileset :dir => CWD do
+      include :name => "#{args[:dir]}/**/*"
+    end
+    manifest do
+      attribute :name => "Main-Class", :value => "redstorm.TopologyLauncher"
+    end
+  end
+  puts("\nRedStorm generated jar file #{TARGET_CLUSTER_JAR}")
+end
+
+task :examples do
+  if File.identical?(SRC_EXAMPLES, 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")
+    exit(1)
+  end
+
+  puts("copying examples into #{DST_EXAMPLES}")
+  system("mkdir #{DST_EXAMPLES}")
+  system("cp -r #{SRC_EXAMPLES}/* #{DST_EXAMPLES}")
+  puts("\nRedStorm examples completed. All examples copied in #{DST_EXAMPLES}")
+end
+
+task :deps do
+  system("rmvn dependency:copy-dependencies -f #{RedStorm::REDSTORM_HOME}/pom.xml -DoutputDirectory=#{TARGET_DEPENDENCY_DIR}")
+end
+
+task :build => :setup do
+  # compile the JRuby proxy classes to Java
+  build_jruby("#{JRUBY_SRC_DIR}/red_storm/proxy")
+
+  # compile the generated Java proxy classes
+  build_java_dir("#{TARGET_SRC_DIR}")
+
+  # generate the JRuby topology launcher
+  build_jruby("#{JRUBY_SRC_DIR}/red_storm/topology_launcher.rb")
+
+  # compile the JRuby proxy classes
+  build_java_dir("#{JAVA_SRC_DIR}")
+
+  # compile the JRuby proxy classes
+  build_java_dir("#{TARGET_SRC_DIR}")
+end 
+
+def build_java_dir(source_folder)
+  puts("\n--> Compiling Java")
+  ant.javac(
+    :srcdir => source_folder,
+    :destdir => TARGET_CLASSES_DIR,
+    :classpathref => 'classpath', 
+    :source => "1.6",
+    :target => "1.6",
+    :debug => "yes",
+    :includeantruntime => "no",
+    :verbose => false,
+    :listfiles => true
+  )
+end  
+
+def build_jruby(source_path)
+  puts("\n--> Compiling JRuby")
+  system("cd #{RedStorm::REDSTORM_HOME}; jrubyc -t #{TARGET_SRC_DIR} --verbose --java -c \"#{TARGET_DEPENDENCY_DIR}/storm-0.5.3.jar\" -c \"#{TARGET_CLASSES_DIR}\" #{source_path}")
+end

data/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>redstorm</groupId>
   <artifactId>redstorm</artifactId>
-  <version>0.1.1</version>
+  <version>0.2.0</version>
   <name>RedStorm JRuby on Storm</name>
 
   <properties>

metadata

@@ -2,7 +2,7 @@
 name: redstorm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
   - Colin Surprenant
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rubyforge
@@ -45,7 +45,7 @@ dependencies:
             version: 3.0.3.0.28.5
     type: :runtime
     version_requirements: *id003
-description: JRuby integration for the Storm distributed realtime computation system
+description: JRuby integration & DSL for the Storm distributed realtime computation system
 email: 
   - colin.surprenant@gmail.com
 executables: 
@@ -57,19 +57,31 @@ extra_rdoc_files: []
 files: 
   - lib/red_storm.rb
   - lib/red_storm/application.rb
+  - lib/red_storm/simple_bolt.rb
+  - lib/red_storm/simple_spout.rb
+  - lib/red_storm/simple_topology.rb
   - lib/red_storm/topology_launcher.rb
   - lib/red_storm/version.rb
   - lib/red_storm/proxy/bolt.rb
   - lib/red_storm/proxy/spout.rb
-  - examples/cluster_word_count_topology.rb
-  - examples/exclamation_bolt.rb
-  - examples/local_exclamation_topology.rb
-  - examples/local_exclamation_topology2.rb
-  - examples/local_redis_word_count_topology.rb
-  - examples/local_word_count_topology.rb
-  - examples/random_sentence_spout.rb
-  - examples/split_sentence_bolt.rb
-  - examples/word_count_bolt.rb
+  - lib/tasks/red_storm.rake
+  - examples/native/cluster_word_count_topology.rb
+  - examples/native/exclamation_bolt.rb
+  - examples/native/local_exclamation_topology.rb
+  - examples/native/local_exclamation_topology2.rb
+  - examples/native/local_redis_word_count_topology.rb
+  - examples/native/local_word_count_topology.rb
+  - examples/native/random_sentence_spout.rb
+  - examples/native/split_sentence_bolt.rb
+  - examples/native/word_count_bolt.rb
+  - examples/simple/exclamation_bolt.rb
+  - examples/simple/exclamation_topology.rb
+  - examples/simple/exclamation_topology2.rb
+  - examples/simple/random_sentence_spout.rb
+  - examples/simple/redis_word_count_topology.rb
+  - examples/simple/split_sentence_bolt.rb
+  - examples/simple/word_count_bolt.rb
+  - examples/simple/word_count_topology.rb
   - src/main/redstorm/storm/jruby/JRubyBolt.java
   - src/main/redstorm/storm/jruby/JRubySpout.java
   - bin/redstorm