simp-metadata 0.4.4 → 0.5.2

data/Rakefile

@@ -3,7 +3,6 @@
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
 
-
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
@@ -11,10 +10,10 @@ require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 
-
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*.rb']
 end
+
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
@@ -35,35 +34,33 @@ end
 
 begin
 
-# yardstick
+  # yardstick
 
-# measure coverage
-require 'yardstick/rake/measurement'
-
-Yardstick::Rake::Measurement.new(:yardstick_measure) do |measurement|
-  measurement.output = 'measurement/report.txt'
-end
+  # measure coverage
+  require 'yardstick/rake/measurement'
 
+  Yardstick::Rake::Measurement.new(:yardstick_measure) do |measurement|
+    measurement.output = 'measurement/report.txt'
+  end
 
-# verify coverage
+  # verify coverage
 
-require 'yardstick/rake/verify'
+  require 'yardstick/rake/verify'
 
-Yardstick::Rake::Verify.new(:yardstick_verify) do |verify|
-  verify.threshold = 50
-  verify.require_exact_threshold = false
-end
+  Yardstick::Rake::Verify.new(:yardstick_verify) do |verify|
+    verify.threshold = 50
+    verify.require_exact_threshold = false
+  end
 rescue LoadError
 end
 
-begin 
+begin
 
-# reek
-require 'reek/rake/task'
+  # reek
+  require 'reek/rake/task'
 
-Reek::Rake::Task.new do |t|
-  t.fail_on_error = false
-end
+  Reek::Rake::Task.new do |t|
+    t.fail_on_error = false
+  end
 rescue LoadError
 end
-

data/exe/simp-install

@@ -2,7 +2,7 @@
 
 begin
   require 'simp/install/command'
-  command = Simp::Install::Command.new()
+  command = Simp::Install::Command.new
   command.run(ARGV)
 
 end

data/exe/simp-media

@@ -2,7 +2,7 @@
 
 begin
   require 'simp/media/command'
-  command = Simp::Media::Command.new()
+  command = Simp::Media::Command.new
   command.run(ARGV)
 
 end

data/exe/simp-metadata

@@ -2,7 +2,7 @@
 
 begin
   require 'simp/metadata/command'
-  command = Simp::Metadata::Command.new()
+  command = Simp::Metadata::Command.new
   command.run(ARGV)
 
 end

data/lib/simp/install/command.rb

@@ -7,57 +7,57 @@ module Simp
       def run(argv)
         options = {}
         OptionParser.new do |opts|
-          opts.banner = "Usage: simp-install [options]"
+          opts.banner = 'Usage: simp-install [options]'
 
-          opts.on("-v", "--version [version]", "version to install") do |opt|
-            options["version"] = opt
+          opts.on('-v', '--version [version]', 'version to install') do |opt|
+            options['version'] = opt
           end
-          opts.on("-i", "--input [file]", "input filename") do |opt|
-            options["input"] = opt
+          opts.on('-i', '--input [file]', 'input filename') do |opt|
+            options['input'] = opt
           end
-          opts.on("-t", "--input-type [type]", "input install type", "valid types:", "  - internet", "  - local", "  - tar", "  - iso") do |opt|
-            options["input_type"] = opt
+          opts.on('-t', '--input-type [type]', 'input install type', 'valid types:', '  - internet', '  - local', '  - tar', '  - iso') do |opt|
+            options['input_type'] = opt
           end
-          opts.on("-o", "--output [file]", "output filename, path, or url (if control_repo type is specified)") do |opt|
-            options["output"] = opt
+          opts.on('-o', '--output [file]', 'output filename, path, or url (if control_repo type is specified)') do |opt|
+            options['output'] = opt
           end
-          opts.on("-T", "--output-type [type]", "output install type", "valid types:", "  - control_repo", "  - local", "  - tar", "  - iso") do |opt|
-            options["output_type"] = opt
+          opts.on('-T', '--output-type [type]', 'output install type', 'valid types:', '  - control_repo', '  - local', '  - tar', '  - iso') do |opt|
+            options['output_type'] = opt
           end
-          opts.on("-e", "--edition [edition_name]", "SIMP Edition", "valid editions:", "  - community", "  - enterprise") do |opt|
-            options["edition"] = opt
+          opts.on('-e', '--edition [edition_name]', 'SIMP Edition', 'valid editions:', '  - community', '  - enterprise') do |opt|
+            options['edition'] = opt
           end
-          opts.on("-f", "--flavor [flavor_name]", "SIMP flavor", "valid flavors:", "  - default") do |opt|
-            options["destination_branch"] = opt
+          opts.on('-f', '--flavor [flavor_name]', 'SIMP flavor', 'valid flavors:', '  - default') do |opt|
+            options['destination_branch'] = opt
           end
-          opts.on("-c", "--channel [channel_name]", "Distribution Channel") do |opt|
-            options["channel"] = opt
+          opts.on('-c', '--channel [channel_name]', 'Distribution Channel') do |opt|
+            options['channel'] = opt
           end
-          opts.on("-l", "--license [license]", "path to license file") do |opt|
-            options["license"] = opt
+          opts.on('-l', '--license [license]', 'path to license file') do |opt|
+            options['license'] = opt
           end
-          opts.on("-s", "--sign", "sign output (if applicable)") do |opt|
-            options["sign"] = opt
+          opts.on('-s', '--sign', 'sign output (if applicable)') do |opt|
+            options['sign'] = opt
           end
-          opts.on("-S", "--signing-key [keyid]", "GPG ID of signing key") do |opt|
-            options["signing_key"] = opt
+          opts.on('-S', '--signing-key [keyid]', 'GPG ID of signing key') do |opt|
+            options['signing_key'] = opt
           end
-          opts.on("-d", "--local-directory [directory]", "Local directory to add to SIMP") do |opt|
-            options["local_directory"] = opt
+          opts.on('-d', '--local-directory [directory]', 'Local directory to add to SIMP') do |opt|
+            options['local_directory'] = opt
           end
-          opts.on("-u", "--url [url]", "URL of git hosting server to use (control-repo output only)") do |opt|
-            options["embed"] = opt
+          opts.on('-u', '--url [url]', 'URL of git hosting server to use (control-repo output only)') do |opt|
+            options['embed'] = opt
           end
-          opts.on("-E", "--embed", "embed puppet modules (control-repo output only)") do |opt|
-            options["embed"] = opt
+          opts.on('-E', '--embed', 'embed puppet modules (control-repo output only)') do |opt|
+            options['embed'] = opt
           end
-          opts.on("-b", "--branch [branch_name]", "branch to use (control-repo output only)") do |opt|
-            options["branch"] = opt
+          opts.on('-b', '--branch [branch_name]', 'branch to use (control-repo output only)') do |opt|
+            options['branch'] = opt
           end
-          opts.on("-B", "--destination_branch [branch_name]", "destination branch to use (control-repo output only)") do |opt|
-            options["destination_branch"] = opt
+          opts.on('-B', '--destination_branch [branch_name]', 'destination branch to use (control-repo output only)') do |opt|
+            options['destination_branch'] = opt
           end
-          opts.on("-d", "--debug [level]", "debug logging level: critical, error, warning, info, debug1, debug2") do |opt|
+          opts.on('-d', '--debug [level]', 'debug logging level: critical, error, warning, info, debug1, debug2') do |opt|
             $simp_metadata_debug_level = opt
           end
         end.parse!(argv)
@@ -67,4 +67,3 @@ module Simp
     end
   end
 end
-

data/lib/simp/media.rb

@@ -4,6 +4,5 @@ require 'simp/media/type'
 
 module Simp
   module Media
-
   end
 end

data/lib/simp/media/command.rb

@@ -6,57 +6,57 @@ module Simp
       def run(argv)
         options = {}
         OptionParser.new do |opts|
-          opts.banner = "Usage: simp-media [options]"
+          opts.banner = 'Usage: simp-media [options]'
 
-          opts.on("-v", "--version [version]", "version to install") do |opt|
-            options["version"] = opt
+          opts.on('-v', '--version [version]', 'version to install') do |opt|
+            options['version'] = opt
           end
-          opts.on("-i", "--input [file]", "input filename") do |opt|
-            options["input"] = opt
+          opts.on('-i', '--input [file]', 'input filename') do |opt|
+            options['input'] = opt
           end
-          opts.on("-t", "--input-type [type]", "input install type", "valid types:", "  - internet", "  - local", "  - tar", "  - iso") do |opt|
-            options["input_type"] = opt
+          opts.on('-t', '--input-type [type]', 'input install type', 'valid types:', '  - internet', '  - local', '  - tar', '  - iso') do |opt|
+            options['input_type'] = opt
           end
-          opts.on("-o", "--output [file]", "output filename, path, or url (if control_repo type is specified)") do |opt|
-            options["output"] = opt
+          opts.on('-o', '--output [file]', 'output filename, path, or url (if control_repo type is specified)') do |opt|
+            options['output'] = opt
           end
-          opts.on("-T", "--output-type [type]", "output install type", "valid types:", "  - control_repo", "  - local", "  - tar", "  - iso") do |opt|
-            options["output_type"] = opt
+          opts.on('-T', '--output-type [type]', 'output install type', 'valid types:', '  - control_repo', '  - local', '  - tar', '  - iso') do |opt|
+            options['output_type'] = opt
           end
-          opts.on("-e", "--edition [edition_name]", "SIMP Edition", "valid editions:", "  - community", "  - enterprise") do |opt|
-            options["edition"] = opt
+          opts.on('-e', '--edition [edition_name]', 'SIMP Edition', 'valid editions:', '  - community', '  - enterprise') do |opt|
+            options['edition'] = opt
           end
-          opts.on("-f", "--flavor [flavor_name]", "SIMP flavor", "valid flavors:", "  - default") do |opt|
-            options["destination_branch"] = opt
+          opts.on('-f', '--flavor [flavor_name]', 'SIMP flavor', 'valid flavors:', '  - default') do |opt|
+            options['destination_branch'] = opt
           end
-          opts.on("-c", "--channel [channel_name]", "Distribution Channel") do |opt|
-            options["channel"] = opt
+          opts.on('-c', '--channel [channel_name]', 'Distribution Channel') do |opt|
+            options['channel'] = opt
           end
-          opts.on("-l", "--license [license]", "path to license file") do |opt|
-            options["license"] = opt
+          opts.on('-l', '--license [license]', 'path to license file') do |opt|
+            options['license'] = opt
           end
-          opts.on("-s", "--sign", "sign output (if applicable)") do |opt|
-            options["sign"] = opt
+          opts.on('-s', '--sign', 'sign output (if applicable)') do |opt|
+            options['sign'] = opt
           end
-          opts.on("-S", "--signing-key [keyid]", "GPG ID of signing key") do |opt|
-            options["signing_key"] = opt
+          opts.on('-S', '--signing-key [keyid]', 'GPG ID of signing key') do |opt|
+            options['signing_key'] = opt
           end
-          opts.on("-D", "--local-directory [directory]", "Local directory to add to SIMP") do |opt|
-            options["local_directory"] = opt
+          opts.on('-D', '--local-directory [directory]', 'Local directory to add to SIMP') do |opt|
+            options['local_directory'] = opt
           end
-          opts.on("-u", "--url [url]", "URL of git hosting server to use (control-repo output only)") do |opt|
-            options["embed"] = opt
+          opts.on('-u', '--url [url]', 'URL of git hosting server to use (control-repo output only)') do |opt|
+            options['embed'] = opt
           end
-          opts.on("-E", "--embed", "embed puppet modules (control-repo output only)") do |opt|
-            options["embed"] = opt
+          opts.on('-E', '--embed', 'embed puppet modules (control-repo output only)') do |opt|
+            options['embed'] = opt
           end
-          opts.on("-b", "--branch [branch_name]", "branch to use (control-repo output only)") do |opt|
-            options["branch"] = opt
+          opts.on('-b', '--branch [branch_name]', 'branch to use (control-repo output only)') do |opt|
+            options['branch'] = opt
           end
-          opts.on("-B", "--destination_branch [branch_name]", "destination branch to use (control-repo output only)") do |opt|
-            options["destination_branch"] = opt
+          opts.on('-B', '--destination_branch [branch_name]', 'destination branch to use (control-repo output only)') do |opt|
+            options['destination_branch'] = opt
           end
-          opts.on("-d", "--debug [level]", "debug logging level: critical, error, warning, info, debug1, debug2") do |opt|
+          opts.on('-d', '--debug [level]', 'debug logging level: critical, error, warning, info, debug1, debug2') do |opt|
             $simp_metadata_debug_level = opt
           end
         end.parse!(argv)
@@ -66,4 +66,3 @@ module Simp
     end
   end
 end
-

data/lib/simp/media/engine.rb

@@ -31,54 +31,48 @@ module Simp
         Simp::Metadata.critical(output)
       end
 
-      def initialize(options ={})
+      def initialize(options = {})
         {
-            "input_type" => "internet",
-            "input" => nil,
-            "output_type" => "control_repo",
-            "output" => "file:///usr/share/simp/control-repo",
-            "url" => nil,
-            "embed" => true,
-            "license" => '/etc/simp/license.key',
-            "sign" => false,
-            "signing_key" => nil,
-            "metadata" => nil,
-            "branch" => "production",
-            "destination_branch" => nil,
-            "edition" => "community",
-            "channel" => "stable",
-            "flavor" => "default",
+          'input_type' => 'internet',
+          'input' => nil,
+          'output_type' => 'control_repo',
+          'output' => 'file:///usr/share/simp/control-repo',
+          'url' => nil,
+          'embed' => true,
+          'license' => '/etc/simp/license.key',
+          'sign' => false,
+          'signing_key' => nil,
+          'metadata' => nil,
+          'branch' => 'production',
+          'destination_branch' => nil,
+          'edition' => 'community',
+          'channel' => 'stable',
+          'flavor' => 'default'
         }.each do |key, default_value|
-          unless (options.key?(key))
-            options[key] = default_value
-          end
+          options[key] = default_value unless options.key?(key)
         end
         @cleanup = []
         @options = options
-        if (options["input_type"] == nil)
-          raise "input_type must be specified"
-        end
-        if (options["output_type"] == nil)
-          raise "output_type must be specified"
-        end
-        @input = Module.const_get("Simp::Media::Type::#{@options["input_type"].capitalize}").new(options, self)
-        @output = Module.const_get("Simp::Media::Type::#{@options["output_type"].capitalize}").new(options, self)
+        raise 'input_type must be specified' if options['input_type'].nil?
+        raise 'output_type must be specified' if options['output_type'].nil?
+        @input = Module.const_get("Simp::Media::Type::#{@options['input_type'].capitalize}").new(options, self)
+        @output = Module.const_get("Simp::Media::Type::#{@options['output_type'].capitalize}").new(options, self)
       end
 
-      def run()
+      def run
         # XXX ToDo: Need to not create a target_directory if an input directory exists
-        if (@output.target_directory == nil)
-          target = Dir.mktmpdir("cachedir")
+        if @output.target_directory.nil?
+          target = Dir.mktmpdir('cachedir')
           @cleanup << target
         else
           target = @output.target_directory
         end
 
         # XXX ToDo: only set this if input is specified
-        @input.input_directory = @options["input"]
+        @input.input_directory = @options['input']
 
-        metadata = Simp::Metadata::Engine.new(nil, nil, @options["edition"])
-        version = @options["version"]
+        metadata = Simp::Metadata::Engine.new(nil, nil, @options['edition'])
+        version = @options['version']
         metadata.releases[version].components.each do |component|
           info("Adding #{component.name}")
           retval = @input.fetch_component(component, {})
@@ -90,11 +84,11 @@ module Simp
         cleanup
       end
 
-      def loaded?()
+      def loaded?
         true
       end
 
-      def cleanup()
+      def cleanup
         @cleanup.each do |path|
           FileUtils.rmtree(path)
         end

data/lib/simp/media/type.rb

@@ -1,14 +1,13 @@
-
 require 'simp/media/type/base'
 require 'simp/media/type/internet'
 require 'simp/media/type/local'
 require 'simp/media/type/tar'
 require 'simp/media/type/iso'
 require 'simp/media/type/control-repo'
+
 module Simp
   module Media
     module Type
-
     end
   end
 end

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

@@ -5,10 +5,12 @@ module Simp
       class Base
         attr_accessor :engine
         attr_accessor :options
+
         def initialize(options, engine)
           @options = options
           @engine = engine
         end
+
         def debug2(output)
           engine.debug2(output)
         end
@@ -32,9 +34,10 @@ module Simp
         def critical(output)
           engine.critical(output)
         end
+
         def run(command)
           exitcode = nil
-          Open3.popen3(command) do |stdin, stdout, stderr, thread|
+          Open3.popen3(command) do |_stdin, stdout, stderr, thread|
             pid = thread.pid
             debug1(stdout.read.chomp)
             debug1(stderr.read.chomp)
@@ -42,19 +45,24 @@ module Simp
           end
           exitcode
         end
+
         def target_directory
           nil
         end
+
         def cleanup
           true
         end
-        def fetch_component(component, options)
+
+        def fetch_component(_component, _options)
           raise '`fetch_component` not implemented'
         end
-        def add_component(component, options)
+
+        def add_component(_component, _options)
           raise '`add_component` not implemented'
         end
-        def finalize()
+
+        def finalize
           raise '`finalize` not implemented'
         end
       end