distil 0.11.1 → 0.11.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/distil.gemspec +2 -2
- data/lib/distil/project/distil-project.rb +5 -4
- data/lib/distil/project.rb +12 -2
- data/lib/distil.rb +0 -2
- metadata +3 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.11.
|
1
|
+
0.11.3
|
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.11.
|
8
|
+
s.version = "0.11.3"
|
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-06-
|
12
|
+
s.date = %q{2010-06-09}
|
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"]
|
@@ -19,13 +19,14 @@ module Distil
|
|
19
19
|
project_info["path"]= File.dirname(@project_file)
|
20
20
|
|
21
21
|
begin
|
22
|
+
|
22
23
|
super(project_info, parent)
|
23
|
-
|
24
|
-
|
24
|
+
load_external_projects
|
25
|
+
|
26
|
+
rescue ValidationError => err
|
27
|
+
puts "#{APP_NAME}: #{SourceFile.path_relative_to_folder(project_file, Dir.pwd)}: #{err.message}\n"
|
25
28
|
exit 1
|
26
29
|
end
|
27
|
-
|
28
|
-
load_external_projects
|
29
30
|
end
|
30
31
|
|
31
32
|
def targets
|
data/lib/distil/project.rb
CHANGED
@@ -18,6 +18,15 @@ module Distil
|
|
18
18
|
uri= options["repository"]
|
19
19
|
path= options["path"]
|
20
20
|
|
21
|
+
begin
|
22
|
+
`git --version 2>/dev/null`
|
23
|
+
rescue
|
24
|
+
nil
|
25
|
+
end
|
26
|
+
if $?.nil? || !$?.success?
|
27
|
+
raise ValidationError.new("The git version control tool is required to pull this repository: #{uri}")
|
28
|
+
end
|
29
|
+
|
21
30
|
FileUtils.mkdir_p(path)
|
22
31
|
Dir.chdir path do
|
23
32
|
init_cmd = "git init"
|
@@ -25,7 +34,8 @@ module Distil
|
|
25
34
|
# init_cmd += " -q" if options[:quiet] and not $verbose
|
26
35
|
# puts init_cmd if $verbose
|
27
36
|
system(init_cmd)
|
28
|
-
base_cmd = "git pull --depth 1 #{uri}"
|
37
|
+
# base_cmd = "git pull --depth 1 #{uri}"
|
38
|
+
base_cmd = "git pull #{uri}"
|
29
39
|
base_cmd+= " -q"
|
30
40
|
# base_cmd += " -q" if options[:quiet] and not $verbose
|
31
41
|
base_cmd += " #{options[:version]}" if options[:version]
|
@@ -34,7 +44,7 @@ module Distil
|
|
34
44
|
# puts "removing: .git .gitignore" if $verbose
|
35
45
|
# FileUtils.rm_rf %w(.git .gitignore)
|
36
46
|
else
|
37
|
-
rm_rf path
|
47
|
+
# rm_rf path
|
38
48
|
end
|
39
49
|
end
|
40
50
|
end
|
data/lib/distil.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 11
|
8
|
-
-
|
9
|
-
version: 0.11.
|
8
|
+
- 3
|
9
|
+
version: 0.11.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Jeff Watkins
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-06-
|
17
|
+
date: 2010-06-09 00:00:00 -07:00
|
18
18
|
default_executable: distil
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|