rhoconnect 3.1.1 → 3.1.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.1.2 (2012-04-02)
+* #19297819  - Refactor server middleware loading to be static
+* #25292219  - Ensure that Store.get_zdata always returns valid array (even if it is empty)
+* #26868157 - bug in install.sh in rhoconnect installer
+* #27184633 - Fixing error with recursive loading of application.rb in ruby-1.8.7 and ree
+* use redis 2.4.10 by default
+
 ## 3.1.1 (2012-02-07)
 * Fix Zendesk issue: Rack 1.4.1 and Sinatra 1.3.2 produce 502 error with Heroku deployment (tickets 2147, 2155, 2153)
 

data/Gemfile

@@ -16,8 +16,8 @@ end
 group :development do
   gem 'aws-s3', '>= 0.6.2', :require => 'aws/s3'
   gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
-  gem 'fpm', '>= 0.3.8'
-  gem 'fog' 
+  gem 'fpm', '0.3.11'
+  gem 'fog', '>= 1.1.0'
   gem 'ffaker', '~> 1.12.1'
   gem 'thor', '>= 0.13.6'
   gem 'webmock', '~> 1.6.4'
@@ -25,7 +25,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.6.0'
+  gem 'rspec', '~> 2.8.0'
   gem "rcov", '~> 1.0.0', :require => false, :platforms => :ruby_18
   gem 'simplecov', :require => false, :platforms => [:ruby_19,:jruby]
   gem 'rack-test', '>= 0.5.3', :require => 'rack/test'

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.1.1)
+    rhoconnect (3.1.2)
       bundler (~> 1.0)
       json (~> 1.6.0)
-      rack (~> 1.3.6)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
-      resque (~> 1.19.0)
+      resque (~> 1.20.0)
       rest-client (~> 1.6.1)
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
@@ -18,28 +17,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    addressable (2.2.6)
+    addressable (2.2.7)
     aws-s3 (0.6.2)
       builder
       mime-types
       xml-simple
-    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     crack (0.3.1)
-    dbd-jdbc (0.1.4)
-    dbi (0.4.5)
-      deprecated (= 2.0.1)
-    deprecated (2.0.1)
     diff-lcs (1.1.3)
-    excon (0.9.5)
+    excon (0.13.2)
     extlib (0.9.15)
     ffaker (1.12.1)
-    fog (1.1.2)
+    fog (1.3.1)
       builder
-      excon (~> 0.9.0)
+      excon (~> 0.13.0)
       formatador (~> 0.2.0)
       mime-types
-      multi_json (~> 1.0.3)
+      multi_json (~> 1.0)
       net-scp (~> 1.0.4)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
@@ -48,21 +42,14 @@ GEM
     fpm (0.3.11)
       json
     highline (1.6.11)
