machinery-tool 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df33176b811549a953814924a963e655a842e3e
-  data.tar.gz: 4bd71beba06623be5a2333e6adef30eb2c61305a
+  metadata.gz: f5d39b671ef2bf800e50ffe8cb48003f1ad6cf50
+  data.tar.gz: a5f739eb08389646bd1d6e8d26ee29d6f21b1595
 SHA512:
-  metadata.gz: 1f0afb5e850e9f37772ce71d8f60a295a0e57ee494f9bab20a8e63ea1fac56194e1883c73ba74b35cf3a3ff176feca8293d72659b2a957ec6733b02da2bad97f
-  data.tar.gz: 4a6538e1df02b68cb4800913f4d587b664a843f4589e735a19b6b4186327a2ab424125b09e35e76883c80cc64cabad296f3d7e67147055646f3ef67a0a85a6e6
+  metadata.gz: 1992072db448872c81e4179fa7f2a7518179ecf15f12c433b9cd0f6c6a1811bdb4e7f68b4776ea69ac649fcdf8b5c813af213aa7e786f40d0cb02638f2462d1e
+  data.tar.gz: 651d2cfa1150a857ca265db080d113d61f845c8ed2cfdaeb626b81b058b5b52193239b751c2385cdf2978f86e7ff42510265f5efdb1dbc6f9f57f8031797a5c0

data/NEWS

@@ -1,6 +1,12 @@
 # Machinery Release Notes
 
 
+## Version 1.11.2 - Thu Jul 30 14:42:44 CEST 2015 - thardeck@suse.de
+
+* Fix issue with showing HTML view when not all file scopes are inspected
+  (gh#SUSE/machinery#1150)
+* Fix `--all` option of `remove` command (gh#SUSE/machinery#1128)
+
 ## Version 1.11.1 - Tue Jul 21 09:44:16 CEST 2015 - thardeck@suse.de
 
 * Fix unmanaged-files diff in HTML view (gh#SUSE/machinery#1143)

data/lib/build_task.rb

@@ -19,8 +19,7 @@ class BuildTask
   def build(system_description, output_path, options = {})
     LocalSystem.validate_architecture("x86_64")
     LocalSystem.validate_build_compatibility(system_description)
-    LocalSystem.validate_existence_of_package("kiwi")
-    LocalSystem.validate_existence_of_package("kiwi-desc-vmxboot")
+    LocalSystem.validate_existence_of_packages(["kiwi", "kiwi-desc-vmxboot"])
 
     tmp_config_dir = Dir.mktmpdir("machinery-config", "/tmp")
     tmp_image_dir = Dir.mktmpdir("machinery-image", "/tmp")

data/lib/cli.rb

@@ -35,7 +35,9 @@ class Cli
       Machinery.logger.level = Logger::INFO
     end
 
-    validate_number_of_arguments(command.arguments, args)
+    validate_command_line(command.arguments, args)
+
+    true
   end
 
   post do |global_options,command,options,args|
@@ -55,8 +57,8 @@ class Cli
 
   GLI::Commands::Help.skips_post = false
 
-  def self.validate_number_of_arguments(defined, parsed)
-    if defined.any?(&:multiple?) && parsed.empty?
+  def self.validate_command_line(defined, parsed)
+    if defined.any?(&:multiple?) && !defined.any?(&:optional?) && parsed.empty?
       message = "No arguments given. Nothing to do."
       raise GLI::BadCommandLine.new(message)
     elsif !defined.any?(&:multiple?) && parsed.size > defined.size
@@ -65,8 +67,6 @@ class Cli
       message = "Too many arguments: got #{parsed_arguments}, expected #{defined_arguments}"
       raise GLI::BadCommandLine.new(message)
     end
-
-    true
   end
 
   def self.buildable_distributions
@@ -594,7 +594,7 @@ class Cli
 
     The success of a removal can be shown with the verbose option.
   LONGDESC
-  arg "NAME", :multiple
+  arg "NAME", [:multiple, :optional]
 
   command :remove do |c|
     c.switch :all, negatable: false,
@@ -603,6 +603,10 @@ class Cli
       desc: "Explain what is being done"
 
     c.action do |global_options,options,args|
+      if !options[:all] && args.empty?
+        raise GLI::BadCommandLine.new, "You need to either specify `--all` or a list of system descriptions"
+      end
+
       task = RemoveTask.new
       task.remove(system_description_store, args, verbose: options[:verbose], all: options[:all])
     end
@@ -755,7 +759,8 @@ class Cli
   LONGDESC
   arg "NAME"
   command "serve" do |c|
-    c.flag [:port, :p], type: Integer, required: false, default_value: 7585,
+    c.flag [:port, :p], type: Integer, required: false,
+      default_value: Machinery::Config.new.http_server_port,
       desc: "Listen on port PORT", arg_name: "PORT"
     c.flag [:ip, :i], type: String, required: false, default_value: "127.0.0.1",
       desc: "Listen on ip IP", arg_name: "IP"

data/lib/compare_task.rb

@@ -39,9 +39,7 @@ There is a web server running, serving the comparison result on #{url}.
 The server can be closed with Ctrl+C.
 EOF
 
-    server = Html.run_server(description1.store, port: options[:port], ip: options[:ip])
-
-    Html.when_server_ready(options[:ip], options[:port]) do
+    server = Html.run_server(description1.store, port: options[:port], ip: options[:ip]) do
       LoggedCheetah.run("xdg-open", url)
     end
 

data/lib/config.rb

@@ -21,9 +21,11 @@
 
 module Machinery
   class Config < ConfigBase
-    def define_entries
-      default_config_file(Machinery::DEFAULT_CONFIG_FILE)
+    def default_config_file
+      ENV["MACHINERY_CONFIG_FILE"] || Machinery::DEFAULT_CONFIG_FILE
+    end
 
+    def define_entries
       entry("hints",
         default: true,
         description: "Show hints about usage of Machinery in the context of the commands ran by" \

data/lib/config_base.rb

@@ -20,16 +20,18 @@
 # the file 'machinery_config.rb'.
 
 class ConfigBase
-  def initialize
+  attr_reader :file
+
+  def initialize(file = default_config_file)
     @entries = {}
-    @file = ""
+    @file = file
     define_entries
     apply_custom_config(@file) if File.exist?(@file)
   end
 
-  def default_config_file(file)
-    @file = file
-  end
+  abstract_method :default_config_files
+
+  abstract_method :define_entries
 
   def entry(key, parameters = {})
     key = normalize_key(key)
@@ -39,10 +41,6 @@ class ConfigBase
      create_method("#{key}=".to_sym) { |value| set(key, value) }
   end
 
-  def define_entries
-    raise NotImplementedError.new("No config entries defined for #{self.class}")
-  end
-
   def each(&block)
     @entries.map { |key, value| [unnormalize_key(key), value] }.each(&block)
   end
@@ -82,7 +80,7 @@ class ConfigBase
       config_table_stripped[key] = value[:value]
     end
 
-    FileUtils.mkdir_p(Machinery::DEFAULT_CONFIG_DIR)
+    FileUtils.mkdir_p(File.dirname(file))
 
     begin
       File.write(@file, config_table_stripped.to_yaml)

data/lib/deploy_task.rb

@@ -18,7 +18,7 @@
 class DeployTask
   def deploy(description, cloud_config, options = {})
     LocalSystem.validate_architecture("x86_64")
-    LocalSystem.validate_existence_of_package("python-glanceclient")
+    LocalSystem.validate_existence_of_packages(["python-glanceclient", "kiwi", "kiwi-desc-vmxboot"])
     LocalSystem.validate_build_compatibility(description)
 
     if !File.exists?(cloud_config)

data/lib/exceptions.rb

@@ -134,5 +134,6 @@ module Machinery
     class ZypperFailed < MachineryError; end
     class UnknownConfig < MachineryError; end
     class UnsupportedArchitecture < MachineryError; end
+    class ServeFailed < MachineryError; end
   end
 end

data/lib/html.rb

@@ -16,184 +16,14 @@
 # you may find current contact information at www.suse.com
 
 class Html
-  module Helpers
-    def scope_help(scope)
-      text = File.read(File.join(Machinery::ROOT, "plugins", "#{scope}/#{scope}.md"))
-      Kramdown::Document.new(text).to_html
-    end
-
-    def diff_to_object(diff)
-      diff = Machinery.scrub(diff)
-      lines = diff.lines[2..-1]
-      diff_object = {
-        file: diff[/--- a(.*)/, 1],
-        additions: lines.select { |l| l.start_with?("+") }.length,
-        deletions: lines.select { |l| l.start_with?("-") }.length
-      }
-
-      original_line_number = 0
-      new_line_number = 0
-      diff_object[:lines] = lines.map do |line|
-        line = ERB::Util.html_escape(line.chomp).
-          gsub("\\", "\").
-          gsub("\t", " " * 8)
-        case line
-        when /^@.*/
-          entry = {
-            type: "header",
-            content: line
-          }
-          original_line_number = line[/-(\d+)/, 1].to_i
-          new_line_number = line[/\+(\d+)/, 1].to_i
-        when /^ .*/, ""
-          entry = {
-            type: "common",
-            new_line_number: new_line_number,
-            original_line_number: original_line_number,
-            content: line[1..-1]
-          }
-          new_line_number += 1
-          original_line_number += 1
-        when /^\+.*/
-          entry = {
-            type: "addition",
-            new_line_number: new_line_number,
-            content: line[1..-1]
-          }
-          new_line_number += 1
-        when /^\-.*/
-          entry = {
-            type: "deletion",
-            original_line_number: original_line_number,
-            content: line[1..-1]
-          }
-          original_line_number += 1
-        end
-
-        entry
-      end
-
-      diff_object
-    end
-  end
-
-  # this is required for the #generate_comparison method which renders a HAML template manually with
-  # the local binding, so it expects the helper methods to be available in Html. It can be removed
-  # once the comparison was move to the webserver approach as well
-  extend Helpers
-
   # Creates a new thread running a sinatra webserver which serves the local system descriptions
   # The Thread object is returned so that the caller can `.join` it until it's finished.
-  def self.run_server(system_description_store, opts)
+  def self.run_server(system_description_store, opts, &block)
     Thread.new do
-      require "sinatra/base"
-      require "mimemagic"
-
-      server = Sinatra.new do
-        set :port, opts[:port] || 7585
-        set :bind, opts[:ip] || "localhost"
-        set :public_folder, File.join(Machinery::ROOT, "html")
-
-        helpers Helpers
-
-        get "/descriptions/:id.js" do
-          description = SystemDescription.load(params[:id], system_description_store)
-          diffs_dir = description.scope_file_store("analyze/config_file_diffs").path
-          if description.config_files && diffs_dir
-            # Enrich description with the config file diffs
-            description.config_files.files.each do |file|
-              path = File.join(diffs_dir, file.name + ".diff")
-              file.diff = diff_to_object(File.read(path)) if File.exists?(path)
-            end
-          end
-
-          # Enrich file information with downloadable flag
-          ["config_files", "changed_managed_files", "unmanaged_files"].each do |scope|
-            description[scope].files.each do |file|
-              file.downloadable = file.on_disk?
-            end
-          end
-
-          description.to_hash.to_json
-        end
-
-        get "/descriptions/:id/files/:scope/*" do
-          description = SystemDescription.load(params[:id], system_description_store)
-          filename = File.join("/", params["splat"].first)
-
-          file = description[params[:scope]].files.find { |f| f.name == filename }
-
-          if request.accept.first.to_s == "text/plain" && file.binary?
-            status 406
-            return "binary file"
-          end
-
-          content = file.content
-          type = MimeMagic.by_path(filename) || MimeMagic.by_magic(content) || "text/plain"
-
-          content_type type
-          attachment File.basename(filename)
-
-          content
-        end
-
-        get "/compare/:a/:b.json" do
-          description_a = SystemDescription.load(params[:a], system_description_store)
-          description_b = SystemDescription.load(params[:b], system_description_store)
-
-          diff = {
-            meta: {
-              description_a: description_a.name,
-              description_b: description_b.name,
-            }
-          }
-
-          Inspector.all_scopes.each do |scope|
-            if description_a[scope] && description_b[scope]
-              comparison = Comparison.compare_scope(description_a, description_b, scope)
-              diff[scope] = comparison.as_json
-            else
-              diff[:meta][:uninspected] ||= Hash.new
-
-              if !description_a[scope] && description_b[scope]
-                diff[:meta][:uninspected][description_a.name] ||= Array.new
-                diff[:meta][:uninspected][description_a.name] << scope
-              end
-              if !description_b[scope] && description_a[scope]
-                diff[:meta][:uninspected][description_b.name] ||= Array.new
-                diff[:meta][:uninspected][description_b.name] << scope
-              end
-            end
-          end
-
-          diff.to_json
-        end
-
-        get "/compare/:a/:b" do
-          haml File.read(File.join(Machinery::ROOT, "html/comparison.html.haml")),
-            locals: { description_a: params[:a], description_b: params[:b] }
-        end
-
-        get "/compare/:a/:b/files/:scope/*" do
-          description1 = SystemDescription.load(params[:a], system_description_store)
-          description2 = SystemDescription.load(params[:b], system_description_store)
-          filename = File.join("/", params["splat"].first)
-
-          begin
-            diff = FileDiff.diff(description1, description2, params[:scope], filename)
-          rescue Machinery::Errors::BinaryDiffError
-            status 406
-            return "binary file"
-          end
-
-          diff.to_s(:html)
-        end
-
-        get "/:id" do
-          haml File.read(File.join(Machinery::ROOT, "html/index.html.haml")),
-            locals: { description_name: params[:id] }
-        end
-      end
+      Server.set :system_description_store, system_description_store
+      Server.set :port, opts[:port] || Machinery::Config.new.http_server_port
+      Server.set :bind, opts[:ip] || "localhost"
+      Server.set :public_folder, File.join(Machinery::ROOT, "html")
 
       if opts[:ip] != "localhost" && opts[:ip] != "127.0.0.1"
         Machinery::Ui.puts <<EOF
@@ -205,27 +35,24 @@ EOF
 
       begin
         setup_output_redirection
-        server.run!
+        begin
+          Server.run! do
+            Thread.new { block.call }
+          end
+        rescue Errno::EADDRINUSE
+          servefailed_error = <<-EOF.chomp
+Port #{Server.settings.port} is already in use.
+Stop the already running server on port #{Server.settings.port} or specify a new port by using --port option.
+EOF
+          raise Machinery::Errors::ServeFailed, servefailed_error
+        end
+        remove_output_redirection
       rescue => e
+        remove_output_redirection
         # Re-raise exception in main thread
         Thread.main.raise e
-      ensure
-        remove_output_redirection
-      end
-    end
-  end
-
-  def self.when_server_ready(ip, port, &block)
-    20.times do
-      begin
-        TCPSocket.new(ip, port).close
-        block.call
-        return
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        sleep 0.1
       end
     end
-    raise Machinery::Errors::MachineryError, "The web server did not come up in time."
   end
 
   def self.setup_output_redirection
@@ -240,22 +67,4 @@ EOF
     STDOUT.reopen @orig_stdout
     STDERR.reopen @orig_stderr
   end
-
-  def self.generate_comparison(diff, target)
-    FileUtils.mkdir_p(File.join(target, "assets"))
-    template = Haml::Engine.new(
-      File.read(File.join(Machinery::ROOT, "html", "comparison.html.haml"))
-    )
-
-    FileUtils.cp_r(File.join(Machinery::ROOT, "html", "assets"), target)
-    File.write(File.join(target, "index.html"), template.render(binding))
-    json = diff.to_json.gsub("'", "\\\\'").gsub("\"", "\\\\\"")
-    File.write(File.join(target, "assets/diff.js"),<<-EOT
-      function getDiff() {
-        return JSON.parse('#{json}'
-        )
-      }
-      EOT
-    )
-  end
 end

data/lib/inspector.rb

@@ -68,7 +68,10 @@ class Inspector
       scope_priority = {}
 
       scope_list.each do |scope|
-        scope_priority[self.for(scope).priority] = scope
+        inspector = self.for(scope)
+        next if !inspector
+
+        scope_priority[inspector.priority] = scope
       end
 
       scope_priority.sort.map do |key, value|

data/lib/local_system.rb

@@ -30,17 +30,41 @@ class LocalSystem < System
     end
 
     def validate_existence_of_package(package)
-      begin
-        Cheetah.run("rpm", "-q", package)
-      rescue
-        needed_module = os.module_required_by_package(package)
-        if needed_module
-          raise(Machinery::Errors::MissingRequirement.new("You need the package '#{package}' from module '#{needed_module}'. You can install it as follows:\n" \
-            "If you haven't selected the module '#{needed_module}' before, run `yast2 scc` and choose 'Select Extensions' and activate '#{needed_module}'.\nRun `zypper install #{package}` to install the package."))
-        else
-          raise(Machinery::Errors::MissingRequirement.new("You need the package '#{package}'. You can install it by running `zypper install #{package}`"))
+      validate_existence_of_packages([package])
+    end
+
+    def validate_existence_of_packages(packages)
+      missing_packages = []
+      needed_modules = []
+
+      packages.each do |package|
+        begin
+          Cheetah.run("rpm", "-q", package)
+        rescue Cheetah::ExecutionFailed
+          missing_packages << package
+          needed_module = os.module_required_by_package(package)
+          if needed_module
+            needed_modules << package
+            if needed_module
+              output = <<-EOF
+You need the package '#{package}' from module '#{needed_module}'. You can install it as follows:
+If you haven't selected the module '#{needed_module}' before, run `yast2 scc` and choose 'Select Extensions' and activate '#{needed_module}'.
+Run `zypper install #{package}` to install the package.
+              EOF
+              raise(Machinery::Errors::MissingRequirement.new(output))
+            end
+          end
         end
       end
+
+      if !missing_packages.empty?
+        count = missing_packages.count
+        error_string = <<-EOF
+You need the #{Machinery::pluralize(count, "package")} '#{missing_packages.join("\',\'")}'.
+You can install it by running `zypper install #{missing_packages.join(" ")}`.
+        EOF
+        raise(Machinery::Errors::MissingRequirement.new(error_string))
+      end
     end
 
     def validate_machinery_compatibility

data/lib/machinery.rb

@@ -35,6 +35,8 @@ require "pathname"
 require "nokogiri"
 require "socket"
 require "diffy"
+require "sinatra/base"
+require "mimemagic"
 
 require_relative "machinery_logger"
 require_relative "zypper"
@@ -76,7 +78,6 @@ require_relative "ui"
 require_relative "validate_task"
 require_relative "migration"
 require_relative "upgrade_format_task"
-require_relative "html"
 require_relative "hint"
 require_relative "mountpoints"
 require_relative "config_base"
@@ -99,6 +100,8 @@ require_relative "man_task"
 require_relative "comparison"
 require_relative "serve_html_task"
 require_relative "file_diff"
+require_relative "server"
+require_relative "html"
 
 Dir[File.join(Machinery::ROOT, "plugins", "**", "*.rb")].each { |f| require(f) }
 

data/lib/server.rb

@@ -0,0 +1,181 @@
+# Copyright (c) 2013-2015 SUSE LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE about this file by physical or electronic mail,
+# you may find current contact information at www.suse.com
+
+class Server < Sinatra::Base
+  module Helpers
+    def scope_help(scope)
+      text = File.read(File.join(Machinery::ROOT, "plugins", "#{scope}/#{scope}.md"))
+      Kramdown::Document.new(text).to_html
+    end
+
+    def diff_to_object(diff)
+      diff = Machinery.scrub(diff)
+      lines = diff.lines[2..-1]
+      diff_object = {
+        file: diff[/--- a(.*)/, 1],
+        additions: lines.select { |l| l.start_with?("+") }.length,
+        deletions: lines.select { |l| l.start_with?("-") }.length
+      }
+
+      original_line_number = 0
+      new_line_number = 0
+      diff_object[:lines] = lines.map do |line|
+        line = ERB::Util.html_escape(line.chomp).
+          gsub("\\", "&#92;").
+          gsub("\t", "&nbsp;" * 8)
+        case line
+        when /^@.*/
+          entry = {
+            type: "header",
+            content: line
+          }
+          original_line_number = line[/-(\d+)/, 1].to_i
+          new_line_number = line[/\+(\d+)/, 1].to_i
+        when /^ .*/, ""
+          entry = {
+            type: "common",
+            new_line_number: new_line_number,
+            original_line_number: original_line_number,
+            content: line[1..-1]
+          }
+          new_line_number += 1
+          original_line_number += 1
+        when /^\+.*/
+          entry = {
+            type: "addition",
+            new_line_number: new_line_number,
+            content: line[1..-1]
+          }
+          new_line_number += 1
+        when /^\-.*/
+          entry = {
+            type: "deletion",
+            original_line_number: original_line_number,
+            content: line[1..-1]
+          }
+          original_line_number += 1
+        end
+
+        entry
+      end
+
+      diff_object
+    end
+  end
+
+  helpers Helpers
+
+  get "/descriptions/:id.js" do
+    description = SystemDescription.load(params[:id], settings.system_description_store)
+    diffs_dir = description.scope_file_store("analyze/config_file_diffs").path
+    if description.config_files && diffs_dir
+      # Enrich description with the config file diffs
+      description.config_files.files.each do |file|
+        path = File.join(diffs_dir, file.name + ".diff")
+        file.diff = diff_to_object(File.read(path)) if File.exists?(path)
+      end
+    end
+
+    # Enrich file information with downloadable flag
+    ["config_files", "changed_managed_files", "unmanaged_files"].each do |scope|
+      next if !description[scope]
+
+      description[scope].files.each do |file|
+        file.downloadable = file.on_disk?
+      end
+    end
+
+    description.to_hash.to_json
+  end
+
+  get "/descriptions/:id/files/:scope/*" do
+    description = SystemDescription.load(params[:id], settings.system_description_store)
+    filename = File.join("/", params["splat"].first)
+
+    file = description[params[:scope]].files.find { |f| f.name == filename }
+
+    if request.accept.first.to_s == "text/plain" && file.binary?
+      status 406
+      return "binary file"
+    end
+
+    content = file.content
+    type = MimeMagic.by_path(filename) || MimeMagic.by_magic(content) || "text/plain"
+
+    content_type type
+    attachment File.basename(filename)
+
+    content
+  end
+
+  get "/compare/:a/:b.json" do
+    description_a = SystemDescription.load(params[:a], settings.system_description_store)
+    description_b = SystemDescription.load(params[:b], settings.system_description_store)
+
+    diff = {
+      meta: {
+        description_a: description_a.name,
+        description_b: description_b.name,
+      }
+    }
+
+    Inspector.all_scopes.each do |scope|
+      if description_a[scope] && description_b[scope]
+        comparison = Comparison.compare_scope(description_a, description_b, scope)
+        diff[scope] = comparison.as_json
+      else
+        diff[:meta][:uninspected] ||= Hash.new
+
+        if !description_a[scope] && description_b[scope]
+          diff[:meta][:uninspected][description_a.name] ||= Array.new
+          diff[:meta][:uninspected][description_a.name] << scope
+        end
+        if !description_b[scope] && description_a[scope]
+          diff[:meta][:uninspected][description_b.name] ||= Array.new
+          diff[:meta][:uninspected][description_b.name] << scope
+        end
+      end
+    end
+
+    diff.to_json
+  end
+
+  get "/compare/:a/:b" do
+    haml File.read(File.join(Machinery::ROOT, "html/comparison.html.haml")),
+      locals: { description_a: params[:a], description_b: params[:b] }
+  end
+
+  get "/compare/:a/:b/files/:scope/*" do
+    description1 = SystemDescription.load(params[:a], settings.system_description_store)
+    description2 = SystemDescription.load(params[:b], settings.system_description_store)
+    filename = File.join("/", params["splat"].first)
+
+    begin
+      diff = FileDiff.diff(description1, description2, params[:scope], filename)
+    rescue Machinery::Errors::BinaryDiffError
+      status 406
+      return "binary file"
+    end
+
+    diff.to_s(:html)
+  end
+
+  get "/:id" do
+    haml File.read(File.join(Machinery::ROOT, "html/index.html.haml")),
+      locals: { description_name: params[:id] }
+  end
+end

data/lib/show_task.rb

@@ -41,9 +41,7 @@ There is a web server running, serving the description on #{url}.
 The server can be closed with Ctrl+C.
 EOF
 
-      server = Html.run_server(description.store, port: options[:port], ip: options[:ip])
-
-      Html.when_server_ready(options[:ip], options[:port]) do
+      server = Html.run_server(description.store, port: options[:port], ip: options[:ip]) do
         LoggedCheetah.run("xdg-open", url)
       end
 

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.11.1"
+  VERSION = "1.11.2"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -337,6 +337,7 @@ files:
 - lib/scope_file_access_flat.rb
 - lib/scope_file_store.rb
 - lib/serve_html_task.rb
+- lib/server.rb
 - lib/show_task.rb
 - lib/system.rb
 - lib/system_description.rb