rhoconnect 3.1.0.beta1 → 3.1.0.beta2

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 3.1.0.beta2 (2012-01-24)
+* #21859561 - bug fix (Sync With Sugar CE Brings No Records and Generates An Error from Zendesk ticket #1871)
+* #22399583 - bug fix (Creates are happening multiple times for the same data from Zendesk ticket #1964)
+* #22765085 - 1.9.3 Ruby support - all platforms (Mac,Linux,Windows)
+* #22801803 - support rack 1.4 (bundle dependency '~> 1.4.1')
+* #22965211 - bug fix (startbg, startdebug tasks do not work with Ruby 1.9.x)
+* #23100341 - bug fix (large JSON input is lost in rack, Ruby 1.9.x)
+* #23634587 - bug fix (related data models not getting updated from Zendesk ticket #2098)
+* #23641249 - Update Rhoconnect .NET sample with final code
+* #23625065 - Bug fix (Installing Rhoconnect from Zendesk ticket #2101)
+* #23641103 - .NET plugin needs to have an ability to be partitioned by app
+* #23641329 - JAVA plugin needs to have an ability to return "app" partition
+* #23638123 - Checking for duplicate creates from Zendesk ticket #2097
+* #21237229 - Docs for rhoconnect-benchmark commands
+* #23767161 - Bug fix (java-plugin doc fails to index with indextank)
+* added code coverage for Ruby 1.9 (gem 'simplecov')
+
 ## 3.1.0.beta1 (2011-12-31)
 * #20396499 - saving rhoconnect-benchmark results into the file
 * #21630639 - rhoconnect-benchmark post-processing (GRUFF png images and EXCEL spreadsheets generation)

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in rhoconnect.gemspec
 gemspec
 
+gem 'win32-process', :platforms => [:mswin, :mingw]
+
 platforms :jruby do
   gem 'jdbc-sqlite3', ">= 3.7.2"
   gem 'dbi', ">= 0.4.5"
@@ -24,6 +26,7 @@ end
 
 group :test do
   gem 'rspec', '~> 2.6.0'
-  gem 'rcov', '>= 0.9.8'
+  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'
 end

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.1.0.beta1)
+    rhoconnect (3.1.0.beta2)
       bundler (~> 1.0)
-      json (~> 1.5.0)
+      json (~> 1.6.0)
+      rack (~> 1.4.1)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
@@ -30,12 +31,12 @@ GEM
       deprecated (= 2.0.1)
     deprecated (2.0.1)
     diff-lcs (1.1.3)
-    excon (0.7.12)
+    excon (0.9.5)
     extlib (0.9.15)
     ffaker (1.8.1)
-    fog (1.1.1)
+    fog (1.1.2)
       builder
-      excon (~> 0.7.4)
+      excon (~> 0.9.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0.3)
@@ -46,29 +47,28 @@ GEM
     formatador (0.2.1)
     fpm (0.3.11)
       json
-    highline (1.6.8)
+    highline (1.6.11)
     jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.5)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.1.1)
-    json (1.5.4)
-    json (1.5.4-java)
+    jruby-jars (1.6.5.1)
+    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)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.2.1)
+    net-ssh (2.3.0)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    rcov (1.0.0)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -89,9 +89,13 @@ GEM
     rspec-mocks (2.6.0)
     ruby-hmac (0.4.0)
     rubyzip (0.9.5)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     sqlite3 (1.3.5)
     templater (1.0.0)
@@ -101,7 +105,7 @@ GEM
     thor (0.14.6)
     tilt (1.3.3)
     uuidtools (2.1.2)
-    vegas (0.1.8)
+    vegas (0.1.11)
       rack (>= 1.0.0)
     warbler (1.3.2)
       jruby-jars (>= 1.4.0)
@@ -128,10 +132,12 @@ DEPENDENCIES
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
-  rcov (>= 0.9.8)
+  rcov (~> 1.0.0)
   rhoconnect!
   rspec (~> 2.6.0)
+  simplecov
   sqlite3 (>= 1.3.3)
   thor (>= 0.13.6)
   warbler
   webmock (~> 1.6.4)
+  win32-process

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rubygems'
-load 'tasks/redis.rake'
-
 require 'bundler'
 Bundler.setup(:default, :development, :test)
+
+load 'tasks/redis.rake'
 load 'installer/utils/nix_installation.rake'
 load 'installer/utils/package_upload/repos.rake'
 
@@ -16,7 +16,6 @@ task :spec => 'spec:spec'
 
 begin
   require 'rspec/core/rake_task'
-  require 'rcov/rcovtask'
          
   TYPES = { 
     :spec   => 'spec/*_spec.rb',
@@ -44,9 +43,11 @@ begin
   RSpec::Core::RakeTask.new('spec:all') do |t|
     t.rspec_opts = ["-b", "-c", "-fd"]
     t.pattern = FileList[TYPES.values]
-    unless RUBY_VERSION =~ /1.9/ # FIXME: code coverage not working for Ruby 1.9 !!! Use CoverMe instead.
+    # FIXME: Ruby 1.9 is not supported by rcov. Please switch to simplecov
+    unless RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
+      require 'rcov/rcovtask'
       t.rcov = true
-      t.rcov_opts = ['--exclude', 'spec/*,gems/*,apps/*,bench/spec/*,json/*']    
+      t.rcov_opts = ['--exclude', 'spec/*,gems/*,apps/*,bench/spec/*,json/*']
     end
   end
   

data/bench/bench_runner.rb

@@ -18,7 +18,7 @@ begin
   puts
   
   puts "Installing rhoconnect ..."
-  puts `rake install`
+  puts `bundle exec rake install`
   puts
 
   Dir.chdir "bench/benchapp"  #puts Dir.pwd
@@ -32,7 +32,7 @@ begin
   
   puts "Starting bench application ..."
   t = Thread.new do
-    log = `rackup -D -P /tmp/benchapp.pid -s thin config.ru`
+    log = `bundle exec rackup -D -P /tmp/benchapp.pid -s thin config.ru`
     puts log
   end
   t.join

data/bench/benchapp/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rhoconnect'
+gem 'rhoconnect', '~> 3.1.0.beta' #FIXME: replace by '~> 3.1.0'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
@@ -26,5 +26,4 @@ end
 group :test do
   gem 'rack-test', '>= 0.5.3', :require => "rack/test"
   gem 'rspec', '~> 2.6.0'
-  gem 'rcov', '>= 0.9.8'
 end

data/bench/benchapp/Gemfile.lock

@@ -2,33 +2,20 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    bouncy-castle-java (1.5.0146.1)
-    daemons (1.1.4)
-    dbd-jdbc (0.1.4)
-    dbi (0.4.5)
-      deprecated (= 2.0.1)
-    deprecated (2.0.1)
+    daemons (1.1.6)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
     extlib (0.9.15)
-    highline (1.6.2)
-    jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.4)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.0.10)
-    json (1.5.4)
-    json (1.5.4-java)
+    highline (1.6.11)
+    json (1.6.5)
     mime-types (1.17.2)
-    multi_json (1.0.3)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    multi_json (1.0.4)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    rake (0.9.2.2)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -39,10 +26,11 @@ GEM
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rhoconnect (3.0.6)
+    rhoconnect (3.1.0.beta2)
       bundler (~> 1.0)
-      json (~> 1.5.0)
-      rake (= 0.9.2)
+      json (~> 1.6.0)
+      rack (~> 1.4.1)
+      rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
       rest-client (~> 1.6.1)
@@ -58,36 +46,26 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
+    rubyzip (0.9.5)
+    sinatra (1.3.2)
+      rack (>= 1.3.6, ~> 1.3)
+      rack-protection (~> 1.2)
       tilt (>= 1.3.3, ~> 1.3)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.2.11)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    trinidad (1.2.3)
-      jruby-rack (>= 1.0.9)
-      trinidad_jars (>= 1.0.1)
-    trinidad_jars (1.0.1)
     uuidtools (2.1.2)
-    vegas (0.1.8)
+    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)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -97,8 +75,7 @@ DEPENDENCIES
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
-  rcov (>= 0.9.8)
-  rhoconnect
+  rhoconnect (~> 3.1.0.beta)
   rspec (~> 2.6.0)
   sqlite3 (>= 1.3.3)
   thin

data/bench/benchapp/spec/spec_helper.rb

@@ -12,7 +12,7 @@ rescue LoadError
   require 'rhoconnect'
 end
 
-$:.unshift File.join(File.dirname(__FILE__), "..") # FIXME:
+$:.unshift File.join(File.dirname(__FILE__), "..")
 # Load our rhoconnect application
 require 'application'
 include Rhoconnect

data/bench/blobapp/Gemfile

@@ -26,5 +26,4 @@ end
 group :test do
   gem 'rack-test', '>= 0.5.3', :require => "rack/test"
   gem 'rspec', '~> 2.6.0'
-  gem 'rcov', '>= 0.9.8'
 end

data/bench/blobapp/Gemfile.lock

@@ -1,54 +1,58 @@
+PATH
+  remote: ../../
+  specs:
+    rhoconnect (3.1.0.beta2)
+      bundler (~> 1.0)
+      json (~> 1.6.0)
+      rack (~> 1.4.1)
+      rake (~> 0.9.2)
+      redis (>= 2.2.0)
+      resque (~> 1.19.0)
+      rest-client (~> 1.6.1)
+      rubyzip (~> 0.9.4)
+      sinatra (~> 1.3)
+      templater (~> 1.0.0)
+      uuidtools (>= 2.1.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
     bouncy-castle-java (1.5.0146.1)
-    daemons (1.1.4)
+    daemons (1.1.6)
     dbd-jdbc (0.1.4)
     dbi (0.4.5)
       deprecated (= 2.0.1)
     deprecated (2.0.1)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     eventmachine (0.12.10)
     extlib (0.9.15)
-    highline (1.6.2)
+    highline (1.6.11)
     jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.4)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.0.10)
-    json (1.5.3)
-    json (1.5.3-java)
-    mime-types (1.16)
-    rack (1.3.2)
+    jruby-jars (1.6.5.1)
+    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)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rcov (0.9.10-java)
+    rake (0.9.2.2)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.17.1)
-      json (< 1.6, >= 1.4.6)
+    resque (1.19.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)
-    rhoconnect (3.0.0)
-      SystemTimer (~> 1.2.3)
-      bundler (~> 1.0)
-      json (~> 1.5.0)
-      rake (= 0.9.2)
-      redis (>= 2.2.0)
-      resque (~> 1.17.0)
-      rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.4)
-      sinatra (~> 1.2)
-      sqlite3 (>= 1.3.3)
-      templater (~> 1.0.0)
-      uuidtools (>= 2.1.1)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -57,26 +61,27 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    sqlite3 (1.3.4)
+    rubyzip (0.9.5)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sqlite3 (1.3.5)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.2.11)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    trinidad (1.2.3)
-      jruby-rack (>= 1.0.9)
+    trinidad (1.3.2)
+      jruby-rack (>= 1.1.1)
       trinidad_jars (>= 1.0.1)
-    trinidad_jars (1.0.1)
+    trinidad_jars (1.0.2)
     uuidtools (2.1.2)
-    vegas (0.1.8)
+    vegas (0.1.11)
       rack (>= 1.0.0)
     warbler (1.3.2)
       jruby-jars (>= 1.4.0)
@@ -89,15 +94,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  dbd-jdbc
-  dbi
-  jdbc-sqlite3
-  jruby-openssl
+  SystemTimer (~> 1.2.3)
+  dbd-jdbc (>= 0.1.4)
+  dbi (>= 0.4.5)
+  jdbc-sqlite3 (>= 3.7.2)
+  jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
-  rcov (>= 0.9.8)
-  rhoconnect (>= 3.0.0)
+  rhoconnect!
   rspec (~> 2.6.0)
-  sqlite3
-  thin (= 1.2.11)
+  sqlite3 (>= 1.3.3)
+  thin
   trinidad
   warbler

data/bench/blobapp/spec/spec_helper.rb

@@ -12,7 +12,7 @@ rescue LoadError
   require 'rhoconnect'
 end
 
-$:.unshift File.join(File.dirname(__FILE__), "..") # FIXME:
+$:.unshift File.join(File.dirname(__FILE__), "..")
 # Load our rhoconnect application
 require 'application'
 include Rhoconnect

data/bench/lib/bench/logging.rb

