six-updater-web 0.24.10 → 0.24.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ require 'rake/testtask'
7
7
 
8
8
  spec = Gem::Specification.new do |s|
9
9
  s.name = 'six-updater-web'
10
- s.version = '0.24.10'
10
+ s.version = '0.24.11'
11
11
  s.has_rdoc = false
12
12
  #s.extra_rdoc_files = ['README', 'LICENSE']
13
13
  s.summary = 'Your summary here'
@@ -129,7 +129,7 @@ class Mod < ActiveRecord::Base
129
129
  end
130
130
 
131
131
  def my_path(setting)
132
- return nil unless setting.real_modpath && self.real_name
132
+ return nil if setting.real_modpath.nil? || self.real_name.nil?
133
133
  File.join(self.real_path(setting), self.real_name).gsub("\\", "/")
134
134
  end
135
135
 
@@ -172,8 +172,8 @@ class Mod < ActiveRecord::Base
172
172
  self.update_skip
173
173
  end
174
174
 
175
- def real_path(appsetting)
176
- self.path ? self.path : appsetting.real_modpath
175
+ def real_path(setting)
176
+ self.path.nil? || self.path.empty? ? setting.real_modpath : self.path
177
177
  end
178
178
 
179
179
  def all_repositories
@@ -108,7 +108,7 @@ class Sixconfig < ActiveRecord::Base
108
108
  if force
109
109
  mod.skip = false
110
110
  else
111
- mod.update_version(setting.real_modpath)
111
+ mod.update_version(setting)
112
112
  mod.update_skip
113
113
  end
114
114
  mod.save
@@ -166,7 +166,7 @@ class Sixconfig < ActiveRecord::Base
166
166
 
167
167
  def imp(setting = Appsetting.new)
168
168
  Mod.find(:all).each do |mod|
169
- mod.update_version(setting.real_path)
169
+ mod.update_version(setting)
170
170
  mod.save if mod.changed?
171
171
  next unless mod.installed?
172
172
  self.mods << mod unless self.mods.include?(mod)
@@ -24,7 +24,7 @@ end
24
24
  require 'open3'
25
25
 
26
26
  module SixUpdaterWeb
27
- VERSION = "0.24.10"
27
+ VERSION = "0.24.11"
28
28
  COMPONENT = "six-updater-web"
29
29
 
30
30
  DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 24
8
- - 10
9
- version: 0.24.10
8
+ - 11
9
+ version: 0.24.11
10
10
  platform: ruby
11
11
  authors:
12
12
  - Sickboy