rhoconnect 3.0.0 → 3.0.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.1 (2011-10-04)
+* fix to lock in sinatra 1.2.7
+
 ## 3.0.0 (2011-09-30)
 * #18888077 - implement Redis transactions optimization for push_objects and push_deletes
 * added 2 rake tasks (build:rpm and build:deb) to generate packaged software for popular linux servers   

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.0.0)
+    rhoconnect (3.0.1)
       bundler (~> 1.0)
       json (~> 1.5.0)
       rake (= 0.9.2)
@@ -9,7 +9,7 @@ PATH
       resque (~> 1.17.0)
       rest-client (~> 1.6.1)
       rubyzip (~> 0.9.4)
-      sinatra (~> 1.2)
+      sinatra (= 1.2.7)
       templater (~> 1.0.0)
       uuidtools (>= 2.1.1)
 
@@ -62,9 +62,9 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    sinatra (1.2.6)
+    sinatra (1.2.7)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+      tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.4)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)

data/bench/benchapp/Gemfile.lock

@@ -1,19 +1,46 @@
+PATH
+  remote: ../../
+  specs:
+    rhoconnect (3.0.0)
+      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.7)
+      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)
+    dbd-jdbc (0.1.4)
+    dbi (0.4.5)
+      deprecated (= 2.0.1)
+    deprecated (2.0.1)
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
     extlib (0.9.15)
     highline (1.6.2)
-    json (1.5.3)
+    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)
     mime-types (1.16)
     rack (1.3.2)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
     rcov (0.9.10)
+    rcov (0.9.10-java)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -24,19 +51,6 @@ GEM
       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)
@@ -46,7 +60,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    sinatra (1.2.6)
+    sinatra (1.2.7)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     sqlite3 (1.3.4)
@@ -59,18 +73,34 @@ GEM
       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)
       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
+  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 (>= 1.3.3)
   thin
   trinidad
-  warbler (~> 1.3.0)
+  warbler

data/doc/adapters-crm.txt

@@ -186,7 +186,7 @@ These are:
 Rhoconnect-adapters is not using `OAuth2` scheme at this point.
 
 For every source adapter based on CRM object there is a corresponding *'vendor/salesforce/settings/\<CRM\-object\-name\>.yml'*
-file containing the descriptions for the OracleOnDemand CRM object.
+file containing the descriptions for the SalesForce CRM object.
 Every CRM object file has the following entries:
 
 	Query_Fields: hash of the objects's fields 

data/doc/blob-sync.txt

@@ -127,4 +127,4 @@ A complete image source adapter that stores files in S3 might look like:
 	end
 
 ## Rhodes Sample Code
-See controller and view in the `/app/Blob` directory of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master) for a complete Rhodes code sample.
+See controller and view in the [app/Blob directory](https://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/Blob) of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master) for a complete Rhodes code sample.

data/doc/command-line.txt

@@ -53,12 +53,18 @@ Here's a basic rundown of each of the files that were just generated:
 * **Gemfile** - This file specifies application's dependencies using [bundler](http://gembundler.com/).
 * **spec/spec_helper.rb** - A helper file which loads the environment for running [specs](/rhoconnect/testing).
 
+After generating the application, you might be asked to change directories to your application directory and run bundle install. For example, you would run these commands:
+
+	:::term
+	$ cd storeserver
+	$ bundle install
+
 ### Add a New Source Adapter
 
-To generate a source for your RhoConnect application, run the `rhoconnect source` command:
+To generate a source for your RhoConnect application, run the `rhoconnect source` command within your application directory:
 
 	:::term
-	Usage: rhoconnect source [options] [args]
+	Usage: rhoconnect source name [options] [args]
 
 	Generates a new source adapter.
 
@@ -76,11 +82,10 @@ To generate a source for your RhoConnect application, run the `rhoconnect source
 	        --no-color                   Don't colorize the output
 	    -h, --help                       Show this message
 	        --debug                      Do not catch errors
-	
-For example:
+
+For the storeserver application example, within the sourceserver directory, run:
 
 	:::term
-	$ cd storeserver
 	$ rhoconnect source product
 	Generating with source generator:
 	     [ADDED]  sources/product.rb
@@ -100,21 +105,24 @@ If you're using MacOS / Linux, install [dtach](http://dtach.sourceforge.net/) on
 
 	:::term
 	$ cd storeserver
- 	$ rake dtach:install
+ 	$ [sudo] rake dtach:install
 
 ### Setup Redis
 
 Next, you will need to setup and start a [redis](http://redis.io/) server:
 
 	:::term
-	$ rake redis:install
+	$ [sudo] rake redis:install
 	$ rake redis:start
-	
+
+The server will show that it is running on the console.
+
 ### Start the Application
 
-Now, start the application!
+Open a new console window (since the redis server is running in the previous console window). Then change directories to your rhoconnect applciation and start the application.
 
 	:::term
+	$ cd storeserver
 	$ rake rhoconnect:start
 	
 If everything went well, you should see the following in your console:

data/doc/install.txt

@@ -17,7 +17,7 @@ Your RhoConnect application folder will be located in C:\RhoConnect\rhoconnect b
 
 3. Ruby Web Server - We test with [thin](http://code.macournoyer.com/thin/), and [passenger](http://www.modrails.com/).  WEBrick, the web server that ships with ruby, is known to cause issues with HTTP headers/cookies and is ***not*** recommended.
 
-4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the next section.  Alternatively, you can [install redis directly](http://redis.io/download).
+4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
 
 ### Installing RhoConnect Gem
 

data/doc/net-plugin.txt

@@ -22,7 +22,7 @@ After this step is completed, you can add references to the `Rhoconnect.NET` nam
 	using RhoconnectNET.Controllers;
 
 
-## Registering `Rhoconnect.NET` routes for your application
+## Registering Rhoconnect.NET routes for your application
 
 To establish the communication channel between ASP.NET MVC 3 application and Rhoconnect server, 
 you need to implement the following `init_rhoconnect` and `rhoconnect_authenticate` methods in the `Global.asax.cs` file 

data/installer/utils/{unix_install_test.rb → nix_install_test.rb}

@@ -91,7 +91,7 @@ def start_new_instance
     # wait for all services to start on remote VM
     puts "Waiting #{Constants::SLEEP} seconds for services to start on remote VM..."
     Constants::SLEEP.times do
-      sleep( 1 )
+      sleep 1
       print "."
       STDOUT.flush
     end #do
@@ -162,10 +162,14 @@ def install_package
 end #install_package
 
 def start_servers
-  puts "Starting Redis server"
   ssh_cmd "sudo /etc/init.d/redis start"
-  puts "Starting nginx server"
   ssh_cmd "sudo /etc/init.d/nginx start"
+  puts "Waiting #{Constants::SLEEP} seconds for servers to initialize"
+  Constants::SLEEP.times do
+    sleep 1
+    print '.'
+    STDOUT.flush
+  end # do
   puts
 end # start_servers
 
@@ -201,13 +205,13 @@ end #compute_time
 # Create Packages
 
 # Creating debian package
-cmd "sudo rake build:deb"
+#cmd "sudo rake build:deb"
 # Make sure package was created successfully
-if $? != 0
-  puts "Debian package was not created successfully" + 
-       "Exiting..."
-  exit 1
-end #if
+#if $? != 0
+#  puts "Debian package was not created successfully" + 
+#       "Exiting..."
+#  exit 1
+#end #if
 
 # Keep commented until running on a machine with rpm
 # Creating RPM package
@@ -255,4 +259,4 @@ Constants::STACKS.each do |stack|
   end #begin
 end #do
 end_time = Time.now
-puts compute_time start_time end_time
+puts compute_time(start_time, end_time)

data/installer/utils/nix_installation.rake

@@ -0,0 +1,3 @@
+#! /usr/bin/env ruby
+
+

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/rhoconnect.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
-  s.add_dependency("sinatra", '~> 1.2')
+  s.add_dependency("sinatra", '= 1.2.7')
   s.add_dependency('rake', '0.9.2')
   s.add_dependency('json', '~> 1.5.0')
   s.add_dependency('rubyzip', '~> 0.9.4')

data/tasks/redis.rake

@@ -220,4 +220,4 @@ namespace :dtach do
       puts "Dtach successfully installed to #{bin_dir}"
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -38,13 +38,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 17
         segments: 
         - 1
         - 2
-        version: "1.2"
+        - 7
+        version: 1.2.7
   version_requirements: *id002
   name: sinatra
 - !ruby/object:Gem::Dependency 
@@ -324,8 +325,8 @@ files:
 - installer/unix-like/rho_connect_install_yum.rb
 - installer/unix-like/rhoinstaller.rb
 - installer/utils/constants.rb
+- installer/utils/nix_install_test.rb
 - installer/utils/nix_installation.rake
-- installer/utils/unix_install_test.rb
 - installer/windows/configUi.ini
 - installer/windows/EnvVarUpdate.nsh
 - installer/windows/icon.ico