rhoconnect 4.0.0.beta.12 → 4.0.0.beta.24

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 4.0.0.beta.24 (2013-06-07)
+* Add /system/rps_login route to handle application credentials for push server
+* Update doc for 'rhoconnect-push' config.json advanced options
+
+## 4.0.0.beta.18-23 (skipped for RMS version parity)
+
+## 4.0.0.beta.17 (2013-05-28)
+* B-103375 - Added `rhoconnect routes` command
+* D-05133 - Node.js process detection logic fails on windows
+* Update production stack to ruby-1.9.3-p429
+* D-05169 - Fixed issue where default options can't be overridden in JS controllers
+* D-05223 - Support non-hash result value (needed for stashResult)
+* Fixed recursive infinite loop in the CUD Source Job
+* B-100517 - Added `find_duplicates_on_update` flag for update duplicate detection
+
+## 4.0.0.beta.16 (skipped for RMS version parity)
+
+## 4.0.0.beta.15 (skipped for RMS version parity)
+
+## 4.0.0.beta.14 (2013-05-14)
+* B-101474 - Remove Ruby 1.8.7 support
+* D-04477 - Rack::Session::Cookie security warning printing on every http request
+* B-106356 - Update nginx package to 1.4.1 (CVE-2013-2028)
+* B-105908 - Additional JS API methods: partitionName and exceptions
+* B-105504 - Boilerplate handling of store blob function should return error
+* TK-190698 - Support generic CUD queue (multi-source and interim states)
+
+## 4.0.0.beta.13 (skipped for RMS version parity)
+
 ## 4.0.0.beta.12 (2013-04-26)
 * B-104783 - Add Node package dependency for Ubuntu/CentOS packages
 * B-91486 - Redis custom partitions
@@ -68,6 +97,11 @@
 * Update rhoconnect prod stack to ruby-1.9.3-p374
 * Updated RhoConnect CLI: server is capable to start from any directory and accepts parameters (port, redis URL, and others)
 
+## 3.4.5 (2013-05-14)
+* TK-182435 - Run platform validation in parallel (both nightly tests and release jobs)
+* D-04477 - Rack::Session::Cookie security warning printing on every http request
+* B-106356 - Update nginx package to 1.4.1 (CVE-2013-2028)
+
 ## 3.4.4 (2013-02-27)
 * Updated prod. stack to ruby-1.9.3-p392, redis-2.6.10, and nginx-1.3.13.
 

data/Gemfile

@@ -6,15 +6,12 @@ gemspec
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
-platforms :ruby, :ruby_19, :mingw, :mingw_19 do
+platforms :ruby, :mingw  do
 	gem "eventmachine", "~> 1.0.0"
 	# using thin by default
 	gem 'thin'
-end
-
 # for async framework
 # for Async, Eventful execution
-platforms :ruby_19, :mingw_19 do
   gem 'rack-fiber_pool'
   gem 'async-rack'
 end
@@ -32,10 +29,10 @@ group :development do
   # gem 'debugger'
   gem 'aws-s3', '>= 0.6.2', :require => 'aws/s3'
   gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
-  gem 'fog', '>= 1.1.0'
+  gem "excon", "~> 0.22.1"
+  gem "fog", "~> 1.11.1"
   gem 'ffaker', '~> 1.14.0'
   gem 'webmock', '~> 1.9.0'
-  gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
 end
 
 group :test do
@@ -43,8 +40,8 @@ group :test do
   gem 'simplecov', '>= 0.7.1', :require => false
   gem 'simplecov-rcov', '~> 0.2.3'
   gem 'rack-test', '~> 0.6', :require => 'rack/test'
-  gem 'jasmine', :platforms => [:ruby_19,:jruby]
-  gem 'jasmine-headless-webkit', :platforms => [:ruby_19,:jruby]
+  gem 'jasmine', :platforms => [:ruby,:jruby]
+  gem 'jasmine-headless-webkit', :platforms => [:ruby,:jruby]
 end
 
 group :build do

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    rhoconnect (4.0.0.beta.12)
+    rhoconnect (4.0.0.beta.24)
       bundler (~> 1.0)
       connection_pool (~> 1.0.0)
       json (~> 1.7.7)
-      ohm (~> 0.1.3)
       rack (~> 1.5.2)
       rake (~> 10.0.0)
       redis (>= 3.0.1)
@@ -14,13 +13,12 @@ PATH
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
       templater (~> 1.0.0)
-      thor (~> 0.15.0)
+      thor (~> 0.18.0)
       uuidtools (>= 2.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    SystemTimer (1.2.3)
     addressable (2.3.4)
     arr-pm (0.0.8)
       cabin (> 0)
@@ -30,47 +28,55 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (2.6.2)
-    builder (3.2.0)
+    backports (3.3.1)
+    builder (3.2.2)
     cabin (0.6.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (0.3.1)
+    clamp (0.6.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)
     connection_pool (1.0.0)
-    crack (0.3.2)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.3)
-    excon (0.20.1)
+    excon (0.22.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.16)
     ffaker (1.14.0)
     ffi (1.8.1)
-    fog (1.10.1)
+    fog (1.11.1)
       builder
       excon (~> 0.20)
       formatador (~> 0.2.0)
+      json (~> 1.7)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    fpm (0.4.33)
+    fpm (0.4.37)
       arr-pm (~> 0.0.8)
-      backports (= 2.6.2)
+      backports (>= 2.6.2)
       cabin (>= 0.6.0)
-      clamp (= 0.3.1)
+      childprocess
+      clamp (~> 0.6)
+      ftw (~> 0.0.30)
       json (~> 1.7.7)
-      open4
-    highline (1.6.18)
-    hike (1.2.2)
+    ftw (0.0.34)
+      addressable
+      backports (>= 2.6.2)
+      cabin (> 0)
+      http_parser.rb (= 0.5.3)
+    highline (1.6.19)
+    hike (1.2.3)
+    http_parser.rb (0.5.3)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -85,17 +91,12 @@ GEM
       sprockets (~> 2)
     json (1.7.7)
     mime-types (1.23)
-    mono_logger (1.0.1)
-    multi_json (1.7.2)
-    nest (1.1.2)
-      redis
-    net-scp (1.1.0)
+    mono_logger (1.1.0)
+    multi_json (1.7.6)
+    net-scp (1.1.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
     nokogiri (1.5.9)
-    ohm (0.1.5)
-      nest (~> 1.0)
-    open4 (1.3.0)
     rack (1.5.2)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.0)
@@ -105,7 +106,7 @@ GEM
     rainbow (1.1.4)
     rake (10.0.4)
     redis (3.0.4)
-    redis-namespace (1.2.1)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
     resque (1.24.1)
       mono_logger (~> 1.0)
@@ -125,7 +126,8 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.32.1)
+    safe_yaml (0.9.3)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -140,7 +142,7 @@ GEM
       rack (~> 1.5, >= 1.5.2)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.9.3)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -154,8 +156,8 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.15.4)
-    tilt (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
     uuidtools (2.1.4)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -169,14 +171,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  SystemTimer (~> 1.2.3)
   async-rack
   aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   eventmachine (~> 1.0.0)
+  excon (~> 0.22.1)
   ffaker (~> 1.14.0)
-  fog (>= 1.1.0)
+  fog (~> 1.11.1)
   fpm (>= 0.4.26)
   jasmine
   jasmine-headless-webkit

data/Rakefile

@@ -48,11 +48,6 @@ begin
   RSpec::Core::RakeTask.new('spec:all') do |t|
     t.rspec_opts = ["-b", "-c", "-fd"]
     t.pattern = FileList[TYPES.values]
-    unless RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
-      require 'rcov/rcovtask'
-      t.rcov = true
-      t.rcov_opts = ['--exclude', 'spec/*,gems/*,apps/*,bench/spec/*,json/*']
-    end
   end
 
   desc "Run doc generator - dumps out doc/protocol.html"
@@ -65,13 +60,8 @@ rescue LoadError => e
   # Array of groups whose gems are not installed
   # if bundle install called with the --without option
   unless Bundler.settings.without.include? :test
-    if RUBY_VERSION =~ /1.9/
-      puts "rspec / simplecov not available. Install with: "
-      puts "gem install rspec simplecov\n\n"
-    else
-      puts "rspec / rcov not available. Install with: "
-      puts "gem install rspec rcov\n\n"
-    end
+    puts "rspec / simplecov not available. Install with: "
+    puts "gem install rspec simplecov\n\n"
   end
 end
 

data/bench/run_bench.sh

@@ -33,7 +33,7 @@ redis-cli flushdb > /dev/null
 
 # Run benchmarks for ruby 1.8.7, ree, 1.9.2, and 1.9.3
 #  TODO: 'jruby'
-for ruby in '1.9.3' '1.9.2' '1.8.7' 'ree'
+for ruby in '1.9.3'
 do
   rvm use $ruby > /dev/null
   ruby_version=$(rvm current)

data/bench/spec/bench_spec_helper.rb

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

data/bin/rhoconnect

@@ -1,18 +1,25 @@
 #!/usr/bin/env ruby -W0
-require 'rubygems'
+require 'thor'
+require_relative "../lib/rhoconnect/utilities"
+include Utilities
 
-begin
-  if File.exists?(File.join(Dir.pwd,'Gemfile'))
-    require 'bundler'
-    Bundler.require
-  end
-  $:.unshift File.join(File.dirname(__FILE__),'..')
-  $:.unshift File.join(File.dirname(__FILE__),'..','lib')
-  require 'templater'
-  require 'generators/rhoconnect'
-  require 'rhoconnect'
-  require 'commands/execute'
+# Default settings (template/settings/settings.yml)
+RHOCONNECT_PORT  = 9292
+REDIS_SERVER_URL = "localhost:6379"
+PUSH_SERVER_URL  = "http://someappname@localhost:8675/"
+API_TOKEN        = "my-rhoconnect-token"
 
+class Execute < Thor
+  no_tasks {
+    def self.define_task(&block)
+      Execute.class_eval(&block)
+    end
+  }
+
+  require_relative "../commands/parser"
+end
+
+begin
   Execute.start
 rescue SystemExit => se
   # This is normal
@@ -25,4 +32,4 @@ rescue Exception => e
     puts "Run rhoconnect command error: #{e.inspect}"
     puts e.backtrace.join("\n")
   end
-end
+end

data/commands/dtach/dtach_install.rb

@@ -5,7 +5,7 @@ def fetch(uri_str, limit = 10)
 
   url = URI(uri_str)
   response = Net::HTTP.get_response(url)
-  
+
   case response
   when Net::HTTPOK then
     Net::HTTP.start(url.host, url.port) do |http|
@@ -31,7 +31,7 @@ Execute.define_task do
   desc 'dtach-install', 'Install dtach program from sources'
   def dtach_install
     dtach_about
-    
+
     unless windows?
       Dir.chdir('/tmp/')
       system "rm /tmp/dtach-0.8.tar.gz" if File.exists?('/tmp/dtach-0.8.tar.gz')
@@ -47,7 +47,7 @@ Execute.define_task do
       system 'cd /tmp/dtach-0.8/ && ./configure && make'
 
       ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
-      mk_bin_dir(bin_dir)
+      mkdir_p(bin_dir) unless File.exists?(bin_dir)
       system "sudo cp /tmp/dtach-0.8/dtach #{bin_dir}"
 
       system "rm /tmp/dtach-0.8.tar.gz"

data/commands/generators/update.rb

@@ -1,6 +1,7 @@
 Execute.define_task do
   desc "update", "Update an existing application to the latest rhoconnect release"
   def update
+    require 'bundler'
     Bundler.with_clean_env do
       `bundle install`
     end

data/commands/parser.rb

@@ -0,0 +1,180 @@
+# Matches all inputs
+module InvalidCommand
+  def self.match?(input); true; end
+  def self.execute(input); end
+end
+
+#  rhoconnect [help [cmd]]
+module HelpCommand
+  def self.match?(input); (input == 'help'); end
+
+  def self.execute(input)
+    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 << 'rhoconnect_spec' if File.exists?(File.join(Dir.pwd,'Gemfile'))
+    tasks.each do |dir|
+      Dir.glob(File.join(File.dirname(__FILE__),  "..", "commands", "#{dir}", "*.rb")) do |file|
+        next if windows? &&
+          ["redis_download.rb", "redis_install.rb", "redis_make.rb"].include?(File.basename(file))
+        require file
+      end
+    end
+  end
+end
+
+# rhoconnect start|stop|restart|...
+module RunTimeCommands
+  def self.match?(input)
+    %w[start stop restart startbg startdebug].include?(input)
+  end
+  def self.execute(input)
+    if File.exists?(File.join(Dir.pwd,'Gemfile')) && input =~ /start/
+      require 'bundler'
+      Bundler.require
+    end
+    require_relative '../commands/rhoconnect/config'
+    require_relative '../commands/utilities/redis_runner'
+    %w[start stop restart startbg startdebug].each { |f| require_relative "../commands/rhoconnect/#{f}" }
+  end
+end
+
+# Group of rhconnect redis-*
+module RedisCommands
+  def self.match?(input); input =~ /^redis/; end
+  def self.execute(input)
+    require_relative '../commands/utilities/redis_runner'
+    require_relative '../commands/rhoconnect/config'
+    %w[about start startbg restart stop status].each { |f| require_relative "../commands/redis/redis_#{f}" }
+    unless windows?
+      %w[download install make].each { |f| require_relative "../commands/redis/redis_#{f}" }
+      require_relative '../commands/dtach/redis_attach'
+    end
+  end
+end
+
+# rhoconnect app|source|...
+module GeneratorCommands
+  def self.match?(input); %w[app controller model source update].include?(input); end
+  def self.execute(input)
+    require_relative "../generators/rhoconnect"
+    require_relative '../lib/rhoconnect'
+    include Rhoconnect
+    %w[app controller model source update].each { |f| require_relative "../commands/generators/#{f}" }
+  end
+end
+
+# rhoconnect version
+module VersionCommand
+  def self.match?(input); input == 'version'; end
+  def self.execute(input)
+    require_relative '../lib/rhoconnect/version'
+    include Rhoconnect
+    require_relative '../commands/rhoconnect/version'
+  end
+end
+
+# rhoconnect secret
+module SecretCommand
+  def self.match?(input); input == 'secret'; end
+  def self.execute(input); require_relative '../commands/rhoconnect/secret'; end
+end
+
+# rhoconnect console
+module ConsoleCommand
+  def self.match?(input); input == 'console'; end
+  def self.execute(input)
+    unless jruby?
+      require_relative '../commands/utilities/redis_runner'
+      require_relative '../commands/rhoconnect_console/console'
+    end
+  end
+end
+
+# rhoconnect web
+module WebCommand
+  def self.match?(input); input == 'web'; end
+  def self.execute(input)
+    require_relative '../commands/rhoconnect/config'
+    require_relative '../commands/rhoconnect/web'
+  end
+end
+
+# rhoconnect war
+module WarCommand
+  def self.match?(input); input == 'war'; end
+  def self.execute(input); require_relative '../commands/rhoconnect_war/war' if jruby?; end
+end
+
+# rhoconnect dtach-*
+module DtachCommands
+  def self.match?(input); input =~ /^dtach/ || input == 'attach'; end
+  def self.execute(input)
+    unless windows?
+      require_relative '../commands/utilities/redis_runner'
+      require_relative '../commands/dtach/dtach_about'
+      require_relative '../commands/dtach/dtach_install'
+      require_relative '../commands/rhoconnect_attach/attach' unless jruby?
+    end
+  end
+end
+
+# rhoconnect flushdb
+module FlushdbCommand
+  def self.match?(input); input == 'flushdb'; end
+  def self.execute(input)
+    require_relative '../commands/rhoconnect/config'
+    require_relative '../commands/utilities/redis_runner'
+    require_relative '../commands/rhoconnect/flushdb'
+  end
+end
+
+# rhoconnect get-token|set-admin-password
+module AdminCommands
+  def self.match?(input); input == 'get-token' || input == 'set_admin_password'; end
+  def self.execute(input)
+    require_relative '../commands/rhoconnect/config'
+    require_relative '../commands/rhoconnect/get_token'
+    require_relative '../commands/rhoconnect/set_admin_password'
+  end
+end
+
+# rhoconnect routes
+module RoutesCommand
+  def self.match?(input); input == 'routes'; end
+  def self.execute(input)
+    if File.exists?(File.join(Dir.pwd,'Gemfile'))
+      require 'bundler'
+      Bundler.require
+    end
+    require_relative '../commands/rhoconnect/config'
+    require_relative '../commands/utilities/redis_runner'
+    require_relative '../commands/rhoconnect/routes'
+  end
+end
+
+# rhoconnect spec
+module SpecCommand
+  def self.match?(input); input == 'spec'; end
+  def self.execute(input)
+    if File.exists?(File.join(Dir.pwd,'Gemfile'))
+      require 'bundler'
+      Bundler.require
+      require_relative '../commands/rhoconnect_spec/spec' if Bundler.load.specs.find{ |s| s.name == 'rspec' }
+    end
+  end
+end
+
+commands = [
+  HelpCommand, RunTimeCommands, RedisCommands, GeneratorCommands, VersionCommand,
+  SecretCommand, ConsoleCommand, WebCommand, WarCommand, DtachCommands,
+  FlushdbCommand, AdminCommands, RoutesCommand, SpecCommand, InvalidCommand ]
+
+input = ARGV[0] ? ARGV[0] : 'help'
+# Process user input
+command = commands.find { |cmd| cmd.match?(input) }
+# Load code that matches selected command
+command.execute(input)