Merge pull request #243 from bmarkons/add-ssh-method

Add ssh method to support PG suite

Author: Marko Bogdanović

app/jobs/remote_server_job.rb

@@ -16,6 +16,8 @@ class RemoteServerJob < ActiveJob::Base
 
   BUNDLER_RELEASE = "#{SCRIPTS_PATH}/bundler/releases.sh"
 
+  PG_MASTER = "#{SCRIPTS_PATH}/pg/master.sh"
+
   # Use keyword arguments once Rails 4.2.1 has been released.
   def perform(initiator_key, benchmark_group, options = {})
     Net::SSH.start(
@@ -123,6 +125,12 @@ def bundler_releases(ssh, version, options)
     ssh_exec!(ssh, "#{BUNDLER_RELEASE} #{version} #{secrets.api_name} #{secrets.api_password} #{patterns}")
   end
 
+  def pg_master(ssh, commit_hash, options)
+    patterns = options[:include_patterns]
+
+    ssh_exec!(ssh, "#{PG_MASTER} #{commit_hash} #{secrets.api_name} #{secrets.api_password} #{patterns}")
+  end
+
   def execute_ssh_commands(ssh, commands)
     commands.each do |command|
       ssh_exec!(ssh, command)

app/services/benchmark_pool.rb

@@ -8,6 +8,8 @@ def self.enqueue(repo_name, commit_sha, options = {})
       RemoteServerJob.perform_later(commit_sha, 'rails_trunk', options)
     when 'sequel'
       RemoteServerJob.perform_later(commit_sha, 'sequel_trunk', options)
+    when 'ruby-pg'
+      RemoteServerJob.perform_later(commit_sha, 'pg_master', options)
     else
       raise ArgumentError, "unknown repo: #{repo_name}"
     end

test/jobs/remote_server_job_test.rb

@@ -120,6 +120,16 @@ class RemoteServerJobTest < ActiveJob::TestCase
     )
   end
 
+  test '#perform pg_master' do
+    @ssh.expects(:exec!).with(
+      "tsp #{RemoteServerJob::PG_MASTER} #{@commit_hash} #{@api_name} #{@api_password} #{@patterns}"
+    )
+
+    RemoteServerJob.new.perform(
+      @commit_hash, 'pg_master', include_patterns: @patterns
+    )
+  end
+
   private
 
   def set_script_arguments

test/services/benchmark_pool_test.rb

@@ -26,4 +26,12 @@ class BenchmarkPoolTest < ActiveSupport::TestCase
 
     assert_enqueued_jobs 1
   end
+
+  test '#enqueue for ruby-pg' do
+    assert_enqueued_with(job: RemoteServerJob) do
+      BenchmarkPool.enqueue('ruby-pg', 'abc')
+    end
+
+    assert_enqueued_jobs 1
+  end
 end