arvados-cli 0.1.20131212092848 → 0.1.20131212114626

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36df8ebef84cf051f379ac5a6a6b5af046c05f56
-  data.tar.gz: 4ce7491264c103239c91fe32ce0ebebb0d2b65a2
+  metadata.gz: adcbf46744882d3627d04daacd2f17a21b63d3fd
+  data.tar.gz: de0e2824b4aaba2ab0889a72cd9518b7ee3da632
 SHA512:
-  metadata.gz: d128b81c73238652be314df89814fad01ea2ed01af72d4707994480bcf45faa46ba549749b97df3debe6ff703b85022b35b584832ad3fa5153396d49a27a9428
-  data.tar.gz: 403f2e4d70b2c565d22b07fbeca1a221ae6b77a72254cf10a6e90449aafb43714bc6613eeeab2baef42b1408c47cc2273415b3098cd109171e805e421d57a2ec
+  metadata.gz: 8a5e0ab558f868fe8000ec2fe9e3a101824f4b1345dc2042aab3f805fe619d7e886d66e9428810c4dbf761c759d0a53736ed13cb36f577fb971b054dc7115e42
+  data.tar.gz: 87fd23b7ad22fbbaad8f113c89b2069c4b9ee4d1561efa3e6f64b0354edde12c43c65cd9c16196e245a8d1f3d9d6a3c2004370439e4e1aeb093291fffc112ee8

data/bin/arv

@@ -120,6 +120,47 @@ 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:"
+  banner += "\n\n"
+  discovery_document["resources"][resource_arg.pluralize]["methods"].
+    each do |k,v|
+    description = ''
+    description = '  ' + v["description"] if v.include?("description")
+    banner += "   #{sprintf("%20s",k)}#{description}\n"
+  end
+  banner += "\n"
+  STDERR.puts banner
+  
+  if not method.nil? and method != '--help' then 
+    Trollop::die ("Unknown method #{method.inspect} " +
+                  "for resource #{resource_arg.inspect}")
+  end
+  exit 255
+end
+
+def help_resources(discovery_document, resource_arg)
+  banner = "\n\n"
+  banner += "This Arvados instance supports the following resource types:"
+  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"]
+    end
+    banner += "   #{sprintf("%30s",k.singularize)}#{description}\n"
+  end
+  banner += "\n"
+  STDERR.puts banner
+
+  if not resource_arg.nil? and resource_arg != '--help' then 
+    Trollop::die "Unknown resource type #{resource_arg.inspect}"
+  end
+  exit 255
+end
+
 def parse_arguments(discovery_document)
   resource_types = Array.new()
   resource_types << '--help'
@@ -138,85 +179,51 @@ def parse_arguments(discovery_document)
     stop_on resource_types
   end
   
-  # get the subcommand
-  resource_arg = ARGV.shift
-  if resource_types.include?(resource_arg) and resource_arg != '--help' then
-    # subcommand exists
-    # Now see if the method supplied exists
-    method = ARGV.shift
-    if discovery_document["resources"][resource_arg.pluralize]["methods"].include?(method) then
-      # method exists. Collect arguments.
-      discovered_params = discovery_document["resources"][resource_arg.pluralize]["methods"][method]["parameters"]
-      method_opts = Trollop::options do
-        discovered_params.each do |k,v|
-          opts = Hash.new()
-          opts[:type] = v["type"].to_sym if v.include?("type")
-          if [:datetime, :text, :object, :array].index opts[:type]
-            opts[:type] = :string                       # else trollop bork
-          end
-          opts[:default] = v["default"] if v.include?("default")
-          opts[:default] = v["default"].to_i if opts[:type] == :integer
-          opts[:default] = to_boolean(v["default"]) if opts[:type] == :boolean
-          opts[:required] = true if v.include?("required") and v["required"]
-          description = ''
-          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
-          method_opts[k] = JSON.parse method_opts[k]
-        end
-      end
-    else
-      banner = "\nThis resource type supports the following methods:\n\n"
-      discovery_document["resources"][resource_arg.pluralize]["methods"].each do |k,v|
-        description = ''
-        description = '  ' + v["description"] if v.include?("description")
-        banner += "   #{sprintf("%20s",k)}#{description}\n"
-      end
-      banner += "\n"
+  resource = ARGV.shift
+  if resource == '--help' or not resource_types.include?(resource)
+    help_resources(discovery_document, resource)
+  end
 
-      STDERR.puts banner
-  
-      if not method.nil? and method != '--help' then 
-        Trollop::die "Unknown method #{method.to_s} for command #{resource_arg.to_s}"
-      else
-        exit 255
-      end
+  method = ARGV.shift
+  if not (discovery_document["resources"][resource.pluralize]["methods"].
+          include?(method))
+    help_methods(discovery_document, resource, method)
+  end
 
-    end
-    
-  else
-    banner = "\nThis Arvados instance supports the following resource types:\n\n"
-    discovery_document["resources"].each do |k,v|
+  discovered_params = (discovery_document
+                       ["resources"][resource.pluralize]
+                       ["methods"][method]
+                       ["parameters"])
+  method_opts = Trollop::options do
+    discovered_params.each do |k,v|
+      opts = Hash.new()
+      opts[:type] = v["type"].to_sym if v.include?("type")
+      if [:datetime, :text, :object, :array].index opts[:type]
+        opts[:type] = :string                       # else trollop bork
+      end
+      opts[:default] = v["default"] if v.include?("default")
+      opts[:default] = v["default"].to_i if opts[:type] == :integer
+      opts[:default] = to_boolean(v["default"]) if opts[:type] == :boolean
+      opts[:required] = true if v.include?("required") and v["required"]
       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"]
+      description = '  ' + v["description"] if v.include?("description")
+      opt k.to_sym, description, opts
+    end
+    body_object = discovery_document["resources"][resource.pluralize]["methods"][method]["request"]
+    if body_object and discovered_params[resource].nil?
+      is_required = true
+      if body_object["required"] == false
+        is_required = false
       end
-      banner += "   #{sprintf("%30s",k.singularize)}#{description}\n"
+      opt resource.to_sym, "#{resource} (request body)", required: is_required, type: :string
     end
-    banner += "\n"
-
-    STDERR.puts banner
-
-    if not resource_arg.nil? and resource_arg != '--help' then 
-      Trollop::die "Unknown resource type #{resource_arg.inspect}"
-    else
-      exit 255
+  end
+  discovered_params.each do |k,v|
+    if ['object', 'array'].index(v["type"]) and method_opts.has_key? k
+      method_opts[k] = JSON.parse method_opts[k]
     end
   end
-
-  return resource_arg, method, method_opts, global_opts, ARGV
+  return resource, method, method_opts, global_opts, ARGV
 end
 
 resource_schema, method, method_opts, global_opts, remaining_opts = parse_arguments(arvados.discovery_document)

data/bin/crunch-job

@@ -341,13 +341,13 @@ else
   Log (undef, "Install revision ".$Job->{script_version});
   my $nodelist = join(",", @node);
 
-  # Clean out crunch_tmp/work, crunch_tmp/opt, crunch_tmp/src
+  # Clean out crunch_tmp/work, crunch_tmp/opt, crunch_tmp/src*
 
   my $cleanpid = fork();
   if ($cleanpid == 0)
   {
     srun (["srun", "--nodelist=$nodelist", "-D", $ENV{'TMPDIR'}],
-	  ['bash', '-c', 'if mount | grep -q $JOB_WORK/; then sudo /bin/umount $JOB_WORK/* 2>/dev/null; fi; sleep 1; rm -rf $JOB_WORK $CRUNCH_TMP/opt $CRUNCH_TMP/src']);
+	  ['bash', '-c', 'if mount | grep -q $JOB_WORK/; then sudo /bin/umount $JOB_WORK/* 2>/dev/null; fi; sleep 1; rm -rf $JOB_WORK $CRUNCH_TMP/opt $CRUNCH_TMP/src*']);
     exit (1);
   }
   while (1)
@@ -1351,7 +1351,7 @@ my $repo = $ENV{"CRUNCH_SRC_URL"};
 
 open L, ">", "$destdir.lock" or die "$destdir.lock: $!";
 flock L, LOCK_EX;
-if (readlink ("$destdir.commit") eq $commit) {
+if (readlink ("$destdir.commit") eq $commit && -d $destdir) {
     exit 0;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20131212092848
+  version: 0.1.20131212114626
 platform: ruby
 authors:
 - Arvados Authors
@@ -94,7 +94,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
-description: This is the Arvados SDK CLI gem, git revision 4a05680dd6991129385046ce646c32e1b595055a
+description: This is the Arvados SDK CLI gem, git revision b0f21e25fac7bfc359c0c284805ef2723d7dcc72
 email: gem-dev@clinicalfuture.com
 executables:
 - arv