rhoconnect 3.1.0.beta1 → 3.1.0.beta2

data/installer/utils/package_upload/s3_upload.rb

@@ -6,14 +6,19 @@ require 'find'
 
 # CONSTANTS
 
-# ACCESS_KEY_FILE = '/home/vagrant/.s3/keys'
-START_DIR            = ARGV[0]
-BUCKET               = ARGV[1]
-S3_ACCESS_KEY        = 'AKIAIFBP7PVF6WBEGLGA'
-S3_SECRET_ACCESS_KEY = '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'
+START_DIR = ARGV[0]
+BUCKET    = ARGV[1]
+USER_DATA = `wget -q -O - http://169.254.169.254/latest/user-data`.split("\n")
 
 # METHODS
 
+# Facilitates easy use of system calls
+def cmd(cmd)
+  puts cmd
+  system cmd
+end #cmd
+
+# Makes sure parameters are correctly formed
 def check_params
   if ARGV.size != 2 && ARGV.size != 3
     puts "Wrong number of arguments (#{ARGV.size} for 2)"
@@ -34,29 +39,28 @@ def check_params
   begin
     found = AWS::S3::Bucket.find(BUCKET)
     puts "#{BUCKET} is a valid bucket :)" unless @raked
-  rescue
+  rescue => e
     puts "#{BUCKET} is not a valid bucket."
+    puts e.inspect
+    puts e.backtrace
     exit
   end
 end #check_params
 
+# Retrieves S3 credential information
 def get_keys
-# lines = IO.readlines ACCESS_KEY_FILE
-# @access_key = lines.first.strip
-# @secret_access_key = lines.last.strip
-  @access_key        = S3_ACCESS_KEY
-  @secret_access_key = S3_SECRET_ACCESS_KEY
-
+   access_key        = USER_DATA[0].to_s.strip
+   secret_access_key = USER_DATA[1].to_s.strip
+   keys = { :access_key_id => access_key,
+            :secret_access_key => secret_access_key}
 end #get_keys
 
+# Establishes S3 connection
 def establish_s3_connection
-  get_keys
-  @s3_connection = AWS::S3::Base.establish_connection!(
-                     :access_key_id => @access_key,
-                     :secret_access_key => @secret_access_key
-                   )
+  @s3_connection = AWS::S3::Base.establish_connection!(get_keys)
 end #establish_s3_connection
 
+# Uploads given file to the specified S3 bucket
 def upload(file)
   puts "Uploading #{file} to bucket #{BUCKET}..." unless @raked
   # Upload the given file
@@ -70,6 +74,7 @@ def upload(file)
   puts unless @raked
 end #upload
 
+# Traverses list of file to upload and calls Upload to upload them
 def upload_files 
   # Get list of files do be added
   number_of_files = 0
@@ -102,8 +107,31 @@ def upload_files
   end #if
 end #upload_files
 
-establish_s3_connection
-
-check_params
-
-upload_files
+# SCRIPT
+
+begin
+  establish_s3_connection
+rescue => e
+  puts "Error Connecting to S3!!"
+  puts e.inspect
+  puts e.backtrace
+  exit 1
+end #begin
+
+begin
+  check_params
+rescue => e
+  puts "Error Checking Parameters!!"
+  puts e.inspect
+  puts e.backtrace
+  exit 2
+end #begin
+
+begin
+  upload_files
+rescue => e
+  puts "Error Uploading files!!"
+  puts e.inspect
+  puts e.backtrace
+  exit 3
+end #begin

data/installer/windows/rhosync.nsi

@@ -99,7 +99,7 @@ section "uninstall"
     Push "PATH" 
     Push "R" 
     Push "HKLM" 
-    Push "$INSTDIR\redis-2.4.5"
+    Push "$INSTDIR\redis-2.4.6"
     Call un.EnvVarUpdate
     Pop $R0
 
@@ -170,25 +170,25 @@ Section "Redis" redisSection
  
   SetOutPath $INSTDIR
  
-  File /r "redis-2.4.5"
+  File /r "redis-2.4.6"
  
   ;add to path here
 
   Push "PATH" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.4.5"
+  Push "$INSTDIR\redis-2.4.6"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.4.5"
+  Push "$INSTDIR\redis-2.4.6"
   Call EnvVarUpdate
   Pop $R0
 
