rhoconnect 4.0.0 → 4.0.1

data/spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb

@@ -0,0 +1,111 @@
+require 'rack/test'
+require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
+
+describe "Rhoconnect::RhoInternalJsBenchAdapterController" do
+  include Rack::Test::Methods
+  include Rhoconnect
+
+  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
+    def app
+      @app ||= Rack::URLMap.new Rhoconnect.url_map
+    end
+
+    before(:each) do
+      Rhoconnect::Server.set :environment, :test
+      Rhoconnect::Server.set :secret, "secure!"
+      Rhoconnect.use_node = true
+      Rhoconnect.bootstrap(get_testapp_path)
+      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
+    end
+
+    after(:each) do
+      Rhoconnect::Store.flush_all
+      Rhoconnect::Node.kill_process
+    end
+
+    it "should call query method" do
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+      body = JSON.parse(last_response.body)
+    end
+
+    it "should call create method" do
+      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+      
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      body[5]["insert"]["mockId"]["mockId"].should == "1"
+    end
+
+    it "should call update method" do
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      body[4]["total_count"].should == 0
+
+      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+      count = body[4]["total_count"]
+      count.should == 1
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      count = body[4]["total_count"]
+      count.should == 1
+
+      hsh = {'update'=>{'mockId'=>'1','name'=>'updatename'}}
+      put '/app/v1/RhoInternalJsBenchAdapter/mockId',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      puts "body is #{body}"
+      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+      #body[5]["insert"]["mockId"]["name"].should == "updatename"
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      puts "body is #{body}"
+      last_response.should be_ok
+    end
+
+    it "should call delete method" do 
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      body[4]["total_count"].should == 0
+
+      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body    = JSON.parse(last_response.body)
+      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+      count = body[4]["total_count"]
+      count.should == 1
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      count = body[4]["total_count"]
+      count.should == 1
+
+      delete '/app/v1/RhoInternalJsBenchAdapter/1',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body    = JSON.parse(last_response.body)
+      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+
+      get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      body = JSON.parse(last_response.body)
+      body[4]["total_count"].should == 0
+    end
+  end
+end

data/spec/predefined_adapters/rho_internal_js_bench_adapter_js_spec.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
+
+describe "Rhoconnect::RhoInternalJsBenchAdapter" do
+  include Rhoconnect
+
+  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
+    before(:each) do
+      Rhoconnect::Server.set :environment, :test
+      Rhoconnect::Server.set :secret, "secure!"
+      Rhoconnect.use_node = true
+      Rhoconnect.bootstrap(get_testapp_path)
+    end
+
+    def app
+      @app ||= Rack::URLMap.new Rhoconnect.url_map
+    end
+
+    after(:each) do
+      Rhoconnect::Store.flush_all
+      Rhoconnect::Node.kill_process
+      #Source.valid_doctypes.delete('tmpdoc'.to_sym)
+    end
+
+    it "should call login method from model" do
+      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+      res = rho_int.login
+      res.should == true
+    end
+
+    it "should call logoff method from model" do
+      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+      res = rho_int.logoff
+      res.should == true
+    end
+
+    it "should call query method from model" do
+      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+      res = rho_int.query
+      res.should == true
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -71,6 +71,10 @@ module TestHelpers
     File.expand_path(File.join(File.dirname(__FILE__),'apps','rhotestapp'))
   end
 
+  def get_jstestapp_path
+    File.expand_path(File.join(File.dirname(__FILE__),'apps','jstestapp'))
+  end
+
   def get_emptyapp_path
     File.expand_path(File.join(File.dirname(__FILE__),'apps','emptyapp'))
   end

data/tasks/redis.rake

@@ -1,105 +1,12 @@
 # Inspired by rabbitmq.rake the Redbox project at http://github.com/rick/redbox/tree/master
-require 'fileutils'
-require 'open-uri'
-require 'rbconfig'
-
+require_relative '../lib/rhoconnect/utilities'
+require_relative '../commands/utilities/redis_runner'
+include Utilities
 include Rake::DSL
 
-REDIS_RELEASE = "2.4.10"
-
-# See: http://rbjl.net/35-how-to-properly-check-for-your-ruby-interpreter-version-and-os
-def windows?
-  RbConfig::CONFIG['host_os']  =~ /(win|w)32$/
-end
-
-if windows?
-	$redis_ver = "redis-#{REDIS_RELEASE}"
-	$redis_zip = "C:/#{$redis_ver}.zip"
-	$redis_dest = "C:/"
-end
-
-
-def redis_home
-  ENV['REDIS_HOME'] || File.join($redis_dest,$redis_ver)
-end
-
-def mk_bin_dir(bin_dir)
-  begin
-    mkdir_p bin_dir unless File.exists?(bin_dir)
-  rescue
-    puts "Can't create #{bin_dir}, maybe you need to run command as root?"
-    exit 1
-  end
-end
-
-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 install redis."
-    elsif defined?(JRUBY_VERSION)
-      puts "Starting redis ..."
-      sh "redis-server #{redisconfdir}"
-    else
-      puts 'Detach with Ctrl+\  Re-attach with rake 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 install redis."
-    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
+REDIS_RELEASE = "2.6.14"
 
 namespace :redis do
-
   desc 'About redis'
   task :about do
     puts "\nSee http://redis.io/ for information about redis.\n\n"
@@ -137,11 +44,9 @@ namespace :redis do
 	    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
-
 	    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"
@@ -162,40 +67,17 @@ namespace :redis do
 
   desc "Download package"
   task :download do
-  	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
-	    end
-
-	    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
-    	end
-
-    	FileUtils.mv Dir.glob(File.join(redis_home,'32bit','*')), redis_home
-    	FileUtils.rm_rf File.join(redis_home, '64bit')
-    	FileUtils.rm_f $redis_zip
+    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
-      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}"
+      puts "Not implemented on Windows"
     end
   end
-
 end
 
 namespace :dtach do
-
   desc 'About dtach'
   task :about do
     puts "\nSee http://dtach.sourceforge.net/ for information about dtach.\n\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,22 +107,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.4
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -594,9 +578,10 @@ files:
 - lib/rhoconnect/web-console/controllers/admins.js
 - lib/rhoconnect/web-console/templates/index.erb
 - lib/rhoconnect/web-console/templates/jqplot.erb
-- lib/rhoconnect/tasks.rb
 - lib/rhoconnect/read_state.rb
 - lib/rhoconnect/predefined_adapters/bench_adapter.rb
+- lib/rhoconnect/predefined_adapters/models/js/rho_internal_js_bench_adapter.js
+- lib/rhoconnect/predefined_adapters/controllers/js/rho_internal_js_bench_adapter_controller.js
 - lib/rhoconnect/ping.rb
 - lib/rhoconnect/bulk_data.rb
 - lib/rhoconnect/source.rb
@@ -659,6 +644,8 @@ files:
 - spec/perf/store_perf_spec.rb
 - spec/rhoconnect_spec.rb
 - spec/user_spec.rb
+- spec/predefined_adapters/rho_internal_js_bench_adapter_js_spec.rb
+- spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb
 - spec/models/js_base_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
@@ -732,6 +719,11 @@ files:
 - spec/ping/apple_spec.rb
 - spec/ping/gcm_spec.rb
 - spec/license_spec.rb
+- spec/apps/jstestapp/settings/settings.yml
+- spec/apps/jstestapp/settings/license.key
+- spec/apps/jstestapp/config.ru
+- spec/apps/jstestapp/controllers/js/application_controller.js
+- spec/apps/jstestapp/Rakefile
 - spec/apps/emptyapp/application.rb
 - spec/apps/emptyapp/settings/settings.yml
 - spec/apps/emptyapp/settings/license.key
@@ -770,7 +762,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2978824811517012826
+      hash: -3033428230071358530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -821,6 +813,8 @@ test_files:
 - spec/perf/store_perf_spec.rb
 - spec/rhoconnect_spec.rb
 - spec/user_spec.rb
+- spec/predefined_adapters/rho_internal_js_bench_adapter_js_spec.rb
+- spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb
 - spec/models/js_base_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
@@ -894,6 +888,11 @@ test_files:
 - spec/ping/apple_spec.rb
 - spec/ping/gcm_spec.rb
 - spec/license_spec.rb
+- spec/apps/jstestapp/settings/settings.yml
+- spec/apps/jstestapp/settings/license.key
+- spec/apps/jstestapp/config.ru
+- spec/apps/jstestapp/controllers/js/application_controller.js
+- spec/apps/jstestapp/Rakefile
 - spec/apps/emptyapp/application.rb
 - spec/apps/emptyapp/settings/settings.yml
 - spec/apps/emptyapp/settings/license.key

data/lib/rhoconnect/tasks.rb

@@ -1,315 +0,0 @@
-require 'zip/zip'
-require 'uri'
-$:.unshift File.dirname(__FILE__)
-require 'utilities'
-
-DEPRECATION_MSG =  "\n" + 
-                   "*** Warning:  As of version 4.0 of rhoconnect, the rake command will be deprecated. ***\n" +
-                   "*** Use the corresponding rhoconnect commands instead.                              ***\n" +
-                   "*** Type 'rhoconnect help' for more information on these commands.                  ***\n" +
-                   "\n"
-
-puts DEPRECATION_MSG if $0.include? 'rake'
-
-namespace :rhoconnect do
-  include Utilities
-  
-  task :config do
-    $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
-  
-  task :dtach_installed do
-    if !windows? and (`which dtach` == '')
-      puts "WARNING: dtach not installed or not on path, some tasks will not work!"
-      puts "  Install with '[sudo] rake dtach:install'"
-      exit
-    end
-  end
-  
-  desc "Reset the rhoconnect database (you will need to run rhoconnect:get_token afterwards)"
-  task :reset => :config do
-    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'
-      RestClient.post("#{$url}/api/admin/reset", { :api_token => $token })
-      puts "Database reset."
-    else
-      puts "Cancelling."
-    end
-  end
-  
-  desc "Fetches current api token from rhoconnect"
-  task :get_token => :config do
-    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 = RestClient.post("#{$url}/api/admin/login", { :login => login, :password => password})
-    rescue
-      puts "Login failed."
-      exit
-    end
-    File.open($token_file,'w') {|f| f.write $token}
-    puts "Token is saved in: #{$token_file}"
-  end
-  
-  desc "Clean rhoconnect, get token, and create new user"
-  task :clean_start => [:get_token, :reset, :get_token, :create_user]
-  
-  desc "Alias for `rake rhoconnect:stop; rake rhoconnect:start`"
-  task :restart => [:stop, :start]
-  
-  desc "Creates and subscribes user for application in rhoconnect"
-  task :create_user => :config do
-    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 ''
-    RestClient.post("#{$url}/api/user/create_user", { :api_token => $token, :attributes => {:login => login, :password => password}})
-  end
-  
-  desc "Deletes a user from rhoconnect"
-  task :delete_user => :config do
-    login = ask "user to delete: "
-    RestClient.post("#{$url}/api/user/delete_user", { :api_token => $token, :user_id => login })
-  end
-  
-  desc "Deletes a device from rhoconnect"
-  task :delete_device => :config do
-    user_id = ask "device's user_id: "
-    device_id = ask "device to delete: "
-    RestClient.post("#{$url}/api/client/delete_client", { :api_token => $token, :user_id => user_id, :client_id => device_id})
-  end
-  
-  desc "Sets the admin password"
-  task :set_admin_password => :get_token do
-    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
-    if new_pass == ''
-      puts "\nNew password can't be empty."
-    elsif new_pass == new_pass_confirm
-      puts ""
-      admin_user = 'rhoadmin'
-      RestClient.put("#{$url}/rc/#{Rhoconnect::API_VERSION}/users/#{admin_user}", {:app_name => $appname, :api_token => $token,
-        :attributes => {:new_password => new_pass}})
-    else
-      puts "\nNew password and confirmation must match."
-    end
-  end
-  
-  desc "Reset source refresh time"
-  task :reset_refresh => :config do
-    user = ask "user: "
-    source_name = ask "source name: "
-    RestClient.put("#{$url}/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{user}/sources/#{source_name}", {:api_token => $token})
-  end
-  
-  begin
-    require 'rspec/core/rake_task'
-    
-    desc "Run source adapter specs"
-    task :spec do
-      files = File.join('spec','**','*_spec.rb')
-      puts "files loaded are ****** #{files}"
-      RSpec::Core::RakeTask.new('rhoconnect:spec') do |t|
-        t.pattern = FileList[files]
-        t.rspec_opts = %w(-fn -b --color)
-      end
-    end
-  rescue Exception => e
-    puts "Run source adapter specs error: #{e.inspect}"
-  end
-  
-  desc "Start rhoconnect server"
-  task :start => :dtach_installed do
-    cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
-    if windows?
-      puts 'Starting rhoconnect...'
-      system("#{cmd} config.ru -P #{rhoconnect_pid}")
-    elsif jruby?
-      puts 'Starting rhoconnect in jruby environment...'
-      system("#{cmd} -r config.ru")
-    else
-      puts 'Detach with Ctrl+\  Re-attach with rake rhoconnect:attach'
-      sleep 2
-      system "dtach -A #{rhoconnect_socket} #{cmd} config.ru -P #{rhoconnect_pid}"
-    end
-  end
-  
-#  desc "Start rhoconnect server in bg mode (Rhostudio) - this is an internal command"
-  task :startbg do
-    cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
-    require 'win32/process' if windows?
-    
-    p1 = Process.fork {  
-      if windows?
-        puts 'Starting rhoconnect ...'
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
-      elsif jruby?
-        puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd} -r config.ru")
-      else
-        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
-      end
-    }
-    Process.detach(p1)
-    
-    exit
-  end
-  
-#  desc "Start rhoconnect server in debug mode (Rhostudio) - this is an internal command"
-  task :startdebug do
-    cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
-    ENV['DEBUG'] = 'yes'
-    require 'win32/process' if windows?
-    
-    p1 = Process.fork {  
-      if windows?
-        puts 'Starting rhoconnect ...'
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
-      elsif jruby?
-        puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd} -r config.ru")
-      else
-        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
-      end
-    }
-    Process.detach(p1)
-
-    exit
-  end
-  
-  desc "run rhoconnect console"
-  task :console, :environment do |t, args|
-    if RedisRunner.running?
-      application_file = ruby19? ? './application' : 'application'
-      #load development environment by default
-      ENV['RACK_ENV'] = args[:environment] || 'development'
-      system "irb -rubygems -r #{File.join(File.dirname(__FILE__),'console')} " +
-             "-r #{File.dirname(__FILE__)} " +
-             "-r #{application_file}"
-    else
-      puts "Redis is not running. Please start it by running 'rake redis:start' command."
-    end
-  end
-  
-  desc "Stop rhoconnect server"
-  task :stop => :dtach_installed do
-    if windows?
-  	  File.delete "#{rhoconnect_pid}" if system("FOR /F %A in (#{rhoconnect_pid}) do taskkill /F /PID %A")
-    else
-      if File.exist?("#{rhoconnect_pid}")
-        pid = `cat #{rhoconnect_pid}` 
-        puts "Sending a QUIT signal to process #{pid}"
-        system "kill -3 #{pid}"
-        count = 0
-        loop do
-          sleep 1
-          count += 1
-          exit if !File.exist?("#{rhoconnect_pid}")
-          break if count >= 5       
-        end
-        puts "Process #{pid} is still running. Sending a KILL signal to it ..."
-        system "kill -9 #{pid}"  
-      end
-    end
-  end
-  
-  desc "Attach to rhoconnect console"
-  task :attach => :dtach_installed do
-    system "dtach -a #{rhoconnect_socket}" unless windows?
-  end
-  
-  desc "Launch the web console in a browser - uses :syncserver: in settings.yml"
-  task :web => :config do
-    windows? ? sh("start #{$url}") : sh("open #{$url}")
-  end
-  
-  desc "Flush data store - WARNING: THIS REMOVES ALL DATA IN RHOCONNECT"
-  task :flushdb => :config 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
-      puts "Database flushed..."
-    else
-      puts "Aborted..."
-    end
-  end
-  
-  desc "Generate a cryptographically secure secret session key"
-  task :secret do
-    begin
-      require 'securerandom' 
-      puts SecureRandom.hex(64)
-    rescue LoadError
-      puts "Missing secure random generator.  Try running `rake secret` in a rails application instead."
-    end
-  end
-  
-  desc "Build executable WAR file to be used in Java App Servers"
-  task :war do
-    if jruby? then
-      puts "building the WAR file"
-      if not File::exists? "config/warble.rb"
-        puts "generating Warbler's config file"
-        includeDirs = []
-        Dir.mkdir('config') if not File.exists?('config')
-        aFile = File.new("config/warble.rb", "w+")
-        if aFile
-          includeDirs = FileList['*'].exclude do |entry|
-            entry if (not File.directory? entry) || (entry == 'spec')
-          end
-          configFile = "Warbler::Config.new do |config|\n" +
-            "config.dirs = %w(#{includeDirs.join(' ')})\n" +
-            "config.includes = FileList[\"./*\"]\n" +
-            "config.excludes = FileList[\"./*.war\",'spec']\nend"
-          aFile.write("#{configFile}")
-          aFile.close
-        else
-          puts "Unable to create config/warble.rb file!"
-        end
-      end
-      # build the executable WAR using the config/warble.rb file
-      ENV['BUNDLE_WITHOUT'] = ['development','test'].join(':')
-      system 'warble executable war'
-    else
-      puts "Cannot build WAR files outside of JRuby environment!"
-    end
-  end
-end
-
-task :default => ['rhoconnect:spec']
-
-load File.join(File.dirname(__FILE__),'..','..','tasks','redis.rake')