arvados-cli 0.1.20131212114626 → 0.1.20131212152126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcbf46744882d3627d04daacd2f17a21b63d3fd
-  data.tar.gz: de0e2824b4aaba2ab0889a72cd9518b7ee3da632
+  metadata.gz: 622640ea69fde34097c84b1001d734c7d7d44e5f
+  data.tar.gz: 2aa286553fce18a21cf7d60854daf1937aa767bc
 SHA512:
-  metadata.gz: 8a5e0ab558f868fe8000ec2fe9e3a101824f4b1345dc2042aab3f805fe619d7e886d66e9428810c4dbf761c759d0a53736ed13cb36f577fb971b054dc7115e42
-  data.tar.gz: 87fd23b7ad22fbbaad8f113c89b2069c4b9ee4d1561efa3e6f64b0354edde12c43c65cd9c16196e245a8d1f3d9d6a3c2004370439e4e1aeb093291fffc112ee8
+  metadata.gz: 6b9d83c8aadf5d92cc88f56ad507bee5ad84967605fdfa092a5b401fcabf61b3a616da521c8b5380599d6429d7a8117d6a68a9592361d8f77e187c9a9e108972
+  data.tar.gz: f3218580cf5b0709d2f241d281bc03fcba5ea1302d06cc658300c05570d0159f0d4f5b1f355ff4394e2adb357a641466664d3e4328fc1dc832f62fb3b15e7c15

data/bin/arv

@@ -51,6 +51,7 @@ ARVADOS_API_HOST and ARVADOS_API_TOKEN need to be defined as environment variabl
 end
 
 begin
+  require 'curb'
   require 'rubygems'
   require 'google/api_client'
   require 'json'
@@ -64,7 +65,7 @@ rescue LoadError
 
 Please install all required gems: 
 
-  gem install google-api-client json trollop andand oj activesupport
+  gem install activesupport andand curb google-api-client json oj trollop
 
   EOS
 end
@@ -120,11 +121,11 @@ def to_boolean(s)
   !!(s =~ /^(true|t|yes|y|1)$/i)
 end
 
-def help_methods(discovery_document, resource_arg, method=nil)
-  banner = "\n\n"
-  banner += "The #{resource_arg} resource type supports the following methods:"
+def help_methods(discovery_document, resource, method=nil)
+  banner = "\n"
+  banner += "The #{resource} resource type supports the following methods:"
   banner += "\n\n"
-  discovery_document["resources"][resource_arg.pluralize]["methods"].
+  discovery_document["resources"][resource.pluralize]["methods"].
     each do |k,v|
     description = ''
     description = '  ' + v["description"] if v.include?("description")
@@ -135,13 +136,13 @@ def help_methods(discovery_document, resource_arg, method=nil)
   
   if not method.nil? and method != '--help' then 
     Trollop::die ("Unknown method #{method.inspect} " +
-                  "for resource #{resource_arg.inspect}")
+                  "for resource #{resource.inspect}")
   end
   exit 255
 end
 
-def help_resources(discovery_document, resource_arg)
-  banner = "\n\n"
+def help_resources(discovery_document, resource)
+  banner = "\n"
   banner += "This Arvados instance supports the following resource types:"
   banner += "\n\n"
   discovery_document["resources"].each do |k,v|
@@ -155,8 +156,8 @@ def help_resources(discovery_document, resource_arg)
   banner += "\n"
   STDERR.puts banner
 
-  if not resource_arg.nil? and resource_arg != '--help' then 
-    Trollop::die "Unknown resource type #{resource_arg.inspect}"
+  if not resource.nil? and resource != '--help' then 
+    Trollop::die "Unknown resource type #{resource.inspect}"
   end
   exit 255
 end
@@ -190,10 +191,9 @@ def parse_arguments(discovery_document)
     help_methods(discovery_document, resource, method)
   end
 
-  discovered_params = (discovery_document
-                       ["resources"][resource.pluralize]
-                       ["methods"][method]
-                       ["parameters"])
+  discovered_params = discovery_document\
+    ["resources"][resource.pluralize]\
+    ["methods"][method]["parameters"]
   method_opts = Trollop::options do
     discovered_params.each do |k,v|
       opts = Hash.new()
@@ -247,12 +247,43 @@ if resource_body
 else
   request_body = {}
 end
-request_body[:api_token] = ENV['ARVADOS_API_TOKEN']
-result = client.execute(:api_method => eval(api_method),
-                        :parameters => request_parameters,
-                        :body => request_body,
-                        :authenticated => false)
-results = JSON.parse result.body
+
+case api_method
+when
+  'arvados.users.event_stream',
+  'arvados.jobs.log_stream',
+  'arvados.jobs.log_tail_follow'
+
+  # Special case for methods that respond with data streams rather
+  # than JSON (TODO: use the discovery document instead of a static
+  # list of methods)
+  uri_s = eval(api_method).generate_uri(request_parameters)
+  Curl::Easy.perform(uri_s) do |curl|
+    curl.headers['Accept'] = 'text/plain'
+    curl.headers['Authorization'] = "OAuth2 #{ENV['ARVADOS_API_TOKEN']}"
+    if ENV['ARVADOS_API_HOST_INSECURE']
+      curl.ssl_verify_peer = false 
+      curl.ssl_verify_host = false
+    end
+    if global_opts[:verbose]
+      curl.on_header { |data| $stderr.write data }
+    end
+    curl.on_body { |data| $stdout.write data }
+  end
+  exit 0
+else
+  request_body[:api_token] = ENV['ARVADOS_API_TOKEN']
+  result = client.execute(:api_method => eval(api_method),
+                          :parameters => request_parameters,
+                          :body => request_body,
+                          :authenticated => false)
+end
+
+begin
+  results = JSON.parse result.body
+rescue JSON::ParserError => e
+  abort "Failed to parse server response:\n" + e.to_s
+end
 
 if results["errors"] then
   abort "Error: #{results["errors"][0]}"
@@ -264,6 +295,10 @@ elsif global_opts[:json] then
   puts Oj.dump(results)
 elsif results["items"] and results["kind"].match /list$/i
   results['items'].each do |i| puts i['uuid'] end
+elsif results['uuid'].nil?
+  abort("Response did not include a uuid:\n" +
+        Oj.dump(results, :indent => 1) +
+        "\n")
 else
   puts results['uuid']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20131212114626
+  version: 0.1.20131212152126
 platform: ruby
 authors:
 - Arvados Authors
@@ -94,7 +94,21 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
-description: This is the Arvados SDK CLI gem, git revision b0f21e25fac7bfc359c0c284805ef2723d7dcc72
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+description: This is the Arvados SDK CLI gem, git revision d9cd657b733d578ac0d2167dd75967aa4f22e0ac
 email: gem-dev@clinicalfuture.com
 executables:
 - arv