machinery-tool 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa664c89d067292bb4703e9b8bba47651981831
-  data.tar.gz: 45c13a6f27432d9fc09ab306cdad7c07680df73f
+  metadata.gz: e8755dd722d4450f406fe08db1700528783ff297
+  data.tar.gz: 3709616bfe0e90ac03543cda9ad942cc60ee8800
 SHA512:
-  metadata.gz: f31cd802cb1ce442b18bb0dd374f9308371bf7376e168d97608d5a0ff94e10164d11c6cc0ed58c40aaad230338430c966f5013f3a8c49c940ab1ed45f810ca32
-  data.tar.gz: b1d69fc9f41836dab29ff51e449861517527b9b205ad5e6ccc6ef981199b40386518a93c02a98d3454b25bf842914c8da9f106a15179aa71e11c2e8b8b924908
+  metadata.gz: e8f9fd19e24aeced39f9c6218461aa35145484b53e99de5961d90a9e8933928538aceb53da569714210a2d5fb1d32b6859a73fb383b6b7db2942c601e468c0a7
+  data.tar.gz: a634e571b90b353f7c3f878ccb9dec19ced958df03d0401d7851226847cf4bbc7ce643b8acd7aebc5bc5c69a7cda5db0f445d1a2e19b5886b5e560db74a6dc60

data/NEWS

@@ -1,6 +1,10 @@
 # Machinery Release Notes
 
 
+## Version 1.9.1 - Tue Jun 23 16:57:35 CEST 2015 - thardeck@suse.de
+
+* `machinery config` takes arguments of the form 'key=value' as well
+
 ## Version 1.9.0 - Wed Jun 17 09:57:07 CEST 2015 - thardeck@suse.de
 
 * Support links in changed managed files scope

data/lib/analyze_config_file_diffs_task.rb

@@ -23,6 +23,12 @@ class AnalyzeConfigFileDiffsTask
       "repositories",
       "config_files"
     )
+
+    if !description["repositories"].any? { |repo| repo.enabled && !repo.external_medium? }
+      raise Machinery::Errors::AnalysisFailed,
+        "Can not analyze the system description because it does not contain any online repository"
+    end
+
     if !description.scope_extracted?("config_files")
       raise Machinery::Errors::MissingExtractedFiles.new(description, ["config_files"])
     end

data/lib/cli.rb

@@ -37,7 +37,8 @@ class Cli
     else
       Machinery.logger.level = Logger::INFO
     end
-    check_exceeding_arguments(command.arguments, args)
+
+    validate_number_of_arguments(command.arguments, args)
   end
 
   post do |global_options,command,options,args|
@@ -45,9 +46,9 @@ class Cli
 
       Machinery::Ui.puts "\nMachinery can show hints which guide through a typical workflow."
       if @config.hints
-        Machinery::Ui.puts "These hints can be switched off by '#{$0} config hints off'."
+        Machinery::Ui.puts "These hints can be switched off by '#{$0} config hints=off'."
       else
-        Machinery::Ui.puts "These hints can be switched on by '#{$0} config hints on'."
+        Machinery::Ui.puts "These hints can be switched on by '#{$0} config hints=on'."
       end
 
       Hint.print(:get_started)
@@ -57,11 +58,17 @@ class Cli
 
   GLI::Commands::Help.skips_post = false
 
-  def self.check_exceeding_arguments(defined, parsed)
-    if parsed.size > defined.size
-      message = "The given arguments don't match the command's specified arguments."
+  def self.validate_number_of_arguments(defined, parsed)
+    if defined.any?(&:multiple?) && parsed.empty?
+      message = "No arguments given. Nothing to do."
+      raise GLI::BadCommandLine.new(message)
+    elsif !defined.any?(&:multiple?) && parsed.size > defined.size
+      parsed_arguments = "#{parsed.size} #{Machinery.pluralize(parsed.size, "argument")}"
+      defined_arguments = defined.empty? ? "none" : "only: #{defined.map(&:name).join(", ")}"
+      message = "Too many arguments: got #{parsed_arguments}, expected #{defined_arguments}"
       raise GLI::BadCommandLine.new(message)
     end
+
     true
   end
 
@@ -200,9 +207,9 @@ class Cli
       form = invalid_scopes.length > 1 ? "scopes are" : "scope is"
       raise Machinery::Errors::UnknownScope.new(
         "The following #{form} not valid:" \
-          " \"#{invalid_scopes.join("\", \"")}\"." \
+          " '#{invalid_scopes.join("', '")}'." \
           " Scope names must start with a letter and contain only lowercase" \
-          " letters and digits separated by dashes (\"-\")."
+          " letters and digits separated by dashes ('-')."
       )
     end
 
@@ -567,7 +574,8 @@ class Cli
 
     The success of a removal can be shown with the verbose option.
   LONGDESC
