rhoconnect 3.0.5 → 3.0.6

data/spec/api/source/set_db_doc_spec.rb

@@ -15,5 +15,18 @@ describe "RhoconnectApiSetDbDoc" do
       last_response.should be_ok
       verify_result('abc:abc:str' => data)
     end
+    
+    it "should append data in set db document by doc name and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      data2 = {'2' => {'foo1' => 'bar1'}}
+      data3 = data.merge(data2)
+      post "/api/source/set_db_doc", :api_token => @api_token, :doc => 'abc:abc', :data => data
+      last_response.should be_ok
+      verify_result('abc:abc' => data)
+      
+      post "/api/source/set_db_doc", :api_token => @api_token, :doc => 'abc:abc', :data => data2, :append => true
+      last_response.should be_ok
+      verify_result('abc:abc' => data3)
+    end
   end  
 end

data/spec/server/server_spec.rb

@@ -251,6 +251,16 @@ describe "Server" do
         last_response.headers["Warning"].index('deprecated').should_not == nil
         verify_result("test_update_storage" => {'1'=>@product1})
       end
+      
+      it "should post records for update using the /api/application route and have the deprecation warning" do
+        params = {'update'=>{'1'=>@product1},:client_id => @c.id,:source_name => @s.name,
+          :version => ClientSync::VERSION}
+        do_post "/api/application", params
+        last_response.should be_ok
+        last_response.body.should == ''
+        last_response.headers["Warning"].index('deprecated').should_not == nil
+        verify_result("test_update_storage" => {'1'=>@product1})
+      end
 
       it "should post records for delete" do
         params = {'delete'=>{'1'=>@product1},:client_id => @c.id,:source_name => @s.name,
@@ -298,6 +308,19 @@ describe "Server" do
         JSON.parse(last_response.body).should == [{"version"=>ClientSync::VERSION},{"token"=>token}, 
           {"count"=>2}, {"progress_count"=>0},{"total_count"=>2},{'insert'=>data}]
       end
+      
+      it "should get inserts json with the /api/application route and show deprecation warning" do
+        cs = ClientSync.new(@s,@c,1)
+        data = {'1'=>@product1,'2'=>@product2}
+        set_test_data('test_db_storage',data)
+        get "/api/application",:client_id => @c.id,:source_name => @s.name,:version => ClientSync::VERSION
+        last_response.should be_ok
+        last_response.headers["Warning"].index('deprecated').should_not == nil
+        last_response.content_type.should =~ /application\/json/
+        token = @c.get_value(:page_token)
+        JSON.parse(last_response.body).should == [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          {"count"=>2}, {"progress_count"=>0},{"total_count"=>2},{'insert'=>data}]
+      end
 
       it "should get inserts json and confirm token" do
         cs = ClientSync.new(@s,@c,1)
@@ -464,7 +487,10 @@ describe "Server" do
             Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream"),
             'txtfile-rhoblob-2' => 
               Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file2), "application/octet-stream")}
-        Store.get_data('test_create_storage').each do |id,obj|
+        last_response.should be_ok
+        data = Store.get_data('test_create_storage')
+        data.size.should == 2
+        data.each do |id,obj|
           File.exists?(obj['txtfile-rhoblob']).should == true
         end
       end

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.4.1"
+	$redis_ver = "redis-2.4.2"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -181,7 +181,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.4.1"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.4.2"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 0
-  - 5
-  version: 3.0.5
+  - 6
+  version: 3.0.6
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +30,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id001
-  type: :runtime
-  prerelease: false
+  version_requirements: *id001
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,15 +45,15 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  requirement: *id002
-  type: :runtime
-  prerelease: false
+  version_requirements: *id002
   name: sinatra
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -59,12 +61,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  requirement: *id003
-  type: :runtime
-  prerelease: false
+  version_requirements: *id003
   name: rake
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +77,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  requirement: *id004
-  type: :runtime
-  prerelease: false
+  version_requirements: *id004
   name: json
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +93,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id005
-  type: :runtime
-  prerelease: false
+  version_requirements: *id005
   name: rubyzip
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +109,12 @@ dependencies:
         - 1
         - 1
         version: 2.1.1
-  requirement: *id006
-  type: :runtime
-  prerelease: false
+  version_requirements: *id006
   name: uuidtools
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,12 +125,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  requirement: *id007
-  type: :runtime
-  prerelease: false
+  version_requirements: *id007
   name: redis
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,12 +141,12 @@ dependencies:
         - 19
         - 0
         version: 1.19.0
-  requirement: *id008
-  type: :runtime
-  prerelease: false
+  version_requirements: *id008
   name: resque
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,12 +157,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  requirement: *id009
-  type: :runtime
-  prerelease: false
+  version_requirements: *id009
   name: rest-client
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -171,14 +173,13 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id010
-  type: :runtime
-  prerelease: false
+  version_requirements: *id010
   name: templater
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: 
 - rhoconnect
+- rhoconnect-benchmark
 extensions: []
 
 extra_rdoc_files: 
@@ -200,6 +201,8 @@ files:
 - bench/benchapp/config.ru
 - bench/benchapp/Gemfile
 - bench/benchapp/Gemfile.lock
+- bench/benchapp/log/passenger.3000.log
+- bench/benchapp/log/passenger.9292.log
 - bench/benchapp/Rakefile
 - bench/benchapp/settings/license.key
 - bench/benchapp/settings/settings.yml
@@ -208,6 +211,8 @@ files:
 - bench/benchapp/spec/sources/mock_adapter_spec.rb
 - bench/benchapp/spec/sources/queue_mock_adapter_spec.rb
 - bench/benchapp/spec/spec_helper.rb
+- bench/benchapp/tmp/pids/passenger.3000.pid.lock
+- bench/benchapp/tmp/pids/passenger.9292.pid.lock
 - bench/blobapp/application.rb
 - bench/blobapp/config.ru
 - bench/blobapp/Gemfile
@@ -218,6 +223,11 @@ files:
 - bench/blobapp/sources/blob_adapter.rb
 - bench/blobapp/spec/sources/blob_adapter_spec.rb
 - bench/blobapp/spec/spec_helper.rb
+- bench/distr_bench/distr_bench
+- bench/distr_bench/distr_bench_main
+- bench/distr_bench/run_distr_client.sh
+- bench/distr_bench/run_test_query_script.sh
+- bench/lib/bench/bench_result_processor.rb
 - bench/lib/bench/cli.rb
 - bench/lib/bench/logging.rb
 - bench/lib/bench/mock_client.rb
@@ -229,8 +239,17 @@ files:
 - bench/lib/bench/timer.rb
 - bench/lib/bench/utils.rb
 - bench/lib/bench.rb
+- bench/lib/testdata/0-data.txt
+- bench/lib/testdata/1-data.txt
+- bench/lib/testdata/10-data.txt
 - bench/lib/testdata/100-data.txt
+- bench/lib/testdata/2-data.txt
+- bench/lib/testdata/25-data.txt
+- bench/lib/testdata/250-data.txt
+- bench/lib/testdata/3-data.txt
 - bench/lib/testdata/5-data.txt
+- bench/lib/testdata/50-data.txt
+- bench/lib/testdata/500-data.txt
 - bench/lib/testdata/images/icon.ico
 - bench/lib/testdata/images/icon.png
 - bench/lib/testdata/images/loading-Landscape.png
@@ -240,18 +259,23 @@ files:
 - bench/lib/testdata/images/loading-PortraitUpsideDown.png
 - bench/lib/testdata/images/loading.png
 - bench/lib/testdata/images/loading@2x.png
+- bench/prepare_bench
 - bench/run_bench.sh
 - bench/run_blob_script.sh
 - bench/run_cud_script.sh
 - bench/run_query_md_script.sh
 - bench/run_query_only_script.sh
 - bench/run_query_script.sh
+- bench/run_test_query_script.sh
+- bench/run_test_source_script.sh
 - bench/scripts/blob_cud_script.rb
 - bench/scripts/cud_script.rb
 - bench/scripts/helpers.rb
 - bench/scripts/query_md_script.rb
 - bench/scripts/query_only_script.rb
 - bench/scripts/query_script.rb
+- bench/scripts/test_query_script.rb
+- bench/scripts/test_source_script.rb
 - bench/spec/bench_spec_helper.rb
 - bench/spec/logging_spec.rb
 - bench/spec/mock_adapter_spec.rb
