wonko_the_sane 0.1.2 → 0.1.4

data/lib/wonko_the_sane/{reader_writer.rb → new_format.rb}

@@ -1,36 +1,32 @@
-require 'hashie'
-
 module Reader
   def read_version_index(data)
-    json = Hashie::Mash.new data
-
-    index = VersionIndex.new json.uid
-    index.name = json.name
-    json.versions.each do |ver|
+    data = data.with_indifferent_access
+    index = VersionIndex.new data[:uid]
+    index.name = data[:name]
+    data[:versions].each do |ver|
       v = WonkoVersion.new
       v.is_complete = false
-      v.uid = json.uid
+      v.uid = data[:uid]
       v.version = ver[:version]
       v.type = ver[:type]
       v.time = ver[:time]
       index.versions << v
     end
 
-    return index
+    index
   end
 
   def read_download(data, key)
     if data[key.to_sym]
-      data[key.to_sym].map do |dl|
-        Download.from_json key, dl
-      end
+      data[key.to_sym].map { |dl| Download.from_json key, dl }
     else
       []
     end
   end
 
-  def read_resource(data, res)
-    return if not data or not data.is_a? Object
+  def read_resource(data)
+    return if !data || !data.is_a?(Object)
+    res = WonkoVersion::Resources.new
     res.traits = data[:'general.traits'] if data[:'general.traits']
     res.folders = data[:'general.folders'] if data[:'general.folders']
     res.launchMethod = data[:'general.launcher'] if data[:'general.launcher']
@@ -38,6 +34,7 @@ module Reader
     res.downloads << read_download(data, 'general.downloads')
     res.downloads << read_download(data, 'java.libraries')
     res.downloads << read_download(data, 'java.natives')
+    res.downloads << read_download(data, 'mc.jarmods')
     res.downloads.flatten!
 
     res.mainClass = data[:'java.mainClass']
@@ -46,32 +43,31 @@ module Reader
     res.minecraftArguments = data[:'mc.arguments']
     res.tweakers = data[:'mc.tweakers']
     res.jarModTarget = data[:'mc.jarModTarget'] if data[:'mc.jarModTarget']
+    res
   end
 
   def read_version(data)
-    json = Hashie::Mash.new data
+    data = data.with_indifferent_access
 
     file = WonkoVersion.new
     file.is_complete = true
 
-    file.uid = json.uid
-    file.version = json.version
-    file.time = json.time
-    file.type = json.type
-    file.requires = json.requires.map do |req|
-      Referenced.new(req[:uid], req[:version])
-    end if json.requires
-
-    json[:data].each do |data|
-      rules = data[:rules] ? data[:rules] : [ImplicitRule.new(:allow)]
-      if Rule.allowed_on_side rules, :client
-        read_resource data, file.client
+    file.uid = data[:uid]
+    file.version = data[:version]
+    file.time = data[:time]
+    file.type = data[:type]
+    file.requires = data[:requires].map { |req| Referenced.new(req[:uid], req[:version]) } if data[:requires]
+
+    data[:data].each do |group|
+      rules = group[:rules] ? group[:rules] : [ImplicitRule.new(:allow)]
+      if Rule.allowed_on_side(rules, :client) && Rule.allowed_on_side(rules, :server)
+        file.common = read_resource group
       elsif Rule.allowed_on_side rules, :server
-        read_resource data, file.server
+        file.server = read_resource group
       else
-        read_resource data, file.common
+        file.client = read_resource group
       end
-    end if json[:data]
+    end if data[:data]
 
     file
   end
