simp-metadata 0.4.4 → 0.5.2

data/lib/simp/metadata/components.rb

@@ -12,16 +12,16 @@ module Simp
         @type = type
       end
 
-      def to_s()
-        self.keys.to_s
+      def to_s
+        keys.to_s
       end
 
-      def size()
-        self.keys.size
+      def size
+        keys.size
       end
 
-      def each(&block)
-        self.keys.each do |version|
+      def each
+        keys.each do |version|
           yield self[version]
         end
       end
@@ -31,25 +31,25 @@ module Simp
       end
 
       def key?(name)
-        self.keys.include?(name)
+        keys.include?(name)
       end
 
-      def keys()
+      def keys
         result = {}
-        if (version == nil)
-          engine.sources.each do |name, source|
+        if version.nil?
+          engine.sources.each do |_name, source|
             source.components.keys.each do |name|
               result[name] = true
             end
           end
         else
-          engine.sources.each do |name, source|
-            if (source.releases.key?(version))
-              source.releases[version].each do |component, data|
+          engine.sources.each do |_name, source|
+            if source.releases.key?(version)
+              source.releases[version].each do |component, _data|
                 result[component] = true
               end
             else
-              source.release(version).each do |component, data|
+              source.release(version).each do |component, _data|
                 result[component] = true
               end
             end
@@ -59,7 +59,7 @@ module Simp
       end
 
       def create(name, settings = {})
-        unless (self.key?(name))
+        unless key?(name)
           engine.writable_source.components[name] = settings
           engine.writable_source.dirty = true
         end
@@ -67,4 +67,3 @@ module Simp
     end
   end
 end
-

data/lib/simp/metadata/engine.rb

@@ -5,50 +5,48 @@ require 'simp/metadata'
 module Simp
   module Metadata
     class Engine
+      attr_accessor :options
       attr_accessor :sources
 
-      def initialize(cachepath = nil, metadatarepos = nil, edition = "community", options = {})
-
+      def initialize(cachepath = nil, metadatarepos = nil, edition = 'community', options = {})
         ENV['GIT_SSH'] = "#{File.dirname(__FILE__)}/git_ssh_wrapper.sh"
-        if (options["ssh_key"] != nil)
-          ENV['SIMP_METADATA_SSHKEY'] = "#{options["ssh_key"]}"
+        unless options['ssh_key'].nil?
+          ENV['SIMP_METADATA_SSHKEY'] = (options['ssh_key']).to_s
         end
+        @options = options
         @sources = {}
-        @writable_source = "simp-metadata"
+        @writable_source = 'simp-metadata'
         priority = 0
         bootstrap_source = Simp::Metadata::Bootstrap_source.new(edition)
-        if (metadatarepos.class.to_s == "Hash")
+        if metadatarepos.class.to_s == 'Hash'
           metadatarepos.each do |reponame, url|
             # XXX: ToDo replace with better logic once Simp::Metadata.download_component gets refactored.
             # MUCH LAYERING VIOLATIONS
-            if (bootstrap_source.components.key?(reponame))
-              bootstrap_source.components[reponame]["locations"][0]["url"] = url
-              bootstrap_source.components[reponame]["locations"][0]["method"] = "git"
-              bootstrap_source.components[reponame]["locations"][0]["extract"] = false
-            end
+            next unless bootstrap_source.components.key?(reponame)
+            bootstrap_source.components[reponame]['locations'][0]['url'] = url
+            bootstrap_source.components[reponame]['locations'][0]['method'] = 'git'
+            bootstrap_source.components[reponame]['locations'][0]['extract'] = false
           end
         end
         @sources[bootstrap_source.name] = bootstrap_source
-        self.components.keys.each do |key|
-          component = self.components[key]
-          @sources[key] = Simp::Metadata::Source.new({:name => key, :component => component}.merge({cachepath: cachepath, edition: edition, engine: self}))
+        components.keys.each do |key|
+          component = components[key]
+          @sources[key] = Simp::Metadata::Source.new({ name: key, component: component }.merge(cachepath: cachepath, edition: edition, engine: self))
         end
       end
 
-      def components()
-        return Simp::Metadata::Components.new(self)
+      def components
+        Simp::Metadata::Components.new(self)
       end
 
