six-updater 0.12.7 → 0.13.1

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.12.7'
+  s.version = '0.13.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = 'Sickboy'
   s.email = 'sb@dev-heaven.net'
   s.add_dependency('log4r', '>= 1.1.0')
-  s.add_dependency('six-rsync', '>= 0.1.0')
+  s.add_dependency('six-rsync', '>= 0.3.0')
   s.add_dependency('win32-process', '>= 0.6.0')
   s.add_dependency('win32-shortcut', '>= 0.2.3')
   # s.executables = ['your_executable_here']

data/lib/six/updater-app.rb

@@ -4,7 +4,7 @@ require 'six/updater'
 # TODO: Should exec outside the module
 module Six
   module Updater
-    PID_FILE = File.join(BASE_PATH, "#{COMPONENT}.pid")
+    PID_FILE = File.join(DATA_PATH, "#{COMPONENT}.pid")
     if not defined?(Ocra)
       #Signal.trap("EXIT") { exit_app }
       #Signal.trap("INT") { exit_app }

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.12.7'
+    VERSION = '0.13.1'
     COMPONENT = 'six-updater'
 
     # Configuration
@@ -80,6 +80,17 @@ module Six
       "\"#{File.join(TOOL_PATH, 'six-downloader.exe')}\""
     end
 
+    DATA_PATH = File.join(ENV['APPDATA'], 'Six-Updater')
+
+    lf = File.join(DATA_PATH, "logs")
+    FileUtils.mkdir_p(lf) unless File.exists?(lf)
+
+    cf = File.join(DATA_PATH, "#{COMPONENT}.yml")
+    unless File.exists?(cf)
+      cfo = File.join(BASE_PATH, "#{COMPONENT}.yml")
+      FileUtils.mv(cfo, cf) if File.exists?(cfo)
+    end
+
     LOG_LIMIT = 9999
     # TODO: Allow downloader yml instead?
     # TODO: Auto update always etc? :D
@@ -99,7 +110,6 @@ module Six
     @config[:depth] = 1
     @config[:folders] = []
     @config[:server] = Hash.new
-    @config[:server_path] = File.join(BASE_PATH, 'servers')
     @config[:verbose] = false
 
     # FIXME: Solve this properly!
@@ -119,7 +129,7 @@ module Six
 
     if not defined?(Ocra)
       # Create Outputters
-      path = File.join(BASE_PATH, 'logs')
+      path = File.join(DATA_PATH, 'logs')
       FileUtils::mkdir_p path
       o_file = Log4r::FileOutputter.new "#{COMPONENT}-file",
         'level' => 0, # All
@@ -152,7 +162,7 @@ module Six
 
       # Process the config file
       config = "#{COMPONENT}.yml"
-      config = File.join(BASE_PATH, config)
+      config = File.join(DATA_PATH, config)
       if ARGV[0]
         # FIXME: This is not a very good catch..
         if ARGV[0][/.*\..*/]
@@ -182,7 +192,6 @@ module Six
       @config[:app_exe] = @config[:armaexe] if @config[:armaexe]
       @config[:app_params] = @config[:armaparams] if @config[:armaparams]
       #@config[:git_path] = @config[:gitpath] if @config[:gitpath]
-      @config[:server_path] = @config[:serverpath] if @config[:serverpath]
 
       # Determine arma distribution and location
       unless @config[:app_path]
@@ -233,56 +242,6 @@ module Six
         @config[:app_modpath] = @config[:app_path]
       end
 
-      # Nasty workaround for cygwin on Vista vs XP, vs acl's
-=begin
-        @config[:app_path][/\A(\w\:)/]
-        str = "#{$1}/ /six-app-root ntfs noacl 0 0"
-        etc = File.join(TOOL_PATH, 'etc')
-        FileUtils.mkdir_p etc
-        File.open(File.join(etc, 'fstab'), 'w') { |file| file.puts str }
-        ENV['six-app-root'] = '/six-app-root'
-=end
-      puts
-      if @config[:server][:repository]
-        log.info "Checking for latest updates of #{@config[:server][:name]} server info"
-        path = File.join(@config[:server_path], @config[:server][:name])
-
-        opts = {}
-        opts.merge!({:log => log}) if @config[:verbose]
-
-        case @config[:server][:repository][0]
-        #when /\Agit:\/\//
-        #  repo = GitRepo.new(@config[:server][:repository], path)
-        when /\Arsync:\/\//
-          repo = RsyncRepo.new(@config[:server][:repository], path)
-        end
-
-        if FileTest.exist?(File.join(path, '.git')) || FileTest.exist?(File.join(path, '.rsync'))
-          repo.reset(:hard => true)
-          repo.update
-        else
-          #FileUtils::mkdir_p path
-          repo.clone
-        end
-
-        begin
-          srv = File.join(path, 'server.yml')
-          File.open(srv) do |f|
-            cfg = YAML::load(f)
-            @config[:folders].each do |f|
-              cfg[:folders].each do |f2|
-                @config[:folders] -= [f] if f2[:folder] == f[:folder]
-              end
-            end
-            @config[:folders] = cfg[:folders] + @config[:folders]
-            @config[:server] = cfg.merge @config[:server]
-          end
-        rescue
-          log.warn "WARNING: Server configured but unable to get data from repository"
-          log.debug "#{$!}"
-        end
-      end
-
       @config[:folders].uniq!
       log.debug "@config #{@config}"
 
@@ -410,23 +369,7 @@ module Six
     end
 
     def uninstall
-      if @config[:server]
-        if @config[:server][:name]
-          log.info "#{@config[:server][:name]} server"
-          path = File.join(@config[:server_path], @config[:server][:name])
-          if FileTest.exist?(path)
-            log.warn "###########"
-            log.warn "# WARNING #"
-            log.warn "###########"
-            log.warn "You are about to uninstall the specified repository"
-            sure?
-            log.warn 'Uninstalling...'
-            FileUtils.rm_rf path
-            #FileUtils.rm_f @modconfig[:changelog] if FileTest.exists?(@modconfig[:changelog])
-            #FileUtils.rm_f @modconfig[:versionfile] if FileTest.exists?(@modconfig[:versionfile])
-          end
-        end
-      end
+      log.warn "Uninstall feature temporary disabled. Please delete the modfolder manually for uninstall"
 =begin
         @config[:folders].each do |config|
           log.info "= #{config[:folder]}"

data/lib/six/updater/mod.rb

@@ -21,11 +21,6 @@ module Six
         else
           @modconfig[:versionfile] = File.join(@config[:app_modpath], @modconfig[:folder], '.version.txt')
         end
-        if @modconfig[:changelog]
-          @modconfig[:changelog] = File.join(@config[:app_modpath], @modconfig[:folder], @modconfig[:changelog])
-        else
-          @modconfig[:changelog] = File.join(BASE_PATH, 'changelogs', "Changelog_#{@folder_str}.txt")
-        end
 
         unless @modconfig[:depth]
           @modconfig[:depth] = @config[:depth]
@@ -86,37 +81,6 @@ module Six
         end
       end
 
-      # Process Comment Changelog
-      def write_changelog
-        str = "#{@stat[:current]}"
-        str += " - #{@stat[:previous]}" if @stat[:previous]
-        log.info str
-
-        history = @repository.repository.log(LOG_LIMIT)
-        @stat[:changelog] = []
-        if @stat[:previous]
-          history.between(@stat[:previous], @stat[:current]).each do |c|
-            c.message.split("\n").each { |msg| @stat[:changelog] << msg }
-          end
-        else
-          history.each do |c|
-            c.message.split("\n").each { |msg| @stat[:changelog] << msg }
-          end
-          # DONT SORT, otherwise all messed up stuff :)
-          #@stat[:changelog].sort!
-        end
-
-        # TODO: Clean empty lines etc
-        content = "== #{str}\n"
-        content += @stat[:changelog].join("\n")
-        content += "\n\n"
-        File.open(@modconfig[:changelog], 'r') { |file| content += file.read } if FileTest.exists?(@modconfig[:changelog])
-        @modconfig[:changelog][/(.*)\/(.*)/]
-        folder = $1
-        FileUtils.mkdir_p folder unless FileTest.exists? folder
-        File.open(@modconfig[:changelog], 'w') { |file| file.write content }
-      end
-
       def changelog
         if @modconfig[:disabled]
           log.info "Mod is tagged 'disabled' in the configuration file. Skipping..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  version: 0.12.7
+  version: 0.13.1
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +01:00
+date: 2009-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: win32-process