simp-metadata 0.4.4 → 0.5.2

data/lib/simp/metadata/locations.rb

@@ -10,45 +10,43 @@ module Simp
         @component = component
       end
 
-      def data()
-        if (self.locationinfo["locations"] != nil)
-          self.locationinfo["locations"]
+      def data
+        if locationinfo['locations'].nil?
+          [locationinfo['primary_source']] + locationinfo['mirrors']
         else
-          [ self.locationinfo["primary_source"] ] + self.locationinfo["mirrors"]
+          locationinfo['locations']
         end
       end
 
-      def to_s()
-        self.data.to_s
+      def to_s
+        data.to_s
       end
 
-      def size()
-        self.data.size
+      def size
+        data.size
       end
 
-      def each(&block)
-          self.data.each_index do |location|
-            yield self[location]
-          end
+      def each
+        data.each_index do |location|
+          yield self[location]
+        end
       end
 
       def [](location)
-        Simp::Metadata::Location.new(locationinfo,data[location], component)
+        Simp::Metadata::Location.new(locationinfo, data[location], component)
       end
 
       def primary
-
-        retval = self.find { |i| i.primary == true }
-        if (retval == nil)
-          if (self.locationinfo.key?("primary_source"))
-            retval = Simp::Metadata::Location.new(self.locationinfo, self.locationinfo["primary_source"], component)
+        retval = find(&:primary)
+        if retval.nil?
+          if locationinfo.key?('primary_source')
+            retval = Simp::Metadata::Location.new(locationinfo, locationinfo['primary_source'], component)
           else
-            retval = self.first
+            retval = first
           end
         end
-        return retval
+        retval
       end
     end
   end
 end
-

data/lib/simp/metadata/release.rb

@@ -14,48 +14,48 @@ module Simp
         Simp::Metadata::Components.new(engine, version, type)
       end
 
-      def puppetfile_component(component, options)
+      def puppetfile_component(component, _options)
         contents = []
-        contents << "mod '#{component.name("puppetfile")}',"
+        contents << "mod '#{component.name('puppetfile')}',"
         contents << "  :git => '#{component.primary.url}',"
-        if (component.ref == nil)
-          contents << "  :tag => '#{component.tag}'"
-        else
-          contents << "  :ref => '#{component.ref}'"
-        end
-        contents << ""
+        contents << if component.tag.nil?
+                      "  :ref => '#{component.ref}'"
+                    else
+                      "  :tag => '#{component.tag}'"
+                    end
+        contents << ''
         contents
       end
 
       def puppetfile(options = {})
         contents = []
-        if (options["type"] == "simp-core")
+        if options['type'] == 'simp-core'
           contents << "moduledir 'src'"
-          contents << ""
+          contents << ''
           contents << puppetfile_component(components['simp-doc'], options)
           contents << "moduledir 'src/assets'"
-          contents << ""
+          contents << ''
           components.each do |component|
-            if (component.component_type == "rpm")
+            if component.component_type == 'rpm'
               contents << puppetfile_component(component, options)
             end
-            if (component.component_type == "rubygem")
+            if component.component_type == 'rubygem'
               contents << puppetfile_component(component, options)
             end
           end
           contents << "moduledir 'src/puppet/modules'"
-          contents << ""
+          contents << ''
         end
         components.each do |component|
-          if (component.component_type == "puppet-module")
+          if component.component_type == 'puppet-module'
             contents << puppetfile_component(component, options)
           end
         end
         contents.join("\n")
       end
 
-      def to_s()
-        self.components.to_s
+      def to_s
+        components.to_s
       end
 
       def diff(compare_release, attribute)
@@ -63,13 +63,11 @@ module Simp
 
         current_hash = {}
         compare_hash = {}
-        self.components.each do |comp|
+        components.each do |comp|
           self_component_hash = {}
           comp.each do |key, value|
-            if (attribute != nil)
-              if (key.to_s == attribute)
-                self_component_hash[key] = value.to_s
-              end
+            if !attribute.nil?
+              self_component_hash[key] = value.to_s if key.to_s == attribute
             else
               self_component_hash[key] = value.to_s
             end
@@ -80,10 +78,8 @@ module Simp
         compare_release.components.each do |comp|
           self_component_hash = {}
           comp.each do |key, value|
-            if (attribute != nil)
-              if (key.to_s == attribute)
-                self_component_hash[key] = value.to_s
-              end
+            if !attribute.nil?
+              self_component_hash[key] = value.to_s if key.to_s == attribute
             else
               self_component_hash[key] = value.to_s
             end
@@ -91,23 +87,18 @@ module Simp
           end
         end
         current_hash.each do |comp, hash|
-
           diff_hash = {}
           hash.each do |key, value|
-            if (compare_hash.key?(comp))
-              if (compare_hash[comp][key] != value)
-                diff_hash[key] = {
-                    "original" => "#{value}",
-                    "changed" => "#{compare_hash[comp][key]}"
-                }
-              end
-            end
-          end
-          unless diff_hash.empty?
-            diff[comp] = diff_hash
+            next unless compare_hash.key?(comp)
+            next unless compare_hash[comp][key] != value
+            diff_hash[key] = {
+              'original' => value.to_s,
+              'changed' => (compare_hash[comp][key]).to_s
+            }
           end
+          diff[comp] = diff_hash unless diff_hash.empty?
         end
-        return diff
+        diff
       end
     end
   end

data/lib/simp/metadata/releases.rb

@@ -10,8 +10,8 @@ module Simp
         @engine = engine
       end
 
-      def each(&block)
-        self.keys.each do |version|
+      def each
+        keys.each do |version|
           yield self[version]
         end
       end
@@ -20,9 +20,9 @@ module Simp
         Simp::Metadata::Release.new(engine, index)
       end
 
-      def keys()
+      def keys
         result = {}
-        engine.sources.each do |name, source|
+        engine.sources.each do |_name, source|
           source.releases.keys.each do |name|
             result[name] = true
           end
@@ -30,23 +30,23 @@ module Simp
         result.keys
       end
 
-      def size()
-        self.keys.size
+      def size
+        keys.size
       end
 
-      def to_s()
-        self.keys.to_s
+      def to_s
+        keys.to_s
       end
+
       def delete(version)
-        engine.sources.each do |name, metadata_source|
-          if (metadata_source.writable?)
-            metadata_source.delete_release(version)
-          end
+        engine.sources.each do |_name, metadata_source|
+          metadata_source.delete_release(version) if metadata_source.writable?
         end
       end
+
       def create(destination, source = 'master')
-        engine.sources.each do |name, metadata_source|
-          if (metadata_source.writable?)
+        engine.sources.each do |_name, metadata_source|
+          if metadata_source.writable?
             metadata_source.create_release(destination, source)
           end
         end
@@ -54,4 +54,3 @@ module Simp
     end
   end
 end
-

data/lib/simp/metadata/source.rb

@@ -4,7 +4,6 @@ require 'uri'
 module Simp
   module Metadata
     class Source
-
       attr_accessor :url
       attr_accessor :cachepath
       attr_accessor :components
@@ -18,17 +17,17 @@ module Simp
       attr_accessor :engine
 
       def initialize(args)
-        unless (args.key?(:engine))
-          raise ":engine must be specified when initializing a metadata source"
+        unless args.key?(:engine)
+          raise ':engine must be specified when initializing a metadata source'
         end
-        unless (args.key?(:name))
-          raise ":name must be specified when initializing a metadata source"
+        unless args.key?(:name)
+          raise ':name must be specified when initializing a metadata source'
         end
-        unless (args.key?(:component))
-          raise ":component must be specified when initializing a metadata source"
+        unless args.key?(:component)
+          raise ':component must be specified when initializing a metadata source'
         end
-        unless (args.key?(:edition))
-          raise ":edition must be specified when initializing a metadata source"
+        unless args.key?(:edition)
+          raise ':edition must be specified when initializing a metadata source'
         end
 
         @engine = args[:engine]
@@ -36,11 +35,11 @@ module Simp
         @component = args[:component]
         @edition = args[:edition]
 
-        if (args[:url])
-          @url = args[:url]
-        else
-          @url = @component.primary.url
-        end
+        @url = if args[:url]
+                 args[:url]
+               else
+                 @component.primary.url
+               end
         @write_url = @url
         cachepath = args[:cachepath]
         @components = {}
@@ -48,111 +47,107 @@ module Simp
         @data = {}
         @cleanup = []
 
-        if (cachepath == nil)
-          @cachepath = Dir.mktmpdir("cachedir")
+        if cachepath.nil?
+          @cachepath = Dir.mktmpdir('cachedir')
           @cleanup << @cachepath
         else
-          @cachepath = File.absolute_path(cachepath);
+          @cachepath = File.absolute_path(cachepath)
         end
-        retval = Simp::Metadata.download_component(@component, {"target" => @cachepath})
-        load_from_dir(retval["path"])
+        retval = Simp::Metadata.download_component(@component, 'target' => @cachepath)
+        load_from_dir(retval['path'])
 
         @dirty = false
       end
 
-      def to_s()
-        self.name
+      def to_s
+        name
       end
 
-      def writable?()
+      def writable?
         true
       end
-      def write_url
-        @write_url
-      end
+
+      attr_reader :write_url
+
       def write_url=(value)
-        if (value != @url)
+        if value != @url
           @write_url = value
           FileUtils.rm_r("#{@cachepath}/#{@component.name}")
-          retval = Simp::Metadata.download_component(@component, {"target" => @cachepath, "url" => value})
-          load_from_dir(retval["path"])
+          retval = Simp::Metadata.download_component(@component, 'target' => @cachepath, 'url' => value)
+          load_from_dir(retval['path'])
         end
       end
+
       def release(version)
-        if (self.releases.key?(version))
-          self.releases[version]
+        if releases.key?(version)
+          releases[version]
         else
           {}
         end
       end
 
       def delete_release(version)
