Merge pull request #85 from alces-software/develop

Update master in preparation of version 1.0.1
openflighthpc · Feb 19, 2019 · 7435a91 · 7435a91
2 parents 8272892 + 0e25003
commit 7435a91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/inventoryware/commands/delete.rb b/lib/inventoryware/commands/delete.rb
@@ -36,7 +36,7 @@ def run
           else
             node_msg = "#{prefix} #{node_locations[0]} - proceed? (y/n)"
           end
-          if agree(node_msg)
+          if $terminal.agree(node_msg)
             node_locations.each { |node| FileUtils.rm node }
           end
         else

diff --git a/lib/inventoryware/commands/modifys/location.rb b/lib/inventoryware/commands/modifys/location.rb
@@ -39,7 +39,7 @@ def run
           # Get input REPL style
           fields.each do |field, hash|
             name = hash['name'] ? hash['name'] : field
-            value = ask("Enter a #{name} or press enter to skip")
+            value = $terminal.ask("Enter a #{name} or press enter to skip")
             hash['value'] = value unless value == ''
           end
 

diff --git a/lib/inventoryware/node.rb b/lib/inventoryware/node.rb
@@ -45,13 +45,13 @@ def open
         end
       rescue Psych::SyntaxError
         raise ParseError, <<-ERROR.chomp
-Error parsing yaml in #{node_location} - aborting
+Error parsing yaml in #{@location} - aborting
         ERROR
       end
       # condition for if the .yaml is empty
       unless node_data
         raise ParseError, <<-ERROR.chomp
-Yaml in #{node_location} is empty - aborting
+Yaml in #{@location} is empty - aborting
         ERROR
       end
       @data = node_data.values[0]