rhoconnect 3.3.5 → 3.3.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.6 (2012-10-05)
+* Fix issue with Rhoconnect.api_token for admin user
+* Bump nginx to v1.3.6 and redis to v2.4.17, add http_stub_status_module and include "least_conn" directive to upstream section
+* Adding support for latest (3.0.x) redis client and resque library
+
 ## 3.3.5 (2012-09-20)
 * merge changes from master to fix broken bench script helper
 * ZD-2866 - Issue with Apple Push when User has windows device as one of targeted devices 2 target devices

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.5)
+    rhoconnect (3.3.6)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
-      redis (>= 2.2.0)
-      resque (~> 1.20.0)
+      redis (>= 3.0.1)
+      resque (>= 1.22.0)
       rest-client (~> 1.6.1)
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
@@ -42,7 +42,7 @@ GEM
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
-    excon (0.16.3)
+    excon (0.16.4)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
@@ -59,7 +59,7 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.3)
-    fpm (0.4.17)
+    fpm (0.4.20)
       arr-pm (~> 0.0.7)
       backports (= 2.6.2)
       cabin (~> 0.4.3)
@@ -94,17 +94,17 @@ GEM
     rack-fiber_pool (0.9.2)
     rack-protection (1.2.0)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rainbow (1.1.4)
     rake (0.9.2.2)
     rcov (1.0.0)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.20.0)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    resque (1.23.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
+      redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     rest-client (1.6.7)
@@ -116,7 +116,7 @@ GEM
     rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.0)
+    rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.25.0)
@@ -142,7 +142,7 @@ GEM
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.4.1)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -151,7 +151,7 @@ GEM
     uuidtools (2.1.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.10)
+    webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)

data/doc/deploying.txt

@@ -122,6 +122,7 @@ Default setup of Nginx server is to deal with back-end servers (called "upstream
     # /opt/nginx/conf/conf.d/rhoconnect.conf file
    
     upstream thin_cluster {
+	  least_conn;
       server unix:/tmp/thin.0.sock;
       server unix:/tmp/thin.1.sock;
       #server unix:/tmp/thin.2.sock;
@@ -142,8 +143,8 @@ Thin application server runs as a cluster with /etc/thin/rhoapp.yml configuratio
     chdir: /opt/nginx/html/rhoapp
     environment: production
     timeout: 30
-    log: /opt/nginx/logs/thin.log
-    pid: /var/run/thin.pid
+    log: /var/log/thin/thin.log
+    pid: /var/run/thin/thin.pid
     max_conns: 1024
     max_persistent_conns: 512
     require: []
@@ -155,7 +156,7 @@ Thin application server runs as a cluster with /etc/thin/rhoapp.yml configuratio
 Configuration file is generated by this command:
 
     :::term
-    $ thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log --pid /var/run/thin.pid -e production
+    $ thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --servers 2 --log /var/log/thin/thin.log --pid /var/run/thin/thin.pid -e production
 
 ### Development and deployment of RhoConnect applications 
 
@@ -205,8 +206,8 @@ e) Edit Thin `/etc/thin/rhoapp.yml` configuration file directly
     :::term
     $ env PATH=/opt/rhoconnect/bin:$PATH thin config -C /etc/thin/your_rhoconnect_app.yml \
     -c /opt/nginx/html/your_rhoconnect_app/ \
-    --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log \
-    --pid /var/run/thin.pid -e production
+    --socket /tmp/thin.sock --servers 2 --log /var/log/thin/thin.log \
+    --pid /var/run/thin/thin.pid -e production
 
 f) As root user restart Nginx, and Thin servers
    

data/install.sh

@@ -1,25 +1,8 @@
 #!/bin/bash
 
-# DO FIRST
-
-# make sure only run as root
-if [ "$(id -u)" != "0" ]; then
-   echo "This script must be run as root"
-   exit 1
-fi
-
-# Check if web server is running on port 80
-if [[ `echo "close" | telnet localhost 80 2>&1 | grep "Connected"` ]]; then
-  echo "Web server on port 80 is running."
-  echo "Please stop it and then re-run the installation script."
-  exit 1
-fi
-
 timeInitial=`date +%H%M%S`
 installTime=$timeInitial
 
-# CONSTANTS
-
 DEPS=(gcc tar make wget)
 
 # FUNCTIONS
@@ -58,9 +41,9 @@ checkDeps ()
     echo "Dependencies Missing: " | tee -a $log
     echo "${missingDeps}" | tee -a $log
     echo "These must be installed before setup can continue..." | tee -a $log
