devstructure 0.1.2 → 0.1.3

data/lib/devstructure/blueprint.rb

@@ -59,27 +59,10 @@ class DevStructure::Blueprint < Hash
     )
 
     # 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+(?:\.\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
       }
     )
@@ -130,8 +113,10 @@ EOF
       :package => lambda { |manager, command, package, version|
         return if manager == package
         printf "#{command}\n", package, version
-        if "rubygems-update" == package && command =~ /gem(\d+\.\d+(?:\.\d+)?) install/
-          puts "PATH=\"$PATH:/var/lib/gems/#{$1}/bin\" update_rubygems"
+        if "apt" == manager && package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/
+          puts "/usr/bin/gem#{$1} install rubygems-update"
+          puts "PATH=\"$PATH:/var/lib/gems/#{$1}/bin\" /usr/bin/ruby#{
+            $1} /usr/bin/update_rubygems"
         end
       }
     )
@@ -181,33 +166,49 @@ EOF
         command =~ /gem(\d+\.\d+(?:\.\d+)?) install/
         ruby_version = $1
         case manager
+
         when "apt"
           unless manager == package
             manifest[manager] << Package.new(package, :ensure => version)
           end
-        when "rubygems-update"
-          unless manager == package
-            manifest[manager] << Package.new(package,
-              :require => [
-                Puppet::Class[managers[manager]],
-                Package["ruby#{ruby_version}-dev"],
-                Exec["update_rubygems"],
-              ],
-              :provider => :gem,
-              :ensure => version
+
+          # Update RubyGems.
+          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/
+            v = $1
+            prereq = if "1.8" == v
+              manifest[manager] << Package.new("rubygems-update",
+                :require => Package["rubygems1.8"],
+                :provider => :gem,
+                :ensure => :latest
+              )
+              Package["rubygems1.8"]
+            else
+              manifest[manager] << Exec.new(
+                "/usr/bin/gem#{v} install --no-rdoc --no-ri rubygems-update",
+                :alias => "rubygems-update-#{v}",
+                :require => Package["rubygems#{v}"]
+              )
+              Exec["rubygems-update-#{v}"]
+            end
+            manifest[manager] << Exec.new(
+              "/usr/bin/ruby#{v} /usr/bin/update_rubygems",
+              :path => %W(/usr/bin /var/lib/gems/#{v}/bin),
+              :require => prereq
             )
           end
-        when /rubygems|rip/
+
+        # Only 1.8 can use the native gem package provider.
+        when "rubygems1.8"
           options = {
             :require => [
               Puppet::Class[managers[manager]],
-              Package["rubygems#{ruby_version}", "ruby#{ruby_version}-dev"],
+              Package["rubygems1.8"],
             ],
             :provider => :gem,
             :ensure => version
           }
-          options[:require] += [Package[manager]] unless manager == package
           manifest[manager] << Package.new(package, options)
+
         when /python/
           manifest[manager] << Exec.new(sprintf("#{command}", package),
             :require => [
@@ -226,20 +227,6 @@ EOF
             ]
           )
         end
-      },
-      :after => lambda { |manager, command|
-        p = packages[manager]["_packages"]
-        return if 0 == p.length || 1 == p.length && manager == p.keys.first
-
-        # Update RubyGems if we're through with gems in Debian's location.
-        return unless manager =~ /^rubygems\d+\.\d+(?:\.\d+)?$/
-        return unless p["rubygems-update"]
-        manifest[manager] << Exec.new("update_rubygems",
-          :subscribe => Package["rubygems-update"],
-          :path => %w(/usr/bin /var/lib/gems/1.8/bin),
-          :refreshonly => true
-        )
-
       }
     )
 

data/lib/devstructure/puppet.rb

@@ -15,7 +15,7 @@ module DevStructure::Puppet
 
     def initialize(name, parent=nil)
       @name, @parent = name, parent
-      @manifests, @resources = {}, []
+      @manifests, @resources = {}, {}
     end
 
     # Return a reference to a sub-manifest of the given name.
@@ -28,7 +28,8 @@ module DevStructure::Puppet
 
     # Add a resource to this manifest.
     def <<(resource)
-      @resources << resource
+      @resources[resource.type] ||= []
+      @resources[resource.type] << resource
     end
 
     def to_s(tab="")
@@ -37,8 +38,17 @@ module DevStructure::Puppet
       @manifests.each_value do |manifest|
         out << manifest.to_s("#{tab}\t")
       end
-      @resources.each do |resource|
-        out << resource.to_s("#{tab}\t")
+      @resources.each do |type, resources|
+        if 1 < resources.length
+          out << "#{tab}\t#{type} {"
+          resources.each do |resource|
+            resource.style = :partial
+            out << resource.to_s("#{tab}\t")
+          end
+          out << "#{tab}\t}"
+        else
+          out << resources.first.to_s("#{tab}\t")
+        end
       end
       out << "#{tab}}"
       out << "#{tab}include #{@name.gsub(".", "--")}" if @parent

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +00:00
+date: 2010-07-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency