six-updater 0.14.16 → 0.15.1

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.14.16'
+  s.version = '0.15.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.14.16'
+    VERSION = '0.15.1'
     COMPONENT = 'six-updater'
 
     # Configuration

data/lib/six/updater/mod.rb

@@ -36,6 +36,10 @@ module Six
         end
       end
 
+      def esc(val)
+        "\"#{val}\""
+      end
+
       def get_repositories
         cfg = File.join(@path, '.repositories.yml')
         @repositories = if FileTest.exist?(cfg)
@@ -216,7 +220,7 @@ module Six
               log.info "Found #{@folder_str}.7z, using it"
               #Six::Updater.zipcheck
               FileUtils.mkdir_p @path
-              cmd = "7z x -o\"#{@path}\" \"#{file}\""
+              cmd = "7z x -o#{esc(@path)} #{esc(file)}"
               log.debug cmd
               output = %x[#{cmd}]
               log.debug output
@@ -307,22 +311,31 @@ module Six
           return
         end
 
-        path = File.join(@path, 'keys')
+        path = File.join(@path, 'store', 'keys.tar')
+        path = File.join(@path, 'store', 'keys') unless File.exists?(path)
+        path = File.join(@path, 'keys') unless File.directory?(path)         
         if File.exists?(path)
           log.info "Found keys, processing..."
           k_path = File.join(@config[:app_path], 'keys')
-          Dir[File.join(path, '*.bikey')].each do |key|
-            key[/(.*)\/(.*)/]
-            path, file = $1, $2
-            file[/(.*)_(.*)\.bikey/]
-            prefix, suffix = $1, $2
-            if suffix && prefix
-              if suffix[/(\D*)\d*/]
-                suf = $1
-                Dir[File.join(k_path, "#{prefix}_#{suf}*.bikey")].each { |delkey| FileUtils.rm_f(delkey) } if suf
+          if File.directory? path
+            Dir[File.join(path, '*.bikey')].each do |key|
+              key[/(.*)\/(.*)/]
+              path, file = $1, $2
+              file[/(.*)_(.*)\.bikey/]
+              prefix, suffix = $1, $2
+              if suffix && prefix
+                if suffix[/(\D*)\d*/]
+                  suf = $1
+                  Dir[File.join(k_path, "#{prefix}_#{suf}*.bikey")].each { |delkey| FileUtils.rm_f(delkey) } if suf
+                end
               end
+              FileUtils.cp(key, k_path)
             end
-            FileUtils.cp(key, k_path)
+          else
+            # TODO: Cleanup old keys, Ruby Tar library, examine content? - tarruby doesn't build on 1.9.1. mingw
+            cmd = "7z x #{esc(path)} -o #{esc(@config[:app_path])}"
+            cmd.gsub!("/", "\\")
+            system cmd
           end
         end
       end
@@ -342,8 +355,9 @@ module Six
         time = Time.now.to_i
         f = @modconfig[:folder].clone
         f.gsub!('@', '')
-        path = File.join(@path, 'store', 'userconfig')
-        path = File.join(@path, 'userconfig') unless File.exists?(path)         
+        path = File.join(@path, 'store', 'userconfig.tar')
+        path = File.join(@path, 'store', 'userconfig') unless File.exists?(path)
+        path = File.join(@path, 'userconfig') unless File.directory?(path)         
         if File.exists?(path)
           uconfig = File.join(@config[:app_path], 'userconfig')
           uconfigpath = File.join(uconfig, f)
@@ -352,9 +366,15 @@ module Six
             return
           end
           log.info "Found userconfig, processing..."
-          FileUtils::mv(uconfigpath, "#{uconfigpath}_#{time}") if FileTest.exist?(uconfigpath)
-          FileUtils::mkdir_p uconfig unless FileTest.exist?(uconfig)
-          FileUtils::cp_r(path, uconfigpath)
+          FileUtils::mv(uconfigpath, "#{uconfigpath}_#{time}") if File.exists?(uconfigpath)
+          if File.directory? path
+            FileUtils::mkdir_p uconfig unless File.exists?(uconfig)
+            FileUtils::cp_r(path, uconfigpath)
+          else
+            cmd = "7z x #{esc(path)} -o #{esc(@config[:app_path])}"
+            cmd.gsub!("/", "\\")
+            system cmd
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  version: 0.14.16
+  version: 0.15.1
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +01:00
+date: 2010-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency