simp-metadata 0.4.4 → 0.5.2

data/lib/simp/metadata/bootstrap_source.rb

@@ -4,7 +4,6 @@ require 'uri'
 module Simp
   module Metadata
     class Bootstrap_source
-
       attr_accessor :url
       attr_accessor :cachepath
       attr_accessor :components
@@ -20,118 +19,123 @@ module Simp
         @edition = edition
 
         case edition
-          when "enterprise"
-            @data = {
-                "components" => {
-                    "enterprise-metadata" => {
-                        "component-type" => "simp-metadata",
-                        "authoritative" => true,
-                        "locations" => [
-                            {
-                                "url" => "simp-enterprise:///enterprise-metadata?version=master&filetype=tgz",
-                                "method" => "file",
-                                "extract" => true,
-                                "primary" => true,
-                            }
-                        ]
-                    },
-                    "simp-metadata" => {
-                        "component-type" => "simp-metadata",
-                        "authoritative" => true,
-                        "locations" => [
-                            {
-                                "url" => "https://github.com/simp/simp-metadata",
-                                "method" => "git",
-                                "primary" => true,
-                            }
-                        ],
-                    },
-                }
+        when 'enterprise'
+          @data = {
+            'components' => {
+              'enterprise-metadata' => {
+                'component-type' => 'simp-metadata',
+                'authoritative' => true,
+                'locations' => [
+                  {
+                    'url' => 'simp-enterprise:///enterprise-metadata?version=master&filetype=tgz',
+                    'method' => 'file',
+                    'extract' => true,
+                    'primary' => true
+                  }
+                ]
+              },
+              'simp-metadata' => {
+                'component-type' => 'simp-metadata',
+                'authoritative' => true,
+                'locations' => [
+                  {
+                    'url' => 'https://github.com/simp/simp-metadata',
+                    'method' => 'git',
+                    'primary' => true
+                  }
+                ]
+              }
             }
-          when "enterprise-only"
-            @data = {
-                "components" => {
-                    "enterprise-metadata" => {
-                        "component-type" => "simp-metadata",
-                        "authoritative" => true,
-                        "locations" => [
-                            {
-                                "url" => "simp-enterprise:///enterprise-metadata?version=master&filetype=tgz",
-                                "method" => "file",
-                                "extract" => true,
-                                "primary" => true,
-                            }
-                        ]
-                    }
-                }
+          }
+        when 'enterprise-only'
+          @data = {
+            'components' => {
+              'enterprise-metadata' => {
+                'component-type' => 'simp-metadata',
+                'authoritative' => true,
+                'locations' => [
+                  {
+                    'url' => 'simp-enterprise:///enterprise-metadata?version=master&filetype=tgz',
+                    'method' => 'file',
+                    'extract' => true,
+                    'primary' => true
+                  }
+                ]
+              }
             }
-          else
-            @data = {
-                "components" => {
-                    "simp-metadata" => {
-                        "component-type" => "simp-metadata",
-                        "authoritative" => true,
-                        "locations" => [
-                            {
-                                "url" => "https://github.com/simp/simp-metadata",
-                                "method" => "git",
-                                "primary" => true,
-                            }
-                        ],
-                    }
-                }
+          }
+        else
+          @data = {
+            'components' => {
+              'simp-metadata' => {
+                'component-type' => 'simp-metadata',
+                'authoritative' => true,
+                'locations' => [
+                  {
+                    'url' => 'https://github.com/simp/simp-metadata',
+                    'method' => 'git',
+                    'primary' => true
+                  }
+                ]
+              }
             }
+          }
         end
         @components = @data['components']
       end
 
-      def release(version)
+      def release(_version)
         case edition
-          when "enterprise"
-            {
-                "enterprise-metadata" => {
-                    "version" => "master",
-                },
-                "simp-metadata" => {
-                  "branch" => "master"
-                }
+        when 'enterprise'
+          {
+            'enterprise-metadata' => {
+              'version' => 'master'
+            },
+            'simp-metadata' => {
+              'branch' => 'master'
             }
-          when "enterprise-only"
-            {
-                "enterprise-metadata" => {
-                    "version" => "master",
-                }
+          }
+        when 'enterprise-only'
+          {
+            'enterprise-metadata' => {
+              'version' => 'master'
             }
-          else
-            {
-                "simp-metadata" => {
-                    "branch" => "master"
-                }
+          }
+        else
+          {
+            'simp-metadata' => {
+              'branch' => 'master'
             }
+          }
         end
       end
-      # Stub out 'writing' methods as they don't apply to bootstrap_source
-      def create_release(destination, source = 'master')
 
+      # Stub out 'writing' methods as they don't apply to bootstrap_source
+      def create_release(_destination, _source = 'master')
       end
-      def writable?()
+
+      def writable?
         false
       end
-      def dirty?()
+
+      def dirty?
         false
       end
-      def save()
+
+      def save
         true
       end
-      def cleanup()
+
+      def cleanup
       end
-      def to_s()
-        self.name
+
+      def to_s
+        name
       end
-      def name()
-        "bootstrap_metadata"
+
+      def name
+        'bootstrap_metadata'
       end
     end
   end
 end
-

data/lib/simp/metadata/buildinfo.rb

@@ -10,49 +10,49 @@ module Simp
         @component = component
       end
 
-      def keys()
-        ["type", "build_method"]
+      def keys
+        %w(type build_method)
       end
 
-      def [] (index)
-        self.send index.to_sym
+      def [](index)
+        send index.to_sym
       end
 
-      def each(&block)
-        self.keys.each do |key|
+      def each
+        keys.each do |key|
           yield key, self[key]
         end
       end
 
       def fetch_data
-        component.fetch_data("buildinfo")
+        component.fetch_data('buildinfo')
       end
 
       def method_defaults
         {
-            "rpm" => {
-                "build_method" => "simp-core",
-            }
+          'rpm' => {
+            'build_method' => 'simp-core'
+          }
         }
       end
 
-      def build_method()
-        buildinfo = self.fetch_data
-        if (buildinfo == nil)
-          retval = method_defaults[type]["build_method"]
+      def build_method
+        buildinfo = fetch_data
+        if buildinfo.nil?
+          retval = method_defaults[type]['build_method']
         else
-          if (buildinfo.key?(type))
-            if (buildinfo[type].key?("build_method"))
-              retval = buildinfo[type]["build_method"]
-            else
-              retval = method_defaults[type]["build_method"]
-            end
+          if buildinfo.key?(type)
+            retval = if buildinfo[type].key?('build_method')
+                       buildinfo[type]['build_method']
+                     else
+                       method_defaults[type]['build_method']
+                     end
           else
-            retval = method_defaults[type]["build_method"]
+            retval = method_defaults[type]['build_method']
           end
         end
-        return retval
+        retval
       end
     end
   end
-end
+end

data/lib/simp/metadata/command.rb

@@ -8,82 +8,84 @@ module Simp
         command = argv[0]
         argv.shift
         # XXX ToDo: Make this dynamic, just instantiate a class named the subcommand
-        if (command != "")
-          if (command == "-h" || command == "help")
-            self.help()
+        if command != ''
+          if command == '-h' || command == 'help'
+            help
           else
-            unless (command =~ /^#/)
+            unless command =~ /^#/
               begin
-                cmd = Module.const_get("Simp::Metadata::Commands::#{command.gsub("-", "_").capitalize}").new()
+                cmd = Module.const_get("Simp::Metadata::Commands::#{command.tr('-', '_').capitalize}").new
 
               rescue
                 Simp::Metadata.critical("Unable to find command: #{command}")
-                self.help
+                help
                 exit 4
               end
               cmd.run(argv)
             end
           end
         else
-          self.help()
+          help
         end
       end
 
-      def help()
-        puts "Usage: simp-metadata [command] [options]"
+      def help
+        puts 'Usage: simp-metadata [command] [options]'
+
         # XXX: ToDo: make this dynamic...
         subcommands = [
-            [
-                "clone",
-                "Clones one simp release into another",
-            ],
-            [
-                "component",
-                "create, view, or update a component",
-            ],
-            [
-                "delete",
-                "deletes a release",
-            ],
-            [
-                "pry",
-                "opens up pry debugger",
-            ],
-            [
-                "release",
-                "views components of a release",
-            ],
-            [
-                "releases",
-                "lists all releases",
-            ],
-            [
-                "save",
-                "Saves metadata changes",
-            ],
-            [
-                "script",
-                "Execute a script containing multiple commands",
-            ],
-            [
-                "search",
-                "searches for components based on attributes",
-            ],
-            [
-                "set-write",
-                "Sets which metadata repo to write to if there are multiple",
-            ],
-            [
-                "set-write-url",
-                "view/update/create a component",
-            ],
-            [
-                "update",
-                "updates a components attributes",
-            ]
+          [
+            'clone',
+            'Clones one simp release into another'
+          ],
+          [
+            'component',
+            'create, view, or update a component'
+          ],
+          [
+            'delete',
+            'deletes a release'
+          ],
+          [
+            'pry',
+            'opens up pry debugger'
+          ],
+          [
+            'release',
+            'views components of a release'
+          ],
+          [
+            'releases',
+            'lists all releases'
+          ],
+          [
+            'save',
+            'Saves metadata changes'
+          ],
+          [
+            'script',
+            'Execute a script containing multiple commands'
+          ],
+          [
+            'search',
+            'searches for components based on attributes'
+          ],
+          [
+            'set-write',
+            'Sets which metadata repo to write to if there are multiple'
+          ],
+          [
+            'set-write-url',
+            'view/update/create a component'
+          ],
+          [
+            'update',
+            'updates a components attributes'
+          ]
         ]
+
         subcommands.each do |components|
-          output_string = "#{(components[0].ljust(38)).rjust(42)}#{components[1]}"
+          output_string = "#{components[0].ljust(38).rjust(42)}#{components[1]}"
           puts output_string
         end
       end

data/lib/simp/metadata/commands.rb

@@ -18,4 +18,4 @@ module Simp
     module Commands
     end
   end
-end
+end

data/lib/simp/metadata/commands/base.rb

@@ -5,59 +5,62 @@ module Simp
       class Base
         def get_engine(engine, options = {})
           root = false
-          if (options["ssh_key"] != nil)
-            options["ssh_key"] = File.expand_path(options["ssh_key"])
+          unless options['ssh_key'].nil?
+            options['ssh_key'] = File.expand_path(options['ssh_key'])
           end
-          if (engine == nil)
+          if engine.nil?
             root = true
             metadatarepos = {}
-            if (options["writable_urls"] != nil)
-              array = options["writable_urls"].split(',')
-              elements = array.size / 2;
+            if !options['writable_urls'].nil?
+              array = options['writable_urls'].split(',')
+              elements = array.size / 2
               (0...elements).each do |offset|
                 comp = array[offset * 2]
                 url = array[(offset * 2) + 1]
                 metadatarepos[comp] = url
               end
-              engine = Simp::Metadata::Engine.new(nil, metadatarepos, options["edition"], options)
+              engine = Simp::Metadata::Engine.new(nil, metadatarepos, options['edition'], options)
             else
-              engine = Simp::Metadata::Engine.new(nil, nil, options["edition"], options)
+              engine = Simp::Metadata::Engine.new(nil, nil, options['edition'], options)
             end
           else
             root = false
           end
-          return engine, root
+          [engine, root]
         end
-        # Defines default arguments for commands
-        def defaults(argv, &block)
 
+        # Defines default arguments for commands
+        def defaults(argv)
           options = {
-              "edition" => ENV.fetch('SIMP_METADATA_EDITION', 'community'),
+            'edition' => ENV.fetch('SIMP_METADATA_EDITION', 'community')
           }
-          if (ENV.fetch('SIMP_METADATA_WRITABLE_URLS', nil) != nil)
-            options["writable_urls"] = ENV['SIMP_METADATA_WRITABLE_URLS']
+          if ENV.fetch('SIMP_METADATA_WRITABLE_URLS', nil) != nil
+            options['writable_urls'] = ENV['SIMP_METADATA_WRITABLE_URLS']
           end
           option_parser = OptionParser.new do |opts|
-            opts.banner = "Usage: simp-metadata <command> [options]"
-            opts.on("-d", "--debug [level]", "debug logging level: critical, error, warning, info, debug1, debug2") do |opt|
+            opts.banner = 'Usage: simp-metadata <command> [options]'
+            opts.on('-d', '--debug [level]', 'debug logging level: critical, error, warning, info, debug1, debug2') do |opt|
               $simp_metadata_debug_level = opt
             end
-            opts.on("-v", "--version [release]", "release version") do |opt|
-              options["release"] = opt
+            opts.on('-v', '--version [release]', 'release version') do |opt|
+              options['release'] = opt
+            end
+            opts.on('-i', '--identity [ssh_key_file]', 'specify ssh_key to be used') do |opt|
+              options['ssh_key'] = opt
             end
-            opts.on("-i", "--identity [ssh_key_file]", "specify ssh_key to be used") do |opt|
-              options["ssh_key"] = opt
+            opts.on('-w', '--writable-urls [component,url]', 'component,url') do |opt|
+              options['writable_urls'] = opt
             end
-            opts.on("-w", "--writable-urls [component,url]", "component,url") do |opt|
-              options["writable_urls"] = opt
+            opts.on('-e', '--edition [edition]', 'simp edition') do |opt|
+              options['edition'] = opt
             end
-            opts.on("-e", "--edition [edition]", "simp edition") do |opt|
-              options["edition"] = opt
+            opts.on('-p', '--platform [platform]', 'el_version to use', 'valid platforms:', ' - el6', ' - el7') do |opt|
+              options['platform'] = opt
             end
             yield(opts) if block_given?
           end
           option_parser.parse!(argv)
-          return options
+          options
         end
       end
     end