warp_drive 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/tasks/compile.rake +1 -1
- data/lib/warp_drive/boot/workers.rb +4 -1
- metadata +1 -1
data/lib/tasks/compile.rake
CHANGED
@@ -9,7 +9,7 @@ namespace :warp_drive do
|
|
9
9
|
WarpDriveGemGenerator.run('APP' => File.basename(pwd), 'OUT_DIR' => File.join(pwd, 'tmp', File.basename(pwd)))
|
10
10
|
|
11
11
|
sh "cd #{$genosaurus_output_directory}; rake package"
|
12
|
-
FileUtils.rm_rf($genosaurus_output_directory, :verbose => false)
|
12
|
+
# FileUtils.rm_rf($genosaurus_output_directory, :verbose => false)
|
13
13
|
# FileUtils.rm_rf(File.join(pwd, 'pkg'), :verbose => true)
|
14
14
|
# mv File.join($genosaurus_output_directory, 'pkg'), File.join(pwd, 'pkg')
|
15
15
|
end
|
@@ -65,7 +65,10 @@ module WarpDrive
|
|
65
65
|
|
66
66
|
[WarpDrive::Path.config.database.yml.to_s,
|
67
67
|
File.join(RAILS_ROOT, 'config', 'database.yml')].each do |yml_path|
|
68
|
-
|
68
|
+
if File.exists?(yml_path)
|
69
|
+
opts = YAML::load(ERB.new(File.read(yml_path)).result)
|
70
|
+
db_opts.recursive_merge!(opts) if opts
|
71
|
+
end
|
69
72
|
end
|
70
73
|
|
71
74
|
db_opts
|