distil 0.12.4 → 0.12.6
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/VERSION +1 -1
- data/assets/distil.js +20 -0
- data/distil.gemspec +2 -2
- data/distil.tmproj +55 -39
- data/lib/distil/project/distil-project.rb +1 -1
- data/lib/distil/project.rb +5 -16
- data/lib/distil/task/validate-js-task.rb +6 -0
- metadata +4 -4
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.12.
|
1
|
+
0.12.6
|
data/assets/distil.js
CHANGED
@@ -284,7 +284,27 @@
|
|
284
284
|
|
285
285
|
if (!distil.mainModule)
|
286
286
|
distil.mainModule= def;
|
287
|
+
else
|
288
|
+
{
|
289
|
+
// @HACK: This makes resources work in secondary bundles
|
290
|
+
var key;
|
291
|
+
var value;
|
292
|
+
var main= distil.mainModule;
|
287
293
|
|
294
|
+
for (key in def.assets||{})
|
295
|
+
{
|
296
|
+
if (key in main.assets)
|
297
|
+
continue;
|
298
|
+
main.assets[key]= def.assets[key];
|
299
|
+
}
|
300
|
+
for (key in def.asset_map||{})
|
301
|
+
{
|
302
|
+
if (key in main.asset_map)
|
303
|
+
continue;
|
304
|
+
main.asset_map[key]= def.asset_map[key];
|
305
|
+
}
|
306
|
+
}
|
307
|
+
|
288
308
|
moduleIndex[name]= def;
|
289
309
|
if (def.required && def.required.length)
|
290
310
|
distil.require(name);
|
data/distil.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{distil}
|
8
|
-
s.version = "0.12.
|
8
|
+
s.version = "0.12.6"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Jeff Watkins"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-08-14}
|
13
13
|
s.default_executable = %q{distil}
|
14
14
|
s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
|
15
15
|
s.executables = ["distil"]
|
data/distil.tmproj
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
<plist version="1.0">
|
4
4
|
<dict>
|
5
5
|
<key>currentDocument</key>
|
6
|
-
<string>
|
6
|
+
<string>assets/distil.js</string>
|
7
7
|
<key>documents</key>
|
8
8
|
<array>
|
9
9
|
<dict>
|
@@ -26,72 +26,74 @@
|
|
26
26
|
<key>caret</key>
|
27
27
|
<dict>
|
28
28
|
<key>column</key>
|
29
|
-
<integer>
|
29
|
+
<integer>35</integer>
|
30
30
|
<key>line</key>
|
31
|
-
<integer>
|
31
|
+
<integer>13</integer>
|
32
32
|
</dict>
|
33
|
+
<key>columnSelection</key>
|
34
|
+
<false/>
|
33
35
|
<key>firstVisibleColumn</key>
|
34
36
|
<integer>0</integer>
|
35
37
|
<key>firstVisibleLine</key>
|
36
38
|
<integer>0</integer>
|
37
|
-
|
38
|
-
<key>lib/distil/product/concatenated.rb</key>
|
39
|
-
<dict>
|
40
|
-
<key>caret</key>
|
39
|
+
<key>selectFrom</key>
|
41
40
|
<dict>
|
42
41
|
<key>column</key>
|
43
|
-
<integer>
|
42
|
+
<integer>4</integer>
|
44
43
|
<key>line</key>
|
45
|
-
<integer>
|
44
|
+
<integer>13</integer>
|
45
|
+
</dict>
|
46
|
+
<key>selectTo</key>
|
47
|
+
<dict>
|
48
|
+
<key>column</key>
|
49
|
+
<integer>35</integer>
|
50
|
+
<key>line</key>
|
51
|
+
<integer>13</integer>
|
46
52
|
</dict>
|
47
|
-
<key>firstVisibleColumn</key>
|
48
|
-
<integer>0</integer>
|
49
|
-
<key>firstVisibleLine</key>
|
50
|
-
<integer>2</integer>
|
51
53
|
</dict>
|
52
|
-
<key>
|
54
|
+
<key>assets/distil.js</key>
|
53
55
|
<dict>
|
54
56
|
<key>caret</key>
|
55
57
|
<dict>
|
56
58
|
<key>column</key>
|
57
|
-
<integer>
|
59
|
+
<integer>4</integer>
|
58
60
|
<key>line</key>
|
59
|
-
<integer>
|
61
|
+
<integer>306</integer>
|
60
62
|
</dict>
|
61
63
|
<key>firstVisibleColumn</key>
|
62
64
|
<integer>0</integer>
|
63
65
|
<key>firstVisibleLine</key>
|
64
|
-
<integer>
|
66
|
+
<integer>270</integer>
|
65
67
|
</dict>
|
66
|
-
<key>
|
68
|
+
<key>bin/distil</key>
|
67
69
|
<dict>
|
68
70
|
<key>caret</key>
|
69
71
|
<dict>
|
70
72
|
<key>column</key>
|
71
73
|
<integer>0</integer>
|
72
74
|
<key>line</key>
|
73
|
-
<integer>
|
75
|
+
<integer>70</integer>
|
74
76
|
</dict>
|
75
77
|
<key>firstVisibleColumn</key>
|
76
78
|
<integer>0</integer>
|
77
79
|
<key>firstVisibleLine</key>
|
78
80
|
<integer>0</integer>
|
79
81
|
</dict>
|
80
|
-
<key>
|
82
|
+
<key>distil.gemspec</key>
|
81
83
|
<dict>
|
82
84
|
<key>caret</key>
|
83
85
|
<dict>
|
84
86
|
<key>column</key>
|
85
87
|
<integer>0</integer>
|
86
88
|
<key>line</key>
|
87
|
-
<integer>
|
89
|
+
<integer>0</integer>
|
88
90
|
</dict>
|
89
91
|
<key>firstVisibleColumn</key>
|
90
92
|
<integer>0</integer>
|
91
93
|
<key>firstVisibleLine</key>
|
92
94
|
<integer>0</integer>
|
93
95
|
</dict>
|
94
|
-
<key>lib/distil
|
96
|
+
<key>lib/distil.rb</key>
|
95
97
|
<dict>
|
96
98
|
<key>caret</key>
|
97
99
|
<dict>
|
@@ -100,54 +102,68 @@
|
|
100
102
|
<key>line</key>
|
101
103
|
<integer>0</integer>
|
102
104
|
</dict>
|
103
|
-
<key>columnSelection</key>
|
104
|
-
<false/>
|
105
105
|
<key>firstVisibleColumn</key>
|
106
106
|
<integer>0</integer>
|
107
107
|
<key>firstVisibleLine</key>
|
108
108
|
<integer>0</integer>
|
109
|
-
|
109
|
+
</dict>
|
110
|
+
<key>lib/distil/project.rb</key>
|
111
|
+
<dict>
|
112
|
+
<key>caret</key>
|
110
113
|
<dict>
|
111
114
|
<key>column</key>
|
112
115
|
<integer>0</integer>
|
113
116
|
<key>line</key>
|
114
|
-
<integer>
|
117
|
+
<integer>44</integer>
|
115
118
|
</dict>
|
116
|
-
<key>
|
119
|
+
<key>firstVisibleColumn</key>
|
120
|
+
<integer>0</integer>
|
121
|
+
<key>firstVisibleLine</key>
|
122
|
+
<integer>1</integer>
|
123
|
+
</dict>
|
124
|
+
<key>lib/distil/project/distil-project.rb</key>
|
125
|
+
<dict>
|
126
|
+
<key>caret</key>
|
117
127
|
<dict>
|
118
128
|
<key>column</key>
|
119
|
-
<integer>6</integer>
|
120
|
-
<key>line</key>
|
121
129
|
<integer>0</integer>
|
130
|
+
<key>line</key>
|
131
|
+
<integer>145</integer>
|
122
132
|
</dict>
|
133
|
+
<key>firstVisibleColumn</key>
|
134
|
+
<integer>0</integer>
|
135
|
+
<key>firstVisibleLine</key>
|
136
|
+
<integer>0</integer>
|
123
137
|
</dict>
|
124
|
-
<key>lib/distil/
|
138
|
+
<key>lib/distil/project/external-project.rb</key>
|
125
139
|
<dict>
|
126
140
|
<key>caret</key>
|
127
141
|
<dict>
|
128
142
|
<key>column</key>
|
129
|
-
<integer>
|
143
|
+
<integer>0</integer>
|
130
144
|
<key>line</key>
|
131
|
-
<integer>
|
145
|
+
<integer>35</integer>
|
132
146
|
</dict>
|
133
147
|
<key>firstVisibleColumn</key>
|
134
148
|
<integer>0</integer>
|
135
149
|
<key>firstVisibleLine</key>
|
136
|
-
<integer>
|
150
|
+
<integer>0</integer>
|
137
151
|
</dict>
|
138
152
|
</dict>
|
139
153
|
<key>openDocuments</key>
|
140
154
|
<array>
|
141
|
-
<string>
|
142
|
-
<string>lib/distil/
|
143
|
-
<string>lib/distil/
|
144
|
-
<string>lib/distil/
|
145
|
-
<string>
|
155
|
+
<string>bin/distil</string>
|
156
|
+
<string>lib/distil/project/external-project.rb</string>
|
157
|
+
<string>lib/distil/project/distil-project.rb</string>
|
158
|
+
<string>lib/distil/project.rb</string>
|
159
|
+
<string>assets/distil.js</string>
|
146
160
|
<string>Rakefile</string>
|
161
|
+
<string>lib/distil.rb</string>
|
162
|
+
<string>distil.gemspec</string>
|
147
163
|
</array>
|
148
164
|
<key>showFileHierarchyDrawer</key>
|
149
165
|
<false/>
|
150
166
|
<key>windowFrame</key>
|
151
|
-
<string>{{
|
167
|
+
<string>{{351, 0}, {1089, 878}}</string>
|
152
168
|
</dict>
|
153
169
|
</plist>
|
@@ -143,7 +143,7 @@ module Distil
|
|
143
143
|
return nil if !external_project
|
144
144
|
|
145
145
|
if 1==parts.length
|
146
|
-
return SourceFile::from_path(external_project.product_name(:import, source_file.
|
146
|
+
return SourceFile::from_path(external_project.product_name(:import, source_file.content_type))
|
147
147
|
else
|
148
148
|
return SourceFile::from_path(File.join(external_project.output_folder, *parts[1..-1]))
|
149
149
|
end
|
data/lib/distil/project.rb
CHANGED
@@ -36,22 +36,11 @@ module Distil
|
|
36
36
|
|
37
37
|
FileUtils.mkdir_p(path)
|
38
38
|
Dir.chdir path do
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
# base_cmd = "git pull --depth 1 #{uri}"
|
45
|
-
base_cmd = "git pull #{uri}"
|
46
|
-
base_cmd+= " -q"
|
47
|
-
# base_cmd += " -q" if options[:quiet] and not $verbose
|
48
|
-
base_cmd += " #{options["version"]}" if options["version"]
|
49
|
-
# puts base_cmd if $verbose
|
50
|
-
if system(base_cmd)
|
51
|
-
# puts "removing: .git .gitignore" if $verbose
|
52
|
-
# FileUtils.rm_rf %w(.git .gitignore)
|
53
|
-
else
|
54
|
-
# rm_rf path
|
39
|
+
clone_cmd = "git clone #{uri} ."
|
40
|
+
clone_cmd += " -q"
|
41
|
+
clone_cmd += " #{options["version"]}" if options["version"]
|
42
|
+
if !system(clone_cmd)
|
43
|
+
raise ValidationError.new("Failed to clone external project: #{uri}")
|
55
44
|
end
|
56
45
|
end
|
57
46
|
end
|
@@ -3,6 +3,11 @@ module Distil
|
|
3
3
|
LINT_COMMAND= "#{VENDOR_DIR}/jsl-0.3.0/bin/jsl"
|
4
4
|
# LINT_COMMAND= "/Users/jeff/.gem/ruby/1.8/gems/distil-0.10.2/vendor/jsl-0.3.0/bin/jsl"
|
5
5
|
|
6
|
+
JS_GLOBALS= Set.new ['Array', 'Boolean', 'Date', 'Error', 'EvalError',
|
7
|
+
'Function', 'Math', 'Number', 'Object', 'RangeError',
|
8
|
+
'ReferenceError', 'RegExp', 'String', 'SyntaxError',
|
9
|
+
'TypeError', 'URIError']
|
10
|
+
|
6
11
|
class ValidateJsTask < Task
|
7
12
|
|
8
13
|
include ErrorReporter
|
@@ -37,6 +42,7 @@ module Distil
|
|
37
42
|
end
|
38
43
|
|
39
44
|
additional_globals.each { |g|
|
45
|
+
next if JS_GLOBALS.include?(g)
|
40
46
|
tmp << "+define #{g}\n"
|
41
47
|
}
|
42
48
|
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: distil
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 35
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 12
|
9
|
-
-
|
10
|
-
version: 0.12.
|
9
|
+
- 6
|
10
|
+
version: 0.12.6
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Jeff Watkins
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-
|
18
|
+
date: 2010-08-14 00:00:00 -07:00
|
19
19
|
default_executable: distil
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|