rhoconnect 4.0.4 → 5.1.1

data/Gemfile

@@ -7,7 +7,7 @@ gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
 platforms :ruby, :mingw  do
-	gem "eventmachine", "~> 1.0.0"
+	gem "eventmachine", "~> 1.0.5"
 	# using thin by default
 	gem 'thin'
 # for async framework
@@ -36,7 +36,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.10.0'
+  gem 'rspec', '~> 2.14.0'
   gem 'simplecov', '>= 0.7.1', :require => false
   gem 'simplecov-rcov', '~> 0.2.3'
   gem 'rack-test', '~> 0.6', :require => 'rack/test'

data/Gemfile.lock

@@ -1,24 +1,23 @@
 PATH
   remote: .
   specs:
-    rhoconnect (4.0.4)
+    rhoconnect (5.1.1)
       bundler (~> 1.0)
-      connection_pool (~> 1.0.0)
-      json (~> 1.7.7)
+      connection_pool (~> 1.2.0)
+      json (~> 1.8)
       rack (~> 1.5.2)
-      rake (~> 10.0.0)
+      rake (~> 10.4.0)
       redis (>= 3.0.1)
       resque (>= 1.22.0)
       rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.4)
-      sinatra (~> 1.3)
-      templater (~> 1.0.0)
+      rubyzip (~> 1.1)
+      sinatra (~> 1.4)
       thor (~> 0.18.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.7)
     arr-pm (0.0.9)
       cabin (> 0)
     async-rack (0.5.1)
@@ -27,28 +26,27 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (3.6.0)
+    backports (3.6.4)
     builder (3.2.2)
-    cabin (0.6.1)
-    childprocess (0.5.2)
+    cabin (0.7.1)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.3)
-    coffee-script (2.2.0)
+    clamp (0.6.4)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    connection_pool (1.0.0)
+    coffee-script-source (1.9.1)
+    connection_pool (1.2.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    daemons (1.1.9)
-    diff-lcs (1.1.3)
-    docile (1.1.3)
-    eventmachine (1.0.3)
+    daemons (1.2.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    eventmachine (1.0.7)
     excon (0.22.1)
-    execjs (2.0.2)
-    extlib (0.9.16)
+    execjs (2.4.0)
     ffaker (1.14.0)
-    ffi (1.9.3)
+    ffi (1.9.7)
     fog (1.11.1)
       builder
       excon (~> 0.20)
@@ -59,24 +57,16 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.4)
-    fpm (1.0.2)
-      arr-pm (~> 0.0.8)
+    formatador (0.2.5)
+    fpm (1.3.3)
+      arr-pm (~> 0.0.9)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
       childprocess
       clamp (~> 0.6)
       ffi
-      ftw (~> 0.0.30)
       json (>= 1.7.7)
-    ftw (0.0.39)
-      addressable
-      backports (>= 2.6.2)
-      cabin (> 0)
-      http_parser.rb (= 0.5.3)
-    highline (1.6.21)
     hike (1.2.3)
-    http_parser.rb (0.5.3)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -89,74 +79,73 @@ GEM
       multi_json
       rainbow
       sprockets (~> 2)
-    json (1.7.7)
-    mime-types (2.2)
+    json (1.8.2)
+    mime-types (1.25.1)
     mono_logger (1.1.0)
-    multi_json (1.9.2)
-    net-scp (1.1.2)
+    multi_json (1.11.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
+    net-ssh (2.9.2)
     nokogiri (1.5.11)
     rack (1.5.2)
     rack-fiber_pool (0.9.3)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rainbow (2.0.0)
-    rake (10.0.4)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+      json (~> 1.4)
+    redis (3.2.1)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.9)
-    safe_yaml (1.0.1)
-    selenium-webdriver (2.35.1)
-      childprocess (>= 0.2.5)
+    rubyzip (1.1.7)
+    safe_yaml (1.0.4)
+    selenium-webdriver (2.45.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
-      rubyzip (< 1.0.0)
-      websocket (~> 1.0.4)
-    simplecov (0.8.2)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.12.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    templater (1.0.0)
-      diff-lcs (>= 1.1.2)
-      extlib (>= 0.9.5)
-      highline (>= 1.4.0)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    sqlite3 (1.3.10)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.18.1)
     tilt (1.4.1)
     vegas (0.1.11)
@@ -164,8 +153,8 @@ GEM
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.0.7)
-    xml-simple (1.1.3)
+    websocket (1.2.1)
+    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
@@ -175,7 +164,7 @@ DEPENDENCIES
   aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
-  eventmachine (~> 1.0.0)
+  eventmachine (~> 1.0.5)
   excon (~> 0.22.1)
   ffaker (~> 1.14.0)
   fog (~> 1.11.1)
@@ -188,7 +177,7 @@ DEPENDENCIES
   rack-fiber_pool
   rack-test (~> 0.6)
   rhoconnect!
-  rspec (~> 2.10.0)
+  rspec (~> 2.14.0)
   simplecov (>= 0.7.1)
   simplecov-rcov (~> 0.2.3)
   sqlite3 (>= 1.3.3)

data/Rakefile

@@ -29,7 +29,6 @@ begin
     :ping => 'spec/ping/*_spec.rb',
     :generator => 'spec/generator/*_spec.rb',
     :bench     => 'bench/spec/*_spec.rb',
-    :models    => 'spec/models/*_spec.rb',
     :controllers => 'spec/controllers/**/*_spec.rb',
     :models    => 'spec/models/**/*_spec.rb',
     :cli => 'spec/cli/*_spec.rb'
@@ -56,7 +55,7 @@ begin
     t.rcov = false
   end
 
-rescue LoadError => e
+rescue LoadError
   # Array of groups whose gems are not installed
   # if bundle install called with the --without option
   unless Bundler.settings.without.include? :test

data/bench/benchapp/spec/models/ruby/mock_adapter_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "MockAdapter" do
-  it_should_behave_like "SpecHelper" do
-    before(:each) do
-      setup_test_for MockAdapter,'testuser'
-    end
+  include_examples "SpecHelper"
 
-    it "should process MockAdapter query" do
-      pending
-    end
+  before(:each) do
+    setup_test_for MockAdapter,'testuser'
+  end
 
-    it "should process MockAdapter create" do
-      pending
-    end
+  it "should process MockAdapter query" do
+    pending
+  end
 
-    it "should process MockAdapter update" do
-      pending
-    end
+  it "should process MockAdapter create" do
+    pending
+  end
 
-    it "should process MockAdapter delete" do
-      pending
-    end
-  end  
+  it "should process MockAdapter update" do
+    pending
+  end
+
+  it "should process MockAdapter delete" do
+    pending
+  end
 end

data/bench/benchapp/spec/models/ruby/queue_mock_adapter_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "QueueMockAdapter" do
-  it_should_behave_like "SpecHelper" do
-    before(:each) do
-      setup_test_for QueueMockAdapter,'testuser'
-    end
+  include_examples "SpecHelper"
 
-    it "should process QueueMockAdapter query" do
-      pending
-    end
+  before(:each) do
+    setup_test_for QueueMockAdapter,'testuser'
+  end
 
-    it "should process QueueMockAdapter create" do
-      pending
-    end
+  it "should process QueueMockAdapter query" do
+    pending
+  end
 
-    it "should process QueueMockAdapter update" do
-      pending
-    end
+  it "should process QueueMockAdapter create" do
+    pending
+  end
 
-    it "should process QueueMockAdapter delete" do
-      pending
-    end
-  end  
+  it "should process QueueMockAdapter update" do
+    pending
+  end
+
+  it "should process QueueMockAdapter delete" do
+    pending
+  end
 end

data/bench/benchapp/spec/spec_helper.rb

@@ -19,11 +19,11 @@ include Rhoconnect
 
 require 'rhoconnect/test_methods'
 
-shared_examples_for "SpecHelper" do
+shared_examples "SpecHelper" do
   include Rhoconnect::TestMethods
-  
+
   before(:each) do
     Store.flush_all
     Application.initializer(ROOT_PATH)
-  end  
+  end
 end

data/bench/blobapp/spec/models/ruby/blob_adapter_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "BlobAdapter" do
-  it_should_behave_like "SpecHelper" do
-    before(:each) do
-      setup_test_for BlobAdapter,'testuser'
-    end
+  include_examples "SpecHelper"
 
-    it "should process BlobAdapter query" do
-      pending
-    end
+  before(:each) do
+    setup_test_for BlobAdapter,'testuser'
+  end
 
-    it "should process BlobAdapter create" do
-      pending
-    end
+  it "should process BlobAdapter query" do
+    pending
+  end
 
-    it "should process BlobAdapter update" do
-      pending
-    end
+  it "should process BlobAdapter create" do
+    pending
+  end
 
-    it "should process BlobAdapter delete" do
-      pending
-    end
-  end  
+  it "should process BlobAdapter update" do
+    pending
+  end
+
+  it "should process BlobAdapter delete" do
+    pending
+  end
 end

data/bench/blobapp/spec/spec_helper.rb

@@ -19,11 +19,11 @@ include Rhoconnect
 
 require 'rhoconnect/test_methods'
 
-shared_examples_for "SpecHelper" do
+shared_examples "SpecHelper" do
   include Rhoconnect::TestMethods
-  
+
   before(:each) do
     Store.flush_all
     Application.initializer(ROOT_PATH)
-  end  
+  end
 end

data/bench/lib/bench/runner.rb

@@ -3,7 +3,7 @@ module Bench
     include Logging
     include Timer
     attr_reader :threads
-    
+
     def initialize
       @threads = []
       @sessions = []
@@ -37,73 +37,5 @@ module Bench
       Bench.start_time = total_times[1]
       Bench.end_time = total_times[2]
     end
-
-=begin
-    if defined?(JRUBY_VERSION)
-      def test(concurrency,iterations,&block)
-        total_time = time do
-          0.upto(concurrency - 1) do |thread_id|
-            sleep rand(2)                    
-            threads << Thread.new(block) do |t|
-              0.upto(iterations - 1) do |iteration|
-                s = Session.new(thread_id, iteration)
-                @sessions << s
-                begin
-                  yield Bench,s
-                rescue Exception => e
-                  puts "error running script: #{e.inspect}"
-                  puts e.backtrace.join("\n")
-                end
-              end
-            end
-          end
-          begin 
-            threads.each { |t| t.join }
-          rescue RestClient::RequestTimeout => e
-            bench_log "Request timed out #{e}"
-          end
-        end
-        Bench.sessions = @sessions
-        Bench.total_time = total_time
-      end      
-    else
-      def test(concurrency,iterations,&block)
-        total_time = time do
-          0.upto(concurrency - 1) do |thread_id|
-            sleep rand(2)                    
-            threads << Process.fork do
-              pid = $$ # child process id
-              0.upto(iterations - 1) do |iteration|
-                s = Session.new(thread_id, iteration)
-                begin
-                  yield Bench,s
-                rescue Exception => e
-                  puts "error running script: #{e.inspect}"
-                  puts e.backtrace.join("\n")
-                end
-                File.open("/tmp/runner_#{iteration}.#{pid}", "w+") { |f| Marshal.dump(s, f) }
-              end
-            end
-          end
-          begin 
-            @pid_stats = Process.waitall # returning an array of pid/status pairs
-          rescue RestClient::RequestTimeout => e
-            bench_log "Request timed out #{e}"
-          end
-        end
-        @pid_stats.each do |ps|
-          0.upto(iterations - 1) do |iteration|
-            filename = "/tmp/runner_#{iteration}.#{ps[0]}"
-            s = Marshal.load(File.open(filename))
-            @sessions << s
-            File.delete(filename)
-          end
-        end
-        Bench.sessions = @sessions
-        Bench.total_time = total_time
-      end
-    end
-=end
-
   end
 end