-  ExecWait '$INSTDIR\redis-2.4.5\redis-service.exe install' $0
+  ExecWait '$INSTDIR\redis-2.4.6\redis-service.exe install' $0
   StrCmp $0 "0" continue wrong
 
   wrong:

data/lib/rhoconnect/body_content_type_parser.rb

@@ -13,9 +13,12 @@ module Rhoconnect
     end
 
     def call(env)
-      if env['CONTENT_TYPE'] && env['CONTENT_TYPE'].match(/^application\/json/) 
+      if env[CONTENT_TYPE] && env[CONTENT_TYPE].match(/^application\/json/) 
         begin
           if (body = env[POST_BODY].read).length != 0
+            # for some reason , if we do not do this
+            # Ruby 1.9 will fail
+            env[POST_BODY] = StringIO.new(body)
             env.update(FORM_HASH => JSON.parse(body), FORM_INPUT => env[POST_BODY])
           end
         rescue JSON::ParserError => jpe

data/lib/rhoconnect/jobs/bulk_data_job.rb

@@ -71,9 +71,9 @@ module Rhoconnect
           data.each do |obj,row|
             args = [obj]
             columns.each { |col| args << row[col] }
-            # FIXME: The * is used to expand an array into individual arguments for 'execute' method.
-            # JRuby (1.6.0) won't work without asterisk, but MRI and 1.9.2 are both doing well! 
-            stmt.execute(*args) # FIXME: !!! 
+            # The * is used to expand an array into individual arguments for 'execute' method.
+            # JRuby (1.6.0) won't work without asterisk, but other rubies doing well! 
+            stmt.execute(*args) 
           end
         end
         

data/lib/rhoconnect/tasks.rb

@@ -3,6 +3,7 @@ require 'zip/zip'
 require 'uri'
 require File.join(File.dirname(__FILE__),'console','rhoconnect_api')
 
+
 module Rhoconnect
   module TaskHelper
     def post(path,params)
@@ -230,7 +231,6 @@ namespace :rhoconnect do
   
   begin
     require 'rspec/core/rake_task'
-    require 'rcov/rcovtask' unless (windows? || ruby19?)
     
     desc "Run source adapter specs"
     task :spec do
@@ -238,20 +238,10 @@ namespace :rhoconnect do
       RSpec::Core::RakeTask.new('rhoconnect:spec') do |t|
         t.pattern = FileList[files]
         t.rspec_opts = %w(-fn -b --color)
-        unless (windows? || ruby19?) 
-          t.rcov = true
-          t.rcov_opts = ['--exclude', 'spec/*,gems/*']
-        end
       end
     end
-  rescue LoadError
-    if windows?
-      puts "rspec not available. Install it with: "
-      puts "gem install rspec\n\n"
-    else
-      puts "rspec / rcov not available. Install it with: "
-      puts "gem install rspec rcov\n\n"
-    end
+  rescue Exception => e
+    puts "Run source adapter specs error: #{e.inspect}"
   end
   
   desc "Start rhoconnect server"
@@ -273,18 +263,21 @@ namespace :rhoconnect do
 #  desc "Start rhoconnect server in bg mode (Rhostudio) - this is an internal command"
   task :startbg do
     cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
