rhoconnect 3.1.2 → 3.2.0.beta1

data/bench/benchapp/config.ru

@@ -25,6 +25,8 @@ Rhoconnect::Server.set     :secret,      'cf8e8a1d3653fcfb2332d8b1af9f6762c3c45e
 Rhoconnect::Server.set     :root,        ROOT_PATH
 Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
 Rhoconnect::Server.disable :logging
+#Rhoconnect::Server.set     :use_async_model, false # true by default
+#Rhoconnect::Server.set     :fiberpool_size, 50     # default is 100
 
 # Load our rhoconnect application
 require "#{ROOT_PATH}/application"

data/bench/lib/bench/cli.rb

@@ -14,6 +14,7 @@ module Bench
       Bench.concurrency = params[2].to_i unless params[2].nil?
       Bench.iterations = params[3].to_i unless params[3].nil?
       Bench.datasize = params[4].to_i unless params[4].nil?
+      Bench.simtime = params[5].to_i unless params[5].nil?
       Bench.admin_login = login
       Bench.admin_password = password
       load(script)
@@ -39,6 +40,7 @@ module Bench
       Bench.concurrency = params[2].to_i unless params[2].nil?
       Bench.iterations = params[3].to_i unless params[3].nil?
       Bench.datasize = params[4].to_i unless params[4].nil?
+      Bench.simtime = params[5].to_i unless params[5].nil?
       Bench.admin_login = login
       Bench.admin_password = password
       load(script)

data/bench/lib/bench/distr_runner.rb

@@ -8,7 +8,7 @@ module Bench
       @clients_group = clientgroup
     end
     
-    def run(server, sync_key, payload, concurrency, niterations, result_filename=nil)
+    def run(server, sync_key, payload, concurrency, niterations, result_filename=nil, sim_time = 0)
       # 1) Extract server name
       server ||= 'default'
       if server != 'default'
@@ -33,7 +33,8 @@ module Bench
         Bench.user_name = "benchuser"
         Bench.password = "password"
         Bench.set_server_state("test_db_storage:application:#{Bench.user_name}",expected_data)
-        Bench.reset_refresh_time('RhoInternalBenchmarkAdapter')
+        Bench.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
+        Bench.set_simulate_time('RhoInternalBenchmarkAdapter', sim_time)
 
         #6) set the sync key
         @start_time = Time.now + 10.0

data/bench/lib/bench/runner.rb

@@ -12,7 +12,7 @@ module Bench
     def test(concurrency,iterations,&block)
       total_times = times do
         0.upto(concurrency - 1) do |thread_id|
-          sleep rand(2)
+          #sleep rand(2)
           threads << Thread.new(block) do |t|
             0.upto(iterations - 1) do |iteration|
               s = Session.new(thread_id, iteration)

data/bench/lib/bench.rb

@@ -25,7 +25,7 @@ module Bench
     include TestData
     include Utils
 
-    attr_accessor :concurrency, :iterations, :admin_login 
+    attr_accessor :concurrency, :iterations, :admin_login, :simtime
     attr_accessor :admin_password, :user_name
     attr_accessor :password, :base_url, :host, :token
     attr_accessor :total_time, :sessions, :verify_error
@@ -108,6 +108,15 @@ module Bench
           :content_type => :json)
     end
     
+    def set_simulate_time(source_name,simulate_time=0)
+      token = get_token
+      RestClient.post("#{@host}/api/source/update_source_params",
+        {:api_token => token, :source_name => source_name,
+          :user_name => @user_name, 
+          :data => {:simulate_time => simulate_time}}.to_json, 
+          :content_type => :json)
+    end
+    
     def get_token
       unless @token
         @token = RestClient.post("#{@host}/api/admin/login", 

data/bench/run_bench.sh

@@ -33,7 +33,7 @@ redis-cli flushdb > /dev/null
 
 # Run benchmarks for ruby 1.8.7, ree, 1.9.2, and 1.9.3
 #  TODO: 'jruby'
-for ruby in '1.9.3' '1.8.7' 'ree'
+for ruby in '1.9.3' '1.9.2' '1.8.7' 'ree'
 do
   rvm use $ruby > /dev/null
   ruby_version=$(rvm current)

data/bench/scripts/test_query_script.rb

@@ -20,7 +20,8 @@ Bench.config do |config|
     config.reset_app
     @expected = Bench.get_test_data(@datasize)
     config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
-    config.reset_refresh_time('RhoInternalBenchmarkAdapter')
+    config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
+    config.set_simulate_time('RhoInternalBenchmarkAdapter', Bench.simtime)
   end
 end
 

data/bench/spec/bench_spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rspec'
+require 'excon'
 $:.unshift File.join(File.dirname(__FILE__),'..')
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 

data/bin/rhoconnect

@@ -1,34 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'templater'
-require File.join(File.dirname(__FILE__), '..','generators','rhoconnect')
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-require File.join(File.dirname(__FILE__), '..','lib','rhoconnect')
-
-# Stub this method to force 1.8 compatibility (come on templater!)
-class Encoding
-  def find
-    "utf-8"
-  end
-
-  def dummy?
-    false
-  end
+if File.exists?(File.join(Dir.pwd,'Gemfile'))
+  require 'bundler'
+  Bundler.require
 end
 
-class String
-  def force_encoding(enc)
-    return self
-  end
-  def encoding
-    if RUBY_VERSION =~ /1\.8/ and Encoding.responds_to?('new')
-      Encoding.new
-    else
-      Encoding.default_external
-    end
-  end
-end
+$:.unshift File.join(File.dirname(__FILE__),'..')
 
+require 'templater'
+require 'generators/rhoconnect'
+require 'lib/rhoconnect'
+require 'commands/execute'
 
-Rhoconnect.run_cli(Dir.pwd, 'rhoconnect', Rhoconnect::VERSION, ARGV)
+Execute.start

data/bin/rhoconnect-benchmark

@@ -73,6 +73,11 @@ def parse_options
          options[:title] = title
        end
        
+       options[:simtime] = 0
+       opts.on('-S', '--simtime NUMBER', "Force the source adapter to simulate NUMBER seconds communication roundtrip with the backend") do |simtime|
+         options[:simtime] = simtime
+       end
+       
        opts.on( '-A', '--advanced', 'This convinience option combines -m 10 and -x 500') do
          options[:max_payload] = 500
          options[:payload] = 500
@@ -80,6 +85,7 @@ def parse_options
          options[:num_clients] = 10
          options[:title] ||= "QUERY"
          options[:save_results] = '.'
+         options[:simtime] = 0
        end
        
        options[:distributed] = nil
@@ -91,6 +97,7 @@ def parse_options
          options[:title] ||= "QUERY"
          options[:save_results] = '.'
          options[:distributed] = fname
+         options[:simtime] = 0
        end
           
        # This displays the help screen, all programs are
@@ -236,11 +243,13 @@ begin
       bench_args[7] = options[:num_iterations]
       # datasize
       bench_args[8] = payload
+      # simulate backend delay
+      bench_args[9] = options[:simtime]
   
       # now execute Bench
       if(options[:distributed])
         sync_key = "#{options[:title]}_#{payload}"
-        options[:distr_runner].run(Bench.base_url, sync_key, payload, concurrency, options[:num_iterations], result_fname)
+        options[:distr_runner].run(Bench.base_url, sync_key, payload, concurrency, options[:num_iterations], result_fname, options[:simtime])
       else
         Bench::Cli.start bench_args
       end

data/commands/commands/dtach_commands/dtach_about.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc 'dtach-about', 'About dtach'
+    def dtach_about
+      puts "\nSee http://dtach.sourceforge.net/ for information about dtach.\n\n"
+  end #dtach_about
+end #do

data/commands/commands/dtach_commands/dtach_install.rb

@@ -0,0 +1,30 @@
+Execute.define_task do
+  desc 'dtach-install', 'Install dtach 0.8 from source'
+  def dtach_install
+    invoke :dtach_about
+    
+    unless windows?
+      Dir.chdir('/tmp/')
+      unless File.exists?('/tmp/dtach-0.8.tar.gz')
+        require 'net/http'
+
+        url = 'http://downloads.sourceforge.net/project/dtach/dtach/0.8/dtach-0.8.tar.gz'
+        open('/tmp/dtach-0.8.tar.gz', 'wb') do |file| file.write(open(url).read) end
+      end #do
+
+      unless File.directory?('/tmp/dtach-0.8')
+        system('tar xzf dtach-0.8.tar.gz')
+      end #unless
+
+      ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+      
+      mk_bin_dir(bin_dir)
+	    
+      Dir.chdir('/tmp/dtach-0.8/')
+      system 'cd /tmp/dtach-0.8/ && ./configure && make'
+      system "cp /tmp/dtach-0.8/dtach #{bin_dir}"
+
+      puts "Dtach successfully installed to #{bin_dir}"
+    end #unless
+  end #dtach_install
+end #do

data/commands/commands/redis_commands/redis_about.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "redis-about", 'About redis'
+  def redis_about
+    puts "\nSee http://redis.io/ for information about redis.\n\n"
+  end #about
+end #do

data/commands/commands/redis_commands/redis_attach.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "redis-attach", 'Attach to redis dtach socket'
+  def redis_attach
+    RedisRunner.attach
+  end #redis_attach
+end #do

data/commands/commands/redis_commands/redis_download.rb

@@ -0,0 +1,33 @@
+Execute.define_task do
+  desc "redis-download", "Download redis package"
+  def redis_download
+  	if windows?
+      require 'net/http'
+      require 'zip/zip'
+      puts "Installing redis to #{redis_home}."
+
+	    Net::HTTP.start("cloud.github.com") do |http|
+	      resp = http.get("/downloads/dmajkic/redis/#{$redis_ver}-win32-win64.zip")
+	      open($redis_zip, "wb") do |file|
+	        file.write(resp.body)
+	      end #do
+	    end #do
+
+	    Zip::ZipFile.open($redis_zip) do |zip_file|
+	    	zip_file.each do |f|
+	    		f_path = File.join(redis_home, f.name)
+          FileUtils.mkdir_p(File.dirname(f_path))
+          zip_file.extract(f, f_path) { true }
+    		end #do
+    	end #do
+
+    	FileUtils.mv Dir.glob(File.join(redis_home,'32bit','*')), redis_home
+    	FileUtils.rm_rf File.join(redis_home, '64bit')
+    	FileUtils.rm_f $redis_zip
+    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 #{REDIS_RELEASE}"
+    end #if
+  end #redis_download
+end #do

data/commands/commands/redis_commands/redis_install.rb

@@ -0,0 +1,26 @@
+Execute.define_task do
+desc "redis-install", 'Install the latest verison of Redis from Github (requires git, duh)'
+  def redis_install
+    invoke :redis_about
+    invoke :redis_download
+    invoke :redis_make
+    unless windows?
+        ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+        
+        mk_bin_dir(bin_dir)
+        
+        %w(redis-benchmark redis-cli redis-server).each do |bin|
+          sh "cp /tmp/redis/src/#{bin} #{bin_dir}"
+        end #do
+    
+        puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
+    
+        ENV['PREFIX'] and conf_dir = "#{ENV['PREFIX']}/etc" or conf_dir = "#{RedisRunner.prefix}etc"
+        unless File.exists?("#{conf_dir}/redis.conf")
+          sh "mkdir #{conf_dir}" unless File.exists?("#{conf_dir}")
+          sh "cp /tmp/redis/redis.conf #{conf_dir}/redis.conf"
+          puts "Installed redis.conf to #{conf_dir} \n You should look at this file!"
+        end #unless
+    end #unless
+  end #redis_install
+end #do

data/commands/commands/redis_commands/redis_make.rb

@@ -0,0 +1,9 @@
+Execute.define_task do
+  desc "redis-make", "Alias for make clean && make", :hide => true
+  def redis_make
+    unless windows?
+      sh "cd #{RedisRunner.redisdir} && make clean"
+      sh "cd #{RedisRunner.redisdir} && make"
+    end #unless
+  end #redis_make
+end #do

data/commands/commands/redis_commands/redis_restart.rb

@@ -0,0 +1,7 @@
+Execute.define_task do
+  desc "redis-restart", 'Restart redis'
+  def redis_restart
+    RedisRunner.stop
+    RedisRunner.start
+  end #redis_restart
+end #do

data/commands/commands/redis_commands/redis_runner.rb

@@ -0,0 +1,67 @@
+REDIS_RELEASE = "2.4.10"
+
+class RedisRunner
+  
+  def self.prefix
+    "/usr/local/"
+  end
+
+  def self.redisdir
+    "/tmp/redis/"
+  end
+
+  def self.redisconfdir
+    server_dir = File.dirname(`which redis-server`)
+    conf_file = "#{RedisRunner.prefix}etc/redis.conf"
+    unless File.exists? conf_file
+      conf_file = "#{server_dir}/redis.conf"
+    end
+    conf_file
+  end
+
+  def self.dtach_socket
+    '/tmp/redis.dtach'
+  end
+
+  # Just check for existance of dtach socket
+  def self.running?
+    File.exists? dtach_socket
+  end
+
+  def self.start
+  	if windows?
+  		puts "Starting redis in a new window..."
+  		sh "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+  			"redis-server not installed on your path, please run 'rhoconnect redis-install' first."
+    elsif defined?(JRUBY_VERSION)
+      puts "Starting redis ..."
+      sh "redis-server #{redisconfdir}"
+    else
+      puts 'Detach with Ctrl+\  Re-attach with rhoconnect redis-attach'
+      sleep 1
+      command = "dtach -A #{dtach_socket} redis-server #{redisconfdir}"
+      sh command
+    end
+  end
+  
+  # this function is used with Rhostudio where there is no terminal
+  def self.startbg
+  	if windows?
+  		puts "Starting redis in a new window..."
+  		sh "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+  			"redis-server not installed on your path, please run 'rhoconnect redis-install' first."
+    else
+      puts "Starting redis ..."
+      system("redis-server #{redisconfdir} &")
+    end
+  end
+
+  def self.attach
+    exec "dtach -a #{dtach_socket}"
+  end
+
+  def self.stop
+    Redis.new.shutdown rescue nil
+  end
+
+end #RedisRunner

data/commands/commands/redis_commands/redis_start.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "redis-start", 'Start redis'
+  def redis_start
+    RedisRunner.start
+  end #redis_start
+end #do

data/commands/commands/redis_commands/redis_startbg.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "redis-startbg", "'Start redis' without dtach - for Rhostudio (internal)", :hide => true
+  def redis_startbg
+    RedisRunner.startbg
+  end #redis_startbg
+end #do

data/commands/commands/redis_commands/redis_stop.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "redis-stop", 'Stop redis'
+  def redis_stop
+    RedisRunner.stop
+  end #redis_stop
+end #do

data/commands/commands/rhoconnect/attach.rb

@@ -0,0 +1,7 @@
+Execute.define_task do
+  desc "attach", "Attach to rhoconnect console"
+  def attach
+    invoke :dtach_installed
+    sh "dtach -a #{rhoconnect_socket}" unless windows?
+  end #attach
+end #do

data/commands/commands/rhoconnect/clean_start.rb

@@ -0,0 +1,9 @@
+Execute.define_task do
+  desc "clean-start", "Clean rhoconnect, get token, and create new user"
+  def clean_start
+    invoke :get_token
+    invoke :reset 
+    invoke :get_token
+    invoke :create_user
+  end #clean_start
+end #do

data/commands/commands/rhoconnect/config.rb

@@ -0,0 +1,15 @@
+Execute.define_task do
+  desc "config", "Config", :hide => true
+  def config
+    $settings = load_settings(File.join('settings','settings.yml'))
+    $env = (ENV['RHO_ENV'] || ENV['RACK_ENV'] || :development).to_sym
+    uri = URI.parse($settings[$env][:syncserver])
+    $url = "#{uri.scheme}://#{uri.host}"
+    $url = "#{$url}:#{uri.port}" if uri.port && uri.port != 80
+    $host = uri.host
+    $port = uri.port
+    $appname = $settings[$env][:syncserver].split('/').last
+    $token_file = File.join(ENV['HOME'],'.rhoconnect_token')
+    $token = File.read($token_file) if File.exist?($token_file)
+  end #config
+end #do

data/commands/commands/rhoconnect/console.rb

@@ -0,0 +1,15 @@
+Execute.define_task do
+desc "console [environment]", "run rhoconnect console"
+  def console(environment=nil)
+    if RedisRunner.running?
+      application_file = ruby19? ? './application' : 'application'
+      #load development environment by default
+      ENV['RACK_ENV'] = environment || 'development'
+      system "irb -rubygems -r #{File.join(File.dirname(__FILE__),'console_helper')} " +
+             "-r #{File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'rhoconnect') } " +
+             "-r #{application_file}"
+    else
+      puts "Redis is not running. Please start it by running 'rhoconnect redis-start' command."
+    end #if
+  end #console
+end #do

data/commands/commands/rhoconnect/console_helper.rb

@@ -0,0 +1,3 @@
+path = File.join(File.dirname(__FILE__),'..','..', '..', 'lib')
+$:.unshift path
+ROOT_PATH = Dir.pwd

data/commands/commands/rhoconnect/create_user.rb

@@ -0,0 +1,18 @@
+Execute.define_task do
+  desc "create-user", "Creates and subscribes user for application in rhoconnect"
+  def create_user
+    invoke :config
+    password = ''
+    login = ask "new user login: "
+    begin
+      system "stty -echo"
+      password = ask "\nnew user password: "
+      system "stty echo"
+    rescue NoMethodError, Interrupt
+      system "stty echo"
+      exit
+    end
+    puts ''
+    RhoconnectApi.create_user($url,$token,login,password)
+  end #create_user
+end #do

data/commands/commands/rhoconnect/delete_device.rb

@@ -0,0 +1,9 @@
+Execute.define_task do
+  desc "delete-device", "Deletes a device from rhoconnect"
+  def delete_device
+    invoke :config 
+    user_id = ask "device's user_id: "
+    device_id = ask "device to delete: "
+    RhoconnectApi.delete_client($url,$token,user_id,device_id)
+  end #delete_device
+end #do

data/commands/commands/rhoconnect/delete_user.rb

@@ -0,0 +1,8 @@
+Execute.define_task do
+desc "delete-user", "Deletes a user from rhoconnect"
+  def delete_user
+    invoke :config
+    login = ask "user to delete: "
+    RhoconnectApi.delete_user($url,$token,login)
+  end #delete_user
+end #do

data/commands/commands/rhoconnect/flushdb.rb

@@ -0,0 +1,14 @@
+Execute.define_task do
+  desc "flushdb", "Flush data store - WARNING: THIS REMOVES ALL DATA IN RHOCONNECT"
+  def flushdb
+    invoke :config
+    puts "*** WARNING: THIS WILL REMOVE ALL DATA FROM YOUR REDIS STORE ***"
+    confirm = ask "Are you sure (please answer yes/no)? "
+    if confirm == 'yes'
+      Redis.new.flushdb
+      puts "Database flushed..."
+    else
+      puts "Aborted..."
+    end #if
+  end #flushdb
+end #do

data/commands/commands/rhoconnect/get_token.rb

@@ -0,0 +1,25 @@
+Execute.define_task do
+desc "get-token", "Fetches current api token from rhoconnect"
+  def get_token
+    invoke :config
+    password = ''
+    login = ask "admin login: "
+    begin
+      system "stty -echo"
+      password = ask "\nadmin password: "
+      system "stty echo"
+    rescue NoMethodError, Interrupt
+      system "stty echo"
+      exit
+    end
+    puts ''
+    begin
+      $token = RhoconnectApi.get_token($url,login,password)
+    rescue
+      puts "Login failed."
+      exit
+    end
+    File.open($token_file,'w') {|f| f.write $token}
+    puts "Token is saved in: #{$token_file}"
+  end #get_token
+end #do

data/commands/commands/rhoconnect/reset.rb

@@ -0,0 +1,16 @@
+Execute.define_task do
+  desc "reset", "Reset the rhoconnect database (you will need to run rhoconnect:get_token afterwards)"
+  def reset
+    invoke :config
+    confirm = ask " Are you sure? Resetting will remove all data!\n" + 
+                  " It will also return an error code to all\n" + 
+                  " existing devices when they connect! (yes/no):"
+
+    if confirm == 'yes'
+      RhoconnectApi.reset($url,$token) 
+      puts "Database reset."
+    else
+      puts "Cancelling."
+    end #if
+  end #reset
+end #do

data/commands/commands/rhoconnect/reset_refresh.rb

@@ -0,0 +1,11 @@
+Execute.define_task do
+  desc "reset-refresh", "Reset source refresh time"
+  def reset_refresh
+    invoke :config
+    user = ask "user: "
+    source_name = ask "source name: "
+    RestClient.post("#{$url}/api/source/set_refresh_time", { :api_token => $token,
+                                                             :user_name => user,
+                                                             :source_name => source_name })
+  end #reset_refresh
+end #do

data/commands/commands/rhoconnect/restart.rb

@@ -0,0 +1,7 @@
+Execute.define_task do
+  desc "restart", "Alias for `rhoconnect stop; rhoconnect start`"
+  def restart
+    invoke :stop
+    invoke :start
+  end #restart
+end #do

data/commands/commands/rhoconnect/secret.rb

@@ -0,0 +1,11 @@
+Execute.define_task do
+  desc "secret", "Generate a cryptographically secure secret session key"
+  def secret
+    begin
+      require 'securerandom' 
+      puts SecureRandom.hex(64)
+    rescue LoadError
+      puts "Missing secure random generator.  Try running `rhoconnect secret` in a rails application instead."
+    end #begin
+  end #secret
+end #do

data/commands/commands/rhoconnect/set_admin_password.rb

@@ -0,0 +1,26 @@
+Execute.define_task do
+  desc "set-admin-password", "Sets the admin password"
+  def set_admin_password
+    invoke :get_token
+    new_pass,new_pass_confirm = '',''
+    begin
+      system "stty -echo"
+      new_pass = ask "\nnew admin password: "
+      new_pass_confirm = ask "\nconfirm new admin password: "
+      system "stty echo"
+    rescue NoMethodError, Interrupt
+      system "stty echo"
+      exit
+    end #begin
+    if new_pass == ''
+      puts "\nNew password can't be empty."
+    elsif new_pass == new_pass_confirm
+      puts ""
+      RestClient.post("#{$url}/api/user/update_user", { :app_name => $appname,
+                                                        :api_token => $token,
+                                                        :attributes => { :new_password => new_pass } })
+    else
+      puts "\nNew password and confirmation must match."
+    end #if
+  end #set_admin_password
+end #do