[ARVADOS] created: 1d7f33382486f55ded52fea25271224b4ad88bd4

[git at public.curoverse.com]

        at  1d7f33382486f55ded52fea25271224b4ad88bd4 (commit)


commit 1d7f33382486f55ded52fea25271224b4ad88bd4
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 7 11:28:11 2014 -0500

    Add arvados-cli dependency

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 54e83d8..b1523b8 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -55,4 +55,6 @@ gem 'redis'
 gem 'test_after_commit', :group => :test
 
 gem 'google-api-client', '~> 0.6.3'
-gem 'trollop'
\ No newline at end of file
+gem 'trollop'
+
+gem 'arvados-cli', '>= 0.1.20140307112652'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c78f3a7..24193c5 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,6 +35,14 @@ GEM
     addressable (2.3.5)
     andand (1.3.3)
     arel (3.0.2)
+    arvados-cli (0.1.20140307112652)
+      activesupport (~> 3.2, >= 3.2.13)
+      andand (~> 1.3, >= 1.3.3)
+      curb (~> 0.8)
+      google-api-client (~> 0.6.3)
+      json (~> 1.7, >= 1.7.7)
+      oj (~> 2.0, >= 2.0.3)
+      trollop (~> 2.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -53,6 +61,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    curb (0.8.5)
     daemon_controller (1.1.7)
     erubis (2.7.0)
     execjs (2.0.2)
@@ -182,6 +191,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
+  arvados-cli (>= 0.1.20140307112652)
   coffee-rails (~> 3.2.0)
   google-api-client (~> 0.6.3)
   jquery-rails

commit a7c1fecd8066bb6cfc1242ce1170716230e705bb
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Mar 7 11:26:52 2014 -0500

    Obey ARVADOS_API_HOST_INSECURE

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index fd29a6d..dd89ad5 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -202,6 +202,22 @@ if $options[:run_here] == $options[:submit]
   abort "#{$0}: syntax error: you must supply either --run-here or --submit."
 end
 
+# Suppress SSL certificate checks if ARVADOS_API_HOST_INSECURE
+
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end
+
+if ENV['ARVADOS_API_HOST_INSECURE']
+  suppress_warnings { OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE }
+end
+
 # Set up the API client.
 
 $client ||= Google::APIClient.

-----------------------------------------------------------------------


hooks/post-receive
--