@@ -270,9 +294,11 @@ files:
 - doc/command-line.txt
 - doc/contributing.txt
 - doc/deploying.txt
+- doc/extending-rhoconnect-server.txt
 - doc/heroku-addon.txt
 - doc/install.txt
 - doc/introduction.txt
+- doc/java-plugin.txt
 - doc/licensing.txt
 - doc/metadata.txt
 - doc/migration.txt
@@ -293,7 +319,6 @@ files:
 - doc/web-console.txt
 - examples/simple/application.rb
 - examples/simple/config.ru
-- examples/simple/dump.rdb
 - examples/simple/Rakefile
 - examples/simple/settings/license.key
 - examples/simple/settings/settings.yml
@@ -328,7 +353,6 @@ files:
 - installer/utils/nix_install_test.rb
 - installer/utils/nix_installation.rake
 - installer/utils/package_upload/repos.rake
-- installer/utils/package_upload/repos.rb
 - installer/utils/package_upload/s3_upload.rb
 - installer/windows/configUi.ini
 - installer/windows/EnvVarUpdate.nsh
@@ -563,6 +587,7 @@ files:
 - spec/testdata/upload2.txt
 - spec/user_spec.rb
 - bin/rhoconnect
+- bin/rhoconnect-benchmark
 homepage: http://rhomobile.com/products/rhoconnect
 licenses: []
 
@@ -592,7 +617,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RhoConnect App Integration Server

data/installer/utils/package_upload/repos.rb

@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'find'
-
-# CONSTANTS
-
-PKG_DIR = '/packages'
-START_DIR = PKG_DIR
-BUCKET = 'rhoconnect'
-
-def cmd(cmd)
-  puts cmd unless @raked
-  system(cmd)  
-end #cmd
-
-def prepare_destination
-  # Prompt to remove the /deb directory if it exists
-  if File.directory?("#{PKG_DIR}/deb")
-    if !@raked
-      puts "Remove #{PKG_DIR}/deb?"
-      remove = STDIN.gets.strip.downcase.chars.first
-    else
-      remove = 'y'
-    end #if
-    if remove == 'y'
-      cmd "sudo rm -rf #{PKG_DIR}/deb"
-    end #if
-  end #if
-
-  # Create deb directory if it does not already exist
-  cmd "sudo mkdir -p #{PKG_DIR}/deb" unless File.directory?("#{PKG_DIR}/deb")
-    
-  # Create configuration file "ditributions" in deb directory
-  filename = "#{PKG_DIR}/deb/conf/"
-  cmd "sudo mkdir -p #{filename}"
-  distributions = "Origin: Rhomobile, Inc.\n" +
-                  "Label: Rhomobile, Inc.\n" +
-                  "Codename: rhoconnect\n" +
-                  "Architectures: i386 amd64\n" +
-                  "Components: main\n" +
-                  "Description: Rhoconnect APT Repository"
-  cmd "touch #{filename}/distributions"
-   
-  # Write distributions string to corresponding file 
-  dist_file = File.new("#{filename}/distributions", "w")
-  dist_file.write(distributions)
-  dist_file.close
-
-  # Create rpm directory if it does not already exist
-  cmd "sudo mkdir -p #{PKG_DIR}/rpm" unless File.directory?("#{PKG_DIR}/rpm")
- 
-end #prepare_destination
-
-def copy_files
-  # Copy the packages to their respective directory
-  Find.find('./pkg') do |file|
-    if !FileTest.directory?(file)
-      dest_dir = File.extname(file)
-      #get rid of '.' before extension name
-      dest_dir[0] = ''
-      if dest_dir == 'deb' || dest_dir == 'rpm'
-        if dest_dir == 'deb'
-          @deb_pkg = File.basename(file)
-        end #if
-        file_path = File.expand_path(file)
-        cmd "sudo cp -rf #{file_path} #{PKG_DIR}/#{dest_dir}"
-      end #if
-    end #if
-  end #do
-end #copy_files
-
-@raked = true
-
-prepare_destination
-
-copy_files
-
-# REPOIFY!
-cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
-cmd "sudo createrepo #{PKG_DIR}/rpm"
-
-# Call S3 upload script
-cmd "ruby ./installer/utils/package_upload/s3_upload.rb #{START_DIR} #{BUCKET} #{@raked}"