Merge pull request #48 from alces-software/feat/expand-asterisks

Expand asterisks in node names

lib/utils.rb

@@ -83,7 +83,22 @@ def self.expand_node_ranges(nodes)
           nodes.delete(node)
         end
       end
-      nodes = nodes + new_nodes
+      nodes.push(*new_nodes)
+      return expand_asterisks(nodes)
+    end
+
+    def self.expand_asterisks(nodes)
+      new_nodes = []
+      nodes.each do |node|
+        if node.match(/\*/)
+          node_names = Dir.glob(File.join(YAML_DIR, node)).map { |file|
+            File.basename(file, '.yaml')
+          }
+          new_nodes.push(*node_names)
+        end
+      end
+      nodes.delete_if { |node| node.match(/\*/) }
+      nodes.push(*new_nodes)
       return nodes
     end
 
@@ -181,7 +196,7 @@ def self.select_nodes(nodes, options, return_missing = false)
         node_locations = find_all_nodes
       else
         if nodes
-          node_locations.push(*find_nodes(nodes, return_missing = true))
+          node_locations.push(*find_nodes(nodes, return_missing))
         end
         if options.group
           node_locations.push(*find_nodes_in_groups(options.group.split(',')))
@@ -243,7 +258,7 @@ def self.find_nodes(nodes, return_missing = false)
           if return_missing
             $stderr.puts "Creating..."
           else
-            $stderr.puts "Skipping"
+            $stderr.puts "Skipping."
             next
           end
         end