rhoconnect 3.3.6 → 3.4.2

data/CHANGELOG.md

@@ -1,7 +1,43 @@
-## 3.3.6 (2012-10-05)
-* Fix issue with Rhoconnect.api_token for admin user
-* Bump nginx to v1.3.6 and redis to v2.4.17, add http_stub_status_module and include "least_conn" directive to upstream section
-* Adding support for latest (3.0.x) redis client and resque library
+## 3.4.2 (2012-11-8)
+* fixed `rhoconnect redis-start` and `rhoconnect redis-restart` commands on windows
+# D-04052 - Resque.after_fork hook wasn't initializing efficiently
+
+## 3.4.1 (2012-11-6)
+* D-04031 - `rhoconnect startbg` and `startdebug` commands not working on windows
+* Locked win32-process gem to previous release (0.6.6) so Process.fork is available for
+  `startbg` and `startdebug` commands.
+* `rhoconnect update` command handles exceptions with useful error message
+
+## 3.4.0 (2012-11-1)
+* Let `pass_through` and `push_notify` be string or boolean
+* B-90921 - `rhoconnect` command sets are now platform-specific
+* D-03946 - Fixed `rhoconnect console` command on Windows
+* B-91297 - Added defaults for api_token and push appname
+
+## 3.4.0.rc5 (2012-10-26)
+* Refactor 'Gemfile' in app generator template, add rhoconnect cmd 'update' to simplify upgrade legacy apps to latest gem
+
+## 3.4.0.rc4 (2012-10-19)
+* Updated production stack to ruby 1.9.3p286
+* TK-04054 - fixed GCM push payload so 'data' field is passed to client
+
+## 3.4.0.rc3 (2012-10-15)
+* B-03380 - Added Google Cloud Messaging (GCM) support
+* Filter added to simplecov report so spec files are not included
+* D-01639 - Issues with Resque workers connection to Redis using connection pool
+* D-01563 - `rake resque:work` fails with undefined ROOT_PATH
+
+## 3.4.0.rc2 (2012-10-11)
+* Removing Redis ConnectionPool from 1.8.7 (not supported there)
+* Fixing GetClientDocs API with stats (incorrect return)
+
+## 3.4.0.rc1 (2012-10-09)
+* Add Redis connection pool as a default
+* Add redis_timeout option
+* Implement automatic user notify after push_objects, push_deletes
+* B-03739 - Store re-design : implement diff by object - optimizes speed and Redis memory usage
+* Bump nginx to v. 1.3.6, add http_stub_status_module and include "least_conn" directive to upstream section
+* B-03303 - Move page_token and count into separate headers for easy access (to avoid heavy JSON parsing)
 
 ## 3.3.5 (2012-09-20)
 * merge changes from master to fix broken bench script helper

data/Gemfile

@@ -7,7 +7,7 @@ gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
 platforms :ruby, :ruby_19, :mingw, :mingw_19 do
-	gem "eventmachine", "~> 1.0.0.beta"
+	gem "eventmachine", "~> 1.0.0"
 	# using thin by default
 	gem 'thin'
 end
@@ -39,7 +39,7 @@ end
 group :test do
   gem 'rspec', '~> 2.10.0'
   gem "rcov", '~> 1.0.0', :require => false, :platforms => :ruby_18
-  gem 'simplecov', :require => false, :platforms => [:ruby_19,:jruby]
+  gem 'simplecov', '>= 0.7.1', :require => false, :platforms => [:ruby_19,:jruby]
   gem 'rack-test', '>= 0.5.3', :require => 'rack/test'
   gem 'jasmine', :platforms => :ruby_19
   gem 'jasmine-headless-webkit', :platforms => :ruby_19

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.6)
+    rhoconnect (3.4.2)
       bundler (~> 1.0)
+      connection_pool (>= 0.9.2)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
       redis (>= 3.0.1)
@@ -28,27 +29,28 @@ GEM
       mime-types
       xml-simple
     backports (2.6.2)
-    builder (3.1.3)
+    builder (3.1.4)
     cabin (0.4.4)
       json
-    childprocess (0.3.5)
+    childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     clamp (0.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
+    connection_pool (0.9.2)
     crack (0.3.1)
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
-    excon (0.16.4)
+    excon (0.16.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
-    ffi (1.1.5)
-    fog (1.6.0)
+    ffi (1.2.0)
+    fog (1.8.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -58,8 +60,8 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.3)
-    fpm (0.4.20)
+    formatador (0.2.4)
+    fpm (0.4.24)
       arr-pm (~> 0.0.7)
       backports (= 2.6.2)
       cabin (~> 0.4.3)
@@ -67,28 +69,27 @@ GEM
       json (= 1.6.6)
     highline (1.6.15)
     hike (1.2.1)
-    jasmine (1.2.1)
-      jasmine-core (>= 1.2.0)
+    jasmine (1.3.1)
+      jasmine-core (~> 1.3.1)
       rack (~> 1.0)
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.2.0)
+    jasmine-core (1.3.1)
     jasmine-headless-webkit (0.8.4)
       coffee-script
       jasmine-core (~> 1.1)
       multi_json
       rainbow
       sprockets (~> 2)
-    jruby-pageant (1.1.1)
     json (1.6.6)
-    libwebsocket (0.1.5)
+    libwebsocket (0.1.7.1)
       addressable
+      websocket
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.4.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.0)
-      jruby-pageant (>= 1.1.1)
+    net-ssh (2.6.2)
     nokogiri (1.5.5)
     rack (1.4.1)
     rack-fiber_pool (0.9.2)
@@ -119,20 +120,20 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simplecov (0.6.4)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.6.0)
+    sprockets (2.8.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -154,7 +155,8 @@ GEM
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    xml-simple (1.1.1)
+    websocket (1.0.4)
+    xml-simple (1.1.2)
 
 PLATFORMS
   ruby
@@ -165,7 +167,7 @@ DEPENDENCIES
   aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
-  eventmachine (~> 1.0.0.beta)
+  eventmachine (~> 1.0.0)
   ffaker (~> 1.14.0)
   fog (>= 1.1.0)
   fpm (>= 0.4.9)
@@ -178,7 +180,7 @@ DEPENDENCIES
   rcov (~> 1.0.0)
   rhoconnect!
   rspec (~> 2.10.0)
-  simplecov
+  simplecov (>= 0.7.1)
   sqlite3 (>= 1.3.3)
   thin
   warbler

data/bench/benchapp/Gemfile

@@ -2,31 +2,11 @@ source 'http://rubygems.org'
 
 gem 'rhoconnect', :path => '../../'
 
-# Helps with some of the limitations of green threads, not needed in ruby 1.9.x
-gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
-gem 'win32-process', :platforms => [:mswin, :mingw]
-
-# use thin and eventmachine everywhere except JRuby
-platforms :ruby, :ruby_19, :mingw, :mingw_19 do
-  gem "eventmachine", "~> 1.0.0.beta"
-  # using thin by default
-  gem 'thin'
-end
-
-# for async framework
-# for Async, Eventful execution
-platforms :ruby_19, :mingw_19 do
-  gem 'rack-fiber_pool'
-  gem 'async-rack'
+gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', ".rcgemfile")
+begin 
+  eval(IO.read(gemfile_path)) 
+rescue Exception => e
+  puts "ERROR: Couldn't find RhoConnect .rcgemfile"
+  puts e.message
+  exit 1
 end
-
-platforms :jruby do
-  gem 'jdbc-sqlite3', ">= 3.7.2"
-  gem 'dbi', ">= 0.4.5"
-  gem 'dbd-jdbc', ">= 0.1.4"
-  gem 'jruby-openssl', ">= 0.7.4"
-  gem 'trinidad'
-  gem 'warbler'
-end
-
-gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]

data/bench/benchapp/config.ru

@@ -1,38 +1,16 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'bundler'
-Bundler.require
+require 'rhoconnect/application/init'
 
-# Try to load vendor-ed rhoconnect, otherwise load the gem
-begin
-  require 'vendor/rhoconnect/lib/rhoconnect/server'
-  require 'vendor/rhoconnect/lib/rhoconnect/web-console/server'
-rescue LoadError
-  require 'rhoconnect/server'
-  require 'rhoconnect/web-console/server'
-end
-
-# By default, turn on the resque web console
-require 'resque/server'
-
-ROOT_PATH = File.expand_path(File.dirname(__FILE__))
-
-# Rhoconnect server flags
-Rhoconnect::Server.disable :run
-Rhoconnect::Server.disable :clean_trace
-Rhoconnect::Server.enable  :raise_errors
 Rhoconnect::Server.set     :secret,      'cf8e8a1d3653fcfb2332d8b1af9f6762c3c45ea12144bb5f15cd5618cc8e453b45a02dd304bdd791489dcd1ae35b807e4b4f4e6f7faedb551e76996c0f3c11c6'
-Rhoconnect::Server.set     :root,        ROOT_PATH
-Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
+
+# !!! Add your custom initializers and overrides here !!!
+# For example, uncomment the following line to enable Stats
+#Rhoconnect::Server.enable  :stats
 Rhoconnect::Server.disable :logging
-#Rhoconnect::Server.set     :use_async_model, false # true by default
-#Rhoconnect::Server.set     :fiberpool_size, 50     # default is 100
 
-# Load our rhoconnect application
-require "#{ROOT_PATH}/application"
+# Load RhoConnect application
+require './application'
 
 # Setup the url map
-run Rack::URLMap.new \
-	"/"         => Rhoconnect::Server.new,
-	"/resque"   => Resque::Server.new, # If you don't want resque frontend, disable it here
-	"/console"  => RhoconnectConsole::Server.new # If you don't want rhoconnect frontend, disable it here
+# run RhoConnect Application
+run Rhoconnect.app

data/bench/blobapp/Gemfile

@@ -2,31 +2,11 @@ source 'http://rubygems.org'
 
 gem 'rhoconnect', :path => '../../'
 
-# Helps with some of the limitations of green threads, not needed in ruby 1.9.x
-gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
-gem 'win32-process', :platforms => [:mswin, :mingw]
-
-# use thin and eventmachine everywhere except JRuby
-platforms :ruby, :ruby_19, :mingw, :mingw_19 do
-  gem "eventmachine", "~> 1.0.0.beta"
-  # using thin by default
-  gem 'thin'
-end
-
-# for async framework
-# for Async, Eventful execution
-platforms :ruby_19, :mingw_19 do
-  gem 'rack-fiber_pool'
-  gem 'async-rack'
+gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', ".rcgemfile")
+begin 
+  eval(IO.read(gemfile_path)) 
+rescue Exception => e
+  puts "ERROR: Couldn't find RhoConnect .rcgemfile"
+  puts e.message
+  exit 1
 end
-
-platforms :jruby do
-  gem 'jdbc-sqlite3', ">= 3.7.2"
-  gem 'dbi', ">= 0.4.5"
-  gem 'dbd-jdbc', ">= 0.1.4"
-  gem 'jruby-openssl', ">= 0.7.4"
-  gem 'trinidad'
-  gem 'warbler'
-end
-
-gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]

data/bench/blobapp/config.ru

@@ -1,35 +1,15 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'bundler'
-Bundler.require
+require 'rhoconnect/application/init'
 
-# Try to load vendor-ed rhoconnect, otherwise load the gem
-begin
-  require 'vendor/rhoconnect/lib/rhoconnect/server'
-  require 'vendor/rhoconnect/lib/rhoconnect/web-console/server'
-rescue LoadError
-  require 'rhoconnect/server'
-  require 'rhoconnect/web-console/server'
-end
-
-# By default, turn on the resque web console
-require 'resque/server'
-
-ROOT_PATH = File.expand_path(File.dirname(__FILE__))
-
-# Rhoconnect server flags
-Rhoconnect::Server.disable :run
-Rhoconnect::Server.disable :clean_trace
-Rhoconnect::Server.enable  :raise_errors
 Rhoconnect::Server.set     :secret, '096a8a4212b18d2b281d377f2c350421898a21fec78ac1baf5482c68ee41b30dcc46309cc2fb51ccc37f24789eeaed673a291efdfd0ec42df9f62351e71806f8'
-Rhoconnect::Server.set     :root,        ROOT_PATH
-Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
 
-# Load our rhoconnect application
-require "#{ROOT_PATH}/application"
+# !!! Add your custom initializers and overrides here !!!
+# For example, uncomment the following line to enable Stats
+#Rhoconnect::Server.enable  :stats
+
+# Load RhoConnect application
+require './application'
 
 # Setup the url map
-run Rack::URLMap.new \
-  "/"         => Rhoconnect::Server.new,
-  "/resque"   => Resque::Server.new, # If you don't want resque frontend, disable it here
-  "/console"  => RhoconnectConsole::Server.new # If you don't want rhoconnect frontend, disable it here
+# run RhoConnect Application
+run Rhoconnect.app

data/bench/lib/bench.rb

@@ -1,5 +1,6 @@
 require 'rest_client'
 require 'zip/zip'
+require 'securerandom'
 $:.unshift File.dirname(__FILE__)
 require 'bench/timer'
 require 'bench/logging'
@@ -91,7 +92,13 @@ module Bench
         {:app_name => @app_name, :attributes => {:login => user_name, :password => password}}.to_json,
         {:content_type => :json, 'X-RhoConnect-API-TOKEN' => token})
     end
-    
+
+    def delete_user(user_name)
+      token = get_token
+      RestClient.delete("#{@host}/rc/v1/users/#{user_name}",
+        { 'X-RhoConnect-API-TOKEN' => token } )
+    end
+
     def set_server_state(doc,data,append=false)
       token = get_token
       params = {:data => data, :append => append}

data/bench/lib/bench/test_data.rb

@@ -51,7 +51,10 @@ module Bench
           "Email" =>  Faker::Internet.free_email,
           "Company" => Faker::Company.name,
           "JobTitle" => title,
-          "Phone1" => Faker::PhoneNumber.phone_number
+          "Phone1" => Faker::PhoneNumber.phone_number,
+          "Geolocation" => Faker::Geolocation.lat.to_s + ":" + Faker::Geolocation.lng.to_s,
+          "Education" => Faker::Education.degree,
+          "School" => Faker::Education.school
         }
         if generate_blob
           img_file_name = IMAGE_FILES[rand(IMAGE_FILES.size)]

data/bench/scripts/blob_cud_script.rb

@@ -91,4 +91,8 @@ Bench.verify do |config,sessions|
     master_doc.merge!(user_doc)
   end
   Bench.verify_error = Bench.compare_and_log(@expected_md, master_doc, current_line)
+
+  @users.each do |user|
+    Bench.delete_user(user.user_name)
+  end
 end

data/bench/scripts/cud_script.rb

@@ -88,4 +88,10 @@ Bench.verify do |config,sessions|
     master_doc.merge!(user_doc)
   end
   Bench.verify_error = Bench.compare_and_log(@expected_md, master_doc, current_line)
-end
+
+  @users.each do |user|
+    Bench.delete_user(user.user_name)
+  end
+end
+
+

data/bench/scripts/helpers.rb

@@ -72,7 +72,7 @@ module BenchHelpers
     end
     sleep rand(timeout)
     token = JSON.parse(session.last_result.body)[1]['token']
-    progress_count = JSON.parse(session.last_result.body)[4]['total_count']    
+    progress_count = JSON.parse(session.last_result.body)[4]['total_count']
     return progress_count if token == ''
     
     verify_count(session,caller+"\n"+current_line)