machinery-tool 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33410867e48fc0bcb7307a3bf675c5625ea2f4ad
-  data.tar.gz: b6b56186b5adc312ec8e95eca05aaa42975317ca
+  metadata.gz: ff11a934561d9adad04837ec1de84ed5024afe81
+  data.tar.gz: 591a93b21e2746297042cf185f7f6633f08f21fe
 SHA512:
-  metadata.gz: 01c9c1baa1f5d82665df2c5b590020a87ccf75caf4906e691f80fbb9064f831419fab55958b855016298dbb87d4edf2ef656de23eaa947e4a182db37ab3cce31
-  data.tar.gz: 406612f5da1d81f847e329fc755b6780f7fa5c65d1c31baf09f2c629ef8134105c116c996fc1e53fefd33757a337bcf992cb2d88110615a052bddd47d4140c0f
+  metadata.gz: b9eb62471db592d4d575fe9374a09704b2d7bbb8480904087bf546819a562df955cad13d35d6f890403eba1b11806e44245a84737f53a3f41d49f6555c5ff201
+  data.tar.gz: db1e12957fd5b529871e47b0bec09379f1351d9345e7553d87f4d737aa63586e61789bcbaeca85434b90ec94b124f98a1551f7f6945e457afbe7d13b2f7eebe3

data/.git_revision

@@ -1 +1 @@
-a879bc791c625025e2861c0bc37a2d2207da250a
+b8c8eec01238e18a5ce1d9c53590c5c971e01703

data/NEWS

@@ -1,6 +1,10 @@
 # Machinery Release Notes
 
 
