arvados-cli 0.1.20140117103233 → 0.1.20140127131755

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70b66c41cd68bee38374544c42e1aa3f0ce48ce8
+  data.tar.gz: 70a9c5b4e4bd49af7ad8329369ba1de5d99f828e
+SHA512:
+  metadata.gz: b34407028dfdc9492b41b057a0e729ef3674cda5f496e88045d694313d8c56bbbf0bdd551558a22dedadd7d8e74e9d39c946967f6d4a7fe2232d83450e6155aa
+  data.tar.gz: 9d0b7e520f0107c735854e0478de8b3499491d528209c645a5d751d92e834bbeee6aa1be3287482f85aecd78f0c60a523288fe58d9ea0828f342dd8a48b2d2d5

data/bin/arv

@@ -4,6 +4,8 @@
 #
 # Ward Vandewege <ward@clinicalfuture.com>
 
+require 'fileutils'
+
 if RUBY_VERSION < '1.9.3' then
   abort <<-EOS
 #{$0.gsub(/^\.\//,'')} requires Ruby version 1.9.3 or higher.
@@ -12,7 +14,7 @@ end
 
 # read authentication data from ~/.config/arvados if present
 lineno = 0
-config_file = File.expand_path('~/.config/arvados')
+config_file = File.expand_path('~/.config/arvados/settings.conf')
 if File.exist? config_file then
   File.open(config_file, 'r').each do |line|
     lineno = lineno + 1
@@ -116,15 +118,23 @@ end
 
 class Google::APIClient
  def discovery_document(api, version)
-  api = api.to_s
-  return @discovery_documents["#{api}:#{version}"] ||= (begin
-    response = self.execute!(
-      :http_method => :get,
-      :uri => self.discovery_uri(api, version),
-      :authenticated => false
-    )
-    response.body.class == String ? JSON.parse(response.body) : response.body
-  end)
+   api = api.to_s
+   return @discovery_documents["#{api}:#{version}"] ||=
+     begin
+       # fetch new API discovery doc if stale
+       cached_doc = File.expand_path '~/.cache/arvados/discovery_uri.json'
+       if not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
+         response = self.execute!(:http_method => :get,
+                                  :uri => self.discovery_uri(api, version),
+                                  :authenticated => false)
+         FileUtils.makedirs(File.dirname cached_doc)
+         File.open(cached_doc, 'w') do |f|
+           f.puts response.body
+         end
+       end
+
+       File.open(cached_doc) { |f| JSON.load f }
+     end
  end
 end
 
@@ -152,7 +162,10 @@ def help_methods(discovery_document, resource, method=nil)
   discovery_document["resources"][resource.pluralize]["methods"].
     each do |k,v|
     description = ''
-    description = '  ' + v["description"] if v.include?("description")
+    if v.include? "description"
+      # add only the first line of the discovery doc description
+      description = '  ' + v["description"].split("\n").first.chomp
+    end
     banner += "   #{sprintf("%20s",k)}#{description}\n"
   end
   banner += "\n"
@@ -171,9 +184,10 @@ def help_resources(discovery_document, resource)
   banner += "\n\n"
   discovery_document["resources"].each do |k,v|
     description = ''
-    if discovery_document["schemas"].include?(k.singularize.capitalize) and 
-        discovery_document["schemas"][k.singularize.capitalize].include?('description') then
-      description = '  ' + discovery_document["schemas"][k.singularize.capitalize]["description"]
+    resource_info = discovery_document["schemas"][k.singularize.capitalize]
+    if resource_info and resource_info.include?('description')
+      # add only the first line of the discovery doc description
+      description = '  ' + resource_info["description"].split("\n").first.chomp
     end
     banner += "   #{sprintf("%30s",k.singularize)}#{description}\n"
   end
@@ -188,25 +202,37 @@ end
 
 def parse_arguments(discovery_document)
   resource_types = Array.new()
-  resource_types << '--help'
   discovery_document["resources"].each do |k,v|
     resource_types << k.singularize
   end
 
   global_opts = Trollop::options do
-    banner "arvados cli client"
+    version __FILE__
+    banner "arv: the Arvados CLI tool"
     opt :dry_run, "Don't actually do anything", :short => "-n"
-    opt :verbose, "Print some things on stderr", :short => "-v"
-    opt :uuid, "Return the UUIDs of the objects in the response, one per line (default)", :short => nil
-    opt :json, "Return the entire response received from the API server, as a JSON object", :short => "-j"
-    opt :human, "Return the response received from the API server, as a JSON object with whitespace added for human consumption", :short => "-h"
-    opt :pretty, "Synonym of --human", :short => nil
-    opt :yaml, "Return the response received from the API server, in YAML format", :short => "-y"
+    opt :verbose, "Print some things on stderr"
+    opt :format,
+        "Set the output format. Must be one of json (default), yaml or uuid.",
+        :type => :string,
+        :default => 'json'
+    opt :short, "Return only UUIDs (equivalent to --format=uuid)"
+    opt :resources, "Display list of resources known to this Arvados instance."
+    conflicts :short, :format
     stop_on resource_types
   end
-  
+
+  unless %w(json yaml uuid).include?(global_opts[:format])
+    $stderr.puts "#{$0}: --format must be one of json, yaml or uuid."
+    $stderr.puts "Use #{$0} --help for more information."
+    abort
+  end
+
+  if global_opts[:short]
+    global_opts[:format] = 'uuid'
+  end
+
   resource = ARGV.shift
-  if resource == '--help' or not resource_types.include?(resource)
+  if global_opts[:resources] or not resource_types.include?(resource)
     help_resources(discovery_document, resource)
   end
 
@@ -244,7 +270,6 @@ def parse_arguments(discovery_document)
         required: is_required,
         type: :string
       }
-      discovered_params[resource.to_sym] = body_object
     end
   end
 
@@ -323,18 +348,21 @@ if results["errors"] then
   abort "Error: #{results["errors"][0]}"
 end
 
-if global_opts[:human] or global_opts[:pretty] then
+case global_opts[:format]
+when 'json'
   puts Oj.dump(results, :indent => 1)
-elsif global_opts[:yaml] then
+when 'yaml'
   puts results.to_yaml
-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']
+  if 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
 end
+
+

metadata

@@ -1,181 +1,150 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arvados-cli
-version: !ruby/object:Gem::Version 
-  hash: 40280234206489
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 20140117103233
-  version: 0.1.20140117103233
+version: !ruby/object:Gem::Version
+  version: 0.1.20140127131755
 platform: ruby
-authors: 
+authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: google-api-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 2
-        - 13
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 7
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: andand
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: andand
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: oj
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: curb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
-  version_requirements: *id007
-description: This is the Arvados SDK CLI gem, git revision 3055130be14ab26d68fd1c01a934870855ecbd5c
-email: gem-dev@clinicalfuture.com
-executables: 
+  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 7c99060e90f027b77c82fd8c66902095197261af
+email: gem-dev@curoverse.com
+executables:
 - arv
 - arv-run-pipeline-instance
 - arv-crunch-job
 - arv-tag
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/arv
 - bin/arv-run-pipeline-instance
 - bin/arv-crunch-job
 - bin/arv-tag
 - bin/crunch-job
 homepage: http://arvados.org
-licenses: 
+licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Arvados SDK CLI
 test_files: []
-