wonko_the_sane 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa648a065bfbc6fea0c7f581308ae4466a578fb
-  data.tar.gz: b7049aa48d98789256ce1cb5142553f43e29a34e
+  metadata.gz: 8aae6ec1255ccf32e504d0d7e8e6cf1faaf4d835
+  data.tar.gz: c8426ad171f4b69585999bf476b2b2c1533fc3ea
 SHA512:
-  metadata.gz: e3140975588a58455426f638079786fed82ef3e0a525811ed11f0117083a2e8da6095806fc0bce1586f9c32f858cb202f9024d90a9535b80696687df71cb45b8
-  data.tar.gz: 400710a7384eb938b851c8c018746d3fbc0b3ffe57e0c070b82cf559d270aea6d69212cbe62ed3bc041fb393d6369b475aefbd69109e42908a5cb92314788872
+  metadata.gz: 7c0d69626c46d2764b174cfc43f301c431246d71f8e70588190dd2fe5be41a55c2b73d68e73ecf87dd9b7bcab01c4a28658f3d9bc797a26bd0e19c54e646ec87
+  data.tar.gz: cfd8cd641b7cc9380810632145c260f4545e4b41e0b2fe85e6f3591903331b826fb854e49215a22fbcea3f2fef4dacdbe75a26cf2de92a512be1fd8397cc077f

data/bin/wonko_the_sane

@@ -38,7 +38,7 @@ OptionParser.new do |opts|
     if list.nil?
       Logging.logger['General'].warn "Couldn't find the specified list #{id.cyan}"
     else
-        TaskStack.push(Proc.new do
+        WonkoTheSane.tasks.push(Proc.new do
                          Logging.logger[list.artifact].info 'Refreshing'
                          list.refresh
                          Logging.logger[list.artifact].error list.last_error if list.last_error
@@ -47,7 +47,7 @@ OptionParser.new do |opts|
   end
   opts.on '-a', '--refresh-all', 'Refresh all lists' do
     WonkoTheSane.lists.each do |list|
-      TaskStack.push(Proc.new do
+      WonkoTheSane.tasks.push(Proc.new do
                        Logging.logger[list.artifact].info 'Refreshing'
                        list.refresh
                        Logging.logger[list.artifact].error list.last_error if list.last_error
@@ -83,4 +83,4 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-TaskStack.pop_all
+WonkoTheSane.tasks.pop_all

data/lib/wonko_the_sane.rb

@@ -10,6 +10,7 @@ require 'digest'
 require 'date'
 require 'time'
 require 'oga'
+require 'pathname'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
 
@@ -49,20 +50,16 @@ require 'wonko_the_sane/version_index'
 require 'wonko_the_sane/wonko_version'
 
 module WonkoTheSane
-  def self.wonkoweb_uploader
-    @uploader ||= WonkoWebUploader.new
-  end
-
   def self.lists
     configuration.lists
   end
 
-  def self.settings_file
-    File.dirname(__FILE__) + '/../wonko_the_sane.yml'
+  def self.tasks
+    @tasks ||= WonkoTheSane::Util::TaskStack.new
   end
 
   def self.data(file)
-    configuration.data_path + '/' + file
+    Pathname.new(configuration.data_path) + file
   end
 
   def self.data_json(file)

data/lib/wonko_the_sane/new_format.rb

@@ -98,20 +98,20 @@ module Writer
   def write_resource(side, resource, out)
     data = {}
 
-    data[:'general.traits'] = resource.traits                      if resource.traits and not resource.traits.empty?
-    data[:'general.launcher'] = resource.launchMethod              if resource.launchMethod
-    data[:'general.folders'] = resource.folders                    if resource.folders and not resource.folders.empty?
+    data[:'general.traits'] = resource.traits unless resource.traits.blank?
+    data[:'general.launcher'] = resource.launchMethod unless resource.launchMethod.blank?
+    data[:'general.folders'] = resource.folders unless resource.folders.blank?
     resource.downloads.each do |dl|
       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 != ''
-    data[:'mc.jarModTarget'] = resource.jarModTarget               if resource.jarModTarget
+    data[:'java.mainClass'] = resource.mainClass unless resource.mainClass.blank?
+    data[:'mc.jarModTarget'] = resource.jarModTarget unless resource.jarModTarget.blank?
 
-    data[:'mc.tweakers'] = resource.tweakers                       if resource.tweakers and not resource.tweakers.empty?
-    data[:'mc.appletClass'] = resource.appletClass                 if resource.appletClass and resource.appletClass != ''
-    data[:'mc.assets'] = resource.assets                           if resource.assets and resource.assets != ''
-    data[:'mc.arguments'] = resource.minecraftArguments            if resource.minecraftArguments and resource.minecraftArguments != ''
+    data[:'mc.tweakers'] = resource.tweakers unless resource.tweakers.blank?
+    data[:'mc.appletClass'] = resource.appletClass unless resource.appletClass.blank?
+    data[:'mc.assets'] = resource.assets unless resource.assets.blank?
+    data[:'mc.arguments'] = resource.minecraftArguments unless resource.minecraftArguments.blank?
 
     unless data.empty?
       if side == :client || side == :server
@@ -139,7 +139,7 @@ module Writer
       obj = { uid: req.uid }
       obj[:version] = req.version if req.version
       obj
-    end if version.requires and not version.requires.empty?
+    end unless version.requires.blank?
 
     write_resource(:client, version.client, json[:data]) if version.is_complete
     write_resource(:server, version.server, json[:data]) if version.is_complete

data/lib/wonko_the_sane/util/configuration.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'active_support/core_ext/string/inflections'
 
 module WonkoTheSane
   module Util
@@ -9,13 +10,6 @@ module WonkoTheSane
         attr_accessor :bucket
       end
 
-      class WonkoWeb
-        attr_accessor :host
-        attr_accessor :email
-        attr_accessor :token
-        attr_accessor :name
-      end
-
       attr_reader :aws
       attr_reader :wonkoweb
       attr_reader :lists
@@ -25,7 +19,7 @@ module WonkoTheSane
       def initialize
         @lists = []
         @aws = Aws.new
-        @wonkoweb = WonkoWeb.new
+        @data_path = Dir.pwd + '/data'
       end
 
       def load_from_env
@@ -33,35 +27,28 @@ module WonkoTheSane
         @aws.client_secret = ENV['WTS_AWS_CLIENT_SECRET'] if ENV['WTS_AWS_CLIENT_SECRET']
         @aws.bucket = ENV['WTS_AWS_BUCKET'] if ENV['WTS_AWS_BUCKET']
 
-        @wonkoweb.host = ENV['WTS_WONKOWEB_HOST'] if ENV['WTS_WONKOWEB_HOST']
-        @wonkoweb.email = ENV['WTS_WONKOWEB_EMAIL'] if ENV['WTS_WONKOWEB_EMAIL']
-        @wonkoweb.token = ENV['WTS_WONKOWEB_TOKEN'] if ENV['WTS_WONKOWEB_TOKEN']
-        @wonkoweb.token = ENV['WTS_WONKOWEB_NAME'] if ENV['WTS_WONKOWEB_NAME']
-
         @data_path = ENV['WTS_DATA_PATH'] if ENV['WTS_DATA_PATH']
         @out_dir = ENV['WTS_OUT_DIR'] if ENV['WTS_OUT_DIR']
       end
 
       def load_from_file(filename)
-        raw = YAML.load_file filename
-        @aws.client_id = raw['aws']['client_id']
-        @aws.client_secret = raw['aws']['client_secret']
-        @aws.bucket = raw['aws']['bucket']
-
-        @wonkoweb.host = raw['wonkoweb']['host']
-        @wonkoweb.email = raw['wonkoweb']['email']
-        @wonkoweb.token = raw['wonkoweb']['token']
-        @wonkoweb.name = raw['wonkoweb']['name']
+        raw = YAML.load_file(filename).with_indifferent_access
+        if raw.key? 'aws'
+          aws = raw['aws']
+          @aws.client_id = aws['client_id'] if aws.key? 'client_id'
+          @aws.client_secret = aws['client_secret'] if aws.key? 'client_secret'
+          @aws.bucket = aws['bucket'] if aws.key? 'bucket'
+        end
 
-        @data_path = raw['data_path']
-        @out_dir = raw['out_dir']
+        @data_path = raw['data_path'] if raw.key? 'data_path'
+        @out_dir = raw['out_dir'] if raw.key? 'out_dir'
       end
 
       def register_list(list)
         case list
-        when String
-          register_list list.to_sym
         when Symbol
+          register_list list.to_s.constantize
+        when String
           register_list list.constantize
         when Class
           register_list list.new
@@ -70,8 +57,12 @@ module WonkoTheSane
         end
       end
 
-      def register_lists_from_sources
-        sources = WonkoTheSane.data_json 'sources.json'
+      def register_lists_from_sources(filename = 'sources.json')
+        sources = if filename.is_a? String
+                    WonkoTheSane.data_json filename
+                  else
+                    filename
+                  end
         sources[:forgefiles].each do |uid, urlId|
           register_list ForgeFilesModsList.new(uid.to_s, urlId)
         end if sources[:forgefiles]

data/lib/wonko_the_sane/util/deep_storage_cache.rb

@@ -29,7 +29,7 @@ module WonkoTheSane
 
         object = @bucket.object info[:file]
         unless object.exists? && object.size == info[:size]
-          TaskStack.in_background do
+          WonkoTheSane.tasks.in_background do
             # convert the hex-encoded md5 to a base64-encoded md5, which is what S3 expects
             # http://anthonylewis.com/2011/02/09/to-hex-and-back-with-ruby/
             md5 = [info[:md5].scan(/../).map { |x| x.hex.chr }.join].pack 'm0'

data/lib/wonko_the_sane/util/http_cache.rb

@@ -37,7 +37,7 @@ class HTTPCache
 
     return if File.exists?(cached_path) && !check_stale
 
-    TaskStack.in_background do
+    WonkoTheSane.tasks.in_background do
       uri = URI.parse url
       host = URI::HTTP.new(uri.scheme, uri.userinfo, uri.host, uri.port, nil, nil, nil, nil, nil).to_s
 

data/lib/wonko_the_sane/util/task_stack.rb

@@ -1,22 +1,30 @@
-class TaskStack
-  class << self; attr_accessor :queue; end
-  self.queue = []
-  def self.push(task)
-    self.queue.push task
-  end
-  def self.push_defered(task)
-    self.queue.unshift task
-  end
-  def self.pop
-    task = self.queue.pop
-    task.call
-  end
-  def self.pop_all
-    self.pop until self.queue.empty?
-  end
-  def self.in_background(&block)
-    thread = Thread.new &block
-    TaskStack.pop_all
-    thread.join.value
+module WonkoTheSane
+  module Util
+    class TaskStack
+      attr_reader :queue
+
+      def initialize
+        @queue = []
+      end
+
+      def push(task)
+        @queue.push task
+      end
+      def push_defered(task)
+        @queue.unshift task
+      end
+      def pop
+        task = @queue.pop
+        task.call
+      end
+      def pop_all
+        pop until @queue.empty?
+      end
+      def in_background(&block)
+        thread = Thread.new &block
+        pop_all
+        thread.join.value
+      end
+    end
   end
 end

data/lib/wonko_the_sane/util/version_parser.rb

@@ -1,111 +1,107 @@
-class VersionParser
-  private
+module WonkoTheSane
+  module Util
+    class VersionParser
+      private
 
-  cache = {}
+      class << self; attr_accessor :cache; end
+      self.cache = {}
 
-  def self.parse(string)
-    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
-      test || sec
-    end
-
-    result = {
-        appendix: appendix,
-        sections: sections
-    }
-    self.cache[string] = result
-    return result
-  end
+      def self.parse(string)
+        return self.cache[string] if self.cache.has_key? string
+        appendix = string.scan(/\-.*$/).first
+        sections = string.sub(/\-.*$/, '').split '.'
+        sections.map! do |sec|
+          test = Integer sec rescue nil
+          test || sec
+        end
 
-  def self.appendix_values(appendix)
-    str = appendix.scan /[a-zA-Z]*/
-    digits = appendix.scan(/\d*/).join.to_i
-    ret = case str
-      when 'a'
-        [0, digits]
-      when 'alpha'
-        [0, digits]
-      when 'b'
-        [1, digits]
-      when 'beta'
-        [1, digits]
-      when 'rc'
-        [2, digits]
-      when 'pre'
-        [2, digits]
-          end
-    ret || [-1, digits]
-  end
+        result = {
+          appendix: appendix,
+          sections: sections
+        }
+        self.cache[string] = result
+        return result
+      end
 
-  def self.compare_values(first, second)
-    if first < second
-      -1
-    elsif first > second
-      1
-    else
-      0
-    end
-  end
+      def self.appendix_values(appendix)
+        str = appendix.scan /[a-zA-Z]*/
+        digits = appendix.scan(/\d*/).join.to_i
+        ret = case str.find { |s| !s.blank? }
+              when 'a'
+                [0, digits]
+              when 'alpha'
+                [0, digits]
+              when 'b'
+                [1, digits]
+              when 'beta'
+                [1, digits]
+              when 'rc'
+                [2, digits]
+              when 'pre'
+                [2, digits]
+              end
+        ret || [-1, digits]
+      end
 
-  public
-  def self.compare(string1, string2)
-    par1 = VersionParser.parse string1
-    par2 = VersionParser.parse string2
-    size = [par1[:sections].length, par2[:sections].length].max
-    ret = 0
-    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 && val2.is_a?(Integer)
-        ret = VersionParser.compare_values val1, val2
-      elsif val1.is_a? Integer
-        ret = VersionParser.compare_values val1.to_s, val2
-      elsif val2.is_a? Integer
-        ret = VersionParser.compare_values val1, val2.to_s
-      else
-        ret = VersionParser.compare_values val1.to_s, val2.to_s
+      def self.compare_values(first, second)
+        if first < second
+          -1
+        elsif first > second
+          1
+        else
+          0
+        end
       end
-      break unless ret == 0
-    end
-    if ret == 0
-      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]
+
+      public
+      def self.compare(string1, string2)
+        par1 = VersionParser.parse string1
+        par2 = VersionParser.parse string2
+        size = [par1[:sections].length, par2[:sections].length].max
+        ret = 0
+        size.times do |index|
+          val1 = par1[:sections].length > index ? par1[:sections][index] : 0
+          val2 = par2[:sections].length > index ? par2[:sections][index] : 0
+          ret = VersionParser.compare_values val1.to_i, val2.to_i
+          break unless ret == 0
+        end
         if ret == 0
-          ret = VersionParser.compare_values appendix1[1], appendix2[1]
+          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]
+            if ret == 0
+              ret = VersionParser.compare_values appendix1[1], appendix2[1]
+            end
+          elsif par1[:appendix]
+            ret = -1
+          elsif par2[:appendix]
+            ret = 1
+          end
         end
-      elsif par1[:appendix]
-        ret = -1
-      elsif par2[:appendix]
-        ret = 1
+        return ret
       end
-    end
-    return ret
-  end
 
-  def self.less?(string1, string2)
-    VersionParser.compare(string1, string2) == -1
-  end
-  def self.greater?(string1, string2)
-    VersionParser.compare(string1, string2) == 1
-  end
-  def self.equal?(string1, string2)
-    VersionParser.compare(string1, string2) == 0
-  end
-  def self.less_or_equal?(string1, string2)
-    ret = VersionParser.compare string1, string2
-    ret == 0 or ret == -1
-  end
-  def self.greater_or_equal?(string1, string2)
-    ret = VersionParser.compare string1, string2
-    ret == 0 or ret == 1
-  end
-  def self.not_equal?(string1, string2)
-    VersionParser.compare(string1, string2) != 0
+      def self.less?(string1, string2)
+        VersionParser.compare(string1, string2) == -1
+      end
+      def self.greater?(string1, string2)
+        VersionParser.compare(string1, string2) == 1
+      end
+      def self.equal?(string1, string2)
+        VersionParser.compare(string1, string2) == 0
+      end
+      def self.less_or_equal?(string1, string2)
+        ret = VersionParser.compare string1, string2
+        ret == 0 or ret == -1
+      end
+      def self.greater_or_equal?(string1, string2)
+        ret = VersionParser.compare string1, string2
+        ret == 0 or ret == 1
+      end
+      def self.not_equal?(string1, string2)
+        VersionParser.compare(string1, string2) != 0
+      end
+    end
   end
 end

data/lib/wonko_the_sane/version.rb

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

data/lib/wonko_the_sane/versionlists/vanilla_legacy_version_list.rb

@@ -26,11 +26,10 @@ class VanillaLegacyVersionList < BaseVersionList
     file.client.downloads = [ main_lib ]
 
     file.client.folders['minecraft/screenshots'] = ['general.screenshots']
-    file.client.folders['minecraft/resourcepackks'] = ['mc.resourcepacks'] if file.time >= 1372430921
     file.client.folders['minecraft/texturepacks'] = ['mc.texturepacks'] if file.time < 1372430921
     file.client.folders['minecraft/saves'] = ['mc.saves.anvil'] if file.time >= 1330552800
-    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
+    file.client.folders['minecraft/saves'] = ['mc.saves.region'] if file.time >= 1298325600 && file.time < 1330552800
+    file.client.folders['minecraft/saves'] = ['mc.saves.infdev'] if file.time >= 1291327200 && file.time < 1298325600
     file.client.traits.delete 'texturepacks' if file.client.traits
     file.client.traits.delete 'no-resourcepacks' if file.client.traits
 

data/lib/wonko_the_sane/wonko_version.rb

@@ -19,8 +19,8 @@ class Download
       size: @size,
       sha256: @sha256
     }
-    obj[:rules] = @rules.map do |rule| rule.to_json end if @rules and not @rules.empty?
-    return obj
+    obj[:rules] = @rules.map { |rule| rule.to_json } unless @rules.blank?
+    obj
   end
 
   def from_json(json)
@@ -100,7 +100,7 @@ class VersionLibrary < Download
   def to_json
     obj = super
     obj[:name] = @name
-    obj[:@maven_base_url] = @maven_base_url if @maven_base_url
+    obj[:@maven_base_url] = @maven_base_url unless @maven_base_url.blank?
 
     unless @url
       obj.delete :url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wonko_the_sane
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - 02JanDal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -375,7 +375,6 @@ files:
 - lib/wonko_the_sane/rules.rb
 - lib/wonko_the_sane/timestamps.rb
 - lib/wonko_the_sane/tools/update_nem.rb
-- lib/wonko_the_sane/util.rb
 - lib/wonko_the_sane/util/benchmark.rb
 - lib/wonko_the_sane/util/configuration.rb
 - lib/wonko_the_sane/util/deep_storage_cache.rb

data/lib/wonko_the_sane/util.rb

@@ -1,17 +0,0 @@
-module Util
-  def self.deep_map_keys(val, &block)
-    Util.deep_map_hash val do |k, v|
-      [yield(k), v]
-    end
-  end
-
-  def self.deep_map(val, &block)
-    if val.is_a? Array
-      val.map { |item| deep_map_hash item, &block }
-    elsif val.is_a? Hash
-      Hash[val.map { |k, v| yield k, deep_map_hash(v, &block) }]
-    else
-      yield nil, val
-    end
-  end
-end