jsus 0.1.18 → 0.1.19

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.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/jsus.gemspec +2 -2
  3. data/lib/jsus/pool.rb +17 -6
  4. metadata +4 -4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.18
1
+ 0.1.19
data/jsus.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{jsus}
8
- s.version = "0.1.18"
8
+ s.version = "0.1.19"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Mark Abramov"]
12
- s.date = %q{2010-11-26}
12
+ s.date = %q{2010-11-27}
13
13
  s.default_executable = %q{jsus}
14
14
  s.description = %q{Javascript packager and dependency resolver}
15
15
  s.email = %q{markizko@gmail.com}
data/lib/jsus/pool.rb CHANGED
@@ -51,7 +51,7 @@ module Jsus
51
51
  # If given a source file, returns the input.
52
52
  #
53
53
  def lookup(source_or_key)
54
- result = case source_or_key
54
+ case source_or_key
55
55
  when String
56
56
  provides_map[Tag[source_or_key]]
57
57
  when Tag
@@ -62,8 +62,6 @@ module Jsus
62
62
  raise "Illegal lookup query. Expected String, Tag or SourceFile, " <<
63
63
  "given #{source_or_key.inspect}, an instance of #{source_or_key.class.name}."
64
64
  end
65
- puts "Couldn't find #{source_or_key}" if !result && Jsus.verbose?
66
- result
67
65
  end
68
66
 
69
67
 
@@ -72,7 +70,7 @@ module Jsus
72
70
  #
73
71
  # Returns an instance of Container which contains needed files sorted.
74
72
  #
75
- def lookup_dependencies(source_or_source_key)
73
+ def lookup_dependencies(source_or_source_key)
76
74
  source = lookup(source_or_source_key)
77
75
  result = Container.new
78
76
  looked_up = []
@@ -113,7 +111,12 @@ module Jsus
113
111
  extensions_map[source.extends] ||= []
114
112
  extensions_map[source.extends] << source
115
113
  else
116
- source.provides.each {|p| provides_map[p] = source }
114
+ source.provides.each do |p|
115
+ if provides_map[p] && provides_map[p] != source && provides_map[p].filename != source.filename && Jsus.verbose?
116
+ puts "Redeclared #{p.to_s} in #{source.filename} (previously declared in #{provides_map[p].filename})"
117
+ end
118
+ provides_map[p] = source
119
+ end
117
120
  end
118
121
  when source_or_sources_or_package.kind_of?(Package)
119
122
  package = source_or_sources_or_package
@@ -151,7 +154,15 @@ module Jsus
151
154
  # Performs the actual lookup for #lookup_direct_dependencies
152
155
  #
153
156
  def lookup_direct_dependencies!(source)
154
- result = source ? (source.dependencies + source.external_dependencies).map {|d| lookup(d)} : []
157
+ result = if source
158
+ (source.dependencies + source.external_dependencies).map do |dependency|
159
+ result = lookup(dependency)
160
+ puts "#{source.filename} is missing #{dependency.is_a?(SourceFile) ? dependency.filename : dependency.to_s}" if !result && Jsus.verbose?
161
+ result
162
+ end
163
+ else
164
+ []
165
+ end
155
166
  Container.new(*result)
156
167
  end
157
168
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 1
8
- - 18
9
- version: 0.1.18
8
+ - 19
9
+ version: 0.1.19
10
10
  platform: ruby
11
11
  authors:
12
12
  - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-11-26 00:00:00 +03:00
17
+ date: 2010-11-27 00:00:00 +03:00
18
18
  default_executable: jsus
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -278,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
278
278
  requirements:
279
279
  - - ">="
280
280
  - !ruby/object:Gem::Version
281
- hash: 111448912275714831
281
+ hash: -125126051440542470
282
282
  segments:
283
283
  - 0
284
284
  version: "0"