six-updater-web 0.13.3 → 0.13.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.13.3'
+  s.version = '0.13.4'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/app/controllers/main_controller.rb

@@ -180,35 +180,18 @@ class MainController < ApplicationController
         preset = Sixconfig.new
         preset.name = "Dynamic"
         preset.mods += Mod.find(:all)
-      elsif preset
-      else
-        @msg << "No preset selected!"
-        act
-        return
-      end
-      @msg << "Using preset: #{preset.name}" if preset
-      unless params["all"]
-        if server
-          @msg << "Override server: #{server.name}"
-        else
-          if preset
-            if preset.server
-              server = preset.server
-              @msg << "Preset server: #{server.name}"
-            end
-          end
-        end
       end
+    end
+
+    if preset
+      @msg << "Using preset: #{preset.name}"
     else
-      # TODO: Automatically handle all this stuff better :)
-      if preset
-        @msg << "Using preset: #{preset.name}"
-      else
-        @msg << "No preset selected!"
-        act
-        return
-      end
+      @msg << "No preset selected!"
+      act
+      return
+    end
 
+    unless params["all"]
       if server
         @msg << "Override server: #{server.name}"
       else
@@ -217,24 +200,24 @@ class MainController < ApplicationController
           @msg << "Preset server: #{server.name}"
         end
       end
+    end
 
-      unless reset
-        if setting
-          @msg << "Override settings profile: #{setting.name}"
-        else
-          if preset.appsetting
-            setting = preset.appsetting
-            @msg << "Preset settings profile: #{setting.name}"
-          end
+    unless reset
+      if setting
+        @msg << "Override settings profile: #{setting.name}"
+      else
+        if preset.appsetting
+          setting = preset.appsetting
+          @msg << "Preset settings profile: #{setting.name}"
         end
+      end
 
-        if action
-          @msg << "Override action: #{action.name}"
-        else
-          if preset.action
-            action = preset.action
-            @msg << "Preset action: #{action.name}"
-          end
+      if action
+        @msg << "Override action: #{action.name}"
+      else
+        if preset.action
+          action = preset.action
+          @msg << "Preset action: #{action.name}"
         end
       end
     end
@@ -302,10 +285,10 @@ class MainController < ApplicationController
         Mod.read_modfolders(setting)
     end
 
-    @skip.sort! {|a, b| a.name <=> b.name}
-    @check.sort! {|a, b| a.name <=> b.name}
-    @install.sort! {|a, b| a.name <=> b.name}
-    @disabled.sort! {|a, b| a.name <=> b.name}
+    @skip.sort! { |a, b| a.name <=> b.name }
+    @check.sort! { |a, b| a.name <=> b.name }
+    @install.sort! { |a, b| a.name <=> b.name }
+    @disabled.sort! { |a, b| a.name <=> b.name }
     act
   end
 
@@ -382,7 +365,7 @@ class MainController < ApplicationController
     @cloghash = Hash.new
     Mod.find(:all).each do |mod|
       clog = File.join(path, mod.real_name, "changelog.txt")
-      @cloghash[mod.real_name] = File.open(clog) {|f| f.readlines } if File.exists?(clog)
+      @cloghash[mod.real_name] = File.open(clog) { |f| f.readlines } if File.exists?(clog)
     end
   end
 

data/lib/app/models/mod.rb

@@ -37,7 +37,7 @@ class Mod < ActiveRecord::Base
     return unless path && self.real_name
     cfg = File.join(path, self.real_name, '.rsync', '.repository.yml')
     if File.exists?(cfg)
-      conf = YAML::load(File.open(cfg))
+      conf = YAML::load_file(cfg)
       if conf
         conf[:version]
       else

data/lib/app/models/system_setting.rb

@@ -17,14 +17,16 @@ class SystemSetting < ActiveRecord::Base
   def update_gamespy
     self.gamespied_at = Time.now
     self.save
-    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" # + cl
+    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']}" # + cl
+    cl += " BASE_PATH=\'#{ENV['BASE_PATH']}\'" if ENV['BASE_PATH']
     SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
   end
 
   def update_gamespy_nogeo
     self.gamespied_at = Time.now
     self.save
-    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1 BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" # + cl
+    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1" # + cl
+    cl += " BASE_PATH=\'#{ENV['BASE_PATH']}\'" if ENV['BASE_PATH']
     SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
   end
 

data/lib/common.rb

@@ -7,9 +7,9 @@ module SixUpdaterWeb
 	  ENV['BASE_PATH'] ? ENV['BASE_PATH'] : Dir.pwd
   end
 
-  unless ENV['BASE_PATH']
-    ENV['BASE_PATH'] = OLDLOCATION
-  end
+#  unless ENV['BASE_PATH']
+#    ENV['BASE_PATH'] = OLDLOCATION
+#  end
 
   SPECIAL = true
   SIX_ADMIN = true

data/lib/config/six-updater-web.rb

@@ -19,7 +19,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -30,7 +30,7 @@ module SixUpdaterWeb
   LOCAL_URL = "http://#{SIX_HOST == "0.0.0.0" ? DEFAULT_IP : SIX_HOST}:#{SIX_PORT}"
 
   bpath = if ENV['BASE_PATH']
-    OLDLOCATION = "#{ENV['BASE_PATH']}" unless defined?(OLDLOCATION)
+    OLDLOCATION = "#{ENV['BASE_PATH']}" unless defined?(OLDLOCATION) 
     "#{ENV['BASE_PATH']}"
   elsif defined?(OLDLOCATION)
     OLDLOCATION

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 13
-  - 3
-  version: 0.13.3
+  - 4
+  version: 0.13.4
 platform: ruby
 authors: 
 - Sickboy