arvados-cli 0.1.20130730143934 → 0.1.20130916215921

data/bin/arv

@@ -149,6 +149,14 @@ def parse_arguments(discovery_document)
           description = '  ' + v["description"] if v.include?("description")
           opt k.to_sym, description, opts
         end
+        body_object = discovery_document["resources"][resource_arg.pluralize]["methods"][method]["request"]
+        if body_object and discovered_params[resource_arg].nil?
+          is_required = true
+          if body_object["required"] == false
+            is_required = false
+          end
+          opt resource_arg.to_sym, "#{resource_arg} (request body)", required: is_required, type: :string
+        end
       end
       discovered_params.each do |k,v|
         if ['object', 'array'].index(v["type"]) and method_opts.has_key? k
@@ -195,10 +203,11 @@ def parse_arguments(discovery_document)
     end
   end
 
-  return resource_arg.pluralize, method, method_opts, global_opts, ARGV
+  return resource_arg, method, method_opts, global_opts, ARGV
 end
 
-controller, method, method_opts, global_opts, remaining_opts = parse_arguments(arvados.discovery_document)
+resource_schema, method, method_opts, global_opts, remaining_opts = parse_arguments(arvados.discovery_document)
+controller = resource_schema.pluralize
 
 api_method = 'arvados.' + controller + '.' + method
 
@@ -209,7 +218,20 @@ if global_opts[:dry_run]
   exit
 end
 
-result = client.execute :api_method => eval(api_method), :parameters => { :api_token => ENV['ARVADOS_API_TOKEN'] }.merge(method_opts), :authenticated => false
+request_parameters = {}.merge(method_opts)
+resource_body = request_parameters.delete(resource_schema.to_sym)
+if resource_body
+  request_body = {
+    resource_schema => JSON.parse(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
 
 if results["errors"] then

data/bin/arv-run-pipeline-instance

@@ -201,9 +201,11 @@ class PipelineInstance
   def self.find(uuid)
     result = $client.execute(:api_method => $arvados.pipeline_instances.get,
                              :parameters => {
-                               :api_token => ENV['ARVADOS_API_TOKEN'],
                                :uuid => uuid
                              },
+                             :body => {
+                               :api_token => ENV['ARVADOS_API_TOKEN']
+                             },
                              :authenticated => false)
     j = JSON.parse result.body, :symbolize_names => true
     unless j.is_a? Hash and j[:uuid]
@@ -216,9 +218,9 @@ class PipelineInstance
   end
   def self.create(attributes)
     result = $client.execute(:api_method => $arvados.pipeline_instances.create,
-                             :parameters => {
+                             :body => {
                                :api_token => ENV['ARVADOS_API_TOKEN'],
-                               :pipeline_instance => attributes.to_json
+                               :pipeline_instance => attributes
                              },
                              :authenticated => false)
     j = JSON.parse result.body, :symbolize_names => true
@@ -231,8 +233,10 @@ class PipelineInstance
   def save
     result = $client.execute(:api_method => $arvados.pipeline_instances.update,
                              :parameters => {
+                               :uuid => @pi[:uuid]
+                             },
+                             :body => {
                                :api_token => ENV['ARVADOS_API_TOKEN'],
-                               :uuid => @pi[:uuid],
                                :pipeline_instance => @attributes_to_update.to_json
                              },
                              :authenticated => false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20130730143934
+  version: 0.1.20130916215921
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -107,7 +107,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
-description: This is the Arvados SDK CLI gem, git revision 5fcebaf9f4c05cf63f2cfa6d69b5bf16e0a73b96
+description: This is the Arvados SDK CLI gem, git revision ef71d0cab582ed90fea0edc9ea2ed94a22946086
 email: gem-dev@clinicalfuture.com
 executables:
 - arv