wonko_the_sane 0.1.2 → 0.1.4

data/lib/wonko_the_sane/{version_parser.rb → util/version_parser.rb}

@@ -1,27 +1,23 @@
 class VersionParser
   private
-  @@cache = {}
+
+  cache = {}
+
   def self.parse(string)
-    if @@cache.has_key? string
-      return @@cache[string]
-    end
+    return self.cache[string] if self.cache.has_key? string
     appendix = string.scan(/\-.*$/).first
     string = string.sub /\-.*$/, ''
     sections = string.split '.'
     sections.map! do |sec|
       test = Integer sec rescue nil
-      if test.nil?
-        sec
-      else
-        test
-      end
+      test || sec
     end
 
     result = {
         appendix: appendix,
         sections: sections
     }
-    @@cache[string] = result
+    self.cache[string] = result
     return result
   end
 
@@ -42,7 +38,7 @@ class VersionParser
       when 'pre'
         [2, digits]
           end
-    return ret ? ret : [-1, digits]
+    ret || [-1, digits]
   end
 
   def self.compare_values(first, second)
@@ -64,7 +60,7 @@ class VersionParser
     size.times do |index|
       val1 = par1[:sections].length > index ? par1[:sections][index] : 0
       val2 = par2[:sections].length > index ? par2[:sections][index] : 0
-      if val1.is_a? Integer and val2.is_a? Integer
+      if val1.is_a? Integer && val2.is_a?(Integer)
         ret = VersionParser.compare_values val1, val2
       elsif val1.is_a? Integer
         ret = VersionParser.compare_values val1.to_s, val2
@@ -76,7 +72,7 @@ class VersionParser
       break unless ret == 0
     end
     if ret == 0
-      if par1[:appendix] and par2[:appendix]
+      if par1[:appendix] && par2[:appendix]
         appendix1 = VersionParser.appendix_values par1[:appendix]
         appendix2 = VersionParser.appendix_values par2[:appendix]
         ret = VersionParser.compare_values appendix1[0], appendix2[0]
@@ -112,4 +108,4 @@ class VersionParser
   def self.not_equal?(string1, string2)
     VersionParser.compare(string1, string2) != 0
   end
-end
+end

data/lib/wonko_the_sane/version.rb

@@ -1,3 +1,3 @@
 module WonkoTheSane
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/lib/wonko_the_sane/versionlists/base_version_list.rb

@@ -2,43 +2,50 @@ class BaseVersionList
   attr_accessor :artifact
   # @processed contains a list of version ids for all versions that have been processed. simply clear it to invalidate caches
   attr_accessor :processed
-  attr_accessor :lastError
+  attr_accessor :last_error
 
   def initialize(artifact)
     @artifact = artifact
     if File.exist? cache_file
       data = JSON.parse File.read(cache_file), symbolize_names: true
-      @processed = data[:versions] ? data[:versions] : []
-      @lastError = data[:lastError]
+      @processed = data[:versions] || []
+      @last_error = data[:last_error]
     else
       @processed = []
-      @lastError = nil
     end
   end
 
   def refresh
-    @lastError = nil
+    @last_error = nil
     versions = get_versions
 
     # check if some versions aren't in @processed (likely new ones) and fetch and process them
     versions.each do |version|
+      next if version.nil?
       begin
-        next if not version
         id = version.is_a?(Array) ? version.first : version
         unless @processed.include? id
           files = get_version version
-          next if files.nil? or (files.is_a? Array and files.empty?)
+          next if files.nil? || (files.is_a?(Array) && files.empty?)
 
-          files.flatten.each do |file|
-            file.is_complete = true
-            Registry.instance.store file
-          end if files and files.is_a? Array
-          files.is_complete = true if files and files.is_a? WonkoVersion
-          Registry.instance.store files if files and files.is_a? WonkoVersion
+          if files.is_a?(Array)
+            files.flatten.each do |file|
+              file.is_complete = true
+              Registry.instance.store file
+            end
+          else
+            files.is_complete = true
+            Registry.instance.store files
+          end
 
           @processed << id
           write_cache_file
         end
+      rescue => e
+        logger.error e.message
+        logger.warn e.backtrace.first
+        binding.pry if $stdout.isatty && ENV['DEBUG_ON_ERROR']
+        @last_error = e.message
       end
     end
 
@@ -47,7 +54,7 @@ class BaseVersionList
     logger.error e.message
     logger.warn e.backtrace.first
     binding.pry if $stdout.isatty && ENV['DEBUG_ON_ERROR']
-    @lastError = e.message
+    @last_error = e.message
   end
 
   def logger
@@ -74,7 +81,7 @@ class BaseVersionList
   def write_cache_file
     File.write cache_file, JSON.pretty_generate({
                                                     versions: @processed,
-                                                    lastError: @lastError
+                                                    lastError: @last_error
                                                 })
   end
 

