wonko_the_sane 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c75f8cc35f2cedea382f8b22f0373f9199ab60
-  data.tar.gz: 419906fc73b134f8ddc6d994d2bab5ec8d277840
+  metadata.gz: 7aa648a065bfbc6fea0c7f581308ae4466a578fb
+  data.tar.gz: b7049aa48d98789256ce1cb5142553f43e29a34e
 SHA512:
-  metadata.gz: bcba25e623bf105bc2aa37d9572e3a542ffc58c4eaa30f50d8dc576aa6af10a9472175736e4460687d24564e977070de45935b037001b39be6b7f2ea972f3a25
-  data.tar.gz: 52fd86ab7abd1262bf6b2096ef67e89a83641157b8fb9106787a2d71d4916d17bf85f1d0cecf369b64e0c8b6baa126c51302a84f281549851f32179744553e0c
+  metadata.gz: e3140975588a58455426f638079786fed82ef3e0a525811ed11f0117083a2e8da6095806fc0bce1586f9c32f858cb202f9024d90a9535b80696687df71cb45b8
+  data.tar.gz: 400710a7384eb938b851c8c018746d3fbc0b3ffe57e0c070b82cf559d270aea6d69212cbe62ed3bc041fb393d6369b475aefbd69109e42908a5cb92314788872

data/bin/wonko_the_sane

@@ -34,40 +34,34 @@ OptionParser.new do |opts|
   opts.banner = 'Usage: main.rb [options]'
 
   opts.on '-rID', '--refresh=ID', 'Refresh the specified list' do |id|
-    foundList = false
-    WonkoTheSane.lists.each do |list|
-      if list.artifact == id
+    list = WonkoTheSane.lists.find { |l| l.artifact == id }
+    if list.nil?
+      Logging.logger['General'].warn "Couldn't find the specified list #{id.cyan}"
+    else
         TaskStack.push(Proc.new do
                          Logging.logger[list.artifact].info 'Refreshing'
                          list.refresh
-                         Logging.logger[list.artifact].error list.lastError if list.lastError
+                         Logging.logger[list.artifact].error list.last_error if list.last_error
                        end)
-        foundList = true
-      end
     end
-
-    Logging.logger['General'].warn "Couldn't find the specified list #{id.cyan}" if !foundList
   end
   opts.on '-a', '--refresh-all', 'Refresh all lists' do
     WonkoTheSane.lists.each do |list|
       TaskStack.push(Proc.new do
                        Logging.logger[list.artifact].info 'Refreshing'
                        list.refresh
-                       Logging.logger[list.artifact].error list.lastError if list.lastError
+                       Logging.logger[list.artifact].error list.last_error if list.last_error
                      end)
     end
   end
   opts.on '--invalidate=ID', 'Invalidates all versions on the specified list' do |id|
-    foundList = false
-    WonkoTheSane.lists.each do |list|
-      if list.artifact == id
-        Logging.logger[list.artifact].info 'Invalidating'
-        list.invalidate
-        foundList = true
-      end
+    list = WonkoTheSane.lists.find { |l| l.artifact == id }
+    if list.nil?
+      Logging.logger['General'].warn "Couldn't find the specified list #{id.cyan}"
+    else
+      Logging.logger[list.artifact].info 'Invalidating'
+      list.invalidate
     end
-
-    Logging.logger['General'].warn "Couldn't find the specified list #{id.cyan}" if !foundList
   end
   opts.on '--invalidate-all', 'Invalidates all versions on all lists' do
     WonkoTheSane.lists.each do |list|
@@ -83,15 +77,6 @@ OptionParser.new do |opts|
   opts.on '--update-nem', 'Updates sources.json with data from NEM' do
     update_nem
   end
-  opts.on '--set-config=VAL', 'Sets a configuration value' do |val|
-    parts = val.match /([^:=]*)([:=](.*))?/
-    if parts.length == 4 && !parts[3].nil?
-      Settings[parts[1]] = parts[3]
-    else
-      Settings.delete parts[1]
-    end
-    Settings.save! WonkoTheSane.settings_file
-  end
   opts.on '-h', '--help', 'Prints this help' do
     puts opts
     exit
@@ -99,4 +84,3 @@ OptionParser.new do |opts|
 end.parse!
 
 TaskStack.pop_all
-WonkoTheSane.wonkoweb_uploader.upload_changes!

data/data/sources.json

@@ -171,11 +171,6 @@
       "url": "http://jamesmckay.id.au:8080",
       "artifact": "Power%20Converters"
     },
-    {
-      "uid": "galacticraft",
-      "url": "http://ci.micdoodle8.com:8080",
-      "artifact": "Galacticraft-1.7"
-    },
     {
       "uid": "artifice",
       "url": "http://76.72.175.100:8080",

data/lib/wonko_the_sane.rb

@@ -10,9 +10,8 @@ require 'digest'
 require 'date'
 require 'time'
 require 'oga'
-require 'configliere'
-require 'httparty'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
 
 require 'wonko_the_sane/version'
 require 'wonko_the_sane/tools/update_nem'
@@ -24,6 +23,7 @@ require 'wonko_the_sane/util/file_hash_cache'
 require 'wonko_the_sane/util/http_cache'
 require 'wonko_the_sane/util/maven_identifier'
 require 'wonko_the_sane/util/task_stack'
+require 'wonko_the_sane/util/version_parser'
 
 require 'wonko_the_sane/input/base_input'
 require 'wonko_the_sane/input/forge_installer_profile_input'
@@ -40,13 +40,12 @@ require 'wonko_the_sane/versionlists/liteloader_version_list'
 require 'wonko_the_sane/versionlists/vanilla_legacy_version_list'
 require 'wonko_the_sane/versionlists/vanilla_version_list'
 
-require 'wonko_the_sane/wonkoweb_uploader'
-require 'wonko_the_sane/reader_writer'
+require 'wonko_the_sane/new_format'
+require 'wonko_the_sane/old_format'
 require 'wonko_the_sane/registry'
 require 'wonko_the_sane/rules'
 require 'wonko_the_sane/timestamps'
 require 'wonko_the_sane/version_index'
-require 'wonko_the_sane/version_parser'
 require 'wonko_the_sane/wonko_version'
 
 module WonkoTheSane
@@ -82,26 +81,7 @@ module WonkoTheSane
   def self.configuration
     @configuration ||= Util::Configuration.new
   end
-  private_class_method :configuration
 end
 
-Settings.use :config_block, :encrypted, :prompt, :define
-Settings({
-  aws: {
-      client_id: nil,
-      client_secret: nil
-  },
-  wonkoweb: {
-      host: nil,
-      email: nil,
-      token: nil
-  }
-})
-Settings.define 'aws.client_id', encrypted: true
-Settings.define 'aws.client_secret', encrypted: true
-Settings.define 'wonkoweb.host'
-Settings.define 'wonkoweb.name'
-Settings.define 'wonkoweb.token', encrypted: true
-Settings.read WonkoTheSane.settings_file
-Settings[:encrypt_pass] = ENV['ENCRYPT_PASS'] || (print 'Password: '; pwd = STDIN.noecho(&:gets).chomp; puts; pwd)
-Settings.resolve!
+WonkoTheSane.configuration.load_from_file 'wts.yml' if File.exists? 'wts.yml'
+WonkoTheSane.configuration.load_from_env

data/lib/wonko_the_sane/input/base_input.rb

@@ -14,7 +14,6 @@ class BaseSanitizer
     sanitizers.each do |sanitizer|
       tmp = []
       output.each do |file|
-        #puts "Running #{sanitizer.to_s} on #{file.id}"
         result = sanitizer.sanitize(file.clone)
         if result.is_a? Array
           tmp = tmp + result
@@ -24,29 +23,25 @@ class BaseSanitizer
       end
       output = tmp
     end
-    return output
+    output
   end
 end
 
 class DownloadsFixer < BaseSanitizer
   def self.sanitize(file)
     file.client.downloads.map! do |download|
-      if not download.size or not download.sha256 or download.sha256 == ''
-        url = download.internalUrl ? download.internalUrl : download.url
-        info = WonkoTheSane::Util::DeepStorageCache.get_info url, ctxt: file.uid
+      if !download.size || download.sha256.blank?
+        info = WonkoTheSane::Util::DeepStorageCache.get_info download.usable_url, ctxt: file.uid
         download.size = info[:size]
         download.sha256 = info[:sha256]
-        download
       end
       download
     end
     file.server.downloads.map! do |download|
-      if not download.size or not download.sha256 or download.sha256 == ''
-        url = download.internalUrl ? download.internalUrl : download.url
-        info = WonkoTheSane::Util::DeepStorageCache.get_info url, ctxt: file.uid
+      if !download.size || download.sha256.blank?
+        info = WonkoTheSane::Util::DeepStorageCache.get_info download.usable_url, ctxt: file.uid
         download.size = info[:size]
         download.sha256 = info[:sha256]
-        download
       end
       download
     end

data/lib/wonko_the_sane/input/forge_installer_profile_input.rb

@@ -16,9 +16,7 @@ class ForgeInstallerProfileInput < BaseInput
     file.client.minecraftArguments = info[:minecraftArguments]
     file.client.assets = info[:assets]
     file.requires << Referenced.new('net.minecraft', object[:install][:minecraft])
-    libraries = info[:libraries].map do |obj|
-      MojangInput.sanetize_mojang_library obj
-    end.flatten 1
+    libraries = info[:libraries].map { |obj| MojangInput.sanitize_mojang_library obj }.flatten 1
     file.client.downloads = libraries
     file.common.folders['minecraft/mods'] = ['mc.forgemods']
     file.common.folders['minecraft/mods'] << 'mc.forgecoremods' if object[:install][:minecraft].match /[^1]*1\.[0-6]/
@@ -27,7 +25,13 @@ class ForgeInstallerProfileInput < BaseInput
     file.server.launchMethod = 'java.mainClass'
     file.server.extra[:forgeLibraryName] = %W(net.minecraftforge:forge:#{object[:install][:minecraft]}-#{version}:universal net.minecraftforge:forge:#{object[:install][:minecraft]}-#{version} net.minecraftforge:forge:#{version}:universal net.minecraftforge:forge:#{version} net.minecraftforge:minecraftforge:#{object[:install][:minecraft]}-#{version}:universal net.minecraftforge:minecraftforge:#{object[:install][:minecraft]}-#{version} net.minecraftforge:minecraftforge:#{version}:universal net.minecraftforge:minecraftforge:#{version})
 
-    return BaseSanitizer.sanitize file, MojangExtractTweakersSanitizer, MojangSplitLWJGLSanitizer, ForgeRemoveMinecraftSanitizer, ForgeFixJarSanitizer, ForgePackXZUrlsSanitizer, ForgeServerMainClassSanitizer
+    BaseSanitizer.sanitize file,
+                           MojangExtractTweakersSanitizer,
+                           MojangSplitLWJGLSanitizer,
+                           ForgeRemoveMinecraftSanitizer,
+                           ForgeFixJarSanitizer,
+                           ForgePackXZUrlsSanitizer,
+                           ForgeServerMainClassSanitizer
   end
 end
 
@@ -36,17 +40,12 @@ class ForgeFixJarSanitizer < BaseSanitizer
     file.client.downloads.map! do |lib|
       ident = WonkoTheSane::Util::MavenIdentifier.new(lib.name)
       ident.artifact = 'forge' if 'net.minecraftforge' == ident.group && 'minecraftforge' == ident.artifact
-      if ['forge', 'fml'].include?(ident.artifact) && ['net.minecraftforge', 'cpw.mods'].include?(ident.group)
-        mcversion = nil
-        file.requires.each do |req|
-          if req.uid == 'net.minecraft'
-            mcversion = req.version
-          end
-        end
+      if %w(forge fml).include?(ident.artifact) && %w(net.minecraftforge cpw.mods).include?(ident.group)
+        mcversion = file.requires.find { |r| r.uid == 'net.minecraft' }.version rescue nil
         lib = lib.clone
         ident.classifier = 'universal'
         ident.version = "#{mcversion}-#{ident.version}" unless ident.version.start_with? "#{mcversion}"
-        lib.name = ident.to_name()
+        lib.name = ident.to_name
       end
       lib
     end
@@ -59,53 +58,41 @@ class ForgeRemoveMinecraftSanitizer < BaseSanitizer
   def self.sanitize(file)
     return nil if file.uid == 'org.lwjgl' # remove lwjgl, it's managed by minecraft
     return file if file.uid != 'net.minecraftforge'
-    mcversion = nil
-    file.requires.each do |req|
-      if req.uid == 'net.minecraft'
-        mcversion = req.version
-      end
-    end
+    mcversion = file.requires.find { |r| r.uid == 'net.minecraft' }.version rescue nil
+
     minecraft = Registry.instance.retrieve 'net.minecraft', mcversion
-    if not minecraft
+    if minecraft.nil?
       # if we can't find the wanted version on the first try we try reloading the list to see if we get something
-      WonkoTheSane.lists.each do |list|
-        list.refresh if list.artifact == 'net.minecraft'
-      end
+      WonkoTheSane.lists.find { |l| l.artifact == 'net.minecraft' }.refresh
       minecraft = Registry.instance.retrieve 'net.minecraft', mcversion
     end
+
     if minecraft
       file.client.mainClass = nil if minecraft.client.mainClass == file.client.mainClass
       file.client.minecraftArguments = nil if minecraft.client.minecraftArguments == file.client.minecraftArguments
       file.client.assets = nil if minecraft.client.assets == file.client.assets
-      file.client.downloads.select! do |lib|
-        nil == minecraft.client.downloads.find do |mcLib|
-          lib.name == mcLib.name
-        end
+      file.client.downloads.reject! do |lib|
+        minecraft.client.downloads.find { |mcLib| lib.name == mcLib.name } != nil
       end
-      file.requires.select! do |req|
-        if minecraft.requires
-          nil == minecraft.requires.find do |mcReq|
-            req == mcReq
-          end
-        else
-          true
-        end
+      file.requires.reject! do |req|
+        minecraft.requires.find { |mcReq| req == mcReq } != nil
       end
     else
       # don't know which version of minecraft this is, so we can't know which parts to eliminate
     end
+
     file
   end
 end
 
 class ForgePackXZUrlsSanitizer < BaseSanitizer
-  @@packXZLibs = ['org.scala-lang', 'com.typesafe', 'com.typesafe.akka']
+  class << self; attr_accessor :pack_xz_libs; end
+  self.pack_xz_libs = ['org.scala-lang', 'com.typesafe', 'com.typesafe.akka']
 
   def self.sanitize(file)
     file.client.downloads.map! do |lib|
-      if @@packXZLibs.include? WonkoTheSane::Util::MavenIdentifier.new(lib.name).group
-        lib = lib.clone
-        lib.mavenBaseUrl = 'http://repo.spongepowered.org/maven/'
+      if self.pack_xz_libs.include? WonkoTheSane::Util::MavenIdentifier.new(lib.name).group
+        lib.maven_base_url = 'http://repo.spongepowered.org/maven/'
       end
       lib
     end
@@ -117,16 +104,11 @@ class ForgeServerMainClassSanitizer < BaseSanitizer
   def self.sanitize(file)
     file.server.downloads.each do |download|
       if file.server.extra[:forgeLibraryName].include? download.name
-        url = download.internalUrl ? download.internalUrl : download.url
-        libFile = HTTPCache.file(url, ctxt: file.uid, check_stale: false)
+        lib_file = HTTPCache.file(download.usable_url, ctxt: file.uid, check_stale: false)
         # Handle entries one by one
-        text = ExtractionCache.get(libFile, :zip, 'META-INF/MANIFEST.MF')
-        lines = text.lines
-        lines.each do |l|
-          if l =~ /Main-Class: (.*)/
-            file.server.mainClass = $1.strip
-          end
-        end
+        text = ExtractionCache.get(lib_file, :zip, 'META-INF/MANIFEST.MF')
+        match =  text.lines.find { |l| l.match /Main-Class: (.*)/ }
+        file.server.mainClass = match[1] unless match.nil?
       end
     end
     file

data/lib/wonko_the_sane/input/forgefiles_mods_input.rb

@@ -9,22 +9,19 @@ class ForgeFilesModsInput < BaseInput
     file.uid = @artifact
     file.version = version
     file.time = data[:info]
+    file.requires << Referenced.new('net.minecraft', data[:mcver])
 
-    f = data[:files].find do |file|
-      type = file[:buildtype].downcase
-      (file[:ext] == 'jar' or file[:ext] == 'zip') and (type == 'universal' or type == 'client' or type == 'main') #not type.include? 'src' and not type.include? 'deobf' and not type.include? 'api' and not type.include? 'backup'
-    end
-    if not f
+    f = data[:files].find { |f| %w(jar zip).include?(f[:ext]) && %(universal client main).include?(f[:buildtype].downcase) }
+    if f.nil?
       logger.warn 'No file found for ' + file.uid + ' version ' + file.version
       return []
     end
-    file.requires << Referenced.new('net.minecraft', f[:mcver])
 
     dl = FileDownload.new
     dl.url = f[:url]
     dl.destination = "mods/#{file.uid}-#{file.version}.jar"
     file.common.downloads << dl
 
-    return BaseSanitizer.sanitize file
+    BaseSanitizer.sanitize file
   end
 end

data/lib/wonko_the_sane/input/jenkins_input.rb

@@ -1,30 +1,27 @@
 class JenkinsInput < BaseInput
-  def initialize(artifact, fileRegex)
+  def initialize(artifact, file_regex)
     @artifact = artifact
-    @fileRegex = fileRegex
+    @file_regex = file_regex
   end
 
   def parse(data)
-    if data[:result] != 'SUCCESS'
-      return nil
-    end
+    return nil if data[:result] != 'SUCCESS'
 
     file = WonkoVersion.new
-
     file.uid = @artifact
     file.version = data[:number].to_s
     file.time = data[:timestamp]
 
     artifact = data[:artifacts].find do |art|
       path = art[:fileName]
-      if @fileRegex
-        path.match @fileRegex
+      if @file_regex
+        path.match @file_regex
       else
-        not path.include? '-api.' and not path.include? '-deobf.' and not path.include? '-dev.' and not path.include? '-javadoc.' and not path.include? '-library.' and not path.include? '-sources.' and not path.include? '-src.' and not path.include? '-util.'
+        %w(-api. -deobf. -dev. -javadoc. -library. -sources. -src. -util.).find { |infix| path.include? infix }.nil?
       end
     end
 
-    if not artifact
+    if artifact.nil?
       logger.warn 'No valid artifact found for ' + file.version
     else
       dl = FileDownload.new
@@ -33,14 +30,13 @@ class JenkinsInput < BaseInput
       file.common.downloads << dl
     end
 
-    return BaseSanitizer.sanitize file
+    BaseSanitizer.sanitize file
   end
 
   private
+
   def clean_url(url)
-    if url[url.length - 1] == '/'
-      url[url.length - 1] = ''
-    end
-    return url
+    url[url.length - 1] = '' if url[url.length - 1] == '/'
+    url
   end
 end

data/lib/wonko_the_sane/input/mojang_input.rb

@@ -1,77 +1,72 @@
-def allowedPlatformsForRules(rules)
+def allowed_platforms_for_rules(rules)
   possible = ['win32', 'win64', 'lin32', 'lin64', 'osx64']
 
   allowed = possible
   if rules
     rules.each do |rule|
-      if rule.action == :allow
-        if rule.is_a? OsRule
-          if rule.os == 'windows'
-            allowed << 'win32'
-            allowed << 'win64'
-          elsif rule.os == 'linux'
-            allowed << 'lin32'
-            allowed << 'lin64'
-          elsif rule.os == 'osx'
-            allowed << 'osx64'
-          end
-        elsif rule.is_a? ImplicitRule
+      if rule.is_a? ImplicitRule
+        if rule.action == :allow
           allowed = possible
+        else
+          allowed = []
         end
-      elsif rule.action == :disallow
-        if rule.is_a? OsRule
-          if rule.os == 'windows'
+      elsif rule.is_a? OsRule
+        if rule.action == :allow
+          case rule.os
+          when 'windows'
+            allowed << 'win32' << 'win64'
+          when 'linux'
+            allowed << 'lin32' << 'lin64'
+          when 'osx'
+            allowed << 'osx64'
+          end
+        elsif rule.action == :disallow
+          case rule.os
+          when 'windows'
             allowed.delete 'win32'
             allowed.delete 'win64'
-          elsif rule.os == 'linux'
+          when 'linux'
             allowed.delete 'lin32'
             allowed.delete 'lin64'
-          elsif rule.os == 'osx'
+          when 'osx'
             allowed.delete 'osx64'
           end
-        elsif rule.is_a? ImplicitRule
-          allowed = []
         end
       end
     end
   end
 
-  return allowed
+  allowed
 end
 
 class MojangInput
   # reads a general mojang-style library
-  def self.sanetize_mojang_library(object)
-    lib = if object.key? :natives then VersionLibraryNative.new else VersionLibrary.new end
+  def self.sanitize_mojang_library(object)
+    lib = object.key?(:natives) ? VersionLibraryNative.new : VersionLibrary.new
     lib.name = object[:name]
-    lib.mavenBaseUrl = object.key?(:url) ? object[:url] : 'https://libraries.minecraft.net/'
-
+    lib.maven_base_url = object.key?(:url) ? object[:url] : 'https://libraries.minecraft.net/'
     lib.rules = object[:rules].map do |obj| Rule.from_json obj end if object[:rules]
 
     libs = []
-    if not lib.is_a? VersionLibraryNative
+    if !lib.is_a? VersionLibraryNative
       libs << lib
     else
-      nativeIds = {}
-      if object.key? :natives
-        natives = object[:natives]
-        if natives.key? :windows
-          nativeIds['win32'] = natives[:windows].gsub "${arch}", '32'
-          nativeIds['win64'] = natives[:windows].gsub "${arch}", '64'
-        end
-        if natives.key? :linux
-          nativeIds['lin32'] = natives[:linux].gsub "${arch}", '32'
-          nativeIds['lin64'] = natives[:linux].gsub "${arch}", '64'
-        end
-        if natives.key? :osx
-          nativeIds['osx64'] = natives[:osx].gsub "${arch}", '64'
-        end
+      native_ids = {}
+      natives = object[:natives]
+      if natives.key? :windows
+        native_ids['win32'] = natives[:windows].gsub "${arch}", '32'
+        native_ids['win64'] = natives[:windows].gsub "${arch}", '64'
+      end
+      if natives.key? :linux
+        native_ids['lin32'] = natives[:linux].gsub "${arch}", '32'
+        native_ids['lin64'] = natives[:linux].gsub "${arch}", '64'
+      end
+      if natives.key? :osx
+        native_ids['osx64'] = natives[:osx].gsub "${arch}", '64'
       end
 
-      allowedPlatformsForRules(lib.rules).uniq.each do |platform|
-        if not nativeIds.key? platform
-          next
-        end
+      allowed_platforms_for_rules(lib.rules).uniq.each do |platform|
+        next unless native_ids.key? platform
 
         native = lib.clone
         native.rules = [
@@ -81,12 +76,12 @@ class MojangInput
           nil,
           {'win32': '32', 'win64': '64', 'lin32': '32', 'lin64': '64', 'osx64': '64'}[platform.to_sym])
         ]
-        native.url = native.url.sub '.jar', ('-' + nativeIds[platform] + '.jar')
+        native.url = native.url.sub '.jar', ('-' + native_ids[platform] + '.jar')
         libs << native
       end
     end
 
-    return libs
+    libs
   end
 
   def initialize(artifact)
@@ -97,7 +92,7 @@ class MojangInput
     object = data.class == Hash ? data : JSON.parse(data, symbolize_names: true)
 
     if object[:minimumLauncherVersion] and object[:minimumLauncherVersion] > 14
-      # TODO log error
+      logger.warn 'To high minimumLauncherVersion encountered for ' + object[:id] + ': ' + object[:minimumLauncherVersion]
       return []
     end
 
@@ -111,9 +106,7 @@ class MojangInput
     file.client.assets = object[:assets]
     file.client.minecraftArguments = object[:minecraftArguments]
     file.client.jarModTarget = "net.minecraft:minecraft:#{file.version}"
-    file.client.downloads = object[:libraries].map do |obj|
-      MojangInput.sanetize_mojang_library obj
-    end.flatten 1
+    file.client.downloads = object[:libraries].map { |obj| MojangInput.sanitize_mojang_library obj }.flatten 1
     main_lib = VersionLibrary.new
     main_lib.name = "net.minecraft:minecraft:#{file.version}"
     main_lib.url = 'http://s3.amazonaws.com/Minecraft.Download/versions/' + file.version + '/' + file.version + '.jar'
@@ -134,7 +127,7 @@ class MojangInput
     file.client.folders['minecraft/saves'] = ['mc.saves.region'] if file.time >= 1298325600 and file.time < 1330552800
     file.client.folders['minecraft/saves'] = ['mc.saves.infdev'] if file.time >= 1291327200 and file.time < 1298325600
 
-    return BaseSanitizer.sanitize file, MojangSplitLWJGLSanitizer
+    BaseSanitizer.sanitize file, MojangSplitLWJGLSanitizer
   end
 end
 
@@ -142,28 +135,28 @@ class MojangExtractTweakersSanitizer < BaseSanitizer
   def self.sanitize(file)
     file.client.tweakers = file.client.minecraftArguments.scan(/--tweakClass ([^ ]*)/).flatten
     file.client.minecraftArguments = file.client.minecraftArguments.gsub /\ ?--tweakClass ([^ ]*)/, ''
-    return file
+    file
   end
 end
 
 # extract lwjgl specific libraries and natives
 class MojangSplitLWJGLSanitizer < BaseSanitizer
-  @@lwjglList = ['org.lwjgl', 'net.java.jinput', 'net.java.jutils']
-  @@lwjglExtras = ['net.java.jinput', 'net.java.jutils']
+  class << self; attr_accessor :lwjgl_list, :lwjgl_extras; end
+  self.lwjgl_list = %w(org.lwjgl net.java.jinput net.java.jutils)
+  self.lwjgl_extras = %w(net.java.jinput net.java.jutils)
 
   def self.sanitize(file)
     file.requires = [] if file.requires.nil?
     file.requires << Referenced.new('org.lwjgl')
 
     extras = [] # [Download]
-    versioned = {} # String => [Download]
+    versioned = Hash.new { |hash, key| hash[key] = [] } # String => [Download]
     file.client.downloads.select! do |lib|
-      nil == @@lwjglList.find do |lwjglCandidate|
-        if lib.name.include? lwjglCandidate
-          if @@lwjglExtras.include? lib.maven.group
+      nil == self.lwjgl_list.find do |lwjgl_candidate|
+        if lib.name.include? lwjgl_candidate
+          if self.lwjgl_extras.include? lib.maven.group
             extras << lib
           else
-            versioned[lib.maven.version] ||= []
             versioned[lib.maven.version] << lib
           end
           true
@@ -190,8 +183,6 @@ end
 
 class MojangTraitsSanitizer < BaseSanitizer
   def self.sanitize(file)
-    if file.uid == 'net.minecraft'
-    end
     file
   end
 end