-        if (@releases.key?(version))
+        if @releases.key?(version)
           self.dirty = true
           @releases.delete(version)
         end
       end
 
       def create_release(destination, source = 'master')
-        if (@releases.key?(destination))
+        if @releases.key?(destination)
           raise "destination version #{destination} already exists"
         end
-        unless (@releases.key?(source))
+        unless @releases.key?(source)
           raise "source version #{source} doesn't exist"
         end
         self.dirty = true
         @releases[destination] = Marshal.load(Marshal.dump(@releases[source]))
       end
 
-      def dirty?()
+      def dirty?
         @dirty
       end
 
-      def dirty=(value)
-        @dirty = value
-      end
+      attr_writer :dirty
 
-      def save(message = "Auto-saving using simp-metadata")
-        if (self.dirty? == true)
+      def save(message = 'Auto-saving using simp-metadata')
+        if dirty?
           puts @load_path
           # XXX ToDo: Write files to yaml, commit and push (where appropriate)
 
-
-
           Simp::Metadata.run("cd #{@load_path} && rm -rf v1")
           FileUtils.mkdir_p("#{@load_path}/v1")
-          File.open("#{@load_path}/v1/components.yaml", 'w') {|file| file.write({"components" => @components}.to_yaml)}
+          File.open("#{@load_path}/v1/components.yaml", 'w') { |file| file.write({ 'components' => @components }.to_yaml) }
           @releases.each do |releasename, data|
-            directory = "releases"
-            case releasename
-              when /.*-[Aa][Ll][Pp][Hh][Aa].*/
-                directory = "prereleases"
-              when /.*-[Bb][Ee][Tt][Aa].*/
-                directory = "prereleases"
-              when /.*-[Rr][Cc].*/
-                directory = "prereleases"
-              when /^nightly\-/
-                directory = "nightlies"
-              when /develop/
-                directory = "channels"
-              when /development/
-                directory = "channels"
-              when /master/
-                directory = "channels"
-              when /^test\-/
-                directory = "tests"
-              else
-                directory = "releases"
-            end
+            directory = case releasename
+                        when /.*-[Aa][Ll][Pp][Hh][Aa].*/
+                          'prereleases'
+                        when /.*-[Bb][Ee][Tt][Aa].*/
+                          'prereleases'
+                        when /.*-[Rr][Cc].*/
+                          'prereleases'
+                        when /^nightly-/
+                          'nightlies'
+                        when /develop/
+                          'channels'
+                        when /development/
+                          'channels'
+                        when /master/
+                          'channels'
+                        when /^test-/
+                          'tests'
+                        else
+                          'releases'
+                        end
             FileUtils.mkdir_p("#{@load_path}/v1/#{directory}")
-            File.open("#{@load_path}/v1/#{directory}/#{releasename}.yaml", 'w') {|file| file.write({"releases" => {"#{releasename}" => data}}.to_yaml)}
+            File.open("#{@load_path}/v1/#{directory}/#{releasename}.yaml", 'w') { |file| file.write({ 'releases' => { releasename.to_s => data } }.to_yaml) }
           end
           Simp::Metadata.run("cd #{@load_path} && git remote add upstream #{write_url}")
           Simp::Metadata.run("cd #{@load_path} && git remote set-url upstream #{write_url}")
           exitcode = Simp::Metadata.run("cd #{@load_path} && git add -A && git commit -m '#{message}'; git push upstream master")
-          if (exitcode != 0)
-            Simp::Metadata.critical("error committing changes")
-            raise "#{exitcode}"
+          if exitcode != 0
+            Simp::Metadata.critical('error committing changes')
+            raise exitcode.to_s
           else
             puts "Successfully updated #{name}"
           end
@@ -163,26 +158,22 @@ module Simp
       def load_from_dir(path)
         @load_path = path
         Dir.chdir(path) do
-          Dir.glob("**/*.yaml") do |filename|
+          Dir.glob('**/*.yaml') do |filename|
             begin
               hash = YAML.load_file(filename)
               @data = deep_merge(@data, hash)
             end
           end
         end
-        unless @data['releases'] == nil
-          @releases = @data['releases']
-        end
-        unless @data['components'] == nil
-          @components = @data['components']
-        end
+        @releases = @data['releases'] unless @data['releases'].nil?
+        @components = @data['components'] unless @data['components'].nil?
       end
 
       def deep_merge(target_hash, source_hash)
         source_hash.each do |key, value|
-          if (target_hash.key?(key))
-            if (value.class == Hash)
-              self.deep_merge(target_hash[key], value)
+          if target_hash.key?(key)
+            if value.class == Hash
+              deep_merge(target_hash[key], value)
             else
               target_hash[key] = value
             end
@@ -193,7 +184,7 @@ module Simp
         target_hash
       end
 
-      def cleanup()
+      def cleanup
         @cleanup.each do |path|
           FileUtils.rmtree(path)
         end
@@ -201,4 +192,3 @@ module Simp
     end
   end
 end
-