devstructure 0.0.7 → 0.0.8

data/lib/devstructure/blueprint.rb

@@ -38,14 +38,56 @@ class DevStructure::Blueprint < Hash
   end
 
   def -(other)
-    b = self.dup
+    b = Marshal.load(Marshal.dump(self))
+
+    # First pass removes all duplicates except managers.
     other.walk(
       :package => lambda { |manager, command, package, version|
-        unless b.packages[package]
-          b.packages[manager]["_packages"].delete package
+        return if b.packages[package]
+        b.packages[manager]["_packages"].delete package
+      }
+    )
+
+    # Second pass removes managers that manage no packages.
+    #   For RubyGems we have to dig a little deeper to see what is managed
+    #   by rubygems-update.
+    b.walk(
+      :package => lambda { |manager, command, package, version|
+        return unless b.packages[package]
+        test = if package =~ /^rubygems(\d+\.\d+)$/
+          b.packages["rubygems-update"]
+        else
+          b.packages[package]
         end
+        if test
+          case test["_packages"].length
+          when 0
+          when 1
+            return unless test["_packages"]["rubygems-update"]
+          else
+            return
+          end
+        end
+        p = b.packages[manager]["_packages"]
+        p.delete package
+        b.packages.delete manager if 0 == p.length
       }
     )
+
+    # Third pass adds back special dependencies like ruby*-dev.
+    b.walk(
+      :after => lambda { |manager, command|
+        case manager
+
+        # Match a version of ruby*-dev to a version of rubygems*.
+        when /^rubygems(\d+\.\d+)$/
+          b.packages["apt"]["_packages"]["ruby#{$1}-dev"] =
+            packages["apt"]["_packages"]["ruby#{$1}-dev"]
+
+        end
+      }
+    )
+
     b
   end
 
@@ -76,7 +118,7 @@ EOF
     # Packages.
     walk(
       :package => lambda { |manager, command, package, version|
-        return if "rubygems-update" == manager && manager == package
+        return if manager == package
         printf "#{command}\n", package, version
         if "rubygems-update" == package && command =~ /gem(\d+\.\d+) install/
           puts "PATH=\"$PATH:/var/lib/gems/#{$1}/bin\" update_rubygems"
@@ -117,7 +159,7 @@ EOF
     walk(
       :before => lambda { |manager, command|
         p = packages[manager]["_packages"]
-        return if 0 == p.length || 1 == p.length && manager == p.keys.first
+        return if 0 == p.length || 1 == p.length && p[manager]
         puts "\n\t# Packages that depend on #{manager}."
         case manager
         when /rubygems|rip/
@@ -166,9 +208,7 @@ EOF
 
         # Debian packages get no special treatment.
         else
-          if manager == package
-            puts Package.partial(package, :ensure => version)
-          else
+          unless manager == package
             puts Package.partial(package,
               :require => Package[manager],
               :ensure => version

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +00:00
+date: 2010-06-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency