[ARVADOS] updated: 5be66e86ac84d7d46c8503c3c136cb144222e4bf

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/arv     |  8 +-------
 sdk/cli/bin/arv-tag | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

       via  5be66e86ac84d7d46c8503c3c136cb144222e4bf (commit)
       via  fd207a0e0fc3aa02eba81b567b0b30d144ac3fbf (commit)
      from  9966893484226206474d7d9936d884cc56582f15 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5be66e86ac84d7d46c8503c3c136cb144222e4bf
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Nov 12 17:20:31 2014 -0500

    Make arv-tag print usage when --help is given. Also, fix typo in usage lines.
    
    No issue #

diff --git a/sdk/cli/bin/arv-tag b/sdk/cli/bin/arv-tag
index 4ee6770..e400dab 100755
--- a/sdk/cli/bin/arv-tag
+++ b/sdk/cli/bin/arv-tag
@@ -5,13 +5,17 @@
 #   arv tag remove tag1 [tag2 ...] --object obj_uuid1 [--object obj_uuid2 ...]
 #   arv tag remove tag1 [tag2 ...] --all
 
-def usage
-  abort "Usage:\n" +
-    "arv tag add tag1 [tag2 ...] --objects object_uuid1 [object_uuid2...]\n" +
-    "arv tag remove tag1 [tag2 ...] --objects object_uuid1 [object_uuid2...]\n" +
+def usage_string
+  return "\nUsage:\n" +
+    "arv tag add tag1 [tag2 ...] --object object_uuid1 [object_uuid2...]\n" +
+    "arv tag remove tag1 [tag2 ...] --object object_uuid1 [object_uuid2...]\n" +
     "arv tag remove --all\n"
 end
 
+def usage
+  abort usage_string
+end
+
 def api_call(method, parameters:{}, request_body:{})
   request_body[:api_token] = ENV['ARVADOS_API_TOKEN']
   result = $client.execute(:api_method => method,
@@ -147,7 +151,8 @@ class Google::APIClient
 end
 
 global_opts = Trollop::options do
-  banner "arvados cli client"
+  banner usage_string
+  banner ""
   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

commit fd207a0e0fc3aa02eba81b567b0b30d144ac3fbf
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Nov 12 17:19:39 2014 -0500

    Remove some redundant lines from sdk/bin/arv
    
    No issue #

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 77affe9..533ea39 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -122,7 +122,7 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
     arv_create client, arvados, global_opts, remaining_opts
   when 'edit'
     arv_edit client, arvados, global_opts, remaining_opts
-  when 'copy', 'tag', 'ws'
+  when 'copy', 'tag', 'ws', 'run'
     exec `which arv-#{subcommand}`.strip, *remaining_opts
   when 'keep'
     @sub = remaining_opts.shift
@@ -150,12 +150,6 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
       puts "Available methods: run"
     end
     abort
-  when 'run'
-    exec `which arv-run`.strip, *remaining_opts
-  when 'tag'
-    exec `which arv-tag`.strip, *remaining_opts
-  when 'ws'
-    exec `which arv-ws`.strip, *remaining_opts
   end
 end
 

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


hooks/post-receive
--