rhosync 2.0.0.beta1 → 2.0.0.beta2

data/README.md

@@ -1,26 +1,11 @@
-Rhosync
+RhoSync
 -------------------------------------------------------------
-
-Redis-powered rhosync with built-in sinatra application.
-
-INSTALL
--------------------------------------------------------------
-1. Make sure you have the following gems installed:
-
-	* rspec rcov json sqlite3-ruby faker redis redis-namespace sinatra rack-test rubyzip uuidtools resque
-	
-2. Install and start a redis server (v1.2 or greater is required) (see <http://code.google.com/p/redis/>)
-
-3. Install hsqldata.jar to vendor/ directory.  See <http://github.com/rhomobile/hsqldata> for instructions on how to build hsqldata.
-
-4. "rake" to run all specs
-
-Windows Notes: when run any spec task error message box (ruby.exe - Unable to locate component) will appear. Just press 'OK'. This is problem with rcov.
+RhoSync 2.0 is a redis-powered implementation of the RhoSync synchronization system.
 
 DOCS
 -------------------------------------------------------------
-  * Intro to Rhodes & Rhosync: <http://wiki.rhomobile.com/index.php/Rhomobile> -> Read this first!
+  * Intro to Rhodes & Rhosync: <http://wiki.rhomobile.com/index.php/Rhomobile>
+  * RhoSync 2.0:               <http://wiki.rhomobile.com/index.php/RhoSync_2.0>
   * Tutorial:                  <http://wiki.rhomobile.com/index.php/Tutorial> 
-  * Architecture:              <http://wiki.rhomobile.com/index.php/RhoSync_2.0>
-  * Rdoc (still rough):        <http://rdoc.info/projects/rhomobile/rhosync>
+  * RDoc (still rough):        <http://rdoc.info/projects/rhomobile/rhosync>
   * Client/Server Protocol:    See doc/protocol.html

data/Rakefile

@@ -55,28 +55,30 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "rhosync"
     gemspec.summary = %q{Rhosync Server}
-    gemspec.description = %q{Rhosync Server and related command-line utilities for using Rhosync}
+    gemspec.description = %q{Rhosync library and related command-line utilities for using Rhosync}
     gemspec.homepage = %q{http://rhomobile.com/products/rhosync}
     gemspec.authors = ["Rhomobile"]
+    gemspec.email = %q{dev@rhomobile.com}
     gemspec.version = Rhosync::VERSION
     gemspec.files =  FileList["[A-Z]*", "{bench,bin,doc,generators,lib,spec,tasks}/**/*"]
 
-    gemspec.add_dependency "json", ">=1.2.3"
+    # TODO: Due to https://www.pivotaltracker.com/story/show/3417862, we can't use JSON 1.4.3
+    gemspec.add_dependency "json", "<=1.4.2"
     gemspec.add_dependency "log4r", ">=1.1.7"
     gemspec.add_dependency "sqlite3-ruby", ">=1.2.5"
     gemspec.add_dependency "rubyzip", ">=0.9.4"
     gemspec.add_dependency "uuidtools", ">=2.1.1"
-    gemspec.add_dependency "redis", ">=0.2.0"
+    gemspec.add_dependency "redis", ">=1.0.7"
     gemspec.add_dependency "resque", ">=1.8.0"
     gemspec.add_dependency "rest-client", ">=1.4.2"
-    gemspec.add_dependency "sinatra", ">=0.9.2"
+    gemspec.add_dependency "sinatra", ">=1.0"
     gemspec.add_dependency "templater", ">=1.0.0"
+    gemspec.add_dependency "rake", ">=0.8.7"
     gemspec.add_development_dependency "jeweler", ">=1.4.0"
     gemspec.add_development_dependency "rspec", ">=1.3.0"
     gemspec.add_development_dependency "rcov", ">=0.9.8"
     gemspec.add_development_dependency "faker", ">=0.3.1"
     gemspec.add_development_dependency "rack-test", ">=0.5.3"
-    gemspec.add_development_dependency "mechanize", ">=1.0.0"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: "

data/bench/lib/bench.rb

@@ -2,7 +2,6 @@
 require 'rest_client'
 require 'log4r'
 require 'json'
-require 'mechanize'
 require 'zip/zip'
 $:.unshift File.dirname(__FILE__)
 require 'bench/timer'
@@ -48,7 +47,7 @@ module Bench
     end
     
     def reset_app
-      Mechanize.new.post("#{@host}/api/reset",:api_token => get_token)
+      RestClient.post("#{@host}/api/reset",{:api_token => get_token}.to_json, :content_type => :json)
     end
     
     def create_user