data/bench/lib/bench.rb

@@ -1,5 +1,5 @@
 require 'rest_client'
-require 'zip/zip'
+require 'zip'
 require 'securerandom'
 $:.unshift File.dirname(__FILE__)
 require 'bench/timer'
@@ -32,10 +32,10 @@ module Bench
     attr_accessor :total_time, :sessions, :verify_error
     attr_accessor :adapter_name, :datasize, :result_filename
     attr_accessor :main_marker, :start_time, :end_time
-    
+
     # these attributes for distributed testing
     attr_accessor :processor_id, :save_to_redis, :sync_key
-    
+
     def config
       begin
         @verify_error ||= 0
@@ -45,7 +45,7 @@ module Bench
         raise e
       end
     end
-    
+
     def synchronize
       begin
         yield self
@@ -54,7 +54,7 @@ module Bench
         raise e
       end
     end
-    
+
     def get_server_license_info
       token = get_token
       @body = RestClient.get(
@@ -62,7 +62,7 @@ module Bench
         {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
       JSON.parse(@body.to_s)
     end
-    
+
     def get_server_state(doc)
       token = get_token
       @body = RestClient.get(
@@ -70,21 +70,21 @@ module Bench
         {'X-RhoConnect-API-TOKEN' => token})
       JSON.parse(@body.to_s)
     end
-    
+
     def get_server_value(doc)
       token = get_token
       @body = RestClient.get(
         "#{@host}/rc/#{Rhoconnect::API_VERSION}/store/#{doc}",
         {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
-    
+
     def reset_app
       RestClient.post(
         "#{@host}/rc/#{Rhoconnect::API_VERSION}/system/reset",
         {},
         {:content_type => :json, 'X-RhoConnect-API-TOKEN' => get_token})
     end
-    
+
     def create_user(user_name, password)
       token = get_token
       RestClient.post(
@@ -108,7 +108,7 @@ module Bench
         params.to_json,
         {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
-    
+
     def reset_refresh_time(source_name,poll_interval=nil)
       token = get_token
       RestClient.put(
@@ -116,7 +116,7 @@ module Bench
         {:poll_interval => poll_interval}.to_json,
         {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
-    
+
     def set_simulate_time(source_name,simulate_time=0)
       token = get_token
       RestClient.put(
@@ -124,7 +124,7 @@ module Bench
         {:data => {:simulate_time => simulate_time}}.to_json,
         {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
     end
-    
+
     def get_token
       unless @token
         @token = RestClient.post(
@@ -134,7 +134,7 @@ module Bench
       end
       @token
     end
-    
+
     def get_test_server(app_name = nil)
       if @base_url.nil?
         app_name = 'benchapp' unless app_name
@@ -149,22 +149,22 @@ module Bench
       @host = "#{uri.scheme}://#{uri.host}#{port}"
       puts "Test server is #{@host}..."
     end
-    
+
     def test(&block)
       Runner.new.test(@concurrency,@iterations,&block)
     end
-    
+
     def verify(&block)
       yield self,@sessions
     end
-    
+
     # TODO: These functions are duplicates!
-    
+
     def compress(path)
       path.sub!(%r[/$],'')
       archive = File.join(path,File.basename(path))+'.zip'
       FileUtils.rm archive, :force=>true
-      Zip::ZipFile.open(archive, 'w') do |zipfile|
+      Zip::File.open(archive, 'w') do |zipfile|
         Dir["#{path}/**/**"].reject{|f|f==archive}.each do |file|
           zipfile.add(file.sub(path+'/',''),file)
         end