-    Thread.new {  
+    require 'win32/process' if windows?
+    
+    p1 = Process.fork {  
       if windows?
-        puts 'Starting rhoconnect...'
+        puts 'Starting rhoconnect ...'
         system("#{cmd} config.ru -P #{rhoconnect_pid}")
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
         system("#{cmd}")
       else
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
+        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
       end
     }
-  
+    Process.detach(p1)
+    
     exit
   end
   
@@ -292,18 +285,21 @@ namespace :rhoconnect do
   task :startdebug do
     cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
     ENV['DEBUG'] = 'yes'
-    Thread.new {  
+    require 'win32/process' if windows?
+    
+    p1 = Process.fork {  
       if windows?
-        puts 'Starting rhoconnect...'
+        puts 'Starting rhoconnect ...'
         system("#{cmd} config.ru -P #{rhoconnect_pid}")
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
         system("#{cmd}")
       else
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
+        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
       end
     }
-  
+    Process.detach(p1)
+
     exit
   end
   

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.1.0.beta1'
+  VERSION = '3.1.0.beta2'
 end

data/rhoconnect.gemspec

@@ -37,9 +37,10 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
+  s.add_dependency("rack", '~> 1.4.1')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2')
-  s.add_dependency('json', '~> 1.5.0')
+  s.add_dependency('json', '~> 1.6.0')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
   s.add_dependency('redis', '>= 2.2.0')

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'webmock/rspec'
 require 'rspec'
+
+if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'rhoconnect'
 include Rhoconnect
 ENV['RACK_ENV'] = 'test'
@@ -8,13 +14,15 @@ ENV['RACK_ENV'] = 'test'
 ERROR = '0_broken_object_id' unless defined? ERROR
 
 # Monkey patch to fix the following issue:
-# /Library/Ruby/Gems/1.8/gems/rspec-core-2.5.1/lib/rspec/core/shared_example_group.rb:45:
-# in `ensure_shared_example_group_name_not_taken': Shared example group '...' already exists (ArgumentError)
-module RSpec
-  module Core
-    module SharedExampleGroup
-    private
-      def ensure_shared_example_group_name_not_taken(name)
+# /usr/local/rvm/gems/ruby-1.8.7-p352/gems/rspec-core-2.6.4/lib/rspec/core/shared_example_group.rb:59:
+# in `ensure_shared_example_group_name_not_taken': Shared example group 'SharedRhoconnectHelper' already exists (ArgumentError)
+if RUBY_VERSION =~ /1.8/ 
+  module RSpec
+    module Core
+      module SharedExampleGroup
+      private
+        def ensure_shared_example_group_name_not_taken(name)
+        end
       end
     end
   end

data/spec/stats/middleware_spec.rb

@@ -30,7 +30,6 @@ describe "Middleware" do
     metric = 'http:GET:/api/application/query:SampleAdapter'
     Record.key(metric).should == "stat:#{metric}"
 
-    # FIXME:
     # The conversion algorithm (float to string) currently checks two precisions. 
     # In Ruby 1.9, it tries 16 digits and if that's not enough it then uses 17. 
     # In 1.8, it's the same but with 15 and 16.

data/spec/store_spec.rb

@@ -225,7 +225,6 @@ describe "Store" do
       end
 
       if defined?(JRUBY_VERSION)
-        # FIXME:
         it "should lock document" do
           doc = "locked_data"
           m_lock = Store.get_lock(doc)

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.4.5"
+	$redis_ver = "redis-2.4.6"
 	$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.5"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.4.6"
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 62196433
+  hash: 62196439
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - beta
-  - 1
-  version: 3.1.0.beta1
+  - 2
+  version: 3.1.0.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,12 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,12 +32,28 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  name: bundler
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  requirement: *id001
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
+  name: rack
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: sinatra
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +63,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  type: :runtime
-  requirement: *id002
+  name: sinatra
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,28 +79,28 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :runtime
-  requirement: *id003
+  name: rake
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 1
-        - 5
+        - 6
         - 0
-        version: 1.5.0
-  type: :runtime
-  requirement: *id004
+        version: 1.6.0
+  name: json
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rubyzip
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +111,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
-  requirement: *id005
+  name: rubyzip
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: uuidtools
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,12 +127,12 @@ dependencies:
         - 1
         - 1
         version: 2.1.1
-  type: :runtime
-  requirement: *id006
+  name: uuidtools
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: redis
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,12 +143,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
-  requirement: *id007
+  name: redis
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: resque
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,12 +159,12 @@ dependencies:
         - 19
         - 0
         version: 1.19.0
-  type: :runtime
-  requirement: *id008
+  name: resque
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rest-client
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,12 +175,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  type: :runtime
-  requirement: *id009
+  name: rest-client
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: templater
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,8 +191,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  requirement: *id010
+  name: templater
+  version_requirements: *id011
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: 
@@ -311,6 +327,7 @@ files:
 - doc/settings.txt
 - doc/source-adapters.txt
 - doc/stats-middleware.txt
+- doc/supported-platforms.txt
 - doc/testing.txt
 - doc/tutorial.txt
 - doc/web-console.txt
@@ -617,7 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RhoConnect App Integration Server