wonko_the_sane 0.1.2 → 0.1.4

data/lib/wonko_the_sane/versionlists/vanilla_legacy_version_list.rb

@@ -2,11 +2,11 @@ require_relative 'base_version_list'
 
 class VanillaLegacyVersionList < BaseVersionList
   def initialize
-    super('net.minecraft')
+    super 'net.minecraft'
   end
 
   def get_versions
-    WonkoTheSane.data_json('minecraft.json')[:versions].map do |obj| [obj[:id], obj] end
+    WonkoTheSane.data_json('minecraft.json')[:versions].map { |obj| [obj[:id], obj] }
   end
 
   def get_version(id)
@@ -20,10 +20,10 @@ class VanillaLegacyVersionList < BaseVersionList
     file.client.extra[:processArguments] = data[:processArguments]
     file.client.mainClass = data[:mainClass] if data.has_key? :mainClass
     file.client.appletClass = data[:appletClass] if data.has_key? :appletClass
-    mainLib = VersionLibrary.new
-    mainLib.name = 'net.minecraft:minecraft:' + file.version
-    mainLib.url = 'http://s3.amazonaws.com/Minecraft.Download/versions/' + file.version + '/' + file.version + '.jar'
-    file.client.downloads = [ mainLib ]
+    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'
+    file.client.downloads = [ main_lib ]
 
     file.client.folders['minecraft/screenshots'] = ['general.screenshots']
     file.client.folders['minecraft/resourcepackks'] = ['mc.resourcepacks'] if file.time >= 1372430921

data/lib/wonko_the_sane/versionlists/vanilla_version_list.rb

@@ -3,8 +3,8 @@ require 'date'
 
 class VanillaVersionList < BaseVersionList
   def initialize
-    super('net.minecraft')
-    @input = MojangInput.new('net.minecraft')
+    super 'net.minecraft'
+    @input = MojangInput.new 'net.minecraft'
   end
 
   def get_versions
@@ -12,7 +12,7 @@ class VanillaVersionList < BaseVersionList
     @latest_release = result[:latest][:release]
     @latest_snapshot = result[:latest][:snapshot]
 
-    return result[:versions].map do |obj| obj[:id] end
+    result[:versions].map { |obj| obj[:id] }
   end
 
   def get_version(id)
@@ -23,13 +23,11 @@ class VanillaVersionList < BaseVersionList
              get_json_cached url
            end
     files = @input.parse json
-    mcfile = files.find do |file|
-      file.uid == 'net.minecraft'
-    end
-    if mcfile and mcfile.time > DateTime.iso8601('2013-06-25T15:08:56+02:00').to_time.to_i
+    mcfile = files.find { |file| file.uid == 'net.minecraft' }
+    if mcfile && mcfile.time > DateTime.iso8601('2013-06-25T15:08:56+02:00').to_time.to_i
       files
     else
       []
     end
   end
-end
+end

data/lib/wonko_the_sane/wonko_version.rb

@@ -1,10 +1,14 @@
 class Download
-  attr_accessor :internalUrl # not serialized, used for DownloadsFixer when the url isn't direct (requires user interaction)
+  attr_accessor :internal_url # not serialized, used for DownloadsFixer when the url isn't direct (requires user interaction)
   attr_accessor :url
   attr_accessor :size
   attr_accessor :sha256
   attr_accessor :rules # [Rule]
 
+  def usable_url
+    internal_url.nil? ? url : internal_url
+  end
+
   def type
     'general.downloads'
   end
@@ -35,6 +39,8 @@ class Download
       dl = VersionLibraryNative.new
     when 'general.downloads'
       dl = FileDownload.new
+    when 'mc.jarmods'
+      dl = Jarmod.new
     end
 
     dl.from_json json
@@ -64,13 +70,27 @@ end
 
 class VersionLibrary < Download
   attr_accessor :name
-  attr_accessor :mavenBaseUrl
+  attr_accessor :maven_base_url
+
+  def ==(other)
+    self.class == other.class && name == other.name && url == other.url && sha256 == other.sha256 && rules == other.rules
+  end
 
   def type
     'java.libraries'
   end
   def url
-    @url ? @url : (@mavenBaseUrl + WonkoTheSane::Util::MavenIdentifier.new(@name).to_path)
+    if @url
+      @url
+    elsif @maven_base_url
+      @maven_base_url + WonkoTheSane::Util::MavenIdentifier.new(@name).to_path
+    else
+      nil
+    end
+  end
+
+  def explicit_url?
+    !@url.nil?
   end
 
   def maven
@@ -80,9 +100,9 @@ class VersionLibrary < Download
   def to_json
     obj = super
     obj[:name] = @name
-    obj[:mavenBaseUrl] = @mavenBaseUrl if @mavenBaseUrl
+    obj[:@maven_base_url] = @maven_base_url if @maven_base_url
 
-    if not @url
+    unless @url
       obj.delete :url
     end
 
@@ -92,10 +112,10 @@ class VersionLibrary < Download
   def from_json(json)
     super
     @name = json[:name]
-    @mavenBaseUrl = json[:mavenBaseUrl]
+    @maven_base_url = json[:@maven_base_url]
 
     # if the absolute url is equal to the expected maven url we clear the absolute url
-    if @mavenBaseUrl && @url == url
+    if @maven_base_url && @url == url
       @url = nil
     end
   end
@@ -109,7 +129,7 @@ end
 
 class Jarmod < VersionLibrary
   def type
-    'mc.jarmod'
+    'mc.jarmods'
   end
 end
 
@@ -123,7 +143,7 @@ class Referenced
   end
 
   def ==(other)
-    @uid == other.uid and @version == other.version
+    self.class == other.class && @uid == other.uid && @version == other.version
   end
 end
 
@@ -160,9 +180,9 @@ class WonkoVersion
     end
   end
 
-  attr_reader :client
-  attr_reader :server
-  attr_reader :common
+  attr_accessor :client
+  attr_accessor :server
+  attr_accessor :common
 
   def initialize
     @requires = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wonko_the_sane
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - 02JanDal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,7 +181,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,7 +195,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,7 +209,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oga
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -223,7 +223,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,7 +237,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -251,7 +251,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: configliere
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -265,7 +265,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -279,7 +279,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-request-timer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-cookie_jar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -313,7 +369,8 @@ files:
 - lib/wonko_the_sane/input/forgefiles_mods_input.rb
 - lib/wonko_the_sane/input/jenkins_input.rb
 - lib/wonko_the_sane/input/mojang_input.rb
-- lib/wonko_the_sane/reader_writer.rb
+- lib/wonko_the_sane/new_format.rb
+- lib/wonko_the_sane/old_format.rb
 - lib/wonko_the_sane/registry.rb
 - lib/wonko_the_sane/rules.rb
 - lib/wonko_the_sane/timestamps.rb
@@ -327,9 +384,9 @@ files:
 - lib/wonko_the_sane/util/http_cache.rb
 - lib/wonko_the_sane/util/maven_identifier.rb
 - lib/wonko_the_sane/util/task_stack.rb
+- lib/wonko_the_sane/util/version_parser.rb
 - lib/wonko_the_sane/version.rb
 - lib/wonko_the_sane/version_index.rb
-- lib/wonko_the_sane/version_parser.rb
 - lib/wonko_the_sane/versionlists/base_version_list.rb
 - lib/wonko_the_sane/versionlists/curse_version_list.rb
 - lib/wonko_the_sane/versionlists/forge_version_list.rb
@@ -339,7 +396,6 @@ files:
 - lib/wonko_the_sane/versionlists/vanilla_legacy_version_list.rb
 - lib/wonko_the_sane/versionlists/vanilla_version_list.rb
 - lib/wonko_the_sane/wonko_version.rb
-- lib/wonko_the_sane/wonkoweb_uploader.rb
 homepage: https://github.com/MultiMC/WonkoTheSane
 licenses:
 - MIT
@@ -360,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pre-processing and format-unification of various resources mainly related

data/lib/wonko_the_sane/wonkoweb_uploader.rb

@@ -1,162 +0,0 @@
-module WonkoTheSane
-  class WonkoWeb
-    include HTTParty
-
-    class UploadError < ResponseError
-      attr_reader :errors
-
-      def initialize(errors)
-        @errors = errors
-      end
-    end
-
-    def initialize(benchmark)
-      self.class.base_uri Settings[:wonkoweb][:host]
-      self.class.headers 'X-Uploader-Name' => Settings[:wonkoweb][:name],
-                         'X-Uploader-Token' => Settings[:wonkoweb][:token],
-                         'X-WUR-Enabled' => 'true',
-                         'Content-Type' => 'application/json'
-
-      @benchmark = benchmark
-    end
-
-    def index
-      self.class.get(path 'index').with_indifferent_access
-    end
-
-    def file(uid)
-      self.class.get(path uid).with_indifferent_access
-    end
-
-    def version(uid, version)
-      self.class.get(path uid, version).with_indifferent_access
-    end
-
-    def upload_file(data)
-      return if data.nil?
-      uid = data[:uid]
-      theirs = @benchmark.benchmark('upload_file.theirs') { file uid rescue nil }
-
-      data.delete :versions # only stubs here
-      data[:name] ||= data[:uid]
-
-      upload_hash path, path(uid), data, theirs, false
-    end
-
-    def upload_version(data)
-      return if data.nil?
-      uid = data[:uid]
-      version = data[:version]
-      theirs = @benchmark.benchmark('upload_version.theirs') { version uid, version rescue nil }
-      upload_hash path(uid), path(uid, version), data, theirs, true
-    end
-
-    private
-
-    def upload_hash(create_path, update_path, ours, theirs, allow_overwrite)
-      caller = ours[:version] ? 'upload_version' : 'upload_file'
-      res = if theirs.nil? || (theirs[:errors] && theirs[:errors].size > 0)
-              # upload entire file
-              @benchmark.benchmark(caller + '.create') { self.class.post create_path, body: JSON.generate(ours) }
-            else
-              # upload changes
-
-              body = JSON.parse JSON.generate ours # round-trip to "normalize" things
-              # keep_if modifies in-place (why isn't it named keep_if! ????????)
-              body.keep_if { |k, v| !(theirs[k.to_sym] == v) }
-              body.keep_if { |k, v| theirs[k.to_sym].nil? || theirs[k.to_sym].to_s.empty? } unless allow_overwrite
-              @benchmark.benchmark(caller + '.update') { self.class.patch update_path, body: JSON.generate(body) } unless body.empty?
-            end
-
-      if !res.nil? && (res.code >= 300 || JSON.parse(res.body).key?('errors'))
-        binding.pry
-        fail UploadError.new res.body[:errors]
-      end
-    end
-
-    def path(*args)
-      return '/api/v1.json' if args.nil? || args.empty?
-      '/api/v1/' + args.map(&:to_s).join('/') + '.json'
-    end
-  end
-
-  class WonkoWebUploader
-    def initialize
-      data = JSON.parse File.read 'uploader_queue.json' if File.exists? 'uploader_queue.json'
-      data ||= {}
-      data = data.with_indifferent_access
-      @changed_files = data[:files] || []
-      @changed_versions = data[:versions] || {}
-
-      @benchmark = WonkoTheSane::Util::Benchmark.new
-      @client = WonkoWeb.new @benchmark
-    end
-
-    def file_changed(uid)
-      @changed_files << uid
-      save_changes!
-    end
-
-    def version_changed(uid, version)
-      @changed_versions[uid] ||= []
-      @changed_versions[uid] << version
-      save_changes!
-    end
-
-    def upload_changes!
-      @changed_files.uniq!
-      return if Settings[:wonkoweb][:host].nil?
-
-      existing_uids = @benchmark.benchmark('initial index') { @client.index }[:index].map { |obj| obj[:uid] }
-      logger.info "Uploading #{@changed_files.size} changed files to WonkoWeb at #{Settings[:wonkoweb][:host]}..."
-      @changed_files.dup.each do |uid|
-        begin
-          @client.upload_file $rw.write_version_index Registry.instance.version_index uid
-          existing_uids << uid
-          @changed_files.delete uid
-        rescue => e
-          logger.error "Unable to upload file for #{uid} to WonkoWeb: #{e.message}"
-          logger.warn e.backtrace.first
-          binding.pry if $stdout.isatty && ENV['DEBUG_ON_ERROR']
-        end
-      end
-      logger.info 'Done.'
-      @benchmark.print_times true
-
-      num_versions = @changed_versions.collect { |k, v| v.size }.inject :+
-      logger.info "Uploading #{num_versions} changed versions to WonkoWeb at #{Settings[:wonkoweb][:host]}..."
-      @changed_versions.dup.each do |uid, versions|
-        versions.dup.each do |version|
-          begin
-            @client.upload_file $rw.write_version_index Registry.instance.version_index uid unless existing_uids.include? uid
-            @client.upload_version $rw.write_version Registry.instance.retrieve uid, version
-            versions.delete version
-          rescue => e
-            logger.error "Unable to upload version #{version} of #{uid} to WonkoWeb: #{e.message}"
-            logger.warn e.backtrace.first
-            binding.pry if $stdout.isatty && ENV['DEBUG_ON_ERROR']
-          end
-          @changed_versions.delete uid if versions.empty?
-        end
-      end
-      logger.info 'Done.'
-      @benchmark.print_times true
-
-      save_changes!
-    end
-
-    private
-
-    def logger
-      Logging.logger[self]
-    end
-
-    def save_changes!
-      data = {
-          files: @changed_files,
-          versions: @changed_versions
-      }
-      File.write 'uploader_queue.json', JSON.pretty_generate(data)
-    end
-  end
-end