devstructure 0.5.2 → 0.5.3

data/lib/devstructure/blueprint.rb

@@ -208,13 +208,16 @@ EOF
     # encountered.
     walk(
       :before => lambda { |manager, command|
-        io.puts "apt-get update" if "apt" == manager
+        io.puts "apt-get -q update" if "apt" == manager
       },
       :package => lambda { |manager, command, package, version|
         return if manager == package
         io.printf "#{command}\n", package, version
-        if "apt" == manager && package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/
-          io.puts "/usr/bin/gem#{$1} install --no-rdoc --no-ri rubygems-update"
+        if "apt" == manager \
+          && package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ \
+          && "1.8" == $1
+          io.puts \
+            "/usr/bin/gem#{$1} install --no-rdoc --no-ri rubygems-update"
           io.puts "/usr/bin/ruby#{$1} $(PATH=\"$PATH:/var/lib/gems/#{
             $1}/bin\" which update_rubygems)"
         end
@@ -323,7 +326,7 @@ EOF
         p = packages[manager]["_packages"]
         return if 0 == p.length || 1 == p.length && p[manager]
         if "apt" == manager
-          manifest << Puppet::Exec.new("apt-get update",
+          manifest << Puppet::Exec.new("apt-get -q update",
             :before => Puppet::Class["apt"])
         end
       },
@@ -343,27 +346,16 @@ EOF
 
           # However, if this package happens to be RubyGems, we introduce
           # a couple of new resources that update it to the latest version.
-          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/
-            v = $1
-            prereq = if "1.8" == v
-              manifest[manager] << Puppet::Package.new("rubygems-update",
-                :require => Puppet::Package["rubygems1.8"],
-                :provider => :gem,
-                :ensure => :latest
-              )
-              Puppet::Package["rubygems-update"]
-            else
-              manifest[manager] << Puppet::Exec.new(
-                "/usr/bin/gem#{v} install --no-rdoc --no-ri rubygems-update",
-                :alias => "rubygems-update-#{v}",
-                :require => Puppet::Package["rubygems#{v}"]
-              )
-              Puppet::Exec["rubygems-update-#{v}"]
-            end
+          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && "1.8" == $1
+            manifest[manager] << Puppet::Package.new("rubygems-update",
+              :require => Puppet::Package["rubygems1.8"],
+              :provider => :gem,
+              :ensure => :latest
+            )
             manifest[manager] << Puppet::Exec.new(
               "/bin/sh -c '/usr/bin/ruby#{v} $(PATH=$PATH:/var/lib/gems/#{
                 v}/bin which update_rubygems)'",
-              :require => prereq
+              :require => Puppet::Package["rubygems-update"]
             )
           end
 
@@ -384,7 +376,7 @@ EOF
         # but follow a predictable enough directory layout that we can
         # avoid running the `gem` command after the first run with an
         # inexpensive check to see if the directory exists.
-        when /rubygems/
+        when /ruby/
           manifest[manager] << Puppet::Exec.new(
             sprintf(command, package, version),
             :creates =>
@@ -491,7 +483,7 @@ EOF
     # code generator but passed off to the cookbook.
     walk(
       :before => lambda { |manager, command|
-        cookbook.execute "apt-get update" if "apt" == manager
+        cookbook.execute "apt-get -q update" if "apt" == manager
       },
       :package => lambda { |manager, command, package, version|
         return if manager == package
@@ -504,7 +496,7 @@ EOF
         # install.
         when "apt"
           cookbook.apt_package package, :version => version
-          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/
+          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && "1.8" == $1
             v = $1
             cookbook.gem_package "rubygems-update",
               :gem_binary => "/usr/bin/gem#{v}"
@@ -517,7 +509,7 @@ EOF
         # can be managed by the builtin `package` resource type because
         # Opscode thoughtfully allows specifying the `gem` command
         # to run for each resource individually.
-        when /rubygems(\d+\.\d+(?:\.\d+)?)/
+        when /ruby(?:gems)?(\d+\.\d+(?:\.\d+)?)(?:-dev)?/
           v = $1
           cookbook.gem_package package,
             :gem_binary => "/usr/bin/gem#{v}",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +00:00
+date: 2010-11-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency