rhoconnect 4.0.0 → 4.0.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.0.1 (2013-10-29)
+* fixed issue with loading JS Store api from controller context
+* spelling mistakes in docs
+* Updated load path to run CLI commands directly from rhoconnect bin directory
+* Added warning msg to app generator if it cannot run bundler due to missing rhoconnect version.
+* Setup redis_url variable to represent connection string for redis (fixes #57611994 and #57773212)
+* Use unique identifier for pubsub channel names (#58934776)
+
 ## 4.0.0 (2013-09-05)
 * Final v4.0.0 stable release based on beta.63
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (4.0.0)
+    rhoconnect (4.0.1)
       bundler (~> 1.0)
       connection_pool (~> 1.0.0)
       json (~> 1.7.7)
@@ -14,7 +14,6 @@ PATH
       sinatra (~> 1.3)
       templater (~> 1.0.0)
       thor (~> 0.18.0)
-      uuidtools (>= 2.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -28,7 +27,7 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (3.3.3)
+    backports (3.3.5)
     builder (3.2.2)
     cabin (0.6.1)
     childprocess (0.3.9)
@@ -45,7 +44,7 @@ GEM
     diff-lcs (1.1.3)
     eventmachine (1.0.3)
     excon (0.22.1)
-    execjs (2.0.1)
+    execjs (2.0.2)
     extlib (0.9.16)
     ffaker (1.14.0)
     ffi (1.9.0)
@@ -68,12 +67,12 @@ GEM
       clamp (~> 0.6)
       ftw (~> 0.0.30)
       json (>= 1.7.7)
-    ftw (0.0.34)
+    ftw (0.0.36)
       addressable
       backports (>= 2.6.2)
       cabin (> 0)
       http_parser.rb (= 0.5.3)
-    highline (1.6.19)
+    highline (1.6.20)
     hike (1.2.3)
     http_parser.rb (0.5.3)
     jasmine (1.3.2)
@@ -89,25 +88,25 @@ GEM
       rainbow
       sprockets (~> 2)
     json (1.7.7)
-    mime-types (1.25)
+    mime-types (2.0)
     mono_logger (1.1.0)
-    multi_json (1.7.9)
+    multi_json (1.8.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     rack (1.5.2)
     rack-fiber_pool (0.9.3)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rainbow (1.1.4)
     rake (10.0.4)
-    redis (3.0.4)
+    redis (3.0.5)
     redis-namespace (1.3.1)
       redis (~> 3.0.0)
-    resque (1.24.1)
+    resque (1.25.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.2)
@@ -125,7 +124,7 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    safe_yaml (0.9.5)
+    safe_yaml (0.9.7)
     selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
@@ -137,7 +136,7 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -151,13 +150,12 @@ GEM
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.5.1)
+    thin (1.6.0)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.5.0)
     thor (0.18.1)
     tilt (1.4.1)
-    uuidtools (2.1.4)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (1.9.3)

data/Rakefile

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :development, :test, :build)
 
-load 'tasks/redis.rake'
-load 'installer/utils/nix_installation.rake'
-load 'installer/utils/package_upload/repos.rake'
+load File.join(File.dirname(__FILE__) ,'tasks', 'redis.rake')
+load File.join(File.dirname(__FILE__) ,'installer', 'utils', 'nix_installation.rake')
+load File.join(File.dirname(__FILE__) ,'installer', 'utils', '', 'package_upload', 'repos.rake')
 
 require 'yaml'
 $:.unshift File.join(File.dirname(__FILE__),'lib')
@@ -181,7 +181,7 @@ end
 
 begin
   require 'jasmine'
-  load 'tasks/jasmine.rake'
+  load File.join(File.dirname(__FILE__) ,'tasks', 'jasmine.rake')
 rescue LoadError
   task :jasmine do
     abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"

data/bench/benchapp/Rakefile

@@ -1,22 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
-
-begin
-  require 'vendor/rhoconnect/lib/rhoconnect/tasks'
-  require 'vendor/rhoconnect/lib/rhoconnect'
-rescue LoadError
-  require 'rhoconnect/tasks'
-  require 'rhoconnect'
-end
+require 'rhoconnect'
+require 'resque/tasks'
 
 ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 
-begin
-  require 'resque/tasks'
-  task "resque:setup" do
-    require 'application'
+task 'resque:setup' do
+  # The number of redis connections you want a job to have
+  Rhoconnect.connection_pool_size = 1
+  require 'rhoconnect/application/init'
+
+  Resque.after_fork do
+    Store.reconnect
   end
-rescue LoadError
-  puts "Resque not available. Install it with: "
-  puts "gem install resque\n\n"
-end
+end

data/bench/blobapp/Rakefile

@@ -1,25 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'rhoconnect/tasks'
+require 'rhoconnect'
+require 'resque/tasks'
 
 ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 
-begin
-  require 'resque/tasks'
-  task "resque:setup" do
-    require 'application'
-  end
-  desc "run rhoconnect console"
-  task :console, :environment do |t, args|
-    if RedisRunner.running?  
-      #load development environment by default
-      ENV['RACK_ENV'] = args[:environment] || 'development'
-      sh "irb -rubygems -r rhoconnect -r console -r application"
-    else
-      puts "Redis is not running. Please start it by running 'rake redis:start' command."
-    end
+task 'resque:setup' do
+  # The number of redis connections you want a job to have
+  Rhoconnect.connection_pool_size = 1
+  require 'rhoconnect/application/init'
+
+  Resque.after_fork do
+    Store.reconnect
   end
-rescue LoadError
-  puts "Resque not available. Install it with: "
-  puts "gem install resque\n\n"
 end

data/bench/distr_bench/distr_bench_main

@@ -115,7 +115,7 @@ begin
 
   #7) Start-up all clients
   n_iterations = 50
-  command="cd /opt/rhoconnect/bench/distr_bench; ./run_distr_client.sh #{sync_key} #{server} #{n_iterations} #{Bench.datasize} 1>/dev/null"
+  command="cd /opt/rhoconnect/bench/distr_bench; ./run_distr_client.sh #{sync_key} #{server} #{n_iterations} #{Bench.datasize} #{Bench.adapter_name} 1>/dev/null"
 
   clients = ['ec2-107-20-56-25.compute-1.amazonaws.com',
     'ec2-107-20-56-25.compute-1.amazonaws.com',

data/bench/distr_bench/run_distr_client.sh

@@ -3,10 +3,11 @@ test_label=$1
 server=$2
 n_iterations=$3
 payload=$4
+adapter_name=$5
 
 RACK_ENV=production
 export RACK_ENV
 
 sync_key="${test_label}_$payload"
 n_threads=1
-ruby distr_bench start '../scripts/test_query_script.rb' 'rhoadmin' '' $server $sync_key $n_threads $n_iterations $payload
+ruby distr_bench start '../scripts/test_query_script.rb' 'rhoadmin' '' $server $sync_key $n_threads $n_iterations $payload 0 $adapter_name

data/bench/lib/bench.rb

@@ -26,7 +26,7 @@ module Bench
     include TestData
     include Utils
 
-    attr_accessor :concurrency, :iterations, :admin_login, :simtime
+    attr_accessor :concurrency, :iterations, :admin_login, :simtime, :adapter_name
     attr_accessor :admin_password, :user_name
     attr_accessor :password, :base_url, :host, :token
     attr_accessor :total_time, :sessions, :verify_error

data/bench/lib/bench/cli.rb

@@ -15,6 +15,7 @@ module Bench
       Bench.iterations = params[3].to_i unless params[3].nil?
       Bench.datasize = params[4].to_i unless params[4].nil?
       Bench.simtime = params[5].to_i unless params[5].nil?
+      Bench.adapter_name = params[6] unless params[6].nil?
       Bench.admin_login = login
       Bench.admin_password = password
       load(script)
@@ -41,6 +42,7 @@ module Bench
       Bench.iterations = params[3].to_i unless params[3].nil?
       Bench.datasize = params[4].to_i unless params[4].nil?
       Bench.simtime = params[5].to_i unless params[5].nil?
+      Bench.adapter_name = params[6] unless params[6].nil?
       Bench.admin_login = login
       Bench.admin_password = password
       load(script)

data/bench/lib/bench/distr_runner.rb

@@ -8,7 +8,7 @@ module Bench
       @clients_group = clientgroup
     end
     
-    def run(server, sync_key, payload, concurrency, niterations, result_filename=nil, sim_time = 0)
+    def run(server, sync_key, payload, concurrency, niterations, result_filename=nil, sim_time = 0, bench_adapter_name = "RhoInternalBenchmarkAdapter")
       # 1) Extract server name
       server ||= 'default'
       if server != 'default'
@@ -20,7 +20,7 @@ module Bench
       expected_data = Bench.get_test_data(Bench.datasize)
       Bench.concurrency = concurrency.to_i
       Bench.iterations = niterations.to_i
-
+      Bench.adapter_name = bench_adapter_name
       # 3) extract result filename
       Bench.result_filename = result_filename
 
@@ -33,8 +33,8 @@ module Bench
         Bench.user_name = "benchuser"
         Bench.password = "password"
         Bench.set_server_state("test_db_storage:application:#{Bench.user_name}",expected_data)
-        Bench.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
-        Bench.set_simulate_time('RhoInternalBenchmarkAdapter', sim_time)
+        Bench.reset_refresh_time(Bench.adapter_name, 0)
+        Bench.set_simulate_time(Bench.adapter_name, sim_time)
 
         #6) set the sync key
         @start_time = Time.now + 10.0
@@ -42,7 +42,7 @@ module Bench
         puts "Sync Key #{sync_key} is set to #{@start_time} - waiting for clients now!!!"
 
         #7) Start-up all clients
-        command="cd /opt/rhoconnect/bin; ruby run_client_benchmark #{server} #{sync_key} #{niterations} 1 #{Bench.datasize} 1>/dev/null"
+        command="cd /opt/rhoconnect/bin; ruby run_client_benchmark #{server} #{sync_key} #{niterations} 1 #{Bench.datasize} #{Bench.adapter_name} 1>/dev/null"
         ec2_clients = clients_group.client_instances[0,concurrency]
         Bench::AWSUtils.run_stack_ssh_command(ec2_clients, command)
       

data/bench/lib/bench/test_data.rb

@@ -1,5 +1,5 @@
 require 'ffaker'
-require 'uuidtools'
+require 'securerandom'
 
 module Bench
   module TestData
@@ -43,7 +43,7 @@ module Bench
     def generate_fake_data(num, generate_blob)
       res = {}
       num.times do |n|
-        mock_id = UUIDTools::UUID.random_create.to_s.gsub(/\-/,'')
+        mock_id = SecureRandom.hex
         res[mock_id] = {
           "mock_id" => mock_id,
           "FirstName" => Faker::Name.first_name,

data/bench/scripts/test_query_script.rb

@@ -2,6 +2,7 @@ include BenchHelpers
 bench_log "Runs simple login,clientcreate,clientregister,sync session and validates response"
 
 Bench.config do |config|
+  config.adapter_name ||= "RhoInternalBenchmarkAdapter"
   config.concurrency ||= 1
   config.iterations  ||= 10
   config.datasize ||= 100
@@ -39,7 +40,7 @@ Bench.config do |config|
     #exit(1)
 
     #config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
-    config.set_simulate_time('RhoInternalBenchmarkAdapter', Bench.simtime)
+    config.set_simulate_time(Bench.adapter_name, Bench.simtime)
   end
 end
 
@@ -73,14 +74,14 @@ Bench.test do |config,session|
   pagesize = @datasize
   pagesize = @datasize/10 if @datasize > 1000
   session.get "get-cud",
-    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{Bench.adapter_name}",
     {'X-RhoConnect-CLIENT-ID' => session.client_id} do
       {'p_size' => pagesize}
     end
   token = session.last_result.headers[:x_rhoconnect_page_token]
   while (token and token != '') do
     session.get "ack-cud",
-      "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter",
+      "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{Bench.adapter_name}",
       {'X-RhoConnect-CLIENT-ID' => session.client_id} do
         {'token' => token,
           'p_size' => pagesize}
@@ -93,7 +94,7 @@ Bench.test do |config,session|
   # we also generate 2 random records for CUD calls
   expected_for_cud = Bench.generate_fake_data(2, false)
   session.post "create-object",
-    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter", 
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{Bench.adapter_name}", 
     {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
       {:create => expected_for_cud}.to_json
     end  
@@ -101,13 +102,13 @@ Bench.test do |config,session|
   
   obj_to_delete = expected_for_cud.keys[0]
   session.delete "delete_object",
-    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/#{obj_to_delete}",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{Bench.adapter_name}/#{obj_to_delete}",
     {'X-RhoConnect-CLIENT-ID' => session.client_id}
   session.last_result.verify_code(200)
   
   obj_to_delete = expected_for_cud.keys[1]
   session.post "push_deletes", 
-    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/push_deletes",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{Bench.adapter_name}/push_deletes",
       {'X-RhoConnect-API-TOKEN' => config.token, :content_type => :json} do
     {:user_id => username,
       :rebuild_md => false,

data/bin/rhoconnect

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby -W0
 require 'thor'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require_relative "../lib/rhoconnect/utilities"
 include Utilities
 

data/bin/rhoconnect-benchmark

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+
 $:.unshift File.join(File.dirname(__FILE__),'..','bench','lib')
 $:.unshift File.join(File.dirname(__FILE__),'..','bench')
+require 'forwardable'
 require 'bench'
 require 'optparse'
 
@@ -23,6 +25,11 @@ def parse_options
        opts.on( '-u', '--url URL', 'Use URL as a server for benchmarking' ) do |url|
          options[:server_url] = url
        end
+
+       options[:js_bench] = false
+       opts.on( '-j', '--jsbench', 'Runs Benchmark tests against JavaScript Benchmark Adapter (requires JS App)' ) do
+         options[:js_bench] = true
+       end
      
        options[:start_server] = nil
        opts.on( '-s', '--startserver [APP_PATH]', 'Starts Rhoconnect App Server on localhost and use it for benchmarking' ) do |path|
@@ -218,6 +225,9 @@ begin
     x_keys = concurrency_array.collect {|t| t.to_s }
     Bench.prepare_bench_results_meta(result_dir, options[:title], x_keys)
   end
+
+  # adapter name
+  bench_adapter_name = options[:js_bench] ? "RhoInternalJsBenchAdapter" : "RhoInternalBenchmarkAdapter"
    
   concurrency_array.each do |concurrency|
     payload_array.each do |payload|
@@ -245,11 +255,13 @@ begin
       bench_args[8] = payload
       # simulate backend delay
       bench_args[9] = options[:simtime]
+      # JS Adapter
+      bench_args[10] = bench_adapter_name
   
       # now execute Bench
       if(options[:distributed])
         sync_key = "#{options[:title]}_#{payload}"
-        options[:distr_runner].run(Bench.base_url, sync_key, payload, concurrency, options[:num_iterations], result_fname, options[:simtime])
+        options[:distr_runner].run(Bench.base_url, sync_key, payload, concurrency, options[:num_iterations], result_fname, options[:simtime], bench_adapter_name)
       else
         Bench::Cli.start bench_args
       end

data/commands/redis/redis_download.rb

@@ -1,4 +1,4 @@
-REDIS_RELEASE = "2.6.11"
+REDIS_RELEASE = "2.6.14"
 Execute.define_task do
   desc "redis-download", "Download redis release #{REDIS_RELEASE}"
   def redis_download

data/commands/rhoconnect/routes.rb

@@ -21,6 +21,18 @@ Execute.define_task do
             puts "    --> #{verb.to_s.upcase}\t #{path}"
           end
         end
+        # also , look in superclasses
+        klass = controller.helpers.class
+        superklass = controller.helpers.class.superclass
+        until superklass.nil? or (superklass.name == "Sinatra::Base")
+          superklass.paths.each do |verb, paths|
+            paths.each do |path|
+              puts "    --> #{verb.to_s.upcase}\t #{path}\t (defined in #{superklass.name})"
+            end
+          end
+          klass = superklass
+          superklass = klass.superclass
+        end
       end
     rescue Exception => e
       Rhoconnect.log "#{e.inspect}"