six-updater 0.15.8 → 0.16.1

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.15.8'
+  s.version = '0.16.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/updater.rb

@@ -45,7 +45,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.15.8'
+    VERSION = '0.16.1'
     COMPONENT = 'six-updater'
 
     # Configuration
@@ -262,6 +262,11 @@ module Six
       end
 
       @config[:folders].uniq!
+      @config[:folders].sort! do |a, b|
+        a_prio = a[:priority] ? a[:priority] : 9999
+        b_prio = b[:priority] ? b[:priority] : 9999
+        a_prio <=> b_prio
+      end
       log.debug "@config #{@config}"
 
       # PreProcess the config data

data/lib/six/updater/mod.rb

@@ -9,7 +9,7 @@ module Six
         @stat = Hash.new
         @stat[:changelog] = []
         @stat[:current], @stat[:previous] = "A", "B"
-        @path = File.join(@config[:app_modpath], @modconfig[:folder])
+        @path = File.join(self.apppath, @modconfig[:folder])
         get_repositories
 
         @modconfig[:folder].gsub!('\\', '/')
@@ -36,10 +36,19 @@ module Six
         end
       end
 
+      # TODO: Custom paths need more consideration, especially re the -mod= line
+      def apppath
+        @modconfig[:path] ? @modconfig[:path] : @config[:app_modpath]   
+      end
+
       def esc(val)
         "\"#{val}\""
       end
 
+      def priority
+        @modconfig[:priority] ? @modconfig[:priority] : 9999 
+      end
+
       def get_repositories
         cfg = File.join(@path, '.repositories.yml')
         @repositories = if FileTest.exist?(cfg)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 15
-  - 8
-  version: 0.15.8
+  - 16
+  - 1
+  version: 0.16.1
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +02:00
+date: 2010-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency