arvados-cli 0.1.20141105204412 → 0.1.20141112222031

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34ccd344914c54c8a356e2588d88d96702e48d6
-  data.tar.gz: 423c472d261c79db27f1543373c69f9da2292ca6
+  metadata.gz: 4c391c78633a3dfde9b38334757f75784c2bf2d0
+  data.tar.gz: e0755301bebfe524c73890fdf4a6ffb099339e69
 SHA512:
-  metadata.gz: f969df92c49b053db6c7d7857102ca38ff578828cfe372f934b32050441685c2e8693596b12c75ffaa10dbe5b5d69fb8b9ef3f7ff575bb8e7cf8a344334d92e7
-  data.tar.gz: 5b6c8edc6da8b1a77c0583d1f07baeef5c016f4e1183829d2eec5a92713d3e142c2627102a1348bb248cbba793540b26679ab59740ee57326ed77f2f9150be20
+  metadata.gz: 8d5a5216800d15ac2bc28acbac5b63f769dadaab5725436879a46a8ca8cac755cec1f154e2e203e27eb95972d1d7e7f1fecb1dc04faa3c0cba2343943529657f
+  data.tar.gz: 6eb68d20b17ade1400a41eff487e8fa3abc1a8ce5961dbf0c2c54431a83f4646456f2a3aab88165ebcd2e8b5f31aa3a489f0052ef585fc116c8f462276a032cb

data/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
 

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20141105204412
+  version: 0.1.20141112222031
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -178,7 +178,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados command line tools, git commit 788ecdf8085f5e69cd3dc960f510b49f11432cb3
+description: Arvados command line tools, git commit 5be66e86ac84d7d46c8503c3c136cb144222e4bf
 email: gem-dev@curoverse.com
 executables:
 - arv