six-updater 0.11.4 → 0.11.5

data/Rakefile

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

data/lib/six/updater/mod.rb

@@ -255,7 +255,7 @@ module Six
           if FileTest.exist?(@path)
             log.warn "WARNING: Folder already exists but seems incompatible. Not installing."
           else
-            log.info "Installing (depth: #{@modconfig[:depth]})... This might take a while, please wait."
+            log.info "Installing... This might take a while, please wait."
             folder = ''
             if @modconfig[:folder][/(.*)\/(.*)/]
               basepath, subfolder = $1, $2
@@ -274,17 +274,26 @@ module Six
               log.debug cmd
               output = %x[#{cmd}]
               log.debug output
-              begin
-                @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
-                #@repository.reset(nil, {:hard => true})
-                @installed = true
-                get_repositories
-                update
-              rescue
-                log.warn "WARNING: Failed to open the repository, not installed!"
+
+              if File.exists?(File.join(@path, ".rsync", "config.yml"))
+                begin
+                  @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
+                  @installed = true
+                  get_repositories
+                  update
+                rescue
+                  @installed = false
+                  FileUtils::rm_rf(@path) if FileTest.exist?(@path)
+                end
+              else
+                log.warn "WARNING: Failed to open the repository, the #{@folder_str}.7z does not seem to be correct"
+                log.warn "Installing from rsync network instead"
                 log.debug "#{$!}"
+                FileUtils::rm_rf(@path) if FileTest.exist?(@path)
               end
-            else
+            end
+
+            unless @installed
               @repository = if @repositories[0][/\Arsync:\/\//]
                 RsyncRepo.new(@repositories, @path, @modconfig[:depth])
               else

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.11.4'
+    VERSION = '0.11.5'
     COMPONENT = 'six-updater'
 
     # Configuration

metadata

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