-    jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.6)
-    jruby-openssl (0.7.5)
-      bouncy-castle-java (>= 1.5.0146.1)
-    jruby-rack (1.1.3)
-    json (1.6.5)
-    json (1.6.5-java)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    json (1.6.6)
+    mime-types (1.18)
+    multi_json (1.2.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
-    rack (1.3.6)
+    nokogiri (1.5.2)
+    rack (1.4.1)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
@@ -72,25 +59,25 @@ GEM
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.19.0)
+    resque (1.20.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.5)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rubyzip (0.9.6.1)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sinatra (1.3.2)
@@ -107,18 +94,12 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warbler (1.3.2)
-      jruby-jars (>= 1.4.0)
-      jruby-rack (>= 1.0.0)
-      rake (>= 0.8.7)
-      rubyzip (>= 0.9.4)
     webmock (1.6.4)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     xml-simple (1.1.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -127,14 +108,14 @@ DEPENDENCIES
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   ffaker (~> 1.12.1)
-  fog
-  fpm (>= 0.3.8)
+  fog (>= 1.1.0)
+  fpm (= 0.3.11)
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
   rcov (~> 1.0.0)
   rhoconnect!
-  rspec (~> 2.6.0)
+  rspec (~> 2.8.0)
   simplecov
   sqlite3 (>= 1.3.3)
   thor (>= 0.13.6)

data/Rakefile

@@ -146,8 +146,7 @@ DEB_DEPS = [
   "zlib1g (>= 1.2.3)", "zlib1g-dev (>= 1.2.3)",
   "libssl0.9.8 (>= 0)", "libssl-dev (>= 0.9.8)",
   "libcurl4-openssl-dev (>= 0)",
-  "libreadline5 (>= 0)", "libreadline5-dev (>= 0)"
-  # "libreadline6 (>= 0)", "libreadline6-dev (>= 0)",
+  "libreadline6 (>= 0)", "libreadline6-dev (>= 0)"
   # "libsqlite3-0 (>= 3.6.22-1)", "libsqlite3-dev (>= 3.6.22-1)"
 ]
 
@@ -163,7 +162,7 @@ RPM_DEPS = [
   "curl >= 7.15.5", "curl-devel >= 7.15.5",
   "pcre >= 6.6", "pcre-devel >= 6.6",
   "openssl >= 0.9.8e", "openssl-devel >= 0.9.8e",
-  "readline-devel >= 5.1", "readline-devel >= 5.1"
+  "readline >= 5.1", "readline-devel >= 5.1"
 ]
 
 desc "Build Red Hat RPM rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"

data/bench/bench_runner.rb

@@ -9,6 +9,10 @@ $stdout = $sdterr = File.new(LOG_FILE, 'a')
 puts "Script #{$0} is started at #{Time.now.to_s}"
 
 begin
+  # Check for another instance of rhoconnect application
+  raise "Another instance of bench application is running." unless `cat /tmp/benchapp.pid 2> /dev/null`.empty?
+  raise "Another instance of rhoconnect application is running." unless `cat /tmp/rhoconnect.pid 2> /dev/null`.empty?
+ 
   ruby_version = `rvm current`
   puts "Ruby version: #{ruby_version}"
   puts
@@ -19,41 +23,37 @@ begin
   puts
   
   puts "Installing rhoconnect ..."
-  puts `bundle exec rake install`
+  puts `rake install`
   puts
 
-  Dir.chdir "bench/benchapp"  #puts Dir.pwd
+  Dir.chdir "bench/benchapp" #puts Dir.pwd
   puts "Checking bench application dependencies ..."
   puts `bundle update`
   puts
-
-  # TODO: Check for another instance of bench application
-  # log = `ps aux | grep /tmp/benchapp.pid | grep -v grep`
-  # puts log
   
   puts "Starting bench application ..."
   t = Thread.new do
-    log = `bundle exec rackup -D -P /tmp/benchapp.pid -s thin config.ru 2>&1`
+    log = `rackup -D -P /tmp/benchapp.pid -s thin config.ru 2>&1`
     puts log
   end
   t.join
 
 =begin
-  if ruby_version =~ /jruby/
-    # puts "Ruby version: #{ruby_version}"
-    t = Thread.new do
-      puts `jruby -S trinidad -p 9292 -r config.ru --load daemon --daemonize /tmp/benchapp.pid`
-    end
-    # t.join    
-  else
-    pid = Process.fork do
-      log = `rackup -D -P /tmp/benchapp.pid -s thin config.ru`
-      puts log
-      puts
-      Process.exit(0)      
-    end
-    Process.waitpid(pid)
-  end
+if ruby_version =~ /jruby/
+# puts "Ruby version: #{ruby_version}"
+t = Thread.new do
+puts `jruby -S trinidad -p 9292 -r config.ru --load daemon --daemonize /tmp/benchapp.pid`
+end
+# t.join
+else
+pid = Process.fork do
+log = `rackup -D -P /tmp/benchapp.pid -s thin config.ru`
+puts log
+puts
+Process.exit(0)
+end
+Process.waitpid(pid)
+end
 =end
 
   count = 0
@@ -68,33 +68,33 @@ begin
   puts "Bench application is up and running with pid #{pid}"
   puts
   
-#  puts `echo 'yes' | rake rhoconnect:reset 2>&1`
-#  puts
+# puts `echo 'yes' | rake rhoconnect:reset 2>&1`
+# puts
 
   Dir.chdir "../"
   bench_errors = {}
   puts "Running bench scripts ..."
-  %w[ cud_script  query_only_script  query_script  query_md_script ].each do |script|
+  %w[ cud_script query_only_script query_script query_md_script ].each do |script|
     puts "Script #{script} ..."
-    log  = `"./run_#{script}.sh" 2>&1`
+    log = `"./run_#{script}.sh" 2>&1`
 
     count = 0
-    stats_found = nil 
+    stats_found = nil
     log.each_line do |line|
       puts line if count <= 1
-      count += 1     
-      stats_found ||= (/Statistics:/ =~ line) 
+      count += 1
+      stats_found ||= (/Statistics:/ =~ line)
       if stats_found
         puts line
         if line.match /err: (\d+), verification err: (\d+)$/
           if $1.to_i != 0 || $2.to_i != 0
             bench_errors[script] ||= []
             bench_errors[script] << line
-          end  
-        end  
+          end
+        end
       end
     end
-    puts    
+    puts
   end
   
   if not bench_errors.empty?
@@ -102,7 +102,7 @@ begin
     puts "The following scripts completed with errors:"
     bench_errors.each do |script, errors|
       puts "#{script}:"
-      errors.each { |err| puts "  #{err}" }
+      errors.each { |err| puts " #{err}" }
     end
     exit -1
   end
@@ -110,10 +110,10 @@ begin
 rescue Exception => e
   puts e.message
   exit -1
-ensure 
-  if File.exist? '/tmp/benchapp.pid' 
+ensure
+  if File.exist? '/tmp/benchapp.pid'
     pid = `cat /tmp/benchapp.pid`
-    res = `kill -9 #{pid}` if pid.to_i > 0   # `kill -s SIGINT #{pid}`
+    res = `kill -9 #{pid}` if pid.to_i > 0 # `kill -s SIGINT #{pid}`
     File.delete '/tmp/benchapp.pid'
     puts "Bench application killed ..."
   end
@@ -121,4 +121,4 @@ ensure
   puts ""
   $stdout = orig_stdout #restore stdout
   $sdterr = orig_stderr #restore stderr
-end
+end

data/bench/benchapp/Gemfile.lock

@@ -9,8 +9,8 @@ GEM
     highline (1.6.11)
     json (1.6.5)
     mime-types (1.17.2)
-    multi_json (1.0.4)
-    rack (1.3.6)
+    multi_json (1.1.0)
+    rack (1.4.1)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
@@ -26,10 +26,9 @@ GEM
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rhoconnect (3.1.1)
+    rhoconnect (3.1.2)
       bundler (~> 1.0)
       json (~> 1.6.0)
-      rack (~> 1.3.6)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
@@ -46,7 +45,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.5)
+    rubyzip (0.9.6.1)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)

data/bench/benchapp/config.ru

@@ -27,11 +27,7 @@ Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect
 Rhoconnect::Server.disable :logging
 
 # Load our rhoconnect application
-$:.unshift ROOT_PATH if RUBY_VERSION =~ /1.9/ # FIXME: see PT story #16682771
-require 'application'
-
-#STDERR=nil
-#STDOUT=nil
+require "#{ROOT_PATH}/application"
 
 # Setup the url map
 run Rack::URLMap.new \

data/bench/benchapp/spec/spec_helper.rb

@@ -19,19 +19,6 @@ include Rhoconnect
 
 require 'rhoconnect/test_methods'
 
-# Monkey patch to fix the following issue:
-# /Library/Ruby/Gems/1.8/gems/rspec-core-2.5.1/lib/rspec/core/shared_example_group.rb:45:
-# in `ensure_shared_example_group_name_not_taken': Shared example group '...' already exists (ArgumentError)
-module RSpec
-  module Core
-    module SharedExampleGroup
-    private
-      def ensure_shared_example_group_name_not_taken(name)
-      end
-    end
-  end
-end
-
 shared_examples_for "SpecHelper" do
   include Rhoconnect::TestMethods
   

data/bench/blobapp/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: ../../
   specs:
-    rhoconnect (3.1.0.beta2)
+    rhoconnect (3.1.2)
       bundler (~> 1.0)
       json (~> 1.6.0)
-      rack (~> 1.4.1)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
@@ -19,7 +18,7 @@ GEM
   specs:
     SystemTimer (1.2.3)
     bouncy-castle-java (1.5.0146.1)
-    daemons (1.1.6)
+    daemons (1.1.8)
     dbd-jdbc (0.1.4)
     dbi (0.4.5)
       deprecated (= 2.0.1)
@@ -29,14 +28,14 @@ GEM
     extlib (0.9.15)
     highline (1.6.11)
     jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.5.1)
-    jruby-openssl (0.7.5)
+    jruby-jars (1.6.7)
+    jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
-    jruby-rack (1.1.3)
+    jruby-rack (1.1.4)
     json (1.6.5)
     json (1.6.5-java)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -61,7 +60,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.5)
+    rubyzip (0.9.6.1)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -76,7 +75,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    trinidad (1.3.2)
+    trinidad (1.3.4)
       jruby-rack (>= 1.1.1)
       trinidad_jars (>= 1.0.1)
     trinidad_jars (1.0.2)