six-updater 0.19.6 → 0.20.0

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.platform = "x86-mingw32"
   s.name = 'six-updater'
-  s.version = '0.19.6'
+  s.version = '0.20.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -35,7 +35,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.19.6'
+  s.version = '0.20.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -56,7 +56,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.19.6'
+  s.version = '0.20.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/updater.rb

@@ -31,7 +31,7 @@ case RUBY_VERSION
 when /1\.8\.[0-9]/
   class Array
     def sample
-      self[rand self.size]
+      self[rand(self.size)]
     end
   end
 end
@@ -39,7 +39,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.19.6'
+    VERSION = '0.20.0'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       

data/lib/six/updater/mod.rb

@@ -31,9 +31,6 @@ module Six
         @changed = false
 
         @installed = if FileTest.exists?(File.join(@path, '.rsync'))
-          # TODO: Temporary, downcase all files and process the configs
-          Six::Cleanup.process(@path)
-
           @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
           true
         else
@@ -110,6 +107,27 @@ module Six
         @repository.repository.reset(nil, {:hard => true})
       end
 
+      # Convert process
+      def convert
+        if @installed
+          log.warn "Already a six-updater repository, not converting."
+        else
+          unless File.directory?(@path)
+            log.warn "Modfolder doesn't exist"
+            return
+          end
+          opts = {}
+          opts.merge!({:log => log}) if @config[:verbose]
+          @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
+          begin
+            @repository.convert(opts)
+          rescue => e
+            log.warn 'WARNING: Error during conversion..'
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"            
+          end
+        end
+      end
+
       # UPDATE Process
       def update
         if self.skip?
@@ -128,10 +146,10 @@ module Six
 
         @stat[:previous] = @repository.version
         log.info "Current Version: #{@stat[:previous]}, checking for updates..."
-        done = @repository.update
-        @stat[:current] = @repository.version
+        done = begin; @repository.update; rescue => e; log.debug "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"; nil; end
 
         begin
+          @stat[:current] = @repository.version
           @repository.status(true)
         rescue => e
           log.warn 'WARNING: Update seems to have completed but there was a status error..'
@@ -165,6 +183,7 @@ module Six
         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
+          true
           # TODO: Add display of stats for changed files etc
         end
       end

data/lib/six/updater/options.rb

@@ -30,6 +30,10 @@ module Six
           todo << :update if bool
         end
 
+        opts.on("-n", "--convert", "Convert each mod available on the updater network to updater") do |bool|
+          todo << :convert if bool
+        end
+
         opts.on("-r", "--reset", "Resets the modfolders to latest commit status. All modifications lost") do |bool|
           todo << :reset if bool
         end

data/lib/six/updater/rsyncrepo.rb

@@ -20,6 +20,10 @@ module Six
         cfg ? cfg[:version] : nil 
       end
 
+      def convert(opts = {})
+        @repository = Six::Repositories::Rsync.convert(@path, :log => log) 
+      end
+
       def open(opts = {})
         repository(opts)
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 19
-  - 6
-  version: 0.19.6
+  - 20
+  - 0
+  version: 0.20.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +02:00
+date: 2010-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency