milkshake 0.0.2 → 0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -0
- data/VERSION +1 -1
- data/lib/milkshake/dependency_resolver.rb +3 -1
- data/lib/milkshake/environment.rb +2 -1
- data/lib/milkshake/linker.rb +0 -15
- data/lib/milkshake/rails_extentions/initializer.rb +8 -10
- data/milkshake.gemspec +5 -2
- metadata +12 -2
data/Rakefile
CHANGED
@@ -14,6 +14,7 @@ begin
|
|
14
14
|
gem.add_development_dependency "yard"
|
15
15
|
gem.add_runtime_dependency 'thor'
|
16
16
|
gem.add_runtime_dependency 'snapshots'
|
17
|
+
gem.add_runtime_dependency 'rack-gem-assets'
|
17
18
|
gem.files += FileList['lib/**/*.rb'] + FileList['templates/**/*']
|
18
19
|
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
|
19
20
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.1.1
|
@@ -52,7 +52,9 @@ module Milkshake
|
|
52
52
|
dep = Gem::Dependency.new(name, requirement)
|
53
53
|
specs = gemspec_index.search(dep)
|
54
54
|
|
55
|
-
|
55
|
+
if specs.empty?
|
56
|
+
raise "Failed to resolve dependency: #{name} #{options.inspect}"
|
57
|
+
end
|
56
58
|
|
57
59
|
specs.sort! do |a,b|
|
58
60
|
b.version <=> a.version
|
@@ -15,6 +15,7 @@ module Milkshake
|
|
15
15
|
def initialize(cache, options={})
|
16
16
|
@cache = cache
|
17
17
|
@options = {'gems' => {}}.merge(options)
|
18
|
+
@options['gems']['rack-gem-assets'] = { 'lib' => 'rack/gem_assets' }
|
18
19
|
|
19
20
|
Milkshake.extender.extend_rubygems!
|
20
21
|
|
@@ -41,7 +42,7 @@ module Milkshake
|
|
41
42
|
resolver.names
|
42
43
|
end
|
43
44
|
|
44
|
-
@
|
45
|
+
@ordered_gemspecs = nil
|
45
46
|
end
|
46
47
|
|
47
48
|
def gemspecs_by_name
|
data/lib/milkshake/linker.rb
CHANGED
@@ -17,8 +17,6 @@ module Milkshake
|
|
17
17
|
if validator.relink?
|
18
18
|
@current_snapshot = Snapshots.dump
|
19
19
|
|
20
|
-
link_public_directories!
|
21
|
-
|
22
20
|
run_migrations!
|
23
21
|
|
24
22
|
validator.persist!
|
@@ -33,19 +31,6 @@ module Milkshake
|
|
33
31
|
ActiveRecord::Migrator.migrate("db/migrate/", nil)
|
34
32
|
end
|
35
33
|
|
36
|
-
def link_public_directories!
|
37
|
-
public_vendor_path = File.join(Rails.public_path, 'vendor')
|
38
|
-
FileUtils.rm_rf(public_vendor_path)
|
39
|
-
FileUtils.mkdir_p(public_vendor_path)
|
40
|
-
|
41
|
-
self.environment.gemspecs.each do |gemspec|
|
42
|
-
public_path = File.join(gemspec.full_gem_path, 'public')
|
43
|
-
if File.directory?(public_path)
|
44
|
-
FileUtils.ln_s(public_path, File.join(public_vendor_path, gemspec.name))
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
34
|
def link_only_once
|
50
35
|
lock_path = Milkshake.cache_file
|
51
36
|
FileUtils.touch(lock_path)
|
@@ -31,18 +31,16 @@ module Milkshake
|
|
31
31
|
def process_with_milkshake
|
32
32
|
process_without_milkshake
|
33
33
|
rescue Exception => e
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
34
|
+
begin
|
35
|
+
Milkshake.cache.restore!
|
36
|
+
Milkshake.environment.reload!
|
37
|
+
if Milkshake.linker.current_snapshot
|
38
|
+
Snapshots.load(Milkshake.linker.current_snapshot)
|
39
|
+
end
|
40
|
+
rescue Exception
|
38
41
|
end
|
39
42
|
|
40
|
-
|
41
|
-
raise e
|
42
|
-
else
|
43
|
-
@restore_relink = true
|
44
|
-
retry
|
45
|
-
end
|
43
|
+
raise e
|
46
44
|
end
|
47
45
|
|
48
46
|
end
|
data/milkshake.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{milkshake}
|
8
|
-
s.version = "0.
|
8
|
+
s.version = "0.1.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Simon Menke"]
|
12
|
-
s.date = %q{2009-11-
|
12
|
+
s.date = %q{2009-11-09}
|
13
13
|
s.default_executable = %q{milkshake}
|
14
14
|
s.description = %q{Compose rails applications using several smaller rails applications}
|
15
15
|
s.email = %q{simon@mrhenry.be}
|
@@ -101,17 +101,20 @@ Gem::Specification.new do |s|
|
|
101
101
|
s.add_development_dependency(%q<yard>, [">= 0"])
|
102
102
|
s.add_runtime_dependency(%q<thor>, [">= 0"])
|
103
103
|
s.add_runtime_dependency(%q<snapshots>, [">= 0"])
|
104
|
+
s.add_runtime_dependency(%q<rack-gem-assets>, [">= 0"])
|
104
105
|
else
|
105
106
|
s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
|
106
107
|
s.add_dependency(%q<yard>, [">= 0"])
|
107
108
|
s.add_dependency(%q<thor>, [">= 0"])
|
108
109
|
s.add_dependency(%q<snapshots>, [">= 0"])
|
110
|
+
s.add_dependency(%q<rack-gem-assets>, [">= 0"])
|
109
111
|
end
|
110
112
|
else
|
111
113
|
s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
|
112
114
|
s.add_dependency(%q<yard>, [">= 0"])
|
113
115
|
s.add_dependency(%q<thor>, [">= 0"])
|
114
116
|
s.add_dependency(%q<snapshots>, [">= 0"])
|
117
|
+
s.add_dependency(%q<rack-gem-assets>, [">= 0"])
|
115
118
|
end
|
116
119
|
end
|
117
120
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: milkshake
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon Menke
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-11-
|
12
|
+
date: 2009-11-09 00:00:00 +01:00
|
13
13
|
default_executable: milkshake
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -52,6 +52,16 @@ dependencies:
|
|
52
52
|
- !ruby/object:Gem::Version
|
53
53
|
version: "0"
|
54
54
|
version:
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: rack-gem-assets
|
57
|
+
type: :runtime
|
58
|
+
version_requirement:
|
59
|
+
version_requirements: !ruby/object:Gem::Requirement
|
60
|
+
requirements:
|
61
|
+
- - ">="
|
62
|
+
- !ruby/object:Gem::Version
|
63
|
+
version: "0"
|
64
|
+
version:
|
55
65
|
description: Compose rails applications using several smaller rails applications
|
56
66
|
email: simon@mrhenry.be
|
57
67
|
engine_dependencies: {}
|