@@ -84,7 +80,7 @@ end
 module Writer
   def write_version_index(index)
     json = {
-        formatVersion: 0,
+        formatVersion: 10,
         uid: index.uid,
         name: index.name,
         versions: []
@@ -106,7 +102,7 @@ module Writer
     data[:'general.launcher'] = resource.launchMethod              if resource.launchMethod
     data[:'general.folders'] = resource.folders                    if resource.folders and not resource.folders.empty?
     resource.downloads.each do |dl|
-      data[dl.type] = [] if not data[dl.type]
+      data[dl.type] = [] unless data[dl.type]
       data[dl.type] << dl.to_json
     end
     data[:'java.mainClass'] = resource.mainClass                   if resource.mainClass and resource.mainClass != ''
@@ -117,8 +113,8 @@ module Writer
     data[:'mc.assets'] = resource.assets                           if resource.assets and resource.assets != ''
     data[:'mc.arguments'] = resource.minecraftArguments            if resource.minecraftArguments and resource.minecraftArguments != ''
 
-    if not data.empty?
-      if side == :client or side == :server
+    unless data.empty?
+      if side == :client || side == :server
         data[:rules] = [
           ImplicitRule.new(:disallow).to_json,
           SidedRule.new(:allow, side).to_json
@@ -131,7 +127,7 @@ module Writer
   def write_version(version)
     # metadata
     json = {
-        formatVersion: 0,
+        formatVersion: 10,
         uid: version.uid,
         version: version.version,
         time: version.time.to_s,

data/lib/wonko_the_sane/old_format.rb

@@ -0,0 +1,123 @@
+require 'time'
+
+module OldFormatWriter
+  def write_version(version)
+    # metadata
+    json = {
+      formatVersion: 0,
+      uid: version.uid,
+      name: version.uid,
+      fileId: version.uid,
+      version: version.version,
+      time: Time.at(version.time).iso8601,
+      releaseTime: Time.at(version.time).iso8601,
+      type: version.type,
+      requires: [],
+      order: order_for(version.uid)
+    }
+    json[:requires] = version.requires.map do |req|
+      obj = { uid: req.uid }
+      obj[:version] = req.version if req.version
+      obj
+    end if version.requires and not version.requires.empty?
+    json[:id] = version.version if version.uid == 'net.minecraft'
+
+    resource = version.client
+
+    vanilla_req = version.requires.find { |r| r.uid == 'net.minecraft' }
+
+    json[:mainClass] = resource.mainClass if resource.mainClass && resource.mainClass != ''
+    json[:appletClass] = resource.appletClass if resource.appletClass && resource.appletClass != ''
+    json[:assets] = resource.assets if resource.assets && resource.assets != ''
+    json[:mcVersion] = vanilla_req.version if vanilla_req
+    json[:minecraftArguments] = resource.minecraftArguments
+
+    vanilla = Registry.instance.retrieve 'net.minecraft', json[:mcVersion] if json[:mcVersion]
+
+    json[:'+tweakers'] = resource.tweakers if resource.tweakers && !resource.tweakers.empty?
+
+    natives = {}
+    json[:'+libraries'] = resource.downloads
+                            .select { |dl| dl.type == 'java.libraries' || dl.type == 'java.natives' }
+                            .reject { |lib| lib.name.start_with? 'net.minecraft:minecraft:' }
+                            .map do |lib|
+      result = { name: lib.name }
+      if lib.explicit_url?
+        result[:'MMC-absoluteUrl'] = lib.url
+      elsif !lib.url.nil? && lib.maven_base_url != 'https://libraries.minecraft.net/'
+        result[:url] = lib.url
+      end
+      result[:rules] = lib.rules.map { |r| r.to_json } unless lib.rules.nil?
+
+      if lib.name.include?('org.scala-lang') || lib.name.include?('com.typesafe')
+        result[:'MMC-hint'] = 'forge-pack-xz'
+      end
+
+      in_vanilla = if vanilla
+                     vanilla.client.downloads
+                       .select { |dl| dl.type == 'java.libraries' || dl.type == 'java.natives' }
+                       .find { |dl| dl.name == lib.name }
+                   end
+      if !in_vanilla.nil? && in_vanilla == lib
+        # it's already there, no need to add it
+      else
+        if in_vanilla.nil?
+          result[:insert] = 'append' unless version.uid == 'net.minecraft'
+          if %w(minecraftforge forge fml liteloader).include? lib.maven.artifact
+            result[:'MMC-depend'] = 'hard'
+          end
+        else
+          result[:insert] = 'replace'
+        end
+
+        [lib, result]
+      end
+    end.reject { |i| i.nil? }.map do |array|
+      lib = array[0]
+      result = array[1]
+      if lib.type == 'java.libraries'
+        result
+      else
+        # reconstruct insane natives
+        # mojang: you invented this fancy^Wweird rules system, and then you don't use it?
+        natives[lib.name] ||= {}
+        osrule = lib.rules[1]
+        if natives[lib.name].key? osrule.os
+          nil
+        else
+          natives[lib.name][osrule.os] = result
+          result[:url] = result[:url].sub /(32|64)/, '${arch}' if result[:url]
+          result[:'MMC-absoluteUrl'] = result[:'MMC-absoluteUrl'].sub /(32|64)/, '${arch}' if result[:'MMC-absoluteUrl']
+          result[:rules][1][:os].delete :arch
+          result
+        end
+      end
+    end.reject { |i| i.nil? }
+
+    json[:'+jarMods'] = resource.downloads.select { |dl| dl.type == 'mc.jarmods' }.map do |lib|
+      {}
+    end
+
+    json
+  end
+
+  def order_for(uid)
+    case uid
+    when 'net.minecraftforge'
+      5
+    when 'com.mumfrey.liteloader'
+      10
+    when 'net.minecraft'
+      -2
+    when 'org.lwjgl'
+      -1
+    else
+      0
+    end
+  end
+end
+
+class OldFormat
+  include OldFormatWriter
+end
+$old_format = OldFormat.new

data/lib/wonko_the_sane/registry.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 class Registry
   def version_index(uid)
     return VersionIndex.new uid unless File.exists? VersionIndex.local_filename uid
@@ -6,49 +8,62 @@ class Registry
 
   def store_version_index(index)
     File.write index.local_filename, JSON.pretty_generate($rw.write_version_index index)
-    WonkoTheSane.wonkoweb_uploader.file_changed index.uid
+    FileUtils.copy index.local_filename, "#{Registry.out_dir}/#{index.uid}.json" unless Registry.out_dir.blank?
   end
 
   def index
-    return { index: [] } unless File.exists? 'files/index.json'
+    return {index: []} unless File.exists? 'files/index.json'
     $rw.read_index JSON.parse File.read 'files/index.json'
   end
 
   def store(version)
     if version.is_a? Array
-      version.each do |f| store(f) end
+      version.each do |f|
+        store(f)
+      end
     else
-      BaseSanitizer.sanitize(version, DownloadsFixer).each do |version|
-        Dir.mkdir 'files/' + version.uid unless Dir.exist? 'files/' + version.uid
-        File.write version.local_filename, JSON.pretty_generate($rw.write_version version)
-        WonkoTheSane.wonkoweb_uploader.version_changed version.uid, version.version
-
-        vindex = version_index version.uid
-        vindex.add_version version
-        store_version_index vindex
-
-        ind = index
-        next if ind[:index].find { |i| version.uid == i[:uid] } # early exit if the uid already exists in the index
-        ind[:formatVersion] = 0
-        ind[:index] << { uid: version.uid }
-        File.write 'files/index.json', JSON.pretty_generate($rw.write_index ind)
+      BaseSanitizer.sanitize(version, DownloadsFixer).each do |ver|
+        begin
+          Dir.mkdir 'files/' + ver.uid unless Dir.exist? 'files/' + ver.uid
+          File.write ver.local_filename + '.new', JSON.pretty_generate($rw.write_version ver)
+          File.write ver.local_filename, JSON.pretty_generate($old_format.write_version ver)
+          unless Registry.out_dir.blank?
+            FileUtils.copy ver.local_filename + '.new', "#{Registry.out_dir}/#{ver.uid}-#{ver.version}.new.json"
+            FileUtils.copy ver.local_filename, "#{Registry.out_dir}/#{ver.uid}-#{ver.version}.json"
+          end
+
+          vindex = version_index ver.uid
+          vindex.add_version ver
+          store_version_index vindex
+
+          ind = index
+          next if ind[:index].find { |i| ver.uid == i[:uid] } # early exit if the uid already exists in the index
+          ind[:formatVersion] = 0
+          ind[:index] << {uid: ver.uid}
+          File.write 'files/index.json', JSON.pretty_generate($rw.write_index ind)
+        rescue Exception => e
+          Logging.logger[ver.uid].error 'Unable to store: ' + ver.version
+          raise e
+        end
       end
     end
-  rescue Exception => e
-    Logging.logger[version.uid].error 'Unable to store: ' + version.version
-    raise e
   end
 
   def retrieve(id, version)
     if File.exist? WonkoVersion.local_filename(id, version)
-      $rw.read_version JSON.parse File.read(WonkoVersion.local_filename id, version)
+      $rw.read_version JSON.parse File.read(WonkoVersion.local_filename(id, version) + '.new')
     else
       nil
     end
   end
 
   def self.instance
-    Dir.mkdir 'files' unless Dir.exist? 'files'
-    @@instance ||= Registry.new
+    FileUtils.mkdir_p 'files' unless Dir.exist? 'files'
+    FileUtils.mkdir_p out_dir unless out_dir.blank? || Dir.exists?(out_dir)
+    @instance ||= Registry.new
+  end
+
+  def self.out_dir
+    WonkoTheSane.configuration.out_dir
   end
 end

data/lib/wonko_the_sane/rules.rb

@@ -11,21 +11,21 @@ class Rule
 
   def self.allowed_on_side(rules, side)
     allowed = :allow
-    rules.each do |rule|
+    rules.map { |r| r.is_a?(Rule) ? r : Rule.from_json(r) }.each do |rule|
       if rule.is_a? ImplicitRule
         allowed = rule.action
       elsif rule.is_a? SidedRule
-        allowed = rule.action if rule.side = side
+        allowed = rule.action if rule.side == side
       end
     end
-    return allowed
+    allowed == :allow
   end
 
   def self.from_json(obj)
     if obj.key? :os
       return OsRule.new obj[:action].to_sym, obj[:os][:name], obj[:os][:version], obj[:os][:arch]
     elsif obj.key? :side
-      return SidedRule.new obj[:action].to_sym, obj[:side]
+      return SidedRule.new obj[:action].to_sym, obj[:side].to_sym
     else
       return ImplicitRule.new obj[:action].to_sym
     end
@@ -50,7 +50,7 @@ class OsRule < Rule
     obj[:os] = { name: @os }
     obj[:os][:version] = @os_version if @os_version
     obj[:os][:arch] = @os_arch if @os_arch
-    return obj
+    obj
   end
 end
 class SidedRule < Rule
@@ -64,6 +64,6 @@ class SidedRule < Rule
   def to_json
     obj = super
     obj[:side] = @side
-    return obj
+    obj
   end
 end

data/lib/wonko_the_sane/timestamps.rb

@@ -4,8 +4,8 @@ class Timestamps
   end
 
   def get(uid, version, default = nil)
-    if @json[uid.to_sym] and @json[uid.to_sym][version.to_sym.to_sym]
-      return @json[uid.to_sym][version.to_sym]
+    if @json[uid.to_sym] && @json[uid.to_sym][version.to_sym]
+      @json[uid.to_sym][version.to_sym]
     elsif default.nil?
       raise 'No timestamp available for ' + uid + ': ' + version
     elsif default.is_a? String
@@ -24,7 +24,7 @@ class Timestamps
   end
 
   def self.get(uid, version, default = nil)
-    @@me ||= Timestamps.new
-    @@me.get uid, version, default
+    @me ||= Timestamps.new
+    @me.get uid, version, default
   end
 end

data/lib/wonko_the_sane/tools/update_nem.rb

@@ -1,31 +1,31 @@
 def get_curse_id(name)
   data = HTTPCache.get('http://minecraft.curseforge.com/mc-mods/' + name).gsub /[\n\r]/, ''
   match = data.match /<li class="view-on?-cur?se"> *<a href="http:\/\/curse.com\/project\/(\d*)">/
-  return match[1]
+  match[1]
 end
 
 def update_nem
-  forgefilesCleaned = {
+  self.forgefiles_cleaned = {
     IronChests: :IronChests2
   }
 
   sources = WonkoTheSane.data_json 'sources.json'
-  sources[:forgefiles] = {} if not sources[:forgefiles]
-  sources[:jenkins] = [] if not sources[:jenkins]
-  sources[:curse] = [] if not sources[:curse]
+  sources[:forgefiles] = {} unless sources[:forgefiles]
+  sources[:jenkins] = [] unless sources[:jenkins]
+  sources[:curse] = [] unless sources[:curse]
 
-  nemList = JSON.parse HTTPCache.get('https://raw.githubusercontent.com/SinZ163/NotEnoughMods/master/NEMP/mods.json'), symbolize_names: true
-  nemList.each do |key, value|
+  nem_list = JSON.parse HTTPCache.get('https://raw.githubusercontent.com/SinZ163/NotEnoughMods/master/NEMP/mods.json'), symbolize_names: true
+  nem_list.each do |key, value|
     name = (value[:name] ? value[:name] : key).to_sym
     case value[:function]
     when 'CheckMCForge2'
-      if forgefilesCleaned[name]
-        name = forgefilesCleaned[name]
+      if self.forgefiles_cleaned[name]
+        name = self.forgefiles_cleaned[name]
       end
       if not sources[:forgefiles].find do |artifact, urlId| urlId == name.to_s end and not [:MinecraftForge, :FML, :Cauldron].include? name
         print "Please enter an uid for the #{"forgefiles".cyan} artifact #{name.to_s.green}: "
         uid = gets.chomp
-        if not uid.empty?
+        unless uid.empty?
           sources[:forgefiles][uid.to_sym] = name.to_s
         end
       end
@@ -42,14 +42,14 @@ def update_nem
     when 'CheckChickenBones'
       # TODO
     when 'CheckCurse'
-      curseId = value[:curse][:id] ? value[:curse][:id] : get_curse_id(value[:curse][:name] ? value[:curse][:name] : name.to_s.downcase)
-      if not sources[:curse].find do |obj| obj[:id] == curseId end
-        print "Please enter an uid for the #{"curse".cyan} artifact #{name.to_s.green} (id: #{curseId.yellow}): "
+      curse_id = value[:curse][:id] ? value[:curse][:id] : get_curse_id(value[:curse][:name] ? value[:curse][:name] : name.to_s.downcase)
+      if sources[:curse].find { |obj| obj[:id] == curse_id }.nil?
+        print "Please enter an uid for the #{'curse'.cyan} artifact #{name.to_s.green} (id: #{curse_id.yellow}): "
         uid = gets.chomp
-        if not uid.empty?
+        unless uid.empty?
           sources[:curse] << {
             uid: uid,
-            id: curseId,
+            id: curse_id,
             fileregex: value[:curse][:regex]
           }
         end
@@ -61,11 +61,11 @@ def update_nem
     when 'CheckHTML'
       # TODO
     when 'CheckJenkins'
-      parts = value[:jenkins][:url].match(/^(.*)\/job\/([^\/]*)\//)
-      if not sources[:jenkins].find do |obj| obj[:url] == parts[1] and obj[:artifact] == parts[2] end
+      parts = value[:jenkins][:url].match /^(.*)\/job\/([^\/]*)\//
+      if sources[:jenkins].find { |obj| obj[:url] == parts[1] && obj[:artifact] == parts[2] }.nil?
         print "Please enter an uid for the #{"jenkins".cyan} artifact #{name.to_s.green} from #{parts[1].yellow} (#{parts[2].red}): "
         uid = gets.chomp
-        if not uid.empty?
+        unless uid.empty?
           sources[:jenkins] << {
             uid: uid,
             url: parts[1],
@@ -77,6 +77,8 @@ def update_nem
       # TODO
     when 'CheckSpacechase'
       # TODO
+    else
+      print 'Unknown checker function: ' + value[:function]
     end
 
     # keep the writing in the loop so we don't lose progress in case of crashes or similar