-  arg "NAME..."
+  arg "NAME", :multiple
+
   command :remove do |c|
     c.switch :all, negatable: false,
       desc: "Remove all system descriptions"
@@ -709,14 +717,22 @@ class Cli
   arg "VALUE", :optional
   command "config" do |c|
     c.action do |global_options,options,args|
-      key = args[0]
-      value = args[1]
+      if args[0] && args[0].include?("=")
+        if args[1]
+          raise GLI::BadCommandLine, "Too many arguments: got 2 arguments, expected only: KEY=VALUE"
+        else
+          key, value = args[0].split("=")
+        end
+      else
+        key = args[0]
+        value = args[1]
+      end
 
       task = ConfigTask.new
       task.config(key, value)
 
       if key == "hints" && !@config.hints
-        Machinery::Ui.puts "Hints can be switched on again by '#{$0} config hints on'."
+        Machinery::Ui.puts "Hints can be switched on again by '#{$0} config hints=on'."
       end
     end
   end

data/lib/config_base.rb

@@ -60,8 +60,9 @@ class ConfigBase
 
     # Check if data type is correct. true and false are not of the same type which makes the check complex
     if value.class != @entries[key][:value].class &&
-      ! ( ( value == true || value == false ) && ( @entries[key][:value].class == TrueClass || @entries[key][:value].class == FalseClass ) )
-      raise Machinery::Errors::MachineryError.new("The value \"#{value}\" for configuration key \"#{key}\" is of an invalid data type.")
+      !(boolean?(value) && boolean?(@entries[key][:value]))
+      raise Machinery::Errors::MachineryError,
+        "The value '#{value}' for configuration key '#{key}' is of an invalid data type."
     end
 
     @entries[key][:value] = value
@@ -69,9 +70,12 @@ class ConfigBase
     save if options[:auto_save]
   end
 
-
   private
 
+  def boolean?(value)
+    value.is_a?(TrueClass) || value.is_a?(FalseClass)
+  end
+
   def save
     config_table_stripped = {}
     @entries.each do |key,value|
@@ -82,9 +86,9 @@ class ConfigBase
 
     begin
       File.write(@file, config_table_stripped.to_yaml)
-      Machinery.logger.info("Wrote configuration file \"#{@file}\".")
+      Machinery.logger.info("Wrote configuration file '#{@file}'.")
     rescue => e
-      raise Machinery::Errors::MachineryError.new("Could not write configuration file \"#{@file}\": #{e}.")
+      raise Machinery::Errors::MachineryError.new("Could not write configuration file '#{@file}': #{e}.")
     end
   end
 
@@ -95,7 +99,7 @@ class ConfigBase
       begin
         set(key, value, :auto_save => false )
       rescue => e
-        Machinery::Ui.warn "Warning: The machinery config file \"#{file}\" contains an invalid entry \"#{key}\":\n#{e}"
+        Machinery::Ui.warn "Warning: The machinery config file '#{file}' contains an invalid entry '#{key}':\n#{e}"
       end
     end
   end
@@ -103,9 +107,9 @@ class ConfigBase
   def read_config_file(file)
     begin
       content = YAML.load_file(file)
-      Machinery.logger.info("Read configuration file \"#{file}\".")
+      Machinery.logger.info("Read configuration file '#{file}'.")
     rescue => e
-      Machinery::Ui.warn "Warning: Cannot parse machinery config file \"#{@file}\":\n#{e}"
+      Machinery::Ui.warn "Warning: Cannot parse machinery config file '#{@file}':\n#{e}"
     end
     content
   end

data/lib/local_system.rb

@@ -50,7 +50,9 @@ class LocalSystem < System
       message = <<EOF
 You are running Machinery on a platform we do not explicitly support and test.
 It still could work very well. If you run into issues or would like to provide us feedback, you are welcome to file an issue at https://github.com/SUSE/machinery/issues/new or write an email to machinery@lists.suse.com.
-Oficially supported operating systems are: #{supported_oses}"
+Oficially supported operating systems are: '#{supported_oses}'
+
+To disable this message in the machinery configuration use 'machinery config perform-support-check=false'
 EOF
 
       Machinery::Ui.warn message

data/lib/remove_task.rb

@@ -32,11 +32,11 @@ class RemoveTask
 
     Array(names).each do |name|
       if !store.list.include?(name)
-        errors.push("System description \"#{name}\" does not exist.")
+        errors.push("System description '#{name}' does not exist.")
       else
         store.remove(name)
         if options[:verbose]
-          Machinery::Ui.puts "System description \"#{name}\" successfully removed."
+          Machinery::Ui.puts "System description '#{name}' successfully removed."
         end
       end
     end

data/lib/show_task.rb

@@ -36,7 +36,7 @@ class ShowTask
       LoggedCheetah.run("xdg-open", html_path)
     rescue Cheetah::ExecutionFailed => e
       raise Machinery::Errors::OpenInBrowserFailed.new(
-        "Could not open system description \"#{description.name}\" in the web browser.\n" \
+        "Could not open system description '#{description.name}' in the web browser.\n" \
           "Error: #{e}\n"
       )
     end

data/lib/system_description.rb

@@ -75,14 +75,14 @@ class SystemDescription < Machinery::Object
     def validate_name(name)
       if ! /^[\w\.:-]*$/.match(name)
         raise Machinery::Errors::SystemDescriptionError.new(
-          "System description name \"#{name}\" is invalid. " +
-          "Only \"a-zA-Z0-9_:.-\" are valid characters."
+          "System description name '#{name}' is invalid. " +
+          "Only 'a-zA-Z0-9_:.-' are valid characters."
         )
       end
 
       if name.start_with?(".")
         raise Machinery::Errors::SystemDescriptionError.new(
-          "System description name \"#{name}\" is invalid. " +
+          "System description name '#{name}' is invalid. " +
           "A dot is not allowed as first character."
         )
       end

data/lib/system_description_store.rb

@@ -134,7 +134,7 @@ class SystemDescriptionStore
   def validate_existence_of_description(description_name)
     if !list.include?(description_name)
       raise Machinery::Errors::SystemDescriptionNotFound.new(
-        "System description \"#{description_name}\" does not exist."
+        "System description '#{description_name}' does not exist."
       )
     end
   end
@@ -142,7 +142,7 @@ class SystemDescriptionStore
   def validate_nonexistence_of_description(description_name)
     if list.include?(description_name)
       raise Machinery::Errors::SystemDescriptionError.new(
-        "A System description with the name \"#{description_name}\" does already exist."
+        "A System description with the name '#{description_name}' does already exist."
       )
     end
   end

data/lib/upgrade_format_task.rb

@@ -19,7 +19,7 @@ class UpgradeFormatTask
   def upgrade(store, name, options = {})
     if !options[:all] && !store.list.include?(name)
       raise Machinery::Errors::SystemDescriptionNotFound.new(
-        "System description \"#{name}\" does not exist."
+        "System description '#{name}' does not exist."
       )
     end
 
@@ -35,8 +35,8 @@ class UpgradeFormatTask
     descriptions.each do |description|
       begin
         hash = Manifest.load(description, store.manifest_path(description)).to_hash
-        Machinery.logger.info "Upgrading description \"#{description}\""
-        Machinery::Ui.print "Reading \"#{description}\" ... "
+        Machinery.logger.info "Upgrading description '#{description}'"
+        Machinery::Ui.print "Reading '#{description}' ... "
         migrated = Migration.migrate_description(store, description, force: options[:force])
 
         if migrated
@@ -45,7 +45,7 @@ class UpgradeFormatTask
             " #{hash["meta"]["format_version"]} to #{SystemDescription::CURRENT_FORMAT_VERSION}."
         end
       rescue StandardError => e
-        errors.push("Upgrading description \"#{description}\" failed:\n#{e}")
+        errors.push("Upgrading description '#{description}' failed:\n#{e}")
         Machinery::Ui.puts "Upgrade failed."
       end
     end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 
 end

data/man/generated/machinery.1.html

@@ -533,8 +533,11 @@ list:</p>
 
 <h3 id="SYNOPSIS">SYNOPSIS</h3>
 
-<p><code>machinery config</code>
-    [KEY] [VALUE]</p>
+<p><code>machinery config</code></p>
+
+<p><code>machinery config</code> KEY</p>
+
+<p><code>machinery config</code> KEY=VALUE</p>
 
 <p><code>machinery</code> help config</p>
 
@@ -561,7 +564,7 @@ If key and value are specified this configuration entry is set accordingly.</p>
 <dl>
 <dt>Turn off hints:</dt><dd><p></p>
 
-<p>$ <code>machinery</code> config hints off</p></dd>
+<p>$ <code>machinery</code> config hints=off</p></dd>
 <dt>Show current configuration of hints:</dt><dd><p></p>
 
 <p>$ <code>machinery</code> config hints</p></dd>
@@ -844,7 +847,7 @@ See the <a href="#Scopes" data-bare-link="true">Scope section</a> for more infor
 <dt><code>-r USER</code>, <code>--remote-user=USER</code> (optional)</dt><dd><p>Defines the user which is used to access the inspected system via SSH.
 This user needs to be allowed to run certain commands using sudo (see
 PREREQUISITES for more information).
-To change the default-user use <code>machinery config remote-user USER</code></p></dd>
+To change the default-user use <code>machinery config remote-user=USER</code></p></dd>
 <dt><code>-x</code>, <code>--extract-files</code> (optional)</dt><dd><p>Extract changed configuration and unmanaged files from the inspected system.
 Shortcut for the combination of <code>--extract-changed-config-files</code>,
 <code>--extract-unmanaged-files</code>, and <code>--extract-changed-managed-files</code></p></dd>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah