summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-02 18:33:07 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-07 11:29:40 +0100
commit95e699482783c93ed323d8a328ded6bd319b9903 (patch)
treef53ff701aa98e94d440ea48c1ba2bed9d455260b
parentcfe206e0e8f2f1389b9c8db25e0adca6b7bcef92 (diff)
downloadmorph-95e699482783c93ed323d8a328ded6bd319b9903.tar.gz
import: Report Rubygem dependencies not in Omnibus as rubygems
-rwxr-xr-ximport/omnibus.to_chunk13
1 files changed, 11 insertions, 2 deletions
diff --git a/import/omnibus.to_chunk b/import/omnibus.to_chunk
index 8f4fa323..142370ab 100755
--- a/import/omnibus.to_chunk
+++ b/import/omnibus.to_chunk
@@ -76,6 +76,12 @@ class OmnibusChunkMorphologyGenerator < Importer::Base
end
def generate_chunk_morph_for_software(software)
+ omnibus_deps = Hash[software.dependencies.collect do |dep|
+ [dep, 0]
+ end]
+ rubygems_deps = Hash[software.builder.manually_installed_rubygems.collect do |dep|
+ [dep.name, dep.requirement.to_s]
+ end]
{
"name" => software.name,
"kind" => "chunk",
@@ -84,8 +90,11 @@ class OmnibusChunkMorphologyGenerator < Importer::Base
# For now: don't bother!
# FIXME: are these build or runtime dependencies? We'll assume both.
- "x-build-dependencies-omnibus" => deps_for_software(software),
- "x-runtime-dependencies-omnibus" => deps_for_software(software),
+ "x-build-dependencies-omnibus" => omnibus_deps,
+ "x-runtime-dependencies-omnibus" => omnibus_deps,
+
+ "x-build-dependencies-rubygems" => {},
+ "x-runtime-dependencies-rubygems" => rubygems_deps,
}
end