machinery-tool 1.22.1 → 1.22.2

data/lib/tarball.rb

@@ -16,13 +16,19 @@
 # you may find current contact information at www.suse.com
 
 # Represents a tarball, possibly gzipped.
-class Tarball
+class Machinery::Tarball
   def initialize(file)
     @file = file
   end
 
   def list
-    output = LoggedCheetah.run("tar", "tvf", @file, "--quoting-style=literal", stdout: :capture)
+    output = Machinery::LoggedCheetah.run(
+      "tar",
+      "tvf",
+      @file,
+      "--quoting-style=literal",
+      stdout: :capture
+    )
 
     output.lines.map do |line|
       mode, user_and_group, size, _date, _time, rest = line.split(" ", 6)

data/lib/upgrade_format_task.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UpgradeFormatTask
+class Machinery::UpgradeFormatTask
   def upgrade(store, name, options = {})
     if !options[:all] && !store.list.include?(name)
       raise Machinery::Errors::SystemDescriptionNotFound.new(
@@ -34,15 +34,20 @@ class UpgradeFormatTask
 
     descriptions.each do |description|
       begin
-        hash = Manifest.load(description, store.manifest_path(description)).to_hash
+        hash = Machinery::Manifest.load(description, store.manifest_path(description)).to_hash
         Machinery.logger.info "Upgrading description '#{description}'"
         Machinery::Ui.print "Reading '#{description}' ... "
-        migrated = Migration.migrate_description(store, description, force: options[:force])
+        migrated = Machinery::Migration.migrate_description(
+          store,
+          description,
+          force: options[:force]
+        )
 
         if migrated
           migrations_done += 1
-          Machinery::Ui.puts "Successfully upgraded from version" \
-            " #{hash["meta"]["format_version"]} to #{SystemDescription::CURRENT_FORMAT_VERSION}."
+          Machinery::Ui.puts "Successfully upgraded from version"\
+            " #{hash["meta"]["format_version"]}"\
+            " to #{Machinery::SystemDescription::CURRENT_FORMAT_VERSION}."
         end
       rescue StandardError => e
         errors.push("Upgrading description '#{description}' failed:\n#{e}")
@@ -53,7 +58,7 @@ class UpgradeFormatTask
     unless errors.empty?
       Machinery.logger.error errors.join("\n")
       exception = Machinery::Errors::UpgradeFailed.new("\n" + errors.join("\n") +
-        Hint.to_string(:upgrade_format_force, name: name || "--all"))
+        Machinery::Ui::Hint.to_string(:upgrade_format_force, name: name || "--all"))
       raise exception
     end
 

data/lib/validate_task.rb

@@ -15,9 +15,9 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ValidateTask
+class Machinery::ValidateTask
   def validate(store, name)
-    SystemDescription.load!(name, store)
+    Machinery::SystemDescription.load!(name, store)
     Machinery::Ui.puts "Validation succeeded."
   rescue
     Machinery::Ui.puts "Validation failed."

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.22.1"
+  VERSION = "1.22.2"
 
 end

data/lib/workload_mapper.rb

@@ -14,7 +14,7 @@
 #
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
-class WorkloadMapper
+class Machinery::WorkloadMapper
   def save(workloads, path)
     workloads.each do |workload, config|
       FileUtils.mkdir_p(File.join(path, workload))
@@ -75,7 +75,7 @@ class WorkloadMapper
     workloads = {}
 
     Dir["#{File.expand_path(workload_mapper_path)}/*"].each do |workload_dir|
-      mapper = WorkloadMapperDSL.new(system_description)
+      mapper = Machinery::WorkloadMapperDSL.new(system_description)
       workload = mapper.check_clue(File.read(File.join(workload_dir, "clue.rb")))
       workloads.merge!(workload.to_h)
     end

data/lib/workload_mapper_dsl.rb

@@ -14,7 +14,7 @@
 #
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
-class WorkloadMapperDSL
+class Machinery::WorkloadMapperDSL
   attr_reader :system, :name, :service, :parameters, :data
 
   def initialize(system)

data/lib/zypper.rb

@@ -21,33 +21,44 @@
 # for running zypper in an isolated environment using 'Zypper.isolated'.
 # That way Machinery can safely add repositories and download packages without
 # polluting the host.
-class Zypper
+class Machinery::Zypper
   attr_accessor :zypper_options
   attr_accessor :zypp_config
+  attr_accessor :zypp_base
 
   class <<self
     def isolated(options = {}, &block)
-      Dir.mktmpdir("machinery_zypper") do |zypper_base|
-        zypper = Zypper.new
+      zypper = Machinery::Zypper.new
+      zypper.zypp_base = Dir.mktmpdir("machinery_zypper")
 
-        zypper.zypper_options = [
-          "--non-interactive",
-          "--no-gpg-checks",
-          "--root", zypper_base
-        ]
+      zypper.zypper_options = [
+        "--non-interactive",
+        "--no-gpg-checks",
+        "--root", zypper.zypp_base
+      ]
 
-        if options[:arch]
-          zypper.zypp_config = create_zypp_config(zypper_base, options[:arch])
-        end
-
-        block.call(zypper)
+      if options[:arch]
+        zypper.zypp_config = create_zypp_config(zypper.zypp_base, options[:arch])
       end
+
+      block.call(zypper)
+    ensure
+      clean_up(zypper)
     end
 
     private
 
-    def create_zypp_config(base_path, arch)
-      zypp_dir = File.join(base_path, "/etc/zypp")
+    def clean_up(zypper)
+      unless zypper.zypp_base =~ /^\/tmp\/machinery_zypper/
+        raise("The zypper base directory is not inside of '/tmp'. Aborting...")
+      end
+      cmd = ["rm", "-rf", zypper.zypp_base]
+      cmd = cmd.insert(0, "sudo") if zypper.contains_mountable_repos?
+      Machinery::LoggedCheetah.run(*cmd)
+    end
+
+    def create_zypp_config(zypp_base, arch)
+      zypp_dir = File.join(zypp_base, "/etc/zypp")
       zypp_config = File.join(zypp_dir, "zypp.conf")
 
       FileUtils.mkdir_p(zypp_dir)
@@ -70,7 +81,7 @@ class Zypper
   end
 
   def refresh
-    call_zypper "refresh"
+    call_zypper "refresh", sudo: contains_mountable_repos?
   end
 
   def download_package(package)
@@ -86,15 +97,27 @@ class Zypper
     [found[1].to_i, found[2].to_i, found[3].to_i] if found
   end
 
+  def contains_mountable_repos?
+    files = Dir.glob(File.join(@zypp_base, "etc/zypp/repos.d", "*"))
+    files.any? do |file|
+      File.readlines(file).any? do |line|
+        line.start_with?("baseurl=nfs://", "baseurl=nfs4://", "baseurl=smb://", "baseurl=cifs://")
+      end
+    end
+  end
+
   private
 
   def call_zypper(*args)
+    sudo = args.last.delete(:sudo) if args.last.is_a?(Hash)
+
     cmd = ["zypper"]
+    cmd.unshift("sudo") if sudo
     cmd += @zypper_options if @zypper_options
     cmd += args
 
     with_env "ZYPP_CONF" => @zypp_config do
-      LoggedCheetah.run(*cmd)
+      Machinery::LoggedCheetah.run(*cmd)
     end
   end
 end

data/machinery-helper/machinery_helper.go

@@ -199,8 +199,8 @@ func getManagedFiles() (map[string]string, map[string]bool) {
 	return files, dirs
 }
 
-func assembleJSON(unmanagedFilesMap interface{}) string {
-	jsonMap := map[string]interface{}{"extracted": false, "files": unmanagedFilesMap}
+func assembleJSON(unmanagedFilesList interface{}) string {
+	jsonMap := map[string]interface{}{"extracted": false, "files": unmanagedFilesList}
 	json, _ := json.MarshalIndent(jsonMap, " ", "  ")
 	return string(json)
 }
@@ -299,7 +299,7 @@ func dirInfo(path string) (size int64, fileCount int, dirCount int) {
 		if f.IsDir() {
 			dirCount++
 			fileCount--
-			if _, ok := IgnoreList[path + f.Name()]; !ok {
+			if _, ok := IgnoreList[path+f.Name()]; !ok {
 				subSize, subFiles, subDirs := dirInfo(path + f.Name() + "/")
 				size += subSize
 				fileCount += subFiles
@@ -352,6 +352,36 @@ func printVersion() {
 	os.Exit(0)
 }
 
+func getUnmanagedFilesList(files []string, unmanagedFiles map[string]string, extractMetadataFlag *bool) []UnmanagedFile {
+	unmanagedFilesList := make([]UnmanagedFile, len(unmanagedFiles))
+	i := 0
+	for j := range files {
+		// only add accessible files
+		if _, err := os.Lstat(files[j]); isAccessible(err) {
+			entry := UnmanagedFile{}
+			entry.Name = files[j]
+			entry.Type = unmanagedFiles[files[j]]
+
+			if *extractMetadataFlag {
+				amendPathAttributes(&entry, unmanagedFiles[files[j]])
+			}
+
+			unmanagedFilesList[i] = entry
+			i++
+		} else {
+			fmt.Fprintln(os.Stderr, files[j], "was not accessible. Skipping.")
+		}
+	}
+	return unmanagedFilesList[0:i]
+}
+
+func isAccessible(err error) bool {
+	return err == nil ||
+		(os.IsNotExist(err) == false &&
+			os.IsPermission(err) == false &&
+			strings.Contains(err.Error(), "no such device") == false)
+}
+
 // IgnoreList includes mounts and any other file type that will be ignored when
 // evaluating the unmanaged files in a system.
 var IgnoreList = map[string]bool{}
@@ -405,19 +435,8 @@ func main() {
 	}
 	sort.Strings(files)
 
-	unmanagedFilesMap := make([]UnmanagedFile, len(unmanagedFiles))
-	for j := range files {
-		entry := UnmanagedFile{}
-		entry.Name = files[j]
-		entry.Type = unmanagedFiles[files[j]]
-
-		if *extractMetadataFlag {
-			amendPathAttributes(&entry, unmanagedFiles[files[j]])
-		}
-
-		unmanagedFilesMap[j] = entry
-	}
+	unmanagedFilesList := getUnmanagedFilesList(files, unmanagedFiles, extractMetadataFlag)
 
-	json := assembleJSON(unmanagedFilesMap)
+	json := assembleJSON(unmanagedFilesList)
 	fmt.Println(json)
 }

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "c9cc765d7146920c59d05dd9e483a82eb5f836df"
+const VERSION = "5544d3469a45c0bf15d3263bc1bbbd32afb7f274"

data/manual/site/sitemap.xml

@@ -4,7 +4,7 @@
     
     <url>
      <loc>None/docs/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -12,7 +12,7 @@
     
     <url>
      <loc>None/machinery_main_general.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -20,7 +20,7 @@
     
     <url>
      <loc>None/machinery_main_scopes.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -28,7 +28,7 @@
     
     <url>
      <loc>None/machinery_main_usecases.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -36,7 +36,7 @@
     
     <url>
      <loc>None/machinery_main_security_implications.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -45,115 +45,115 @@
         
     <url>
      <loc>None/machinery-analyze.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-build.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-compare.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-config.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-copy.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-deploy.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-autoyast.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-kiwi.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-html.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect-container.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-list.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-man.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-move.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-remove.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-serve.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-show.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-upgrade-format.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-validate.1/</loc>
-     <lastmod>2016-10-14</lastmod>
+     <lastmod>2016-11-16</lastmod>
      <changefreq>daily</changefreq>
     </url>