+## Version 1.14.2 - Wed Oct 14 18:00:51 CEST 2015 - thardeck@suse.de
+
+* Fix typo in HTML package view  (gh#SUSE/machinery#1493)
+
 ## Version 1.14.1 - Fri Oct 09 18:30:13 CEST 2015 - thardeck@suse.de
 
 * Fix: Clean up binding the server for HTML view to IP addresses

data/html/partials/packages.html.haml

@@ -5,7 +5,7 @@
       = render_partial "scope_header",
         :scope => "packages",
         :title => "Packages",
-        :count => "#{packages.length} #{Machinery.pluralize(packages.length, "packages")}"
+        :count => "#{packages.length} #{Machinery.pluralize(packages.length, "package")}"
 
       .row.scope_content.collapse.in
         .col-xs-1

data/lib/hint.rb

@@ -67,7 +67,7 @@ class Hint
          "#{program_name} inspect #{options[:host]} --name #{options[:name]} --extract-files"
       elsif options[:docker_container]
         "To do a full inspection containing all scopes and to extract files run:\n" \
-         "#{program_name} inspect-container #{options[:docker_container]}" \
+         "#{program_name} inspect-container #{options[:docker_container]} " \
          "--name #{options[:name]} --extract-files"
       end
     end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.14.1"
+  VERSION = "1.14.2"
 
 end

data/machinery-helper/Rakefile

@@ -15,110 +15,20 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+require_relative "../tools/helper_builder"
+
 task :default => "try_build"
 
 HELPER_DIR = File.expand_path(File.dirname(__FILE__))
-GIT_REVISION_FILE = File.join(HELPER_DIR, "..", ".git_revision")
-
-def write_go_version_file
-  file = <<-EOF
-// This is a generated file and shouldn't be changed
-
-package main
-
-const VERSION = "#{git_revision}"
-  EOF
-  File.write(File.join(HELPER_DIR, "version.go"), file)
-end
-
-def build_machinery_helper
-  FileUtils.rm_f(File.join(HELPER_DIR, "machinery-helper"))
-  Dir.chdir(HELPER_DIR) do
-    puts("Building machinery-helper binary.")
-    if !system("go build")
-      STDERR.puts("Warning: Building of the machinery-helper failed!")
-      false
-    else
-      true
-    end
-  end
-end
-
-def go_available?
-  if !system("which go > /dev/null 2>&1")
-    STDERR.puts(
-      "Warning: The Go compiler is not available on this system. Skipping building the" \
-        " machinery-helper.\nThe machinery-helper increases the inspection speed significantly."
-    )
-    false
-  else
-    true
-  end
-end
-
-def arch_supported?
-  arch = `uname -p`.chomp
-  if !["x86_64"].include?(arch)
-    STDERR.puts(
-      "Warning: The hardware architecture #{arch} is not yet supported by the machinery-helper."
-    )
-    false
-  else
-    true
-  end
-end
-
-def runs_in_git?
-  Dir.exist?(File.join(HELPER_DIR, "..", ".git")) && system("which git > /dev/null 2>&1")
-end
-
-def git_revision
-  `git rev-parse HEAD`.chomp
-end
-
-def write_git_revision_file
-  File.write(GIT_REVISION_FILE, git_revision)
-end
-
-def changed_revision?
-  if File.exist?(GIT_REVISION_FILE)
-    old_revision = File.read(GIT_REVISION_FILE)
-  else
-    old_revision = "unknown"
-  end
-  git_revision != old_revision
-end
-
-def run_build
-  # An unsupported architecture is no error
-  return true if !arch_supported?
-  return false if !go_available?
-
-  # handle changed branches (where go files are older than the helper)
-  if runs_in_git? && changed_revision?
-    write_go_version_file
-    if build_machinery_helper
-      write_git_revision_file
-      return true
-    else
-      return false
-    end
-  end
-
-  if !FileUtils.uptodate?(
-    File.join(HELPER_DIR, "machinery-helper"), Dir.glob(File.join(HELPER_DIR, "*.go"))
-  )
-    return build_machinery_helper
-  end
-  true
-end
 
 desc "Build the helper if needed"
 task :build do
-  raise "Error: Build of Machinery helper failed" if !run_build
+  helper_builder = HelperBuilder.new(HELPER_DIR)
+  raise "Error: Build of Machinery helper failed" if !helper_builder.run_build
 end
 
 desc "Don't fail on build errors"
 task :try_build do
-  run_build
+  helper_builder = HelperBuilder.new(HELPER_DIR)
+  helper_builder.run_build
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "a879bc791c625025e2861c0bc37a2d2207da250a"
+const VERSION = "b8c8eec01238e18a5ce1d9c53590c5c971e01703"

data/tools/helper_builder.rb

@@ -0,0 +1,133 @@
+# encoding:utf-8
+
+# 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
+
+# This class is used in the machinery-helper/Rakefile to build the helper
+class HelperBuilder
+  def initialize(helper_dir)
+    @helper_dir = helper_dir
+    @git_revision_file = File.join(helper_dir, "..", ".git_revision")
+  end
+
+  def run_build
+    # An unsupported architecture is no error
+    return true if !arch_supported?
+    return false if !go_available?
+
+    # handle changed branches (where go files are older than the helper)
+    if runs_in_git? && changed_revision?
+      write_go_version_file
+      if build_machinery_helper
+        write_git_revision_file
+        return true
+      else
+        return false
+      end
+    end
+
+    if !FileUtils.uptodate?(
+      File.join(@helper_dir, "machinery-helper"), Dir.glob(File.join(@helper_dir, "*.go"))
+    )
+      return build_machinery_helper
+    end
+    true
+  end
+
+  def write_go_version_file
+    file = <<-EOF
+// This is a generated file and shouldn't be changed
+
+package main
+
+const VERSION = "#{git_revision}"
+    EOF
+    File.write(File.join(@helper_dir, "version.go"), file)
+  end
+
+  def build_machinery_helper
+    FileUtils.rm_f(File.join(@helper_dir, "machinery-helper"))
+    Dir.chdir(@helper_dir) do
+      puts("Building machinery-helper binary.")
+      if !run_go_build
+        STDERR.puts("Warning: Building of the machinery-helper failed!")
+        false
+      else
+        true
+      end
+    end
+  end
+
+  def go_available?
+    if !run_which_go
+      STDERR.puts(
+        "Warning: The Go compiler is not available on this system. Skipping building the" \
+          " machinery-helper.\nThe machinery-helper increases the inspection speed significantly."
+      )
+      false
+    else
+      true
+    end
+  end
+
+  def arch_supported?
+    arch = run_uname_p
+    if !["x86_64"].include?(arch)
+      STDERR.puts(
+        "Warning: The hardware architecture #{arch} is not yet supported by the machinery-helper."
+      )
+      false
+    else
+      true
+    end
+  end
+
+  def runs_in_git?
+    Dir.exist?(File.join(@helper_dir, "..", ".git")) && system("which git > /dev/null 2>&1")
+  end
+
+  def write_git_revision_file
+    File.write(@git_revision_file, git_revision)
+  end
+
+  def changed_revision?
+    if File.exist?(@git_revision_file)
+      old_revision = File.read(@git_revision_file)
+    else
+      old_revision = "unknown"
+    end
+    git_revision != old_revision
+  end
+
+  private
+
+  def run_go_build
+    system("go build")
+  end
+
+  def git_revision
+    `git rev-parse HEAD`.chomp
+  end
+
+  def run_which_go
+    system("which go > /dev/null 2>&1")
+  end
+
+  def run_uname_p
+    `uname -p`.chomp
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -501,6 +501,7 @@ files:
 - schema/system-description-global.schema-v3.json
 - schema/system-description-global.schema-v4.json
 - schema/system-description-global.schema-v5.json
+- tools/helper_builder.rb
 - workload_mapper/docker-registry/clue.rb
 - workload_mapper/docker-registry/compose-template.yml
 - workload_mapper/docker-registry/container/Dockerfile