dev 2.0.232 → 2.0.233
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/base/project.rb +2 -2
- data/lib/base/projects.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8462481dd723a298f0ccd788324a2e157354c115
|
4
|
+
data.tar.gz: 3ea02f48f3a9620059c44f32cb2835c3c548f286
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 070c27ce8366377c232bf9b3c9c34b9ccd8eacc49e2e2c66c836978d6f7c9a0e2d313e7cdd2061c699f37ba2d5c4960114c99925a7377f01c496f74de697f27a
|
7
|
+
data.tar.gz: 5f99908d3bfe01aad586da18e84c1844973d92ae542be7afc16fe76358b5f6fee0dfb6bc7ef5915cae7a9f21167a75531efc8a4321cba943d6a82bd2ed6bc216
|
data/lib/base/project.rb
CHANGED
@@ -17,7 +17,7 @@ class Project < Hash
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def self.get_fullname directory
|
20
|
-
|
20
|
+
directory.gsub(Environment.dev_root,'').gsub('/trunk','') .gsub('/wrk','')
|
21
21
|
end
|
22
22
|
|
23
23
|
def self.get_fullname_from_url url
|
@@ -178,7 +178,7 @@ class Project < Hash
|
|
178
178
|
clone
|
179
179
|
checkout
|
180
180
|
if(File.exists?(wrk_dir))
|
181
|
-
if(last_work_mtime.nil? ||
|
181
|
+
if(last_work_mtime.nil? || last_work_mtime < Environment.get_latest_mtime(wrk_dir))
|
182
182
|
Dir.chdir(wrk_dir) do
|
183
183
|
rake_default=Command.new('rake default')
|
184
184
|
rake_default[:quiet]=true
|
data/lib/base/projects.rb
CHANGED
@@ -107,8 +107,8 @@ class Projects < Hash
|
|
107
107
|
url = Project.get_url rakedir
|
108
108
|
#puts "checking #{url}"
|
109
109
|
project = Project.new(Project.get_url(rakedir))
|
110
|
-
project[:fullname]=Project.get_fullname
|
111
|
-
if(pattern.length==0 || project.fullname.include?(pattern) && !self.has_key?(project.fullname))
|
110
|
+
project[:fullname]=Project.get_fullname rakedir if(project.fullname.include?(':'))
|
111
|
+
if(pattern.length==0 || project.fullname.include?(pattern) && project.fullname.length > 0 && !self.has_key?(project.fullname))
|
112
112
|
puts "importing #{project.fullname}"
|
113
113
|
self[project.fullname]=project
|
114
114
|
end
|