tlb-rspec1 0.3.0 → 0.3.1

data/.emacs_project

@@ -1,7 +1,19 @@
 (setq rspec-executable "spec")
-(setenv "GEM_HOME" "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1")
-(setenv "GEM_PATH" "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1:/home/janmejay/.rvm/gems/ruby-1.9.2-head@global")
-(let ((bindir "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1/bin")
-      (path (getenv "PATH")))
-  (unless (string-match-p  bindir path)
-    (setenv "PATH" (concat bindir ":" path))))
+(setq rb_platform "jruby")
+(setq rb_platform "mri")
+
+(unless (getenv "ORIG_PATH")
+  (setenv "ORIG_PATH" (getenv "PATH")))
+
+(defun add-gem-bin (gem-bin)
+  (setenv "PATH" (concat gem-bin ":" (getenv "ORIG_PATH"))))
+
+(if (equal rb_platform "jruby")
+    (progn 
+      (setenv "GEM_HOME" "/home/janmejay/.rvm/gems/jruby-1.5.6@tlb")
+      (setenv "GEM_PATH" "/home/janmejay/.rvm/gems/jruby-1.5.6@tlb:/home/janmejay/.rvm/gems/jruby-1.5.6@global")
+      (add-gem-bin "/home/janmejay/.rvm/gems/jruby-1.5.6@tlb/bin"))
+    (progn
+      (setenv "GEM_HOME" "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1")
+      (setenv "GEM_PATH" "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1:/home/janmejay/.rvm/gems/ruby-1.8.7-head@global")
+      (add-gem-bin "/home/janmejay/.rvm/gems/ruby-1.9.2-head@rspec-1/bin")))

data/lib/tlb.rb

@@ -23,7 +23,7 @@ module Tlb
     end
 
     def self.port
-      ENV[TLB_BALANCER_PORT]
+      ENV[TLB_BALANCER_PORT] || '8019'
     end
 
     def self.send path, data
@@ -44,10 +44,13 @@ module Tlb
       false
     end
 
+    def self.terminate
+      get("/control/suicide")
+    end
+
     def self.wait_for_start
       loop do
         begin
-          TCPSocket.new(host, port)
           break if running?
         rescue
           #ignore
@@ -103,37 +106,126 @@ module Tlb
     "java -jar #{tlb_jar}"
   end
 
-  def self.write_to_file file_var, clob
-    File.open(ENV[file_var], 'a') do |h|
-      h.write(clob)
+  def self.can_fork?
+    RUBY_PLATFORM != 'java'
+  end
+
+  class BalancerProcess
+    class StreamPumper
+      def initialize stream, file
+        @stream, @file = stream, file
+        @thd = Thread.new { pump }
+      end
+
+      def pump
+        loop do
+          data_available? && flush_stream
+          Thread.current[:stop_pumping] && break
+          sleep 0.1
+        end
+      end
+
+      def flush_stream
+        File.open(ENV[@file], 'a') do |h|
+          h.write(read)
+        end
+      end
+
+      def stop_pumping!
+        @thd[:stop_pumping] = true
+        @thd.join
+      end
+    end
+
+    def initialize server_command
+      pumper_type, out, err  = start(server_command)
+      @out_pumper = pumper_type.new(out, TLB_OUT_FILE)
+      @err_pumper = pumper_type.new(err, TLB_ERR_FILE)
+    end
+
+    def stop_pumping
+      @out_pumper.stop_pumping!
+      @err_pumper.stop_pumping!
+    end
+
+    def die
+      Balancer.terminate
+      stop_pumping
     end
   end
 
-  def self.start_server
-    ENV[TLB_APP] = 'tlb.balancer.BalancerInitializer'
-    @pid, input, out, err = Open4.popen4(server_command)
-    @out_pumper = stream_pumper_for(out, TLB_OUT_FILE)
-    @err_pumper = stream_pumper_for(err, TLB_ERR_FILE)
-    Balancer.wait_for_start
+  class ForkBalancerProcess < BalancerProcess
+    def start server_command
+      @pid, input, out, err = Open4.popen4(server_command)
+      unless (out)
+        raise "out was nil"
+      end
+      return Class.new(StreamPumper) do
+        def data_available?
+          not @stream.eof?
+        end
+
+        def read
+          @stream.read
+        end
+      end, out, err
+    end
+
+    def die
+      super
+      @pid = nil
+      Process.wait
+    end
   end
 
-  def self.stream_pumper_for stream, dump_file
-    Thread.new do
-      loop do
-        stream.eof? || write_to_file(dump_file, stream.read)
-        Thread.current[:stop_pumping] && break
-        sleep 1
+  class JavaBalancerProcess < BalancerProcess
+    def start server_command
+      require 'java'
+      pb = java.lang.ProcessBuilder.new(server_command.split)
+      ENV.each do |key, val|
+        pb.environment[key] = val
       end
+      @process = pb.start()
+      return Class.new(StreamPumper) do
+        def data_available?
+          @stream.ready
+        end
+
+        def read
+          @stream.read_line
+        end
+
+        def stop_pumping!
+          super
+          @stream.close
+        end
+      end, buf_reader(@process.input_stream), buf_reader(@process.error_stream)
     end
+
+    def buf_reader stream
+      java.io.BufferedReader.new(java.io.InputStreamReader.new(stream))
+    end
+
+    def die
+      super
+      @process.destroy
+      @process.waitFor
+      @process = nil
+    end
+  end
+
+  def self.balancer_process_type
+    can_fork? ? ForkBalancerProcess : JavaBalancerProcess
+  end
+
+  def self.start_server
+    ENV[TLB_APP] = 'tlb.balancer.BalancerInitializer'
+    bal_klass = balancer_process_type
+    @balancer_process = bal_klass.new(server_command)
+    Balancer.wait_for_start
   end
 
   def self.stop_server
-    Process.kill(Signal.list["TERM"], @pid)
-    @pid = nil
-    @out_pumper[:stop_pumping] = true
-    @err_pumper[:stop_pumping] = true
-    @out_pumper.join
-    @err_pumper.join
-    Process.wait
+    @balancer_process.die
   end
 end

data/test.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# this is a smart hack strictly meant for developer convinience, not for CI. -janmejay
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
+sep() {
+    in_red "-----------------------------------------------------------------"
+    echo
+}
+
+function in_red {
+    tput sgr0
+    tput setaf 1; 
+    tput setab 7; 
+    echo -n $1; 
+    tput sgr0
+}
+
+function show_running_with {
+    echo -e "\n"
+    sep
+    in_red "|"
+    echo -n " "
+    tput setaf 4
+    echo -n "Running tests with: "
+    tput bold; 
+    tput setaf 0
+    ruby --version
+    sep
+    echo 
+}
+
+run_tests_with() {
+    rvm use $1
+    show_running_with  
+    rake spec
+}
+
+run_tests_with ruby-1.9.2-head@rspec-1
+
+run_tests_with jruby-1.5.6@rspec-1

metadata

@@ -3,71 +3,68 @@ name: tlb-rspec1
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+    - 0
+    - 3
+    - 1
+  version: 0.3.1
 platform: ruby
 authors: 
-- Janmejay Singh
-- Pavan KS
+  - Janmejay Singh
+  - Pavan KS
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 +05:30
+date: 2011-05-11 00:00:00 +05:30
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: open4
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 1
+            version: 1.0.1
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 3
+              - 0
+            version: 1.3.0
+        - - <
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 0
+            version: 2.0.0
+    type: :runtime
+    version_requirements: *id003
 description: |
   TLB ruby implementation base, which provides support for load balancing tests written in rspec-1.x.
   TLB.rb test suite is not bundled, please check http://github.com/test-load-balancer/tlb.rb for tests.
@@ -79,21 +76,22 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+  - README.markdown
 files: 
-- .emacs_project
-- .gitignore
-- .gitmodules
-- README.markdown
-- Rakefile
-- gem_common.rb
-- lib/tasks/tlb.rake
-- lib/tlb.rb
-- lib/tlb/spec_formatter.rb
-- lib/tlb/spec_task.rb
-- lib/tlb/util.rb
-- tlb-rspec1.gemspec
-- tlb-alien-g0.3.0.jar
+  - .emacs_project
+  - .gitignore
+  - .gitmodules
+  - README.markdown
+  - Rakefile
+  - gem_common.rb
+  - lib/tasks/tlb.rake
+  - lib/tlb.rb
+  - lib/tlb/spec_formatter.rb
+  - lib/tlb/spec_task.rb
+  - lib/tlb/util.rb
+  - test.sh
+  - tlb-rspec1.gemspec
+  - tlb-alien-g0.3.0-4-g1077d1b.jar
 has_rdoc: true
 homepage: http://github.com/test-load-balancer/tlb.rb
 licenses: []
@@ -117,31 +115,29 @@ post_install_message: |
   -------------------------------------------------------------------------
 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: tlb-rb
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: tlb-rspec1-0.3.0-rspec-1
+summary: tlb-rspec1-0.3.1-rspec-1
 test_files: []