data/lib/wonko_the_sane/versionlists/curse_version_list.rb

@@ -1,38 +1,37 @@
 class CurseVersionList < BaseVersionList
-  def initialize(uid, curseId, fileRegex)
-    super(uid)
-    @curseId = curseId
-    @fileRegex = fileRegex.gsub /\?P\</, '?<'
+  def initialize(uid, curse_id, file_regex)
+    super uid
+    @curse_id = curse_id
+    @file_regex = file_regex.gsub /\?P\</, '?<'
   end
 
   def get_versions
-    result = Oga.parse_html HTTPCache.file('http://curse.com/project/' + @curseId, ctxt: @artifact, key: 'curse/' + @curseId + '.html', check_stale: false)
+    result = Oga.parse_html HTTPCache.file('http://curse.com/project/' + @curse_id, ctxt: @artifact, key: 'curse/' + @curse_id + '.html', check_stale: false)
     # start by getting rid of some elements that standard xml parsers have issues with
-    result.each_node do |node| node.remove if node.is_a? Oga::XML::Element and ['script', 'like'].include? node.name end
-    rows = result.xpath("html/body/#{'div/' * 14}table/tbody/tr")
+    result.each_node { |node| node.remove if node.is_a?(Oga::XML::Element) && ['script', 'like'].include?(node.name) }
+    rows = result.xpath "html/body/#{'div/' * 14}table/tbody/tr"
 
-    return rows.map do |row|
-      match = row.xpath('td/a/text()').first.text.match @fileRegex
-      next if not match
-      version = match[:version]
+    rows.map do |row|
+      match = row.xpath('td/a/text()').first.text.match @file_regex
+      next if match.nil?
       [
-        version,
+        match[:version],
         {
           url: row.xpath('td/a/@href').first.value,
           fileId: row.xpath('td/a/text()').first.text,
           type: row.xpath('td[2]/text()').first.text,
           mcVersion: row.xpath('td[3]/text()').first.text,
           timestamp: row.xpath('td[5]/@data-sort-value').first.value.to_i / 1000,
-          version: version
+          version: match[:version]
         }
       ]
     end
   end
 
   def get_version(id)
-    urlId = id[1][:url].match(/\/(\d*)$/)[1]
+    url_id = id[1][:url].match(/\/(\d*)$/)[1]
     dl = FileDownload.new
-    dl.internalUrl = "http://addons-origin.cursecdn.com/files/#{urlId[0...4]}/#{urlId[4...7]}/#{id[1][:fileId]}"
+    dl.internal_url = "http://addons-origin.cursecdn.com/files/#{url_id[0...4]}/#{url_id[4...7]}/#{id[1][:fileId]}"
     dl.url = "http://curse.com" + id[1][:url]
     dl.destination = "mods/#{@artifact}-#{id.first}.jar"
 
@@ -43,6 +42,6 @@ class CurseVersionList < BaseVersionList
     file.time = id[1][:timestamp]
     file.requires << Referenced.new('net.minecraft', id[1][:mcVersion])
     file.common.downloads << dl
-    return BaseSanitizer.sanitize file
+    BaseSanitizer.sanitize file
   end
 end

data/lib/wonko_the_sane/versionlists/forge_version_list.rb

@@ -16,20 +16,20 @@ def fml_libs_mappings
   ]
 
   {
-      '1.3.2' => [
+      :'1.3.2' => [
           create_fmllib_download('argo-2.25.jar'),
           create_fmllib_download('guava-12.0.1.jar'),
           create_fmllib_download('asm-all-4.0.jar')
       ],
-      '1.4' => libs14,
-      '1.4.1' => libs14,
-      '1.4.2' => libs14,
-      '1.4.3' => libs14,
-      '1.4.4' => libs14,
-      '1.4.5' => libs14,
-      '1.4.6' => libs14,
-      '1.4.7' => libs14,
-      '1.5' => [
+      :'1.4' => libs14,
+      :'1.4.1' => libs14,
+      :'1.4.2' => libs14,
+      :'1.4.3' => libs14,
+      :'1.4.4' => libs14,
+      :'1.4.5' => libs14,
+      :'1.4.6' => libs14,
+      :'1.4.7' => libs14,
+      :'1.5' => [
         create_fmllib_download('argo-small-3.2.jar'),
         create_fmllib_download('guava-14.0-rc3.jar'),
         create_fmllib_download('asm-all-4.1.jar'),
@@ -37,7 +37,7 @@ def fml_libs_mappings
         create_fmllib_download('deobfuscation_data_1.5.zip'),
         create_fmllib_download('scala-library.jar', false)
       ],
-      '1.5.1' => [
+      :'1.5.1' => [
           create_fmllib_download('argo-small-3.2.jar'),
           create_fmllib_download('guava-14.0-rc3.jar'),
           create_fmllib_download('asm-all-4.1.jar'),
@@ -45,7 +45,7 @@ def fml_libs_mappings
           create_fmllib_download('deobfuscation_data_1.5.1.zip'),
           create_fmllib_download('scala-library.jar', false)
       ],
-      '1.5.2' => [
+      :'1.5.2' => [
           create_fmllib_download('argo-small-3.2.jar'),
           create_fmllib_download('guava-14.0-rc3.jar'),
           create_fmllib_download('asm-all-4.1.jar'),
@@ -73,7 +73,7 @@ class ForgeVersionList < BaseVersionList
         baseurl: result[:webpath]
       })
     end
-    return out
+    out
   end
 
   def get_version(id)
@@ -83,40 +83,37 @@ class ForgeVersionList < BaseVersionList
     result = []
 
     files = id[1][:files]
-    installerFile = files.find do |file| file[1] == 'installer' end
-    universalFile = files.find do |file| file[1] == 'universal' end
-    clientFile = files.find do |file| file[1] == 'client' end
-    serverFile = files.find do |file| file[1] == 'server' end
+    installer_file = files.find { |file| file[1] == 'installer' }
+    universal_file = files.find { |file| file[1] == 'universal' }
+    client_file = files.find { |file| file[1] == 'client' }
+    server_file = files.find { |file| file[1] == 'server' }
 
     # installer versions of forge
-    if not installerFile.nil? and id[1][:mcversion] != '1.5.2'
-      path = "#{version}/#{id[1][:artifact]}-#{version}-#{installerFile[1]}.#{installerFile[0]}"
+    if !installer_file.nil? && id[1][:mcversion] != '1.5.2'
+      path = "#{version}/#{id[1][:artifact]}-#{version}-#{installer_file[1]}.#{installer_file[0]}"
       url = id[1][:baseurl] + '/' + path
       HTTPCache.get url, ctxt: @artifact, key: 'forgeinstallers/' + path, check_stale: false
       result << @input.parse(ExtractionCache.get('cache/network/forgeinstallers/' + path, :zip, 'install_profile.json'), id[1][:version])
-    elsif not universalFile.nil?
+    elsif !universal_file.nil?
       res = construct_base_version id[1]
       mod = Jarmod.new
-      mod.name = "net.minecraftforge:#{id[1][:artifact]}:#{version}:universal@#{universalFile[0]}"
-      mod.mavenBaseUrl = 'http://files.minecraftforge.net/maven/'
+      mod.name = "net.minecraftforge:#{id[1][:artifact]}:#{version}:universal@#{universal_file[0]}"
+      mod.maven_base_url = 'http://files.minecraftforge.net/maven/'
       res.client.downloads << mod
       res.client.downloads |= fml_libs_mappings[id[1][:mcversion]] if fml_libs_mappings[id[1][:mcversion]]
       result << res
-    else
-      unless clientFile.nil?
-        res = construct_base_version id[1]
-        mod = Jarmod.new
-        mod.name = "net.minecraftforge:#{id[1][:artifact]}:#{version}:client@#{clientFile[0]}"
-        mod.mavenBaseUrl = 'http://files.minecraftforge.net/maven/'
-        res.client.downloads << mod
-        res.client.downloads |= fml_libs_mappings[id[1][:mcversion]] if fml_libs_mappings[id[1][:mcversion]]
-        result << res
-      end
-      unless serverFile.nil?
-
-      end
+    elsif !client_file.nil?
+      res = construct_base_version id[1]
+      mod = Jarmod.new
+      mod.name = "net.minecraftforge:#{id[1][:artifact]}:#{version}:client@#{client_file[0]}"
+      mod.maven_base_url = 'http://files.minecraftforge.net/maven/'
+      res.client.downloads << mod
+      res.client.downloads |= fml_libs_mappings[id[1][:mcversion]] if fml_libs_mappings[id[1][:mcversion]]
+      result << res
+    elsif !server_file.nil?
+      # TODO
     end
-    return result.flatten
+    result.flatten
   end
 
   def construct_base_version(data)
@@ -137,6 +134,6 @@ end
 
 class FMLVersionList < ForgeVersionList
   def initialize
-    super('net.minecraftforge.fml', 'fml')
+    super 'net.minecraftforge.fml', 'fml'
   end
 end

data/lib/wonko_the_sane/versionlists/forgefiles_mods_list.rb

@@ -1,16 +1,12 @@
-require 'pry'
-
 class ForgeFilesModsList < BaseVersionList
-  def initialize(artifact, urlId)
+  def initialize(artifact, url_id)
     super(artifact)
-    @urlId = urlId
+    @url_id = url_id
     @input = ForgeFilesModsInput.new(artifact)
   end
 
   def get_versions
-    result = get_json "http://files.minecraftforge.net/#{@urlId}/json"
-
-    return result[:builds].map do |build|
+    get_json("http://files.minecraftforge.net/#{@url_id}/json")[:builds].map do |build|
       [
           build[:version],
           build

data/lib/wonko_the_sane/versionlists/jenkins_version_list.rb

@@ -1,26 +1,17 @@
-require 'pry'
-
 class JenkinsVersionList < BaseVersionList
-  def initialize(artifact, baseUrl, job, fileRegex)
+  def initialize(artifact, base_url, job, file_regex)
     super(artifact)
-    @baseUrl = baseUrl
+    @base_url = base_url
     @job = job
-    @input = JenkinsInput.new(artifact, fileRegex)
+    @input = JenkinsInput.new(artifact, file_regex)
 
-    if @baseUrl[@baseUrl.length - 1] == '/'
-      @baseUrl[@baseUrl.length - 1] = ''
+    if @base_url[@base_url.length - 1] == '/'
+      @base_url[@base_url.length - 1] = ''
     end
   end
 
   def get_versions
-    result = get_json "#{@baseUrl}/job/#{@job}/api/json"
-
-    return result[:builds].map do |build|
-      [
-          build[:number],
-          build[:url]
-      ]
-    end
+    get_json("#{@base_url}/job/#{@job}/api/json")[:builds].map { |build| [build[:number], build[:url]] }
   end
 
   def get_version(id)

data/lib/wonko_the_sane/versionlists/liteloader_version_list.rb

@@ -4,7 +4,7 @@ require 'time'
 
 class LiteLoaderVersionList < BaseVersionList
   def initialize
-    super('com.mumfrey.liteloader')
+    super 'com.mumfrey.liteloader'
   end
 
   def get_versions
@@ -15,34 +15,26 @@ class LiteLoaderVersionList < BaseVersionList
       minecraft = mcver.first
       mcver[1][:artefacts].each do |artefact|
         if artefact.first == :'com.mumfrey:liteloader'
-          latest = nil
-          artefact[1].each do |item|
-            if item.first == 'latest'
-              latest = item[1][:version]
-              break
-            end
-          end
-          artefact[1].each do |item|
-            if item.first != 'latest'
-              out << [
-                  item[1][:version],
-                  item[1].merge({
-                    minecraft: minecraft.to_s,
-                    type: latest == item[1][:version] ? 'latest' : nil
-                  })
-              ]
-            end
+          latest = artefact[1].find { |i| i[0] == 'latest' }[1][:version]
+          artefact[1].reject { |i| i.first == 'latest' }.each do |item|
+            out << [
+                item[1][:version],
+                item[1].merge({
+                  minecraft: minecraft.to_s,
+                  type: latest == item[1][:version] ? 'latest' : nil
+                })
+            ]
           end
         end
       end
     end
-    return out
+    out
   end
 
   def get_version(id)
-    liteloaderLib = VersionLibrary.new
-    liteloaderLib.name = 'com.mumfrey:liteloader:' + id[1][:version]
-    liteloaderLib.url = 'http://dl.liteloader.com/versions/com/mumfrey/liteloader/' + id[1][:minecraft] + '/' + id[1][:file]
+    liteloader_lib = VersionLibrary.new
+    liteloader_lib.name = 'com.mumfrey:liteloader:' + id[1][:version]
+    liteloader_lib.url = 'http://dl.liteloader.com/versions/com/mumfrey/liteloader/' + id[1][:minecraft] + '/' + id[1][:file]
 
     file = WonkoVersion.new
     file.uid = 'com.mumfrey.liteloader'
@@ -53,14 +45,12 @@ class LiteLoaderVersionList < BaseVersionList
     file.client.tweakers = [ id[1][:tweakClass] ]
     file.client.mainClass = 'net.minecraft.launchwrapper.Launch'
     file.client.downloads = id[1][:libraries].map do |lib|
-      libs = MojangInput.sanetize_mojang_library lib
-      if lib[:name] == 'org.ow2.asm:asm-all:5.0.3'
-        libs[0].mavenBaseUrl = 'http://repo.maven.apache.org/maven2/'
-      end
+      libs = MojangInput.sanitize_mojang_library lib
+      libs[0].maven_base_url = 'http://repo.maven.apache.org/maven2/' if lib[:name] == 'org.ow2.asm:asm-all:5.0.3'
       libs
     end.flatten 1
     file.client.folders['minecraft/mods'] = ['mc.liteloadermods']
-    file.client.downloads.unshift liteloaderLib
-    return BaseSanitizer.sanitize file
+    file.client.downloads << liteloader_lib
+    BaseSanitizer.sanitize file
   end
 end