six-updater 0.10.10 → 0.10.11

data/Rakefile

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

data/lib/six/updater.rb

@@ -44,7 +44,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.10.10'
+    VERSION = '0.10.11'
     COMPONENT = 'six-updater'
 
     # Configuration

data/lib/six/updater/mod.rb

@@ -229,6 +229,14 @@ module Six
           end
         end
 
+        # TODO: Detect missing / out of date config files, and notify user
+        begin
+          userconfig(false)
+        rescue
+          log.warn 'WARNING: Userconfig processing is unable to complete.'
+          log.debug "#{$!}"
+        end
+
         unless done
           log.warn 'WARNING: Update was unable to complete. This could be due to a server / connection problem, or due to files in use or out of synch repositories. Please make sure ArmA is closed, retry, otherwise reset and retry'
           log_status
@@ -336,7 +344,7 @@ module Six
 
       # Process userconfigs
       # TODO: Add this processing to update, aka; IF userconfig has changed THEN update it
-      def userconfig
+      def userconfig(force = true)
         unless @installed
           not_a_repository
           return
@@ -346,9 +354,13 @@ module Six
         f = @modconfig[:folder].clone
         f.gsub!('@', '')
         path = File.join(@path, 'userconfig')
-        uconfig = File.join(@config[:app_path], 'userconfig')
-        uconfigpath = File.join(uconfig, f)
         if FileTest.exist?(path)
+          uconfig = File.join(@config[:app_path], 'userconfig')
+          uconfigpath = File.join(uconfig, f)
+          if !force && FileTest.exist?(uconfigpath)
+            log.debug "Userconfig folder already found, skipping"
+            return
+          end
           log.info "Found userconfig, processing..."
           FileUtils::mv(uconfigpath, "#{uconfigpath}_#{time}") if FileTest.exist?(uconfigpath)
           FileUtils::mkdir_p uconfig unless FileTest.exist?(uconfig)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +01:00
+date: 2009-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency