six-updater 0.11.6 → 0.12.1

data/Rakefile

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

data/lib/six/updater-app.rb

@@ -17,13 +17,13 @@ module Six
         found = false
         out.split("\n").each do |line|
           line[/\Aruby\.exe[\t| ]*([0-9]*)/]
-            p = $1
-            if p
-              if p.size > 0
-                pid = pid.to_i
-                found = true if pid == p.to_i
-              end
+          p = $1
+          if p
+            if p.size > 0
+              pid = pid.to_i
+              found = true if pid == p.to_i
             end
+          end
           #end
         end
         if found
@@ -42,25 +42,28 @@ module Six
       mods = []
       puts
       log.info "Processing:"
-      @config[:folders].each do |config|
-        # TODO: Only display message when there are actually todo's
-        puts
-        log.info "= #{config[:folder]}"
-        mod = Mod.new(config, @config)
-        mods << mod
-        @todo.each { |t| mod.send t }
-        #mod.install
+      @config[:folders].each_with_index do |config, index|
+        unless config[:skip] || config[:disabled]
+          # TODO: Only display message when there are actually todo's
+          puts
+          log.info "= #{config[:folder]}"
+          mod = Mod.new(config, @config)
+          mods[index] = mod
+          @todo.each { |t| mod.send t }
+        end
       end
 
       puts
       log.info "Postprocessing:"
-      @config[:folders].each_with_index do |config,index|
-        mod = mods[index]
-        if mod.changed || @config[:force]
-          # TODO: Only display message when there are actually todo's
-          puts
-          log.info "= #{config[:folder]}"
-          @second_todo.each { |t| mod.send t }
+      @config[:folders].each_with_index do |config, index|
+        unless config[:skip] || config[:disabled]
+          mod = mods[index]
+          if mod.changed || @config[:force]
+            # TODO: Only display message when there are actually todo's
+            puts
+            log.info "= #{config[:folder]}"
+            @second_todo.each { |t| mod.send t }
+          end
         end
       end
 

data/lib/six/updater.rb

@@ -1,4 +1,4 @@
- # encoding: UTF-8
+# encoding: UTF-8
 
 require 'yaml'
 require 'fileutils'
@@ -44,7 +44,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.11.6'
+    VERSION = '0.12.1'
     COMPONENT = 'six-updater'
 
     # Configuration
@@ -141,6 +141,168 @@ module Six
     end
 
     module_function
+    def initialize
+      # Banner
+      log.info "Updater (v#{VERSION}) by Sickboy <sb_at_dev-heaven.net>"
+      log.info 'Run with --help for help'
+      log.warn "WARNING: Please make sure anything ArmA related has been closed / shutdown, incl explorer windows, etc"
+      log.debug "BASE_PATH: #{BASE_PATH}"
+      log.debug "TOOL_PATH: #{TOOL_PATH}"
+      log.debug "@config #{@config}"
+
+      # Process the config file
+      config = "#{COMPONENT}.yml"
+      config = File.join(BASE_PATH, config)
+      if ARGV[0]
+        # FIXME: This is not a very good catch..
+        if ARGV[0][/.*\..*/]
+          if FileTest.exist?(ARGV[0])
+            config = ARGV[0]
+          else
+            log.warn "#{ARGV[0]} not found, trying #{config}"
+          end
+        end
+      end
+
+      unless FileTest.exist?(config)
+        log.error "ERROR: #{config} config missing!"
+        wait
+        exit
+      end
+
+      File.open(config) { |file| @config.merge!(YAML::load(file)) }
+      @config[:folders] = [] unless @config[:folders]
+      @config[:server][:folders] = [] unless @config[:server][:folders]
+
+      # Parses CLI Parameters, merges configuration and gets todo list
+      parse_options
+
+      # Backwards compatibility
+      @config[:app_path] = @config[:armapath] if @config[:armapath]
+      @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]
+        begin
+          @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
+          log.info "ArmA 2 Steam Distribution detected"
+        rescue
+          begin
+            @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
+            log.info "ArmA 2 Alt Distribution detected"
+          rescue
+            begin
+              @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
+              log.info "ArmA 2 Standard Distribution detected"
+            rescue
+              log.warn "No (known) ArmA 2 Distribution detected"
+            end
+          end
+        end
+      end
+
+      # Verify installation folder
+      if @config[:app_path]
+        log.info "Installation Path: #{@config[:app_path]}"
+        if FileTest.exists?(@config[:app_path])
+          @config[:app_path].gsub!('\\', '/')
+        else
+          log.error "No valid installation folder found, please abort!"
+          wait
+          exit
+        end
+      else
+        log.error "No valid installation folder found, please abort!"
+        wait
+        exit
+      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}"
+
+      # PreProcess the config data
+      @mods = []
+      @mods << @config[:mods] if @config[:mods]
+
+      @config[:folders].each do |folder|
+        unless folder[:disabled]
+          folder[:folder].gsub!('\\', '/')
+          if folder[:mods]
+            @mods << folder[:mods]
+          else
+            @mods << folder[:folder]
+          end
+        end
+      end
+      @mods = @mods.join(';')
+
+      # Output processed config data
+      log.info "Manager for: #{@mods}"
+
+
+      # Prepare stats
+      @stats = []
+      @config[:folders].each do |folder|
+        stat = Hash.new
+        @stats << stat
+        path = File.join(@config[:app_path], folder[:folder])
+        stat[:changelog] = []
+      end
+    end
+
     def log
       @@log
     end
@@ -308,166 +470,6 @@ module Six
         require 'git'
       end
     end
-
-    def initialize
-      # Banner
-      log.info "Updater (v#{VERSION}) by Sickboy <sb_at_dev-heaven.net>"
-      log.info 'Run with --help for help'
-      log.warn "WARNING: Please make sure anything ArmA related has been closed / shutdown, incl explorer windows, etc"
-      log.debug "BASE_PATH: #{BASE_PATH}"
-      log.debug "TOOL_PATH: #{TOOL_PATH}"
-      log.debug "@config #{@config}"
-
-      # Process the config file
-      config = "#{COMPONENT}.yml"
-      config = File.join(BASE_PATH, config)
-      if ARGV[0]
-        # FIXME: This is not a very good catch..
-        if ARGV[0][/.*\..*/]
-          if FileTest.exist?(ARGV[0])
-            config = ARGV[0]
-          else
-            log.warn "#{ARGV[0]} not found, trying #{config}"
-          end
-        end
-      end
-
-      unless FileTest.exist?(config)
-        log.error "ERROR: #{config} config missing!"
-        wait
-        exit
-      end
-
-      File.open(config) { |file| @config.merge!(YAML::load(file)) }
-      @config[:folders] = [] unless @config[:folders]
-      @config[:server][:folders] = [] unless @config[:server][:folders]
-
-      # Parses CLI Parameters, merges configuration and gets todo list
-      parse_options
-
-      # Backwards compatibility
-      @config[:app_path] = @config[:armapath] if @config[:armapath]
-      @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]
-        begin
-          @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
-          log.info "ArmA 2 Steam Distribution detected"
-        rescue
-          begin
-            @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
-            log.info "ArmA 2 Alt Distribution detected"
-          rescue
-            begin
-              @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
-              log.info "ArmA 2 Standard Distribution detected"
-            rescue
-              log.warn "No (known) ArmA 2 Distribution detected"
-            end
-          end
-        end
-      end
-
-      # Verify installation folder
-      if @config[:app_path]
-        log.info "Installation Path: #{@config[:app_path]}"
-        if FileTest.exists?(@config[:app_path])
-          @config[:app_path].gsub!('\\', '/')
-        else
-          log.error "No valid installation folder found, please abort!"
-          wait
-          exit
-        end
-      else
-        log.error "No valid installation folder found, please abort!"
-        wait
-        exit
-      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}"
-
-      # PreProcess the config data
-      @mods = []
-      @mods << @config[:mods] if @config[:mods]
-
-      @config[:folders].each do |folder|
-        folder[:folder].gsub!('\\', '/')
-        if folder[:mods]
-          @mods << folder[:mods]
-        else
-          @mods << folder[:folder]
-        end
-      end
-      @mods = @mods.join(';')
-
-      # Output processed config data
-      log.info "Manager for: #{@mods}"
-
-
-      # Prepare stats
-      @stats = []
-      @config[:folders].each do |folder|
-        stat = Hash.new
-        @stats << stat
-        path = File.join(@config[:app_path], folder[:folder])
-        stat[:changelog] = []
-      end
-    end
   end
 end
 

metadata

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