rhoconnect 3.0.0.beta3 → 3.0.0.rc1

data/installer/unix-like/rho_connect_install_installers.rb

@@ -4,22 +4,22 @@ require 'rho_connect_install_checkers'
 include Checkers
 
 module Installers
-  extend self
   @options=''
 
   # configure_passenger
   # This method installs items that were retrieved via wget as well as passenger
   def configure_passenger(options)
     @options=options
-    print_header "Configuring Passenger"
+    print_header "Configuring passenger ..."
     if @options[:web_server] && !check_web_server_running
       if @options[:web_server] == "apache2"
-        print_header "Configuring Apache2 to work with Passenger"
+        print_header "Configuring apache2 to work with passenger ..."
         cmd "yes | #{@options[:prefix]}/bin/passenger-install-#{ @options[:web_server] }-module"
       elsif @options[:web_server] == "nginx"
-        print_header "Configuring and Compiling Nginx to work with Passenger"
         nginx_version = Constants::Nginx
-        cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz; tar -xzvf #{nginx_version}.tar.gz"        
+        print_header "Downloading http://nginx.org/download/#{nginx_version}.tar.gz ..."
+        cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz -o /dev/null; tar -xzvf #{nginx_version}.tar.gz"        
+        print_header "Configuring and compiling Nginx to work with passenger ..."
         cmd "#{@options[:prefix]}/bin/passenger-install-nginx-module --auto --prefix=/opt/nginx \
         --nginx-source-dir=#{@options[:prefix]}/#{nginx_version} \
         --extra-configure-flags='--with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx'"
@@ -41,24 +41,24 @@ module Installers
   # install_all_packages
   # This method installs all packages listed in the PACKAGES list defined
   # in the Constants file.
-  def install_all_packages(pkg_mgr)
-    print_header "Installing packages"
-    Constants::PACKAGES.each do |pkg|
-      install_package pkg, pkg_mgr unless check_package pkg == true
-    end #do
-    packages_not_found = check_all_packages
-    if packages_not_found && !packages_not_found.empty?
-      log_print packages_not_found
-    else
-      log_print "All packages installed correctly"
-    end #if
-  end #install_all_packages
+#  def install_all_packages(pkg_mgr)
+#    print_header "Installing packages ..."
+#    Constants::PACKAGES.each do |pkg|
+#      install_package pkg, pkg_mgr unless check_package pkg == true
+#    end #do
+#    packages_not_found = check_all_packages
+#    if packages_not_found && !packages_not_found.empty?
+#      log_print packages_not_found
+#    else
+#      log_print "All packages installed correctly"
+#    end #if
+#  end #install_all_packages
   
   # install_package
   # This method installs the package passed with the determined get_cmd
-  def install_package(pkg, pkg_mgr)
-    cmd "#{ pkg_mgr } install #{ pkg }"  unless check_package pkg
-  end #install_package
+#  def install_package(pkg, pkg_mgr)
+#    cmd "#{ pkg_mgr } install #{ pkg }"  unless check_package pkg
+#  end #install_package
   
   # install_all_gems
   # This method installs all gems specified in the GEMS list defined in the
@@ -73,13 +73,13 @@ module Installers
   # install_gem
   # This method installs the given gem unless it is already installed
   def install_gem(gem)
-    cmd "#{@gem_path} install #{ gem } --no-ri --no-rdoc"  unless check_gem gem, @gem_path
+    cmd "#{@gem_path} install #{ gem } --no-ri --no-rdoc" unless check_gem(gem, @gem_path)
   end #install_gem
 
   # install_rubygems
   # This method installs rubygems which was downloaded and untarred earlier
   def install_rubygems
-    print_header "Installing Rubygems"
+    print_header "Installing rubygems ..."
     Dir.chdir("#{@options[:prefix]}/#{Constants::RUBYGEMS}")
     cmd "#{@options[:prefix]}/bin/ruby setup.rb --prefix=#{@options[:prefix]}/#{Constants::RUBYGEMS}"
     @gem_path = "#{@options[:prefix]}/bin/gem"
@@ -89,9 +89,10 @@ module Installers
   # install_redis
   # This method installs redis
   def install_redis
+    print_header "Installing redis ..."
     Dir.chdir("#{@options[:prefix]}/#{Constants::REDIS}/src")
-    cmd "make; make PREFIX=#{@options[:prefix]} install"
-    cmd "mkdir #{@options[:prefix]}/etc" unless File.exist? "#{@options[:prefix]}/etc"
+    cmd "make 2>&1; make PREFIX=#{@options[:prefix]} install"
+    `mkdir #{@options[:prefix]}/etc` unless File.exist? "#{@options[:prefix]}/etc"
 
     #cmd "cp ../redis.conf #{@options[:prefix]}etc"
     redis_conf_file = File.new("#{@options[:prefix]}/etc/redis.conf", 'w')
@@ -112,32 +113,31 @@ module Installers
   # install_sqlite
   # This method instaqll sqlite
   def install_sqlite
+    print_header "Installing sqlite3 libs ..."
     Dir.chdir("#{@options[:prefix]}/#{Constants::SQLITE3}")
     cmd "./configure --prefix=#{@options[:prefix]}"
-    cmd "make; make install"
+    cmd "make 2>&1; make install"
   end #install_sqlite
 
   # install_rhoconnect
   # This method installs rhoconnect
   def install_rhoconnect
-    # start installations
-    # store current gem_path
-    # orig_gem_path = `which gem`
-    print_header "Installing Rhoconnect"
-    path_to_rc_gem = "/tmp/installdir/rhoconnect-#{@options[:version]}/rhoconnect-#{@options[:version]}.gem"
-
+    print_header "Installing rhoconnect ..."
     Dir.chdir(@options[:start_dir])
-    if File.exists?(path_to_rc_gem)
-      install_gem path_to_rc_gem
+
+    cmd "#{@options[:prefix]}/bin/bundle config build.sqlite3 " +
+        "--with-sqlite3-include=#{@options[:prefix]}/include " +
+        "--with-sqlite3-lib=#{@options[:prefix]}/lib" if @options[:pkg_mgr]  =~ /yum/ # CentOS
+
+    gem_name = (Dir.glob "rhoconnect-*.gem")[0]
+    if gem_name && File.exists?(gem_name)
+      install_gem gem_name
     else
-      cmd "#{@options[:prefix]}/bin/bundle config build.sqlite3 " + 
-          "--with-sqlite3-include=#{@options[:prefix]}/include " + 
-          "--with-sqlite3-lib=#{@options[:prefix]}/lib" if @options[:pkg_mgr]  =~ /yum/ # CentOS
       cmd "#{@options[:prefix]}/bin/bundle install --system --binstubs=/opt/rhoconnect/bin --without=test development"
       # PATH=/opt/rhoconnect/bin:$PATH rake build
       cmd "PATH=#{@options[:prefix]}/bin:$PATH rake build"
       cmd "#{@gem_path} install pkg/rhoconnect-*.gem --no-ri --no-rdoc"
-      `rm -f pkg/rhoconnect-*.gem`
+      #`rm -f pkg/rhoconnect-*.gem`
     end #if
   end #install_rhoconnect
 end #Installers

data/installer/unix-like/rho_connect_install_utilities.rb

@@ -11,33 +11,10 @@ include Checkers
 include DownloadAndDocompress
 
 module Utilities
-  extend self
-
-  # get_elapsed_time
-  # This method returns the time since the given initial_time
-  def get_elapsed_time(initial_time)
-    #get time difference
-    elapsed_time = Time.now - initial_time
-    #determine if time is displayed in hours, minutes, or seconds
-    if elapsed_time >= 3600
-      elapsed_time /= 60
-      time_units = "hours"
-    elsif elapsed_time >= 60 && elapsed_time < 3600
-      elapsed_time /= 60
-      time_units = "minutes"
-    else
-      time_units = "seconds"
-    end #if
-
-    #round elapsed_time to 3 decimal values
-    elapsed_time = (elapsed_time * 10**3).round.to_f / 10**3
-    elapsed_time.to_s << " " + time_units
-  end #get_elapsed_time
- 
   # log_print
   # This method displays, in minutes, how long the installation process took
   def log_print(string)
-    puts string 
+    puts string
     @log.info {string}  unless @log == nil
   end #log_print
 
@@ -46,8 +23,9 @@ module Utilities
   # cmd
   # This method issues the given system command and calls log_print for output
   def cmd(cmd)
-    log_print cmd
-    log_print `#{cmd}`
+    @log.info cmd unless @log == nil
+    res = `#{cmd} 2>&1`
+    @log.info res unless @log == nil
   end #cmd
 
   #set_log_file
@@ -55,29 +33,17 @@ module Utilities
     @log = log
   end #set_log_file 
   
-  # print_header
-  # This method displays a header surrounded by '=' characters consisting of
-  # the given string
   def print_header(string)
-    header = "\n"
-    border = "===="
-    string.each_char { border << "=" }
-    header << border + "\n"
-    header << "= " + string + " =\n"
-    header << border +"\n"
-    log_print header
+    log_print string
   end #print_header
   
   # cleanup
   # This method moves all compressed files from the installation directory
   # that were downloaded by this installation process
   def cleanup(prefix)
-    print_header "Cleaning up"
+    print_header "Cleaning up ..."
     Constants::SOFTWARE.each do |sw|
-      if File.exist? "#{prefix}/#{sw}.tar.gz"
-        cmd "rm #{prefix}/#{sw}.tar.gz"
-        cmd "rm -rf #{prefix}/#{sw}"
-      end
+      cmd "rm #{prefix}/#{sw}.tar.gz; rm -rf #{prefix}/#{sw}" if File.exist? "#{prefix}/#{sw}.tar.gz"
     end
   end #cleanup
 

data/installer/unix-like/rhoinstaller.rb

@@ -55,11 +55,6 @@ optparse = OptionParser.new do|opts|
     options[:silent] = true
   end #do
 
-  options[:version] = nil
-  opts.on( '-v', '--version VERSION', 'Specify VERSION as the rhoconect version' ) do |ver|
-    options[:version] = ver
-  end #do
-  
   options[:web_server] = "nginx"
   opts.on( '-w', '--web-server SERVER', 'Specify apache2 or nginx.  Default is Nginx.' ) do |server|
     options[:web_server] = server
@@ -74,6 +69,7 @@ end #do
 options[:start_dir] = `pwd`.strip
  
 optparse.parse!
+
 log = Logger.new(IO.readlines("#{options[:prefix]}/info.dat").last.strip)
 log.datetime_format = "%Y-%m-%d %H:%M:%S"  # simplify time output
 options[:log] = log

data/installer/utils/create_texts.rb

@@ -88,6 +88,9 @@ user="${user:-root}"
 #config="${config:-/etc/redis/redis.conf}"
 #user="${user:-redis}"
 
+# If the redis-cli file is not found, terminate the script.
+test -x $redis_cli || exit 0
+
 #
 # Set the running $pid value based on $pidfile.
 #
@@ -350,7 +353,7 @@ _NGINX_CONF_
   rho_vhost_conf = <<'_VHOST_CONF_'
 server {
   listen      80;
-  server_name www.yourhost.com;           # <-- your server domain name!
+#  server_name www.yourhost.com;           # <-- your server domain name!
   root  /opt/nginx/html/rhoapp/public;    # <--- be sure to point to 'public' folder of your application!
   passenger_enabled on;
 }
@@ -535,6 +538,18 @@ _NGINX_README_
   readme
 end
 
+def generate_rhoapp(rho_path)
+  puts "Generating rhoconnect application: /opt/nginx/html/rhoapp ..."
+  Dir.chdir "/opt/nginx/html"
+  unless File.directory? "/opt/nginx/html/rhoapp"
+    `#{rho_path}/bin/rhoconnect app rhoapp`
+    Dir.chdir "rhoapp"
+    `#{rho_path}/bin/bundle install --without=test development`
+    Dir.chdir "../"
+    `chown nginx:nginx rhoapp/`
+  end
+end
+
 def create_texts
   if @redis
     create_redis_init 
@@ -545,6 +560,7 @@ def create_texts
     create_nginx_init
     create_nginx_logrotate
     create_nginx_conf_files
+    generate_rhoapp @prefix
     distro_info = nginx_readme
   else
     create_passenger_load
@@ -570,16 +586,17 @@ _IT_SHOULD_BE_DONE_
 
   puts afterwords +   
   if  @server == 'nginx'
-     server_todo_list = <<_NGINX_TO_DO_
-2) Complete setup Nginx web server
-   A) Configure virtual host for your rhoconnect application:
-      Edit the file /opt/nginx/conf/conf.d/rhoconnect.conf so that it reflects your specifications.
-   B) As root user start server to pick up the changes:
-      /etc/init.d/nginx start
+    server_todo_list = <<_NGINX_TO_DO_
+2) Try rhoconnect 'rhoapp' application, created in /opt/nginx/html directory
+  A) As root user start redis and nginx servers:
+     /etc/init.d/redis start
+     /etc/init.d/nginx start
+  B) Open RhoConnect application web console in your browser:
+     http://localhost/console/
 
 _NGINX_TO_DO_
   else  
-     server_todo_list = <<_APACHE2_TO_DO_
+    server_todo_list = <<_APACHE2_TO_DO_
 2) Complete setup of Apache2 web server
    A) Configure virtual host for your rhoconnect application:
       Edit the file /etc/httpd/conf.d/rhoconnect.conf so that it reflects your specifications.
@@ -587,7 +604,7 @@ _NGINX_TO_DO_
       /sbin/service httpd start
        
 _APACHE2_TO_DO_
-  end  + "For more details see #{@prefix}/README file."
+  end  + "For more details see #{@prefix}/README and #{@prefix}/logs/ files."
 
 end #create_texts
 

data/installer/utils/install_test.rb

@@ -1,23 +1,33 @@
 #! /usr/bin/env ruby
 
+require 'rhoconnect/version'
 require 'rubygems'
 require 'fog'
 require 'readline'
 require 'optparse'
 
+# CONSTANTS
+
 REGION          = 'us-west-1'
 SLEEP           = 45
-KEYS            = '/home/mike/.ssh/alexdevkey.pem'
-USER            = 'ubuntu'
+SSH_KEY         = '/home/mike/.ssh/alexdevkey.pem'
+SCP_KEY         = '/home/mike/.scp/alexdevkey.pem'
 ACCESS_KEY_FILE = '/Users/rhomobile/.ec2'
-LOCAL_REPO      = '/home/mike/git/rhoconnect.tgz'
-REMOTE_REPO     = "/home/#{USER}/git/rhoconnect"
-STACKS          = [ { :image_id         => 'ami-3d491a78',
-                      :flavor_id        => 'm1.small',
-                      :key_name         => 'alexdevkey',
-                      :groups           => 'load-test' },
-                    {}
-                  ]
+LOCAL_FILE      = ''
+REMOTE_FILE     = "/home/#{USER}/rhoconnect"
+UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
+                    :flavor_id => 'm1.small',
+                    :key_name  => 'alexdevkey',
+                    :groups    => 'load-test',
+                    :user      => 'ubuntu' }                
+CENTOS_STACK    = { :image_id  => 'ami-13346656',
+                    :flavor_id => 'm1.small',
+                    :key_name  => 'alexdevkey',
+                    :groups    => 'load-test',
+                    :user      => 'root' }
+STACKS          = [ UBUNTU_STACK, CENTOS_STACK ]
+
+# METHODS
 
 # cmd
 # easily issue system commands in a clear way
@@ -55,10 +65,10 @@ end #make_fog
 
 # start_new_instance
 # Creates a new ec2 instance as per the given stack.
-def start_new_instance
+def start_new_instance(stack)
   puts "Creating new instance..."
 
-  @server = @fog.servers.create(STACKS[0])
+  @server = @fog.servers.create(stack)
   @server.wait_for { print "."; STDOUT.flush; ready? }
   puts
   if @server.ready?
@@ -129,6 +139,8 @@ def destroy_ec2_instance
   puts "Instance Terminated."
 end #destroy_ec2_instance
 
+# SCRIPT
+
 create_ec2_instance
 
 # Establish connections

data/installer/windows/rhosync.nsi

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

data/lib/rhoconnect/console/app/public/home.css

@@ -74,19 +74,12 @@ body{
 	position:absolute;
 	top:9px;
 }
-.header .logos a.logo_rhohub{
-	background:url("images/logo_rhoconnect.png") no-repeat scroll -56px 0 transparent;
-	float:left;
-	height:38px;
-	text-indent:-3000px;
-	width:175px;
-}
-.header .logos a.logo_rhomobile{
+.header .logos a.logo_rhoconnect{
 	background:url("images/logo_rhoconnect.png") no-repeat scroll 0 0 transparent;
+	float:left;
 	height:38px;
 	text-indent:-3000px;
-	float: left;
-	width:56px;
+	width:400px;
 }
 .header .logo a{
 	display:block;

data/lib/rhoconnect/console/app/routes/docs.rb

@@ -2,7 +2,7 @@ class RhoconnectConsole::Server
   def docs_render_page(contenturl)
     @currentpage = "Console"
     @initialcontent = contenturl
-     @pagetitle = "Rhoconnect Console" #H1 title
+     @pagetitle = "RhoConnect Console" #H1 title
      @locals = {
        :div => "main_box",
        :links => [ 

data/lib/rhoconnect/console/app/routes/home.rb

@@ -20,7 +20,7 @@ class RhoconnectConsole::Server
           ]
         }
       else
-        @pagetitle = "Rhoconnect Console" #H1 title
+        @pagetitle = "RhoConnect Console" #H1 title
         @initialcontent = url_path('/homepage')
 
         @locals = {

data/lib/rhoconnect/console/app/routes/user.rb

@@ -2,7 +2,7 @@ class RhoconnectConsole::Server
   def render_page(contenturl)
     @currentpage = "Console"
     @initialcontent = contenturl
-     @pagetitle = "Rhoconnect Console" #H1 title
+     @pagetitle = "RhoConnect Console" #H1 title
      @locals = {
        :div => "main_box",
        :links => [ 

data/lib/rhoconnect/console/app/views/index.erb

@@ -1,5 +1,5 @@
 <%if not login_required %>
-	<h1>Rhoconnect Console</h1>
+	<h1>RhoConnect Console</h1>
 	<%if is_errors? or @sources.nil? %>
 		<%= show_errors%>
 	<%end%>

data/lib/rhoconnect/console/app/views/layout.erb

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Rhoconnect Console</title>
+	<title>RhoConnect Console</title>
 	<!--<link rel="stylesheet" href="<%=url_path('main.css')%>" type="text/css" media="screen" /> -->
 	<link rel="stylesheet" href="<%=url_path('reset.css')%>" type="text/css" media="screen" /> 
 	<link rel="stylesheet" href="<%=url_path('home.css')%>" type="text/css" media="screen" /> 
@@ -105,8 +105,7 @@
 			<div class="header"> 
 				<div class="logos"> 
 				  <% unless RhoconnectConsole::Server::HEROKU_NAV %>
-					<a href="" class="logo_rhomobile">RhoMobile</a> 
-					<a href="" class="logo_rhohub">RhoHub</a> 
+					<a href="" class="logo_rhoconnect">RhoHub</a> 
 				  <% end %>
 				</div> 
 				<div id="menu">	
@@ -144,19 +143,8 @@
 								<%="<li>Licensed to #{license['licensee']}</li><li>|</li><li> #{license['available']}/#{license['seats']} devices available</li>"%>
 							<%end%>
 							<li>|</li>
-							<li>Rhoconnect v<%=Rhoconnect::VERSION%></li>
-<!--						<li><a href="http://app.rhohub.com">Home</a></li>
-							<li>|</li>
-							<li><a href="http://app.rhohub.com/how_to_use">How to Use</a></li>
-							<li>|</li>
-							<li><a href="http://app.rhohub.com/pricing">Pricing</a></li>
-							<li>|</li>
-							<li><a class="largea3" target="_blank" href="http://wiki.rhomobile.com/index.php/RhoHub">Docs</a></li>
-							<li>|</li>
-							<li><a href="http://app.rhohub.com/terms">Terms of Service</a></li>
-							<li>|</li>
-							<li><a href="http://www.twitter.com/rhohub">Status</a></li>
--->						</ul>
+							<li>RhoConnect v<%=Rhoconnect::VERSION%></li>
+						</ul>
 					</div>
 					<br class="clear">
 				</div>

data/lib/rhoconnect/db_adapter.rb

@@ -1,10 +1,3 @@
-unless defined?(JRUBY_VERSION)
-  require 'sqlite3'
-else
-  require 'dbi'
-  require 'dbd/Jdbc'
-  require 'jdbc/sqlite3'
-end
 require 'singleton'
 
 class DBAdapter 
@@ -15,6 +8,10 @@ class DBAdapter
   # and redefined 'transaction' method (to manage DBI auto-commit behavior)  
   def get_connection(dbfile)
     if defined?(JRUBY_VERSION) # JRuby
+      require 'dbi'
+      require 'dbd/Jdbc'
+      require 'jdbc/sqlite3'
+      
       db = DBI.connect("DBI:Jdbc:SQLite:#{dbfile}", nil, nil, 'driver' => 'org.sqlite.JDBC')
       class << db
         # jdbc/sqlite3 has no Database#execute_batch method
@@ -38,6 +35,7 @@ class DBAdapter
         end          
       end        
     else # Ruby 1.8/1.9
+      require 'sqlite3'
       db = SQLite3::Database.new(dbfile)
     end
 

data/lib/rhoconnect/tasks.rb

@@ -40,11 +40,16 @@ module Rhoconnect
     end
     
     def rhoconnect_socket
-      "/tmp/rhoconnect.dtach"
+      '/tmp/rhoconnect.dtach'
     end
     
     def rhoconnect_pid
-      "/tmp/rhoconnect.pid"
+      if windows?
+    	  Dir.mkdir 'C:/TMP' unless File.directory? 'C:/TMP'
+    	  'C:/TMP/rhoconnect.pid'
+      else
+        '/tmp/rhoconnect.pid'
+      end
     end
 
     def windows?
@@ -254,7 +259,7 @@ namespace :rhoconnect do
     cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
     if windows?
       puts 'Starting rhoconnect...'
-      system("#{cmd} config.ru")
+      system("#{cmd} config.ru -P #{rhoconnect_pid}")
     elsif jruby?
       puts 'Starting rhoconnect in jruby environment...'
       system("#{cmd}")
@@ -265,6 +270,24 @@ namespace :rhoconnect do
     end
   end
   
+  desc "Start rhoconnect server in bg mode (Rhostudio)"
+  task :startbg do
+    cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
+    Thread.new {  
+      if windows?
+        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}")
+      end
+    }
+  
+    exit
+  end
+  
   desc "run rhoconnect console"
   task :console, :environment do |t, args|
     if RedisRunner.running?        
@@ -278,7 +301,11 @@ namespace :rhoconnect do
   
   desc "Stop rhoconnect server"
   task :stop => :dtach_installed do
-    sh "cat #{rhoconnect_pid} | xargs kill -3" unless windows?
+    if windows?
+  	  File.delete "#{rhoconnect_pid}" if system("FOR /F %A in (#{rhoconnect_pid}) do taskkill /F /PID %A")
+    else
+      sh "cat #{rhoconnect_pid} | xargs kill -3"
+    end
   end
   
   desc "Attach to rhoconnect console"

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.0.beta3'
+  VERSION = '3.0.0.rc1'
 end

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.2.13"
+	$redis_ver = "redis-2.2.14"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -164,7 +164,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.2.13"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.14"
     end
   end