-      def releases()
-        return Simp::Metadata::Releases.new(self)
+      def releases
+        Simp::Metadata::Releases.new(self)
       end
 
-      def dirty?()
+      def dirty?
         dirty = false
-        @sources.each do |name, source|
-          if (source.dirty? == true)
-            dirty = true
-          end
+        @sources.each do |_name, source|
+          dirty = true if source.dirty?
         end
         dirty
       end
@@ -57,12 +55,11 @@ module Simp
         @writable_source = source
       end
 
-      def writable_source_name()
+      def writable_source_name
         @writable_source
       end
 
-
-      def writable_source()
+      def writable_source
         @sources[@writable_source]
       end
 
@@ -70,10 +67,10 @@ module Simp
         @sources[metadata_name].write_url = url
       end
 
-      def save(message = "Auto-saving using simp-metadata")
-        Simp::Metadata.debug2("Saving metadata")
-        @sources.each do |name, source|
-          if (source.dirty? == true)
+      def save(message = 'Auto-saving using simp-metadata')
+        Simp::Metadata.debug2('Saving metadata')
+        @sources.each do |_name, source|
+          if source.dirty?
             Simp::Metadata.debug1("#{source} - dirty, saving")
             source.save(message)
           else
@@ -82,20 +79,15 @@ module Simp
         end
       end
 
-      def ssh_key
-        @ssh_key
-      end
+      attr_reader :ssh_key
 
-      def ssh_key= (value)
-        @ssh_key = value
-      end
+      attr_writer :ssh_key
 
-      def cleanup()
-        @sources.each do |name, source|
+      def cleanup
+        @sources.each do |_name, source|
           source.cleanup
         end
       end
     end
   end
 end
-

data/lib/simp/metadata/fake_uri.rb

@@ -8,9 +8,11 @@ module Simp
       attr_accessor :port
       attr_accessor :path
       attr_accessor :user
+
       def initialize(uri)
         @uri = uri
       end
+
       def to_s
         @uri
       end

data/lib/simp/metadata/location.rb

@@ -2,7 +2,6 @@ require 'uri'
 module Simp
   module Metadata
     class Location
-
       attr_accessor :locationinfo
       attr_accessor :location
       attr_accessor :component
@@ -14,34 +13,34 @@ module Simp
       end
 
       def to_s
-        self.url
+        url
       end
 
       def primary
-        if (location.key?("primary"))
-          location["primary"]
+        if location.key?('primary')
+          location['primary']
         else
           false
         end
       end
 
-      def keys()
-        ["extract", "primary", "method", "type", "url"]
+      def keys
+        %w(extract primary method type url)
       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 extract
-        if (location.key?("extract"))
-          location["extract"]
+        if location.key?('extract')
+          location['extract']
         else
           false
         end
@@ -52,27 +51,27 @@ module Simp
       end
 
       def method
-        if (@local_method)
+        if @local_method
           @local_method
         else
-          if (location.key?("type"))
-            if (location["type"] == "git")
-              method = "git"
+          if location.key?('type')
+            if location['type'] == 'git'
+              'git'
             else
-              method = "file"
+              'file'
             end
           else
-            if (location.key?("method"))
-              location["method"]
+            if location.key?('method')
+              location['method']
             else
-              method = "file"
+              'file'
             end
           end
         end
       end
 
       def type
-        location["binary"]
+        location['binary']
       end
 
       def url=(value)
@@ -80,119 +79,114 @@ module Simp
       end
 
       def url
-        if (@local_url)
+        if @local_url
           @local_url
         else
-          base = self.real_url
+          base = real_url
           uri = Simp::Metadata.uri(base)
           case uri.scheme
-            when "simp-enterprise"
-              if (uri.query.class == String)
-                query_elements = uri.query.split("&")
-                newquery = []
-                found_version = false
-                found_filetype = false
-                query_elements.each do |element|
-                  elements = element.split("=")
-                  if (elements.size > 1)
-                    if (elements[0] == "version")
-                      found_version = true
-                      elements[1] = component.version
-                      newquery << elements.join("=")
-                    elsif (elements[0] == "filetype")
-                      found_filetype = true
-                      elements[1] = component.extension
-                      newquery << elements.join("=")
-                    else
-                      newquery << element
-                    end
+          when 'simp-enterprise'
+            if uri.query.class == String
+              query_elements = uri.query.split('&')
+              newquery = []
+              found_version = false
+              found_filetype = false
+              query_elements.each do |element|
+                elements = element.split('=')
+                if elements.size > 1
+                  if elements[0] == 'version'
+                    found_version = true
+                    elements[1] = component.version
+                    newquery << elements.join('=')
+                  elsif elements[0] == 'filetype'
+                    found_filetype = true
+                    elements[1] = component.extension
+                    newquery << elements.join('=')
                   else
                     newquery << element
                   end
+                else
+                  newquery << element
                 end
-                if (found_version == false)
-                  newquery << "version=#{component.version}"
-                end
-                if (found_filetype == false)
-                  newquery << "filetype=#{component.extension}"
-                end
-                uri.query = newquery.join("&")
               end
-              uri.to_s
-
-            when "simp"
-              if (uri.query.class == String)
-                query_elements = uri.query.split("&")
-                newquery = []
-                found_version = false
-                found_filetype = false
-                query_elements.each do |element|
-                  elements = element.split("=")
-                  if (elements.size > 1)
-                    if (elements[0] == "version")
-                      found_version = true
-                      elements[1] = component.version
-                      newquery << elements.join("=")
-                    elsif (elements[0] == "filetype")
-                      found_filetype = true
-                      elements[1] = component.extension
-                      newquery << elements.join("=")
-                    else
-                      newquery << element
-                    end
+              newquery << "version=#{component.version}" unless found_version
+
+              unless found_filetype
+                newquery << "filetype=#{component.extension}"
+              end
+
+              uri.query = newquery.join('&')
+            end
+            uri.to_s
+
+          when 'simp'
+            if uri.query.class == String
+              query_elements = uri.query.split('&')
+              newquery = []
+              found_version = false
+              found_filetype = false
+              query_elements.each do |element|
+                elements = element.split('=')
+                if elements.size > 1
+                  if elements[0] == 'version'
+                    found_version = true
+                    elements[1] = component.version
+                    newquery << elements.join('=')
+                  elsif elements[0] == 'filetype'
+                    found_filetype = true
+                    elements[1] = component.extension
+                    newquery << elements.join('=')
                   else
                     newquery << element
                   end
+                else
+                  newquery << element
                 end
-                if (found_version == false)
-                  newquery << "version=#{component.version}"
-                end
-                if (found_filetype == false)
-                  newquery << "filetype=#{component.extension}"
-                end
-                uri.query = newquery.join("&")
               end
-              uri.to_s
-            else
-              case component.component_type
-                when "rubygem"
-                  if (base =~ /.*\.gem/)
-                  else
-                    "#{base}/#{component.asset_name}-#{component.version}.gem"
-                  end
+              newquery << "version=#{component.version}" unless found_version
+              unless found_filetype
+                newquery << "filetype=#{component.extension}"
               end
-              base
+              uri.query = newquery.join('&')
+            end
+            uri.to_s
+          else
+            case component.component_type
+            when 'rubygem'
+              if base =~ /.*\.gem/
+              else
+                "#{base}/#{component.asset_name}-#{component.version}.gem"
+              end
+            end
+            base
           end
         end
-
       end
 
       def real_url
-        if (component.compiled? == true)
+        if component.compiled?
           case component.component_type
-            when "rubygem"
-              case component.release_source.to_s
-                when "simp-metadata"
-                  return "simp:///#{component.name}/#{component.binaryname}"
-                when "enterprise-metadata"
-                  return "simp-enterprise:///#{component.name}/#{component.binaryname}"
-              end
+          when 'rubygem'
+            case component.release_source.to_s
+            when 'simp-metadata'
+              return "simp:///#{component.name}/#{component.binaryname}"
+            when 'enterprise-metadata'
+              return "simp-enterprise:///#{component.name}/#{component.binaryname}"
+            end
           end
         end
-        if (location.key?("url"))
-          location["url"]
+        if location.key?('url')
+          location['url']
         else
-          if (location.key?("host"))
-            if (location.key?("path"))
-              if (location.key?("type"))
-                "https://#{location["host"]}/#{location["path"]}"
+          if location.key?('host')
+            if location.key?('path')
+              if location.key?('type')
+                "https://#{location['host']}/#{location['path']}"
               end
             end
           end
         end
       end
-
-
     end
   end
 end