rhoconnect 3.1.1 → 3.1.2

data/doc/plugin-intro.txt

@@ -1,8 +1,8 @@
 RhoConnect Plugins Introduction
 ===
 
-Rhoconnect Plugins allow you to connect your backend apps seamlessly with rhoconnect. You can write the source (query, create, update and delete operations) into a backend application, and write a RhoConnect plugin in the language that matchs your backend application, such as Java or .NET.
+Rhoconnect Plugins allow you to connect your backend apps seamlessly with rhoconnect. You can write the source (query, create, update and delete operations) into a backend application, and use a RhoConnect plugin in the language that matchs your backend application, such as Java or .NET.
 
 <img src='https://s3.amazonaws.com/rhodocs/rhoconnect-service/intro-plugin.png' alt='image' height='467' width='800' />
 
-**NOTE:** Another way to connect particular backend applications (such as for Salesforce or Oracle) is to generate a [RhoConnect source adapter](/rhoconnect/source-adapters) which contains the query, create, update and delete operations.
+**NOTE: Another way to connect particular backend applications (such as for Salesforce or Oracle) is to generate a [RhoConnect source adapter](/rhoconnect/source-adapters) which contains the query, create, update and delete operations.**

data/doc/supported-platforms.txt

@@ -15,22 +15,22 @@ Supported Platforms
   </tr>
   <tr>
     <td class='cap'>Linux</td>
-    <td> CentOS 5 & 6,<br/>Ubuntu 11,<br/>Amazon Linux</td>
-    <td> ruby-1.8.7-p352 <br/> ruby-1.8.7-p357 </td>
-    <td> ree-1.8.7-2011.03 <br/> ree-1.8.7-2012.01 </td>
+    <td> CentOS / RHEL 5 & 6,<br/>Ubuntu 11,<br/>Amazon Linux</td>
+    <td> ruby-1.8.7-p358 </td>
+    <td> ree-1.8.7-2012.02 </td>
     <td> ruby-1.9.2-p290 </td>
-    <td> ruby-1.9.3-p0 </td>
-    <td> jruby-1.6.4,<br/>jruby-1.6.5.1 </td>
+    <td> ruby-1.9.3-p125 </td>
+    <td> jruby-1.6.7 </td>
     <td>Development &<br/>Production</td>
   </tr>
   <tr>
     <td class='cap'>Mac OS </td>
     <td> Mac OS X 10.6/10.7 </td>
-    <td> ruby-1.8.7-p352 <br/> ruby-1.8.7-p357 </td>
-    <td> ree-1.8.7-2011.03 <br/> ree-1.8.7-2012.01 </td>
+    <td> ruby-1.8.7-p358 </td>
+    <td> ree-1.8.7-2012.02 </td>
     <td> ruby-1.9.2-p290 </td>
-    <td> ruby-1.9.3-p0 </td>
-    <td> jruby-1.6.4,<br/>jruby-1.6.5.1 </td>
+    <td> ruby-1.9.3-p125 </td>
+    <td> jruby-1.6.7 </td>
     <td>Development &<br/>Production</td>
   </tr>
   <tr>
@@ -69,5 +69,6 @@ RhoConnect for Linux and Mac OS X is supported for both development and producti
 ## Known Issues
 
 * Windows platform: only pre-release (~> 1.0.0.beta) of <b>eventmachine</b> is working on Windows  
-* Examples for <b>RSpec</b> (~> 2.8.0) fail for Ruby 1.8.7, gemset locked to ver. >= 2.6.0
-* Release <b>JRuby-1.6.5</b> is broken, use either <b>JRuby-1.6.4</b> or <b>JRuby-1.6.5.1</b> instead
+* Examples for <b>RSpec</b> (~> 2.8.0) fail for Ruby 1.8.7, gemset locked to ver. >= 2.6.0. <b>Issue is fixed in v. 3.1.2.</b>
+* Rack is locked to version 1.3.6 due to issues with RhoConnect applications deployed on Heroku (502 server error if rhoconnect bundled with rake 1.4.1). <b>Fixed in v. 3.1.2.</b>
+  

data/generators/templates/application/config.ru

@@ -33,8 +33,7 @@ Rhoconnect::Server.set     :root,        ROOT_PATH
 Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
 
 # Load our rhoconnect application
-$:.unshift ROOT_PATH if RUBY_VERSION =~ /1.9/ # FIXME: see PT story #16682771
-require 'application'
+require "#{ROOT_PATH}/application"
 
 # Setup the url map
 run Rack::URLMap.new \

data/generators/templates/application/spec/spec_helper.rb

@@ -19,21 +19,6 @@ include Rhoconnect
 
 require 'rhoconnect/test_methods'
 
-# Monkey patch to fix the following issue:
-# /usr/local/rvm/gems/ruby-1.8.7-p352/gems/rspec-core-2.6.4/lib/rspec/core/shared_example_group.rb:59:
-# in `ensure_shared_example_group_name_not_taken': Shared example group 'SharedRhoconnectHelper' already exists (ArgumentError)
-if RUBY_VERSION =~ /1.8/ 
-  module RSpec
-    module Core
-      module SharedExampleGroup
-      private
-        def ensure_shared_example_group_name_not_taken(name)
-        end
-      end
-    end
-  end
-end
-
 shared_examples_for "SpecHelper" do
   include Rhoconnect::TestMethods
   

data/install.sh

@@ -201,7 +201,7 @@ setRubyVars ()
 {
   if [[ $rubyVersion == "" || $rubyVersion =~ ruby'ee'|'enterprise' ]]; then
     rubyVersion="rubyee"
-    rubyDir="ruby-enterprise-1.8.7-2012.01"
+    rubyDir="ruby-enterprise-1.8.7-2012.02"
     rubyTar="${rubyDir}.tar.gz"
     rubyURL="http://rubyenterpriseedition.googlecode.com/files/${rubyTar}"
   elif [$rubyVersion == "ruby187"]; then
@@ -351,7 +351,7 @@ else
 fi
 
 # Construct the string with which to call the ruby installation script.
-callruby="sudo ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}"
+callruby="${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}"
 # Call the ruby script
 $callruby
 rho_status=$?
@@ -372,7 +372,7 @@ if [[ $installedSoftware -eq ${#INSTALL_ARRAY[@]} ]]; then
     echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log    
   else
     opts=" -d $dist"  
-    sudo ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}
+    ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}
   fi
   #  timeFinal=`date +%H%M%S`
   #  getTime $timeFinal

data/installer/unix-like/create_texts.rb

@@ -151,8 +151,8 @@ redis_stop() {
     while [[ -x /proc/${pid} ]] ; do
       echo -n '.' ; sleep 1
     done
-  else # Darwin, etc...
-    while [[ ! -z "$(ps auxww | grep [r]edis | grep "$config" | awk '{print $2}')" ]] ; do
+  else # Darwin, etc ...
+    while [[ ! -z "$(ps auxww | grep [r]edis | grep "$config" | grep -v grep | awk '{print $2}')" ]] ; do
       echo -n '.' ; sleep 1
     done
   fi

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,11 +8,11 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  REDIS                   = "redis-2.4.6"
+  REDIS                   = "redis-2.4.10"
   SQLITE3                 = "sqlite-autoconf-3071000"
 
-  RUBY                    = "ruby-enterprise-1.8.7-2012.01"
-  Nginx                   = "nginx-1.0.11"
+  RUBY                    = "ruby-enterprise-1.8.7-2012.02"
+  Nginx                   = "nginx-1.0.14"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, Nginx ]
 

data/installer/unix-like/rho_connect_install_utilities.rb

@@ -1,4 +1,3 @@
-require 'readline'
 require 'net/http'
 require 'net/https'
 require 'rho_connect_install_constants'

data/installer/utils/constants.rb

@@ -9,18 +9,18 @@ module Constants
   SLEEP           = 60
   HOME_DIR        = `echo ~/`.strip.chomp("/")
   REMOTE_HOME     = '/home/ubuntu'
-  PEM_FILE        = 'alexdevkey.pem'
+  PEM_FILE        = 'jenkinskey.pem'
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
-  UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
-                      :flavor_id => 'c1.medium',
-                      :key_name  => 'alexdevkey',
+  UBUNTU_STACK    = { :image_id  => 'ami-6da8f128',
+                      :flavor_id => 'c1.xlarge',
+                      :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
                 
   CENTOS_STACK    = { :image_id  => 'ami-13346656',
                       :flavor_id => 'c1.medium',
-                      :key_name  => 'alexdevkey',
+                      :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'root'}
 

data/installer/utils/create_sha1.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'digest/sha1'
+require 'find'
+
+if ARGV.length != 2 ||
+   !File.directory?(ARGV[0])
+  puts "Usage: #{$0} directory_to_use location_for_SHA1_file"
+  exit 1
+end #if
+
+dir      = ARGV[0]
+dest_dir = ARGV[1]
+
+dir_digest = Digest::SHA1.new
+
+Find.find(dir) do |path|
+  if !File.directory?(path)
+    file_sha1 = Digest::SHA1.file(path).to_s
+    dir_digest << file_sha1
+  end #if
+end #do
+
+Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
+File.open("#{dest_dir}/checksum", 'w') { |f| f.write(dir_digest) }

data/installer/utils/delete_from_s3.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'aws/s3'
+
+include AWS::S3
+
+USER_DATA = `wget -q -O - http://169.254.169.254/latest/user-data`.split("\n")
+
+bucket_name = ARGV[0].strip
+channel     = ARGV[1].strip
+files = []
+
+def get_access_keys
+  access_key        = USER_DATA[0].to_s.strip
+  secret_access_key = USER_DATA[1].to_s.strip
+  keys = { :access_key_id => access_key,
+           :secret_access_key => secret_access_key}
+end #get_access_keys
+
+AWS::S3::Base.establish_connection!(get_access_keys)
+
+objects = Bucket.objects(bucket_name)
+
+objects.each do |obj|
+  files << "#{obj.key}" if obj.key =~ /^#{channel}/
+end
+
+files.each do |file|
+  puts "Deleting #{file}"
+  S3Object.delete file, bucket_name
+end #do

data/installer/utils/download_from_s3.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'aws/s3'
+
+include AWS::S3
+
+USER_DATA = `wget -q -O - http://169.254.169.254/latest/user-data`.split("\n")
+
+bucket_name = 'rhoconnect'
+channel     = ARGV[0]
+files       = []
+
+exit if ARGV.length != 1
+
+def cmd(cmd)
+  puts cmd
+  system(cmd)
+end #cmd
+
+def get_access_keys
+  access_key        = USER_DATA[0].to_s.strip
+  secret_access_key = USER_DATA[1].to_s.strip
+  keys = { :access_key_id => access_key,
+           :secret_access_key => secret_access_key}
+end #get_access_keys
+
+AWS::S3::Base.establish_connection!(get_access_keys)
+
+objects = Bucket.objects(bucket_name)
+
+objects.each do |obj|
+  files << "#{obj.key}" if obj.key =~ /^#{channel}/
+end
+
+# Remove the files before downloading new in case they already exist
+cmd "rm -rf #{channel}" if File.directory? channel
+cmd "rm -f #{channel}/SHA1/checksum" if File.exists?("#{channel}/SHA1/checksum")
+
+puts "Downloading S3 files"
+files.each do |file|
+  cmd = "wget -qx -P #{channel} \"http://#{bucket_name}.s3.amazonaws.com/#{file}\""
+  puts cmd
+  system(cmd)
+end #do
+
+# The download increases the depth of the files by two folders.
+# Remove exess directory levels.
+cmd "mv -f #{channel}/#{bucket_name}.s3.amazonaws.com/#{channel}/* #{channel}"
+cmd "rm -rf #{channel}/#{bucket_name}.s3.amazonaws.com"
+
+# Pull the SHA1 checksum out
+cmd "mv -f #{channel}/SHA1/checksum ."
+cmd "mv -f checksum old_checksum"
+cmd "rm -rf #{channel}/SHA1"

data/installer/utils/nix_install_test.rb

@@ -3,12 +3,12 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'installer', 'utils'))
 
-require 'rhoconnect'
 require 'rubygems'
-require 'fog'
 require 'net/http'
 require 'constants'
-require 'readline'
+require 'fog'
+
+BUCKET = 'rhoconnect'
 
 # METHODS
 
@@ -29,11 +29,19 @@ def ssh_cmd(cmd)
   exit 1 if exit_code.to_i != 0
 end #ssh_cmd
 
-# nightly_build?
-# Return whether or not
-def nightly_build?
-  ARGV.include? 'nightly'
-end #nightly_build?
+# build_type
+def build_type
+  case ARGV[0]
+  when 'test'
+    'test-packages'
+  when 'beta'
+    'beta-packages'
+  when 'release'
+    'release-packages'
+  else
+    'nightly-packages'
+  end #case
+end #build_type
 
 # compile_stack_info
 # Fills in all necessary information which is stack specific
@@ -46,11 +54,8 @@ def compile_stack_info
   # This part of the package name will always be the same
   local_file = "#{`pwd`.strip}/pkg/"
   
-  # Determine whether or not the build is a nightly build.
-  bucket = nightly_build? ? 'rhoconnect' : 'rhoconnect-test'
-
-  # Determine which folder in the bucket to grab files from
-  packages = Rhoconnect::VERSION.include?('beta') ? 'beta-packages' : 'packages'
+  # Determine what channel to pull the packages from
+  channel = build_type
 
   # Append the rest of the file name according to distribution
   if @user == 'ubuntu'
@@ -65,7 +70,7 @@ def compile_stack_info
               :repo_src_file => '/etc/apt/sources.list',
               :repo_str      => '\n' + 
                                 '# This is the repository for rhoconnect packages\n' + 
-                                "deb http://#{bucket}.s3.amazonaws.com/#{packages}/deb rhoconnect main" }
+                                "deb http://#{BUCKET}.s3.amazonaws.com/#{channel}/deb rhoconnect main" }
   elsif @user == 'root'
     @dist = { :flavor        => "centos",
               :package       => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
@@ -77,7 +82,7 @@ def compile_stack_info
               :repo_src_file => '/etc/yum.repos.d/rhoconnect.repo',
               :repo_str      => '[rhoconnect]\n' + 
                                 'name=Rhoconnect\n' + 
-                                "baseurl=http://#{bucket}.s3.amazonaws.com/#{packages}/rpm" +
+                                "baseurl=http://#{BUCKET}.s3.amazonaws.com/#{channel}/rpm" +
                                 '\nenabled=1\n' +
                                 'gpgcheck=0\n' }
 
@@ -210,12 +215,19 @@ def start_servers
   end #do
 end # start_servers
 
-# chack_rc_service
+# check_rc_service
 # Makes an HTTP request to check that the rhoconnect service is working
 def check_rc_service
-  request = Net::HTTP.get_response(@host, '/console')
   puts "Host: #{@host}"
+
+  puts "Checking RC service."
+  request = nil  #Defined outside block as to not limit the scope of request to the do block.
+  2.times do
+    request = Net::HTTP.get_response(@host, '/')
+  end #do
+
   puts "Code: #{request.code} Message: #{request.message}"
+
   if request.code == '200'
     puts "Rhoconnect service up!"
   else
@@ -247,8 +259,6 @@ end #compute_time
 # Test Package installations
 Constants::STACKS.each do |stack|
   start_time = Time.now
-  
-  
 
   begin
     @stack = stack 

data/installer/utils/package_upload/repos.rake

@@ -1,27 +1,39 @@
+require 'rubygems'
 require 'rake'
+require 'find'
+require 'fileutils'
+
 
 desc 'Creates and uploads apt and rpm repos.'
-task "build:repos", :build_type do |t, args|
+task "build:repos", :build_type, :build_number do |t, args|
   # Run dependent rake jobs first
   Rake::Task['build:deb'].invoke
   Rake::Task['build:rpm'].invoke
-  args.with_defaults :build_type => 'nightly-build'
+  args.with_defaults :build_type   => 'nightly'
+  args.with_defaults :build_number => ''
   puts args
-  # Exit if args are not valid args 
-  exit 1 if !args[:build_type].eql? "nightly-build" and !args[:build_type].eql? "release-build"
-
-  require 'find'
-  require 'fileutils'
+  
+  build_type   = args[:build_type]
+  build_number = args[:build_number]
 
   # CONSTANTS
 
-  PKG_DIR = '/packages'
-  BETA_PKG_DIR = '/beta-packages'
-  BUCKET = args[:build_type].eql?('release-build') ? 'rhoconnect-test' : 'rhoconnect'
+  PKG_DIR     = case build_type
+                when 'release'
+                  '/packages'
+                when 'test'
+                  '/test-packages'
+                when 'beta'
+                  '/beta-packages'
+                else 'nightly'
+                  '/nightly-packages'
+                end #case
+                   
+  BUCKET      = 'rhoconnect'
 
   def cmd(cmd)
-    puts cmd unless @raked
-    system(cmd)
+    puts cmd
+    puts `#{cmd}`
   end #cmd
 
   # METHODS
@@ -29,15 +41,7 @@ task "build:repos", :build_type do |t, args|
   def prepare_destination
     # Prompt to remove the /deb directory if it exists
     if File.directory?("#{PKG_DIR}/deb")
-      if !@raked
-        puts "Remove #{PKG_DIR}/deb?"
-        remove = STDIN.gets.strip.downcase.chars.first
-      else
-        remove = 'y'
-      end #if
-      if remove == 'y'
-        cmd "sudo rm -rf #{PKG_DIR}/deb"
-      end #if
+      cmd "sudo rm -rf #{PKG_DIR}/deb"
     end #if
 
     # Create deb directory if it does not already exist
@@ -70,7 +74,8 @@ task "build:repos", :build_type do |t, args|
     Find.find('./pkg') do |file|
       if !FileTest.directory?(file)
         dest_dir = File.extname(file)
-        dest_dir[0] = ''                                 #get rid of '.' before extension name
+        # get rid of '.' before extension name
+        dest_dir[0] = ''
         if dest_dir == 'deb' || dest_dir == 'rpm'
           if dest_dir == 'deb'
             @deb_pkg = File.basename(file)
@@ -82,31 +87,38 @@ task "build:repos", :build_type do |t, args|
     end #do
   end #copy_files
 
-  @raked = true
-
   prepare_destination
 	
   copy_files
+  
+  if build_type != "release" &&
+     build_type != "test"
+    # Change name of packages to include build number
+    ['deb', 'rpm'].each do |arch|
+      Find.find("#{PKG_DIR}") do |file|
+        if !File.directory?(file) &&
+           file =~ /#{arch}$/
+          file_to_rename = File.open(file, 'r')
+          old_name = File.expand_path(file)
+          puts "Old Name:\t#{old_name}"
+          new_name = old_name.gsub(/(#{arch})$/, "build-#{build_number.to_s}.\\1" )
+          File.rename(old_name, new_name)
+        end #if
+      end #do
+    end #do
+  end #if
 
   # REPOIFY!
   cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
   cmd "sudo createrepo #{PKG_DIR}/rpm"
+  
+  # Create SHA1 checksum of repo dirs
+  checksum_dest = "#{PKG_DIR}/SHA1/"
+  cmd "sudo ./installer/utils/create_sha1.rb #{PKG_DIR} #{PKG_DIR}/SHA1"
 
-  # Call S3 upload script
+  # Call s3_upload.rb
   ['deb', 'rpm'].each do |dir|
-    beta = false
-    pkg_dir = PKG_DIR
-    Find.find("#{PKG_DIR}/#{dir}") do |file|
-      if File.extname(file) =~ /deb|rpm/
-        beta = file.include?('beta') ? true : false
-        pkg_dir = BETA_PKG_DIR if beta
-        cmd "sudo mkdir #{BETA_PKG_DIR}" unless File.directory? BETA_PKG_DIR
-        cmd "sudo chmod 777 #{BETA_PKG_DIR}"
-        # If one beta pkg is found, break. 
-        break if beta
-      end #if
-    end #do
-    cmd "sudo cp -rf #{PKG_DIR}/#{dir} #{BETA_PKG_DIR}/#{dir}" if pkg_dir == BETA_PKG_DIR
-    cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{pkg_dir}/#{dir} #{BUCKET} #{@raked}" 
+    cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/#{dir} #{BUCKET}" 
   end #do
-end #build:repos
+  cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/SHA1 #{BUCKET}"
+end #build:repos