rhoconnect 3.3.6 → 3.4.2

data/bench/scripts/test_query_script.rb

@@ -18,8 +18,20 @@ Bench.config do |config|
   # if this is not a distributed run - reset the app
   if not Bench.sync_key
     config.reset_app
-    @expected = Bench.get_test_data(@datasize)
-    config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
+    @expected = {}
+    data_to_create = @datasize
+    while (data_to_create > 0) do
+      nobjects = data_to_create > 1000 ? 1000 : data_to_create 
+      data_page = Bench.get_test_data(nobjects, true)
+      config.set_server_state("test_db_storage:application:#{config.user_name}",data_page,true)
+      @expected.merge!(data_page)
+      data_to_create = data_to_create - nobjects
+    end
+    # also, simulate load for incremental syncs
+    @incr_expected = 25
+    incr_data_page = Bench.get_test_data(@incr_expected, true)
+    config.set_server_state("test_db_storage:application:nquser",incr_data_page)
+    
     #config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
     config.set_simulate_time('RhoInternalBenchmarkAdapter', Bench.simtime)
   end
@@ -38,8 +50,9 @@ Bench.synchronize do |config|
 end
 
 Bench.test do |config,session|
+  username = SecureRandom.urlsafe_base64(10)
   session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
-    {:login => config.user_name, :password => config.password}.to_json
+    {:login => username, :password => config.password}.to_json
   end
   session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"
   client_id = JSON.parse(session.last_result.body)['client']['client_id']
@@ -58,15 +71,15 @@ Bench.test do |config,session|
     {'X-RhoConnect-CLIENT-ID' => session.client_id} do
       {'p_size' => pagesize}
     end
-  token = JSON.parse(session.last_result.body)[1]['token']
-  while (token != '') do
+  token = session.last_result.headers[:x_rhoconnect_page_token]
+  while (token and token != '') do
     session.get "ack-cud",
       "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter",
       {'X-RhoConnect-CLIENT-ID' => session.client_id} do
         {'token' => token,
           'p_size' => pagesize}
       end
-    token = JSON.parse(session.last_result.body)[1]['token']
+    token = session.last_result.headers[:x_rhoconnect_page_token]
     session.last_result.verify_code(200)
   end
   
@@ -90,7 +103,7 @@ Bench.test do |config,session|
   session.post "push_deletes", 
     "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/push_deletes",
       {'X-RhoConnect-API-TOKEN' => config.token, :content_type => :json} do
-    {:user_id => config.user_name,
+    {:user_id => username,
       :rebuild_md => false,
       :objects => [obj_to_delete]
     }.to_json

data/bench/spec/bench_spec_helper.rb

@@ -6,7 +6,9 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
 end
 
 require 'bench/logging'

data/bin/rhoconnect

@@ -1,16 +1,26 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
-if File.exists?(File.join(Dir.pwd,'Gemfile'))
-  require 'bundler'
-  Bundler.require
-end
+begin
+  if File.exists?(File.join(Dir.pwd,'Gemfile'))
+    require 'bundler'
+    Bundler.require
+  end
+  $:.unshift File.join(File.dirname(__FILE__),'..')
+  require 'templater'
+  require 'generators/rhoconnect'
+  require 'lib/rhoconnect'
+  require 'commands/execute'
 
-$:.unshift File.join(File.dirname(__FILE__),'..')
-
-require 'templater'
-require 'generators/rhoconnect'
-require 'lib/rhoconnect'
-require 'commands/execute'
+  Execute.start
+rescue SystemExit => se
+  # This is normal
+rescue Exception => e
+  if ARGV[0] == 'update' and e.class == Gem::LoadError
+    puts e.message
+    puts "\nUpdate your Gemfile to latest rhoconnect release and run 'rhoconnect update' again."
+    puts "See http://docs.rhomobile.com/rhoconnect/install#upgrading-an-existing-application about update details.\n\n"
+  else
+    puts "Run rhoconnect command error: #{e.inspect}"
+  end
+end
 
-Execute.start

data/commands/execute.rb

@@ -10,29 +10,28 @@ $:.unshift File.join(File.dirname(__FILE__), '.')
 $:.unshift File.join(File.dirname(__FILE__), '..')
 require 'lib/rhoconnect/utilities'
 require 'lib/rhoconnect'
+require 'utilities/utilities'
+require 'utilities/redis_runner'
 
 include Utilities
 
-TASK_DIRS = ['generators', 'commands', 'utilities']
-
 class Execute < Thor
-  # Methods
   no_tasks {
     def self.define_task(&block)
-      Execute.class_eval &block
+      Execute.class_eval(&block)
     end
   }
-  # Require all tasks defined in the tasks directories
-  TASK_DIRS.each do |dir|
-    Find.find("#{File.expand_path(File.dirname(__FILE__))}/#{dir}") do |path|
-      if !File.directory? path and File.extname(path) == '.rb'
-        if File.basename(path, '.rb') == 'spec'
-          rspec_avail = File.exists?(File.join(Dir.pwd,'Gemfile')) && Bundler.load.specs.find{|s| s.name == 'rspec' }
-          # Drop task 'spec' if gem 'rspec' is not in the current bundle.
-          next unless rspec_avail
-        end
-        require path
-      end
+
+  tasks = [ 'generators', 'rhoconnect', 'redis' ]
+  unless windows?
+    tasks << 'dtach'
+    tasks << 'rhoconnect_attach' unless jruby?
+  end
+  tasks << if jruby? then "rhoconnect_war" else "rhoconnect_console" end
+
+  tasks.each do |dir|
+    Dir.glob(File.join(File.dirname(__FILE__), "#{dir}", "*.rb")) do |file|
+      require file
     end
   end
 end

data/commands/generators/update.rb

@@ -0,0 +1,26 @@
+Execute.define_task do
+  desc "update", "Updates an existing application to the latest rhoconnect release."
+  def update
+    Bundler.with_clean_env do
+      `bundle install`
+    end
+
+    path_to_tempate = File.expand_path(File.join(File.dirname(__FILE__), '..','..', 'generators', 'templates', 'application'))
+    unless File.exist?('.rcgemfile')
+      require 'erb'
+      File.open('Gemfile.new', 'w') do |f|
+        gem_version = Rhoconnect::VERSION
+        template = ERB.new(IO.read(File.join(path_to_tempate, 'Gemfile')))
+        f << template.result(binding)
+      end
+      puts "The new Gemfile for rhoconnect version '#{Rhoconnect::VERSION}' is saved as Gemfile.new"
+    end
+
+    FileUtils.copy(File.join(path_to_tempate, 'rcgemfile'), '.rcgemfile')
+
+    Bundler.with_clean_env do
+      `bundle install`
+    end
+    puts "\nSee http://docs.rhomobile.com/rhoconnect/install#upgrading-an-existing-application about update details.\n\n"
+  end
+end

data/commands/redis/redis_download.rb

@@ -0,0 +1,13 @@
+REDIS_RELEASE = "2.4.10"
+Execute.define_task do
+  desc "redis-download", "Download redis release #{REDIS_RELEASE}"
+  def redis_download
+    unless windows?
+      system 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
+      system 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
+      system "cd #{RedisRunner.redisdir} && git reset --hard && git checkout #{REDIS_RELEASE}"
+    else
+      puts "Not implemented on Windows"
+    end
+  end
+end

data/commands/redis/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|
+        system "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")
+        system "mkdir #{conf_dir}" unless File.exists?("#{conf_dir}")
+        system "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}/redis_restart.rb

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

data/commands/{commands/redis_commands → redis}/redis_stop.rb

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

data/commands/{commands/rhoconnect → rhoconnect}/config.rb

@@ -3,6 +3,7 @@ Execute.define_task do
   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
@@ -11,5 +12,9 @@ Execute.define_task do
     $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
+    # Redis options
+    redis_server = $settings[$env][:redis]
+    host, port, db, password = redis_server.split(':')  
+    $redis_options = { :host => host, :port => port, :db => db, :password => password }      
+  end
+end

data/commands/{commands/rhoconnect → rhoconnect}/flushdb.rb

@@ -5,10 +5,10 @@ Execute.define_task do
     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
+      RedisRunner.flushdb
       puts "Database flushed..."
     else
       puts "Aborted..."
-    end #if
-  end #flushdb
-end #do
+    end
+  end
+end

data/commands/rhoconnect/start.rb

@@ -0,0 +1,27 @@
+Execute.define_task do
+  desc "start", "Start rhoconnect server"
+  def start
+    invoke :config 
+    unless RedisRunner.running?
+      redis_config = "#{$redis_options[:host]}:#{$redis_options[:port]}"
+      puts "Redis is not running on #{redis_config}. Please start it by running 'rhoconnect redis-start' command."
+      exit
+    end
+    command = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
+    if windows?
+      puts 'Starting rhoconnect...'
+      system "#{command} config.ru -P #{rhoconnect_pid}"
+    elsif jruby?
+      puts 'Starting rhoconnect in jruby environment...'
+      system "#{command}"
+    else
+      if dtach_installed?
+        puts 'Detach with Ctrl+\  Re-attach with rhoconnect attach'
+        sleep 2
+        cmd "dtach -A #{rhoconnect_socket} #{command} config.ru -P #{rhoconnect_pid}"
+      else
+        cmd "#{command} config.ru -P #{rhoconnect_pid}"
+      end
+    end
+  end
+end

data/commands/{commands/rhoconnect → rhoconnect}/startdebug.rb

@@ -11,8 +11,8 @@ Execute.define_task do
     cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
     ENV['DEBUG'] = 'yes'
     require 'win32/process' if windows?
-    
-    p1 = Process.fork {  
+
+    p1 = Process.fork {
       if windows?
         puts 'Starting rhoconnect ...'
         system "#{cmd} config.ru -P #{rhoconnect_pid}"

data/commands/{commands/rhoconnect → rhoconnect}/stop.rb

@@ -1,11 +1,10 @@
 Execute.define_task do
   desc "stop", "Stop rhoconnect server"
   def stop
-    invoke :dtach_installed
     if windows?
       File.delete "#{rhoconnect_pid}" if system("FOR /F %A in (#{rhoconnect_pid}) do taskkill /F /PID %A")
     else
       cmd "cat #{rhoconnect_pid} | xargs kill -3"
-    end #if
-  end #stop
-end #do
+    end
+  end
+end

data/commands/rhoconnect_attach/attach.rb

@@ -0,0 +1,10 @@
+Execute.define_task do
+  desc "attach", "Attach to rhoconnect console"
+  def attach
+    if dtach_installed?
+      system "dtach -a #{rhoconnect_socket}"
+    else
+      "Cannot attach to rhoconnect console. 'dtach' program is not installed."
+    end
+  end
+end

data/commands/rhoconnect_console/console.rb

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

data/commands/{commands/redis_commands → utilities}/redis_runner.rb

@@ -1,7 +1,4 @@
-REDIS_RELEASE = "2.4.10"
-
 class RedisRunner
-  
   def self.prefix
     "/usr/local/"
   end
@@ -13,9 +10,7 @@ class RedisRunner
   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 = "#{server_dir}/redis.conf" unless File.exists? conf_file
     conf_file
   end
 
@@ -23,16 +18,18 @@ class RedisRunner
     '/tmp/redis.dtach'
   end
 
-  # Just check for existance of dtach socket
   def self.running?
-    File.exists? dtach_socket
+    $redis_options ||= {}
+    Redis.new($redis_options).ping == 'PONG'
+  rescue
+    false
   end
 
   def self.start
-  	if windows?
-  		puts "Starting redis in a new window..."
-  		system "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."
+    if windows?
+      puts "Starting redis in a new window..."
+      system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+        "redis-server not installed on your path, please install redis."
     elsif defined?(JRUBY_VERSION)
       puts "Starting redis ..."
       system "redis-server #{redisconfdir}"
@@ -43,13 +40,13 @@ class RedisRunner
       system 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..."
-  		system "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."
+    if windows?
+      puts "Starting redis in a new window..."
+      system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+        "redis-server not installed on your path, please install redis."
     else
       puts "Starting redis ..."
       system "redis-server #{redisconfdir} &"
@@ -61,7 +58,13 @@ class RedisRunner
   end
 
   def self.stop
-    Redis.new.shutdown rescue nil
+    $redis_options ||= {}
+    Redis.new($redis_options).shutdown rescue nil
+  end
+
+  def self.flushdb
+    $redis_options ||= {}
+    Redis.new($redis_options).flushdb rescue nil
   end
 
-end #RedisRunner
+end