@@ -3,8 +3,6 @@ module Bench
     attr_accessor :request_logging
     
     def log_prefix
-      # FIXME: in ruby1.8:  "%d" % nil => 0
-      # but in ruby 1.9.2: TypeError: can't convert nil into Integer      
       "[T:%03d|I:%03d]" % [@thread_id.to_i, @iteration.to_i]
     end
     

data/bench/lib/bench/utils.rb

@@ -99,8 +99,8 @@ module Bench
       puts "Starting up the Rhoconnect Application at #{options[:server_url]}"
       current_dir = Dir.pwd
       Dir.chdir(path)
-      exit_code = system("rake rhoconnect:startbg")
-      sleep 1
+      exit_code = system("bundle exec rake rhoconnect:startbg")
+      sleep 2
       Dir.chdir(current_dir)
       
       options[:app_started] = check_rc_service(options[:server_url])
@@ -117,7 +117,7 @@ module Bench
       puts "Stopping the Rhoconnect Application at #{options[:server_url]}"
       current_dir = Dir.pwd
       Dir.chdir(path)
-      system("rake rhoconnect:stop")
+      system("bundle exec rake rhoconnect:stop")
       sleep 1
       Dir.chdir(current_dir)
     end

data/bench/run_bench.sh

@@ -23,18 +23,19 @@ fi
 cd '../'
 RHOCONNECT_HOME=`pwd`
 
+# echo "RhoConnect code already up-to-date." | tee -a /tmp/bench.log
 echo "Pull rhoconnect code from remote repository ..." | tee -a /tmp/bench.log
 git reset --hard HEAD | tee -a /tmp/bench.log 2>&1
 git pull origin master | tee -a /tmp/bench.log 2>&1
 echo '' | tee -a /tmp/bench.log
 
-# Run benchmarks for ruby 1.8.7, ree, and 1.9.2
+# Run benchmarks for ruby 1.8.7, ree, 1.9.2, and 1.9.3
 #  TODO: 'jruby'
-for ruby in '1.9.2' '1.8.7' 'ree'  
+for ruby in '1.9.3' '1.9.2' '1.8.7' 'ree'
 do
   rvm use $ruby > /dev/null
   ruby_version=$(rvm current)
-  echo "Running benchmarks under $ruby_version ..." | tee -a /tmp/bench.log
+  echo "Running benchmarks for $ruby_version ..." | tee -a /tmp/bench.log
   echo "" | tee -a /tmp/bench.log
   ruby ./bench/bench_runner.rb $RHOCONNECT_HOME 2>&1 | tee -a /tmp/bench.log
 done

data/bench/spec/bench_spec_helper.rb

@@ -2,6 +2,12 @@ require 'rubygems'
 require 'rspec'
 $:.unshift File.join(File.dirname(__FILE__),'..')
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'bench/logging'
 require 'bench/mock_client'
 require 'bench/utils'

data/doc/benchmarks-running.txt

@@ -72,6 +72,7 @@ By default, all results are displayed in the console during the test. However, i
 ### Generate EXCEL spreadsheet
 To enable the automatic generation of the EXCEL spreadsheets from the test results, please install the `spreadsheet` gem by using:
 
+	:::term
 	$ [sudo] gem install spreadsheet
 	
 You can read more about the `spreadsheet` gem [here](http://rubygems.org/gems/spreadsheet).
@@ -130,6 +131,7 @@ You can install those gems using the `[sudo] gem install <gemname>` command.
 
 Once all the pre-requisites are met, you can run the distributed Rhoconnect Benchmark test with the following command:
 
+	:::term
 	$ rhoconnect-benchmark -u `server_url` -D `path_to_aws_settings_file`
 	
 

data/doc/client.txt

@@ -1,7 +1,7 @@
 Using RhoConnect with the RhoConnect Client
 ===
 
-Rhoconnect Client is a library to add sync data capability to your applications. Application code can be ObjectiveC, C++, JavaScript or any other supported language. Using this library you can easily enable synchronized data between your smartphone application and a RhoConnect server.
+Rhoconnect Client is a library to add sync data capability to your applications. Application code can be ObjectiveC, JavaScript or any other supported language. Using this library you can easily enable synchronized data between your smartphone application and a RhoConnect server.
 
 ## Objective-C Client