rhoconnect 3.1.1 → 3.1.2

data/installer/utils/package_upload/s3_upload.rb

@@ -20,17 +20,11 @@ end #cmd
 
 # Makes sure parameters are correctly formed
 def check_params
-  if ARGV.size != 2 && ARGV.size != 3
+  if ARGV.size != 2
     puts "Wrong number of arguments (#{ARGV.size} for 2)"
     exit
   end #if
 
-  if ARGV.size == 3 && ARGV[2] == "true"
-    @raked = true
-  else
-    @raked = false
-  end #if
-
   if !FileTest.directory?(START_DIR)
     puts "#{START_DIR} is not a directory."
     exit
@@ -38,7 +32,6 @@ def check_params
   
   begin
     found = AWS::S3::Bucket.find(BUCKET)
-    puts "#{BUCKET} is a valid bucket :)" unless @raked
   rescue => e
     puts "#{BUCKET} is not a valid bucket."
     puts e.inspect
@@ -62,7 +55,6 @@ 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
   AWS::S3::S3Object.store( file,
                            open( file ),
@@ -71,7 +63,6 @@ def upload(file)
 
   # display the URL of the file just uploaded
   puts AWS::S3::S3Object.url_for((file), BUCKET)[/[^?]+/]
-  puts unless @raked
 end #upload
 
 # Traverses list of file to upload and calls Upload to upload them
@@ -84,27 +75,15 @@ def upload_files
       next
     else
       paths.push(path)
-      puts path unless @raked
       number_of_files += 1
     end
   end
 
-  if !@raked
-    puts "Would you like to upload these #{number_of_files} files to the #{BUCKET} bucket? (y/n)"
-    choice = STDIN.gets.strip.downcase
-  else
-    choice = 'y'
-  end #if
-  
-  if choice == 'y'
-    puts "Uploading #{number_of_files} files."
-    paths.each do |path|
-      upload path
-    end #do
-    puts "#{number_of_files} files uploaded."
-  else
-    puts "Exiting."
-  end #if
+  puts "Uploading #{number_of_files} files."
+  paths.each do |path|
+    upload path
+  end #do
+  puts "#{number_of_files} files uploaded."
 end #upload_files
 
 # SCRIPT
@@ -134,4 +113,4 @@ rescue => e
   puts e.inspect
   puts e.backtrace
   exit 3
-end #begin
+end #begin

data/installer/utils/verify_checksum.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'digest/sha1'
+
+if ARGV.length != 2
+  puts "Usage: #{$0} checksum_file directory_to_compare"
+  exit 1
+end #if
+
+def cmd(cmd)
+  puts cmd
+  system(cmd)
+end #cmd
+
+checksum_file  = ARGV[0]
+dir_to_compare = ARGV[1]
+
+# Downoad Packages from S3
+cmd "ruby ./installer/utils/download_from_s3.rb #{dir_to_compare}"
+
+# Create the checksum to compare against the one from the S3 repo
+cmd "ruby ./installer/utils/create_sha1.rb #{dir_to_compare} ."
+
+old_sha1 = File.open(checksum_file) { |f| f.readline }
+new_sha1 = File.open('./checksum')  { |f| f.readline }
+
+if !new_sha1.eql?(old_sha1)
+  puts "Checksums do not match!"
+  exit 2
+else
+  puts "Checksums match!"
+end #if

data/installer/windows/rhosync.nsi

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

data/lib/rhoconnect.rb

@@ -178,7 +178,7 @@ module Rhoconnect
     if secret == '<changeme>'                        
       log "*"*60+"\n\n"
       log "WARNING: Change the session secret in config.ru from <changeme> to something secure."
-      log "  i.e. running `rake secret` in a rails app will generate a secret you could use.\n\n"
+      log "  i.e. running `rake rhoconnect:secret` in your rhoconnect app directory will generate a secret you could use.\n\n"
       log "*"*60
     end
   end

data/lib/rhoconnect/app.rb

@@ -10,9 +10,6 @@ module Rhoconnect
     class << self
       def create(fields={})
         fields[:id] = fields[:name]
-        begin
-          require under_score(fields[:name])
-        rescue Exception; end
         super(fields)
       end
     end

data/lib/rhoconnect/predefined_adapters/bench_adapter.rb

@@ -16,6 +16,12 @@ module Rhoconnect
      end
 
     def query(params=nil)
+      if @source.simulate_time > 0
+        #for i in 1..10
+        #  RestClient.get('www.google.com')
+        #end
+        sleep @source.simulate_time
+      end
       Rhoconnect::Store.lock(lock_name,1) do
         @result = Rhoconnect::Store.get_data(db_name)
       end

data/lib/rhoconnect/server.rb

@@ -25,16 +25,39 @@ module Rhoconnect
     set :public_folder, "#{libdir}/server/public"
     set :static,        true
     set :stats,         false
-
     # default secret
-    @@secret = '<changeme>'
+    @secret = '<changeme>'
                                                                                          
     # Setup route and mimetype for bulk data downloads
     # TODO: Figure out why "mime :data, 'application/octet-stream'" doesn't work
     Rack::Mime::MIME_TYPES['.data'] = 'application/octet-stream'   
      
     include Rhoconnect
-                                                              
+
+    # Set rhoconnect middleware
+    set :use_middleware, Proc.new {
+      return false if @middleware_configured # Middleware might be configured only once!
+
+      use XDomainSessionWrapper
+      use Rack::Cors do |cfg|
+        cfg.allow do |allow|
+          allow.origins /.*/
+          allow.resource '/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource '/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource '/api/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource '/api/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+        end
+      end
+      use Rhoconnect::BodyContentTypeParser
+      use Rhoconnect::Stats::Middleware
+      Rhoconnect::Server.set :secret, @secret unless settings.respond_to?(:secret)
+      use Rack::Session::Cookie,
+        :key => 'rhoconnect_session', :expire_after => Rhoconnect.cookie_expire,
+        :secret => Rhoconnect::Server.secret
+
+      @middleware_configured ||= true
+    }
+
     helpers do
       def request_action
         request.env['PATH_INFO'].split('/').last
@@ -177,34 +200,14 @@ module Rhoconnect
       end
     end
     
-    # TODO: Load middleware statically
-    # hook into new so we can enable middleware
     def self.new
-      use XDomainSessionWrapper
-      use Rack::Cors do |cfg|
-        cfg.allow do |allow|
-          allow.origins /.*/
-          allow.resource '/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-          allow.resource '/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-          allow.resource '/api/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-          allow.resource '/api/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-        end
-      end
-      use Rhoconnect::BodyContentTypeParser
-      
       if settings.respond_to?(:stats) and settings.send(:stats) == true
-        use Rhoconnect::Stats::Middleware 
         Rhoconnect.stats = true
       else
         Rhoconnect::Server.disable :stats
         Rhoconnect.stats = false
       end
-
-      Rhoconnect::Server.set :secret, @@secret unless settings.respond_to?(:secret)
-      use Rack::Session::Cookie,
-            :key => 'rhoconnect_session',
-            :expire_after => Rhoconnect.cookie_expire,
-            :secret => Rhoconnect::Server.secret
+      settings.use_middleware
       super
     end
         

data/lib/rhoconnect/stats/middleware.rb

@@ -6,14 +6,19 @@ module Rhoconnect
       end
 
       def call(env)
-        start = Time.now.to_f
-        status, headers, body = @app.call(env)
-        finish = Time.now.to_f
-        metric = "http:#{env['REQUEST_METHOD']}:#{env['PATH_INFO']}"
-        source_name = env['rack.request.query_hash']["source_name"] if env['rack.request.query_hash']
-        metric << ":#{source_name}" if source_name
-        Record.save_average(metric,finish - start)
-        [status, headers, body]
+        if Rhoconnect.stats || Rhoconnect::Server.stats
+          start = Time.now.to_f
+          status, headers, body = @app.call(env)
+          finish = Time.now.to_f
+          metric = "http:#{env['REQUEST_METHOD']}:#{env['PATH_INFO']}"
+          source_name = env['rack.request.query_hash']["source_name"] if env['rack.request.query_hash']
+          metric << ":#{source_name}" if source_name
+          Record.save_average(metric,finish - start)
+          [status, headers, body]
+        else
+          status, headers, body = @app.call(env)
+          [status, headers, body]
+        end
       end
     end
   end

data/lib/rhoconnect/store.rb

@@ -299,16 +299,18 @@ module Rhoconnect
         data = Store.db.zrange(dockey, 0, -1)
         ret = []
         keys = []
-        scores = []
-        data.each do |zsetkey|
-          obj_hash = Store.get_data zsetkey
-          score,key,objkey = getelement(zsetkey)
-          if scores[-1] != score
-            ret << obj_hash
-            keys << key
-            scores << score
-          else
-            ret[-1].merge!(obj_hash)
+        unless data.nil?
+          scores = []
+          data.each do |zsetkey|
+            obj_hash = Store.get_data zsetkey
+            score,key,objkey = getelement(zsetkey)
+            if scores[-1] != score
+              ret << obj_hash
+              keys << key
+              scores << score
+            else
+              ret[-1].merge!(obj_hash)
+            end
           end
         end
         [ret, keys]

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

data/rhoconnect.gemspec

@@ -37,14 +37,14 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
-  s.add_dependency("rack", '~> 1.3.6')
+#  s.add_dependency("rack", '~> 1.4.0')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2')
   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')
-  s.add_dependency('resque', '~> 1.19.0')
+  s.add_dependency('resque', '~> 1.20.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')  
 end

data/spec/api/admin/api_token_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
-require File.join(File.dirname(__FILE__), '..','..','support', 'shared_examples')
 
 describe "ApiToken" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do

data/spec/api/admin/stats_spec.rb

@@ -9,10 +9,12 @@ describe "RhoconnectApiStats" do
     
     before(:each) do
       Rhoconnect::Server.set :stats, true
+      Rhoconnect.stats = true
     end
     
     after(:each) do
       Rhoconnect::Server.set :stats, false
+      Rhoconnect.stats = false
     end
 
     it "should retrieve metric names" do
@@ -60,6 +62,7 @@ describe "RhoconnectApiStats" do
 
     it "should raise error if stats not enabled" do
       Rhoconnect::Server.set :stats, false
+      Rhoconnect.stats = false
       post "/api/admin/stats", {
         :api_token => @api_token, 
         :metric => 'foo'

data/spec/api/api_helper.rb

@@ -1,12 +1,12 @@
 require 'rack/test'
 require 'rspec'
 
-require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
 require File.join(File.dirname(__FILE__),'..','spec_helper')
-require File.join(File.dirname(__FILE__), '..', 'support', 'shared_examples')
+require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
 
 def app
   Rhoconnect::Server.set :stats, false
+  Rhoconnect.stats = false
   @app ||= Rhoconnect::Server.new
 end
 

data/spec/api/user/list_users_spec.rb

@@ -8,7 +8,7 @@ describe "RhoconnectApiListUsers" do
       post "/api/user/create_user", params
       last_response.should be_ok
       post "/api/user/list_users", {:api_token => @api_token}
-      JSON.parse(last_response.body).should == ["testuser", "testuser1"]
+      JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
     end
 
     it "should handle empty user's list" do
@@ -23,7 +23,7 @@ describe "RhoconnectApiListUsers" do
       post "/api/user/create_user", params
       last_response.should be_ok
       post "/api/list_users", {:api_token => @api_token}
-      JSON.parse(last_response.body).should == ["testuser", "testuser1"]
+      JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
       last_response.headers['Warning'].index('deprecated').should_not == nil
     end
   end  

data/spec/api_token_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
-require File.join(File.dirname(__FILE__), 'support', 'shared_examples')
 
 describe "ApiToken" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do

data/spec/app_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
-require File.join(File.dirname(__FILE__), 'support', 'shared_examples')
 
 describe "App" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do

data/spec/bulk_data/bulk_data_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
-require File.join(File.dirname(__FILE__), '..', 'support', 'shared_examples')
 
 describe "BulkData" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do

data/spec/client_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
-require File.join(File.dirname(__FILE__), 'support', 'shared_examples')
 
 STATS_RECORD_RESOLUTION = 2 unless defined? STATS_RECORD_RESOLUTION
 STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE

data/spec/client_sync_spec.rb

@@ -1,6 +1,4 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
-require File.join(File.dirname(__FILE__), 'support', 'shared_examples')
-
 
 describe "ClientSync" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do

data/spec/document_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
-require File.join(File.dirname(__FILE__), 'support', 'shared_examples')
 
 describe "Document" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do