-    exit
+    exit 1
   fi
-} #end checkDeps
+}
 
 # determinePkgMgr
 # Determines if the system is currently using rpm or 
@@ -76,9 +59,9 @@ determinePkgMgr ()
   else
     echo "No supported package manager." | tee -a $log
     echo "Please install apt-get or yum to continue..." | tee -a $log
-    exit
+    exit 1
   fi
-} #end determinePkgMgr
+}
 
 # parseOpts
 # Parses options passed to the install script
@@ -134,7 +117,7 @@ parseOpts ()
       ;;
     esac
   done
-} #end parseOpts
+}
 
 cleanPrefix ()
 {
@@ -150,7 +133,7 @@ cleanPrefix ()
   if ! [ -d $prefix ]; then
     mkdir -p $prefix
   fi
-} #end cleanPrefix
+}
 
 setPrefixDependantPaths ()
 {
@@ -176,7 +159,7 @@ setPrefixDependantPaths ()
   if ! [ -e "${prefix}/info.dat" ]; then
     mv info.dat "${prefix}/info.dat"
   fi
-} #end setPrefixDependantPaths
+}
 
 setDefaults ()
 {
@@ -189,13 +172,13 @@ setDefaults ()
   if [$webServer == ""]; then
     webServer="nginx"
   fi
-} #end setDefaults
+}
 
 logAndPrint ()
 {
   $1 > $log 2>&1  
   exitStatus=$?
-} #end logAndPrint
+}
 
 setRubyVars ()
 {
@@ -215,7 +198,7 @@ setRubyVars ()
     rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
   else
     echo "${rubyVersion} is not a valid ruby version" | tee -a $log
-    exit
+    exit 1
   fi
 }
 
@@ -255,7 +238,7 @@ installRuby ()
     ;;
   *)
     logAndPrint "echo \"${rubyVersion} is not a supported ruby version\""
-    exit
+    exit 1
     ;;
   esac
 
@@ -263,7 +246,7 @@ installRuby ()
     echo "Some dependencies not installed..." | tee -a $log
     echo "Please install them and then re-run the installation script." | tee -a $log
     echo "For troubleshooting see file $log ..." | tee -a $log
-    exit
+    exit 1
   fi
   
   echo -e "$rubyDir is successfully installed.\n" | tee -a $log
@@ -271,6 +254,23 @@ installRuby ()
 
 # SCRIPT
 
+# define log file name
+DATEFILE=`date +%Y%m%d%H%M%S`
+log=rhoconnect_$(date +$DATEFILE).log
+
+# make sure only run as root
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root" | tee -a $log
+   exit 1
+fi
+
+# Check if web server is running on port 80
+if [[ `echo "close" | telnet localhost 80 2>&1 | grep "Connected"` ]]; then
+  echo "Web server on port 80 is running." | tee -a $log
+  echo "Please stop it and then re-run the installation script." | tee -a $log
+  exit 1
+fi
+
 # Get starting directory
 startDir=`pwd`
 if [[ $startDir = "/opt/rhoconnect/installer" ]]; then #FIXME:
@@ -279,10 +279,6 @@ else
   INSTALL_DIR="./installer"
 fi
 
-# define log file name
-DATEFILE=`date +%Y%m%d%H%M%S`
-log=rhoconnect_$(date +$DATEFILE).log
-
 # Make sure basic system dependencies are installed
 checkDeps
 
@@ -347,6 +343,7 @@ if [[ $installedSoftware -eq ${#INSTALL_ARRAY[@]} ]]; then
 
   if (( $rho_status )) ; then 
     echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log
+    exit 1
   else
     opts=" -d $dist -l $log"
     ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}

data/installer/unix-like/create_texts.rb

@@ -325,7 +325,7 @@ def create_nginx_logrotate
   sharedscripts
   postrotate
     test ! -f /opt/nginx/logs/nginx.pid || kill -USR1 `cat /opt/nginx/logs/nginx.pid`
- endscript
+  endscript
 }
 _NGINX_LOGRORATE_CONF_
 
@@ -348,8 +348,15 @@ http {
     include       mime.types;
     default_type  application/octet-stream;
 
+    log_format time_combined '$remote_addr - $remote_user [$time_local] "$request" '
+                      	'$status $body_bytes_sent "$http_referer" '
+                      	'"$http_user_agent" "$http_x_forwarded_for" "$request_time"';
+    access_log logs/access.log time_combined;
+
     sendfile        on;
-    keepalive_timeout  65;
+    keepalive_timeout  120;
+    client_max_body_size 4m;
+    client_body_buffer_size 128k;
     #gzip  on;
 
     include /opt/nginx/conf/conf.d/*.conf;
@@ -373,15 +380,18 @@ _NGINX_CONF_
   Dir.mkdir "/opt/nginx/conf/conf.d" unless File.exist? "/opt/nginx/conf/conf.d"
   rho_vhost_conf = <<_VHOST_CONF_
 upstream thin_cluster {
-  ip_hash;
+  least_conn;
   server unix:/tmp/thin.0.sock;
   server unix:/tmp/thin.1.sock;
-#  server unix:/tmp/thin.2.sock;
-#  server unix:/tmp/thin.3.sock;
+  # Add additional copies if need more Thin servers
+  #server unix:/tmp/thin.2.sock;
+  #server unix:/tmp/thin.3.sock;
 }
 
 server {
-  listen      80;
+  listen  80; # listen for ipv4
+  # listen  [::]:80 default ipv6only=on; # listen for ipv6
+
   root  /opt/nginx/html/#{app_name}/public; # <-- be sure to point to 'public' folder of your application!
   #  access_log off;                           # <-- disable access logging
   #  error_log /dev/null crit;                 # <-- disable error logging, but critical errors only
@@ -399,6 +409,15 @@ server {
   location = /50x.html {
     root html;
   }
+
+  # Uncomment the following location to get some status from nginx
+  # location /nginx_status {
+  #   stub_status on;
+  #   access_log   off;
+  #   allow 127.0.0.1;
+  #   allow SOME.IP.ADD.RESS;
+  #   deny all;
+  # }
 }     
 _VHOST_CONF_
 
@@ -524,8 +543,9 @@ To deploy and develop your rhoconnect app on nginx and thin servers:
       or as root user generate a new one
          $ env PATH=/opt/rhoconnect/bin:$PATH thin config -C /etc/thin/your_rhoconnect_app.yml \
          -c /opt/nginx/html/your_rhoconnect_app/ \
-         --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log \
-         --pid /var/run/thin.pid -e production
+         --socket /tmp/thin.sock --servers 2 \
+         --user nginx --group nginx \
+         --log /var/log/thin/thin.log --pid /var/run/thin/thin.pid -e production`
 
    f) As root user restart Nginx, and Thin servers
           /etc/init.d/nginx restart
@@ -550,27 +570,8 @@ def generate_rhoapp(rho_path)
   `chown -R nginx:nginx rhoapp/`
 end
 
-def copy_benchapp(rho_path)
-  puts "Copy bench rhoconnect application to /opt/nginx/html directory ..."
-  Dir.chdir "#{rho_path}/installer"
-  `tar xzf bench.tar.gz -C #{rho_path}`
-  `rm -rf bench.tar.gz`
-
-  `#{rho_path}/bin/gem install ffaker --no-ri --no-rdoc`
-  `#{rho_path}/bin/gem install thor --no-ri --no-rdoc`
-
-  Dir.chdir "#{rho_path}/bench"
-  `cp -r benchapp /opt/nginx/html`
-  Dir.chdir "/opt/nginx/html/benchapp"
-  `rm -rf Gemfile.lock`
-  `#{rho_path}/bin/bundle install --without=test development`
-  Dir.chdir "../"
-  `chown -R nginx:nginx benchapp/`
-end
-
 def config_and_install_thin_scripts(rho_path)
   puts "Configuring and installing thin scripts ..."
-  #`env PATH=#{rho_path}/bin:$PATH thin install`
   thin_script = <<'_THIN_INIT_'
 #!/bin/sh
 ### BEGIN INIT INFO
@@ -613,14 +614,45 @@ esac
 
 :
 _THIN_INIT_
+
   thin_init_script="/etc/init.d/thin"
   File.open(thin_init_script, 'w') { |f| f << thin_script }
   `chmod +x #{thin_init_script}`
   Dir.mkdir "/etc/thin" unless File.exist? "/etc/thin"
-  `env PATH=#{rho_path}/bin:$PATH thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log --pid /var/run/thin.pid -e production`
+  Dir.mkdir "/var/run/thin" unless File.exist? "/var/run/thin"
+  `chown nginx:nginx /var/run/thin`
+
+  `env PATH=#{rho_path}/bin:$PATH \
+  thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ \
+  --socket /tmp/thin.sock --servers 2 \
+  --user nginx --group nginx \
+  --log /var/log/thin/thin.log --pid /var/run/thin/thin.pid -e production`
+
   raise "Thin failed to configure rhoconnect application" if $? != 0
 end
 
+def config_thin_logrotate
+  Dir.mkdir "/var/log/thin" unless File.exist? "/var/log/thin"
+  `chown nginx:nginx /var/log/thin`
+
+  thin_logrorate_conf = <<'_THIN_LOGRORATE_CONF_'
+/var/log/thin/*.log {
+  daily
+  missingok
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+#  create 640 root adm
+  sharedscripts
+  postrotate
+    /etc/init.d/thin restart >/dev/null
+  endscript
+}
+_THIN_LOGRORATE_CONF_
+  File.open('/etc/logrotate.d/thin', 'w') { |f| f << thin_logrorate_conf }
+end
+
 def create_texts
   if @redis
     create_redis_init 
@@ -635,6 +667,8 @@ def create_texts
     generate_rhoapp @prefix
 
     config_and_install_thin_scripts(@prefix)
+    config_thin_logrotate
+
     distro_info = nginx_readme
   end
 
@@ -685,4 +719,11 @@ _NGINX_TO_DO_
 
 end
 
-create_texts
+begin
+  create_texts
+rescue => ex
+  File.open("#{@log_file}", 'a') { |f| f << ex.message } if @log_file
+  puts
+  puts "#{ex.message}"
+  exit(1)
+end

data/installer/unix-like/rho_connect_install_constants.rb

@@ -9,9 +9,9 @@ module Constants
                            "dtach"]
 
   RUBY                    = "ruby-1.9.3-p194"
-  REDIS                   = "redis-2.4.13"
+  REDIS                   = "redis-2.4.17"
   SQLITE3                 = "sqlite-autoconf-3071000"
-  NGINX                   = "nginx-1.3.0"
+  NGINX                   = "nginx-1.3.6"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]

data/installer/unix-like/rho_connect_install_installers.rb

@@ -12,7 +12,7 @@ module Installers
     if @options[:web_server] && @options[:web_server] == "nginx"
       print_header "Installing Nginx web server ..."
       Dir.chdir("#{@options[:prefix]}/#{NGINX}")
-      cmd "./configure --prefix=/opt/nginx --with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx"
+      cmd "./configure --prefix=/opt/nginx --with-http_ssl_module --with-http_gzip_static_module --with-http_stub_status_module --user=nginx --group=nginx"
       cmd "make 2>&1; make install"
     else
       raise "Inernal error: only nginx is supported."

data/lib/rhoconnect/store.rb

@@ -362,7 +362,7 @@ module Rhoconnect
         flush_zdata(dockey) unless append
         current_score = 0
         current_score_data = Store.db.zrevrange(dockey,0,0,:with_scores => true)
-        current_score = current_score_data[-1].to_i if current_score_data
+        current_score = current_score_data[-1][1].to_i if current_score_data and current_score_data[-1]
         current_score += 1
         data.each do |key,hash_value|
           unique_record_key = setelement(current_score,assoc_key, key)

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.5'
+  VERSION = '3.3.6'
 end

data/lib/rhoconnect.rb

@@ -125,6 +125,8 @@ module Rhoconnect
       admin.password = ENV['PSWRD'] || ''
       admin.create_token
     end
+    admin = User.load('rhoadmin')
+    Rhoconnect.api_token = admin.token_id
   end
 
   # Add path to load_path unless it has been added already

data/rhoconnect.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.description = %q{RhoConnect App Integration Server and related command-line utilities}
 
   s.rubyforge_project = nil
-  
-  s.files        = %w( 
-    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec 
+
+  s.files        = %w(
+    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec
   )
   s.files       += Dir.glob("bench/**/*")
   s.files       += Dir.glob("commands/**/*")
@@ -37,14 +37,14 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
-  s.add_dependency('bundler', '~> 1.0')  
+  s.add_dependency('bundler', '~> 1.0')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2.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.20.0')
+  s.add_dependency('redis', '>= 3.0.1')
+  s.add_dependency('resque', '>= 1.22.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
   s.add_dependency('thor', '~> 0.15.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,23 +122,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -690,7 +690,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4047375219147671173
+      hash: -1009647506811252622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: