simp-metadata 0.4.4 → 0.5.2

data/lib/simp/media/type/control-repo.rb

@@ -6,169 +6,157 @@ module Simp
         def initialize(options, engine)
           super(options, engine)
           @cleanup = []
-          if (options["output"] == nil)
-            raise "output must be specified for control-repo output"
+          if options['output'].nil?
+            raise 'output must be specified for control-repo output'
           end
-          @origtempdir = Dir.mktmpdir("cachedir")
+          @origtempdir = Dir.mktmpdir('cachedir')
           @repopath = "#{@origtempdir}/control-repo"
           FileUtils.mkdir_p(@repopath)
           @cleanup << @origtempdir
-          exit_code = run("git clone #{options["output"]} #{@repopath}")
-          unless (exit_code.success?)
-            uri = URI(options["output"])
-            if (uri.scheme == "file")
+          exit_code = run("git clone #{options['output']} #{@repopath}")
+          unless exit_code.success?
+            uri = URI(options['output'])
+            if uri.scheme == 'file'
               FileUtils.mkdir_p(uri.path)
               Dir.chdir(uri.path) do |path|
-                if (uri.path =~ /.*\.git$/)
-                  run("git init --bare")
+                if path =~ /.*\.git$/
+                  run('git init --bare')
                 else
-                  run("git init")
+                  run('git init')
                 end
 
-                run("git clone #{options["output"]} #{@repopath}")
+                run("git clone #{options['output']} #{@repopath}")
               end
             else
-              raise "output is not a valid control-repo"
+              raise 'output is not a valid control-repo'
             end
           end
-          Dir.chdir(@repopath) do |path|
-            exit_code = run("git checkout #{options["branch"]}")
+          Dir.chdir(@repopath) do
+            exit_code = run("git checkout #{options['branch']}")
             unless exit_code.success?
-              exit_code = run("git checkout -b #{options["branch"]}")
-              unless (exit_code.success?)
-                raise "error, unable to checkout #{options["branch"]} in git repo #{uri}"
+              exit_code = run("git checkout -b #{options['branch']}")
+              unless exit_code.success?
+                raise "error, unable to checkout #{options['branch']} in git repo #{uri}"
               end
             end
-            @branch = options["branch"]
-            if (options["destination_branch"] != nil)
-              @branch = options["destination_branch"]
-              exit_code = run("git checkout -b #{options["destination_branch"]}")
+            @branch = options['branch']
+            unless options['destination_branch'].nil?
+              @branch = options['destination_branch']
+              exit_code = run("git checkout -b #{options['destination_branch']}")
               unless exit_code.success?
-                  raise "error, unable to create branch #{options["destination_branch"]} in git repo #{uri}"
+                raise "error, unable to create branch #{options['destination_branch']} in git repo #{uri}"
               end
             end
-            run("rm -rf SIMP/modules")
-            run("rm -rf SIMP/assets")
+            run('rm -rf SIMP/modules')
+            run('rm -rf SIMP/assets')
           end
         end
 
         def add_component(component, fetch_return_value)
-          if (options["embed"] == true)
+          if options['embed']
             # XXX ToDo: Copy components to control-repo if embed == true
             case component.component_type
-              when "documentation"
-              when "simp-metadata"
-                subdirectory = "SIMP/metadata"
-                outputpath = "#{@repopath}/#{subdirectory}/#{component.name}"
-                FileUtils.mkdir_p(outputpath)
-                if (Dir.exists?("#{fetch_return_value['path']}/.git"))
-                  exit_code = run("cd #{fetch_return_value['path']} && git --work-tree=\"#{outputpath}\" checkout #{component.version} .")
-                else
-                  exit_code = run("cd #{fetch_return_value['path']} && tar -cf - . | tar -xvpf - -C \"#{outputpath}\"")
-                end
-
-                unless exit_code.success?
-                  error "unable to copy #{component.name} to #{outputpath}: error code #{exit_code.exitstatus}"
-                end
-              when "puppet-module"
-                subdirectory = "SIMP/modules"
-                outputpath = "#{@repopath}/#{subdirectory}/#{component.module_name}"
-                debug2("Copying #{component.module_name} to #{outputpath}")
-                FileUtils.mkdir_p(outputpath)
+            when 'documentation'
+            when 'simp-metadata'
+              subdirectory = 'SIMP/metadata'
+              outputpath = "#{@repopath}/#{subdirectory}/#{component.name}"
+              FileUtils.mkdir_p(outputpath)
+              if Dir.exist?("#{fetch_return_value['path']}/.git")
                 exit_code = run("cd #{fetch_return_value['path']} && git --work-tree=\"#{outputpath}\" checkout #{component.version} .")
-                unless exit_code.success?
-                  error "unable to copy #{component.module_name} to #{outputpath}: error code #{exit_code.exitstatus}"
-                end
               else
-                subdirectory = "SIMP/assets/#{component.name}"
-                case component.output_type
-                  when :file
-                    FileUtils.mkdir_p("#{@repopath}/#{subdirectory}")
-                    FileUtils.cp(fetch_return_value["path"], "#{@repopath}/#{subdirectory}/#{component.output_filename}")
-                end
+                exit_code = run("cd #{fetch_return_value['path']} && tar -cf - . | tar -xvpf - -C \"#{outputpath}\"")
+              end
+
+              unless exit_code.success?
+                error "unable to copy #{component.name} to #{outputpath}: error code #{exit_code.exitstatus}"
+              end
+            when 'puppet-module'
+              subdirectory = 'SIMP/modules'
+              outputpath = "#{@repopath}/#{subdirectory}/#{component.module_name}"
+              debug2("Copying #{component.module_name} to #{outputpath}")
+              FileUtils.mkdir_p(outputpath)
+              exit_code = run("cd #{fetch_return_value['path']} && git --work-tree=\"#{outputpath}\" checkout #{component.version} .")
+              unless exit_code.success?
+                error "unable to copy #{component.module_name} to #{outputpath}: error code #{exit_code.exitstatus}"
+              end
+            else
+              subdirectory = "SIMP/assets/#{component.name}"
+              case component.output_type
+              when :file
+                FileUtils.mkdir_p("#{@repopath}/#{subdirectory}")
+                FileUtils.cp(fetch_return_value['path'], "#{@repopath}/#{subdirectory}/#{component.output_filename}")
+              end
             end
           else
             # XXX ToDo: Add necessary references to generate the puppetfile during finalize
-            raise "not yet implemented"
+            raise 'not yet implemented'
           end
-
         end
 
-        def finalize(manifest)
+        def finalize(_manifest)
           # XXX ToDo: Generate Puppetfile (if options["embed"] == false)
           #     Otherwise copy to control-repo
           #     XXX ToDo: Munge Puppetfile
           environmentconf = "#{@repopath}/environment.conf"
           hierayaml = "#{@repopath}/hiera.yaml"
           # XXX ToDo: Munge hiera.yaml
-          self.munge_hierayaml(hierayaml)
-          if (options["embed"] == true)
-            self.munge_environmentconf(environmentconf)
-          end
+          munge_hierayaml(hierayaml)
+          munge_environmentconf(environmentconf) if options['embed']
           run("cd #{@repopath} && git add -A")
-          run("cd #{@repopath} && git commit -m \"simp-install: upgrade to #{options["version"]}\"")
+          run("cd #{@repopath} && git commit -m \"simp-install: upgrade to #{options['version']}\"")
           run("cd #{@repopath} && git push origin #{@branch}")
         end
 
         def munge_environmentconf(environmentconf)
           # Munge environment.conf to add SIMP/modules to modulepath
-          if (File.exists?(environmentconf))
+          if File.exist?(environmentconf)
             data = File.read(environmentconf).split("\n")
             data.each_with_index do |line, fileline|
-              if (/^modulepath = (?<capture>.*)$/ =~ line)
-                paths = capture.split(":")
-                found = false
-                module_index = nil
-                paths.each_with_index do |path, index|
-                  if (path =~ /modules/)
-                    module_index = index
-                  end
-                  if (path =~ /simp\/modules/)
-                    found = true
-                  end
-                end
-                if (found == false)
-                  newarray = []
-                  paths.each do |path, index|
-                    newarray << path
-                    if (index == module_index)
-                      newarray << "SIMP/modules"
-                    end
-                  end
-                  data[fileline] = "modulepath = #{newarray.join(":")}"
-                  File.open(environmentconf, "w") { |f| f.write(data.join("\n")) }
-                end
+              next unless /^modulepath = (?<capture>.*)$/ =~ line
+              paths = capture.split(':')
+              found = false
+              module_index = nil
+              paths.each_with_index do |path, index|
+                module_index = index if path =~ /modules/
+                found = true if path =~ /simp\/modules/
+              end
+              next if found
+              newarray = []
+              paths.each do |path, index|
+                newarray << path
+                newarray << 'SIMP/modules' if index == module_index
               end
+              data[fileline] = "modulepath = #{newarray.join(':')}"
+              File.open(environmentconf, 'w') { |f| f.write(data.join("\n")) }
             end
           else
-            File.open(environmentconf, "w") { |f| f.write("modulepath = modules:SIMP/modules:$basemodulepath\n") }
+            File.open(environmentconf, 'w') { |f| f.write("modulepath = modules:SIMP/modules:$basemodulepath\n") }
           end
         end
 
         def munge_hierayaml(hierayaml)
           data = {}
-          if (File.exists?(hierayaml))
+          if File.exist?(hierayaml)
             data = YAML.load(File.read(hierayaml))
-            version = data["version"]
+            version = data['version']
             case version
-              when 4
-                # XXX ToDo: Add version 4 hiera.yaml support
-                raise "currently version 4 hiera.yaml's are not supported"
-              when 5
-                found = false
-                data["hierarchy"].each_with_index do |hash|
-                  if (hash["lookup_key"] == "compliance_markup::enforcement")
-                    found = true
-                  end
-                end
-                if (found == false)
-                  hash = {"name" => "SIMP Compliance Engine", "lookup_key" => "compliance_markup::enforcement"}
-                  data["hierarchy"] << hash
+            when 4
+              # XXX ToDo: Add version 4 hiera.yaml support
+              raise "currently version 4 hiera.yaml's are not supported"
+            when 5
+              found = false
+              data['hierarchy'].each_with_index do |hash|
+                if hash['lookup_key'] == 'compliance_markup::enforcement'
+                  found = true
                 end
-              when nil
-                # XXX ToDo: Add version 3 hiera.yaml support
-                raise "currently version 3 hiera.yaml's are not supported"
-                return 0
+              end
+              unless found
+                hash = { 'name' => 'SIMP Compliance Engine', 'lookup_key' => 'compliance_markup::enforcement' }
+                data['hierarchy'] << hash
+              end
+            when nil
+              # XXX ToDo: Add version 3 hiera.yaml support
+              raise "currently version 3 hiera.yaml's are not supported"
             end
           else
             raw_yaml = <<-EOF
@@ -198,9 +186,10 @@ hierarchy:
             EOF
             data = YAML.load(raw_yaml)
           end
-          File.open(hierayaml, "w") { |f| f.write(data.to_yaml)}
+          File.open(hierayaml, 'w') { |f| f.write(data.to_yaml) }
         end
-        def cleanup()
+
+        def cleanup
           @cleanup.each do |path|
             FileUtils.rmtree(path)
           end

data/lib/simp/media/type/internet.rb

@@ -1,4 +1,3 @@
-
 require 'open3'
 
 module Simp
@@ -6,28 +5,29 @@ module Simp
     module Type
       class Internet < Simp::Media::Type::Base
         attr_accessor :options
+
         def initialize(options, engine)
           @cleanup = []
           super(options, engine)
         end
 
-        def input_directory=(directory)
-            @input_directory = directory
-        end
+        attr_writer :input_directory
+
         def input_directory
-          if (@input_directory == nil)
-            target = Dir.mktmpdir("cachedir")
+          if @input_directory.nil?
+            target = Dir.mktmpdir('cachedir')
             @cleanup << target
             @input_directory = target
           else
             @input_directory
           end
         end
+
         def fetch_component(component, options)
-          Simp::Metadata.download_component(component, options.merge({"target" => self.input_directory}))
+          Simp::Metadata.download_component(component, options.merge('target' => input_directory))
         end
 
-        def cleanup()
+        def cleanup
           @cleanup.each do |path|
             FileUtils.rmtree(path)
           end

data/lib/simp/media/type/iso.rb

@@ -2,7 +2,6 @@ module Simp
   module Media
     module Type
       class Iso < Simp::Media::Type::Base
-
       end
     end
   end

data/lib/simp/media/type/local.rb

@@ -3,32 +3,31 @@ module Simp
   module Media
     module Type
       class Local < Simp::Media::Type::Base
-        def input_directory=(directory)
-          @input_directory = directory
-        end
+        attr_writer :input_directory
+
         def input_directory
-          @options["input"]
+          @options['input']
         end
+
         def fetch_component(component, options)
           retval = {}
 
           case component.class.to_s
-            when "String"
-              retval["path"] = "#{options["input"]}/simp/metadata/#{component.name}"
-            when "Simp::Metadata::Component"
-              # XXX ToDo: Add manifest.yaml support so we don't need this logic at all
-              case component.component_type
-                when "documentation"
-                  subdirectory = "simp/docs"
-                when "puppet-module"
-                  subdirectory = "simp/modules"
-                else
-                  subdirectory = "simp/assets"
-              end
-
-              retval["path"] = "#{options["input"]}/#{subdirectory}/#{component.name}"
+          when 'String'
+            retval['path'] = "#{options['input']}/simp/metadata/#{component.name}"
+          when 'Simp::Metadata::Component'
+            # XXX ToDo: Add manifest.yaml support so we don't need this logic at all
+            subdirectory = case component.component_type
+                           when 'documentation'
+                             'simp/docs'
+                           when 'puppet-module'
+                             'simp/modules'
+                           else
+                             'simp/assets'
+                           end
+            retval['path'] = "#{options['input']}/#{subdirectory}/#{component.name}"
           end
-          return retval
+          retval
         end
       end
     end

data/lib/simp/media/type/tar.rb

@@ -3,64 +3,64 @@ module Simp
   module Media
     module Type
       class Tar < Simp::Media::Type::Base
-
         def initialize(options, engine)
           @cleanup = []
 
-          @origtempdir = Dir.mktmpdir("cachedir")
-          @tempdir = @origtempdir + "/" + File.basename(options["output"], ".*")
+          @origtempdir = Dir.mktmpdir('cachedir')
+          @tempdir = @origtempdir + '/' + File.basename(options['output'], '.*')
           @cleanup << @origtempdir
           super(options, engine)
         end
 
         def add_component(component, fetch_return_value)
-          case component.component_type
-            when "documentation"
-              subdirectory = "SIMP/docs"
-            when "simp-metadata"
-              subdirectory = "SIMP/metadata"
-            when "puppet-module"
-              subdirectory = "SIMP/modules"
-            else
-              subdirectory = "SIMP/assets/#{component.name}"
-          end
+          subdirectory = case component.component_type
+                         when 'documentation'
+                           'SIMP/docs'
+                         when 'simp-metadata'
+                           'SIMP/metadata'
+                         when 'puppet-module'
+                           'SIMP/modules'
+                         else
+                           "SIMP/assets/#{component.name}"
+                         end
           case component.output_type
-            when :directory
-              if (Dir.exists?(fetch_return_value["path"]))
-                unless (Dir.exists?(@tempdir + "/#{subdirectory}/#{component.name}"))
-                  FileUtils.mkdir_p(@tempdir + "/#{subdirectory}/#{component.name}")
-                end
-                FileUtils.cp_r(fetch_return_value["path"] + "/.", @tempdir + "/#{subdirectory}/#{component.output_filename}")
-              else
-                raise "Unable to find component #{component.name} in input source: path=#{fetch_return_value["path"]}"
-              end
-            when :file
-              if (File.exists?(fetch_return_value["path"]))
-                FileUtils.mkdir_p(@tempdir + "/#{subdirectory}")
-                FileUtils.cp_r(fetch_return_value["path"], @tempdir + "/#{subdirectory}/#{component.output_filename}")
-              else
-                raise "Unable to find component #{component.name} in input source: path=#{fetch_return_value["path"]}"
+          when :directory
+            if Dir.exist?(fetch_return_value['path'])
+              unless Dir.exist?(@tempdir + "/#{subdirectory}/#{component.name}")
+                FileUtils.mkdir_p(@tempdir + "/#{subdirectory}/#{component.name}")
               end
+              FileUtils.cp_r(fetch_return_value['path'] + '/.', @tempdir + "/#{subdirectory}/#{component.output_filename}")
+            else
+              raise "Unable to find component #{component.name} in input source: path=#{fetch_return_value['path']}"
+            end
+          when :file
+            if File.exist?(fetch_return_value['path'])
+              FileUtils.mkdir_p(@tempdir + "/#{subdirectory}")
+              FileUtils.cp_r(fetch_return_value['path'], @tempdir + "/#{subdirectory}/#{component.output_filename}")
+            else
+              raise "Unable to find component #{component.name} in input source: path=#{fetch_return_value['path']}"
+            end
           end
-
         end
 
-        def finalize(manifest)
-          if @options.key?("local_directory")
-            if Dir.exists?(@options["local_directory"])
-              FileUtils.cp_r(Dir.glob(@options["local_directory"] + "/*"), @tempdir)
+        def finalize(_manifest)
+          if @options.key?('local_directory')
+            if Dir.exist?(@options['local_directory'])
+              FileUtils.cp_r(Dir.glob(@options['local_directory'] + '/*'), @tempdir)
             end
           end
           Dir.chdir(@origtempdir) do
-            `tar -cf - * | gzip -9nc >#{@options["output"]}`
+            `tar -cf - * | gzip -9nc >#{@options['output']}`
           end
         end
 
-        def output(options, directory, version, metadata, output)
-          metadata.releases[version].components.each do |component|
+        # Needs to be finished/fixed
+        def output(_options, _directory, version, metadata, _output)
+          metadata.releases[version].components.each do |_component|
           end
         end
-        def cleanup()
+
+        def cleanup
           @cleanup.each do |path|
             FileUtils.rmtree(path)
           end