devstructure 0.3.1 → 0.4.0

data/lib/devstructure/blueprint.rb

@@ -160,29 +160,6 @@ EOF
   def sh(io=StringIO.new)
     io.puts disclaimer
 
-    # First come packages.  The algorithm used to walk the package tree
-    # is pluggable and in this case we only need to take action as each
-    # package name is encountered.  Each manager is annotated with a
-    # shell command suitable for installing packages in `printf`(3)-style.
-    #
-    # RubyGems is, once again, a special case.  Ubuntu ships with a very
-    # old version so we take the liberty of upgrading it anytime it is
-    # encountered.
-    walk(
-      :before => lambda { |manager, command|
-        io.puts "apt-get 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"
-          io.puts "/usr/bin/ruby#{$1} $(PATH=\"$PATH:/var/lib/gems/#{
-            $1}/bin\" which update_rubygems)"
-        end
-      }
-    )
-
     # Plaintext files are written to their final destination using `cat`(1)
     # and heredoc syntax.  Binary files are written using `base64`(1) and
     # symbolic links are placed using `ln`(1).  Shocking stuff.
@@ -218,6 +195,31 @@ EOF
       io.puts "chmod #{mode} #{pathname}" if mode
     end if files
 
+    # Packages used to come first.  Now they follow files so things like
+    # `/etc/apt/sources.list.d/*` or `/root/.gemrc` can be in place before
+    # package managers are called.  The algorithm used to walk the package
+    # tree is pluggable and in this case we only need to take action as
+    # each package name is encountered.  Each manager is annotated with a
+    # shell command suitable for installing packages in `printf`(3)-style.
+    #
+    # RubyGems is, once again, a special case.  Ubuntu ships with a very
+    # old version so we take the liberty of upgrading it anytime it is
+    # encountered.
+    walk(
+      :before => lambda { |manager, command|
+        io.puts "apt-get 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"
+          io.puts "/usr/bin/ruby#{$1} $(PATH=\"$PATH:/var/lib/gems/#{
+            $1}/bin\" which update_rubygems)"
+        end
+      }
+    )
+
     # Source tarballs are downloaded, extracted, and removed.  Generally,
     # the directory in question is `/usr/local` but the future could hold
     # anything.
@@ -246,6 +248,66 @@ EOF
       managers[package] = manager if packages[package] && manager != package
     })
 
+    # System files must be placed before packages are installed so we set
+    # Puppet's dependencies to put all packages ahead of all files.  This
+    # is a change from the past when files were placed later.  The new
+    # way allows `/etc/apt/sources.list.d/*` and `/root/.gemrc` (for
+    # example) to be placed prior to running package manager commands.
+    #
+    # File content is handled much like the shell version except base 64
+    # decoding takes place here in Ruby rather than in the `base64`(1)
+    # tool.
+    if files && 0 < files.length
+      classes = managers.keys.
+        reject { |manager| 0 == packages[manager]["_packages"].length }.
+        map { |manager| Puppet::Class[manager] }
+      if 0 < classes.length
+        manifest << Puppet::File.defaults(:before => classes)
+      end
+      files.sort.each do |pathname, content|
+
+        # Resources for all parent directories are created ahead of
+        # any file.  Puppet's autorequire mechanism will ensure that a
+        # file's parent directories are realized before the file itself.
+        dirnames = File.dirname(pathname).split("/")
+        dirnames.shift
+        (0..(dirnames.length - 1)).each do |i|
+          manifest << Puppet::File.new("/#{dirnames[0..i].join("/")}",
+            :ensure => :directory)
+        end
+
+        # Convert the blueprint file attributes to those that Puppet
+        # understands.  Everything's optional.
+        options = {}
+        if Hash === content
+          options[:owner] = content["_owner"] if content["_owner"]
+          options[:group] = content["_group"] if content["_group"]
+          if content["_target"]
+            options[:ensure] = content["_target"]
+          else
+            options[:mode] = content["_mode"] if content["_mode"]
+            options[:ensure] = :file
+            options[:content] = if content["_base64"]
+              Base64.decode64(content["_base64"])
+            else
+              content["_content"]
+            end
+          end
+
+        # The easiest way to specify a file is to include just the
+        # content.  The owner and group will be `root` and the mode will
+        # be set according to the `umask`.
+        else
+          options = {
+            :content => content,
+            :ensure => :file,
+          }
+        end
+
+        manifest << Puppet::File.new(pathname, options)
+      end
+    end
+
     # Each manager's packages are grouped to create a series of subclasses
     # that allow dependency management to be handled coursely using Puppet
     # classes.  Because of Puppet's rules about resource name uniqueness,
@@ -359,63 +421,6 @@ EOF
       }
     )
 
-    # System files must be placed after packages are installed so we set
-    # Puppet's dependencies to put all packages ahead of all files.
-    #
-    # File content is handled much like the shell version except base 64
-    # decoding takes place here in Ruby rather than in the `base64`(1)
-    # tool.
-    if files && 0 < files.length
-      classes = managers.keys.
-        reject { |manager| 0 == packages[manager]["_packages"].length }.
-        map { |manager| Puppet::Class[manager] }
-      if 0 < classes.length
-        manifest << Puppet::File.defaults(:require => classes)
-      end
-      files.sort.each do |pathname, content|
-
-        # Resources for all parent directories are created ahead of
-        # any file.  Puppet's autorequire mechanism will ensure that a
-        # file's parent directories are realized before the file itself.
-        dirnames = File.dirname(pathname).split("/")
-        dirnames.shift
-        (0..(dirnames.length - 1)).each do |i|
-          manifest << Puppet::File.new("/#{dirnames[0..i].join("/")}",
-            :ensure => :directory)
-        end
-
-        # Convert the blueprint file attributes to those that Puppet
-        # understands.  Everything's optional.
-        options = {}
-        if Hash === content
-          options[:owner] = content["_owner"] if content["_owner"]
-          options[:group] = content["_group"] if content["_group"]
-          if content["_target"]
-            options[:ensure] = content["_target"]
-          else
-            options[:mode] = content["_mode"] if content["_mode"]
-            options[:ensure] = :file
-            options[:content] = if content["_base64"]
-              Base64.decode64(content["_base64"])
-            else
-              content["_content"]
-            end
-          end
-
-        # The easiest way to specify a file is to include just the
-        # content.  The owner and group will be `root` and the mode will
-        # be set according to the `umask`.
-        else
-          options = {
-            :content => content,
-            :ensure => :file,
-          }
-        end
-
-        manifest << Puppet::File.new(pathname, options)
-      end
-    end
-
     # Source tarballs are downloaded, extracted, and removed in one fell
     # swoop.  Puppet 2.6 introduced the requirement to wrap compound commands
     # such as this in a shell invocation.  This is a pretty direct Puppet
@@ -441,7 +446,45 @@ EOF
   def chef(io=StringIO.new)
     cookbook = Chef::Cookbook.new(@name, disclaimer)
 
-    # First come packages, traversed in the same order as with the shell
+    # Files are handled by the `cookbook_file` resource type and are
+    # preceded by the `directory` which contains them.  Just like the
+    # shell and Puppet generators, this code handles binary files and
+    # symbolic links (handled by the `link` resource type), too.
+    files.sort.each do |pathname, content|
+      cookbook.directory File.dirname(pathname),
+        :group => "root",
+        :mode => "755",
+        :owner => "root",
+        :recursive => true
+      owner = group = mode = nil
+      if Hash === content
+        owner = content["_owner"]
+        group = content["_group"]
+        if content["_target"]
+          cookbook.link pathname,
+            :group => group || "root",
+            :owner => owner || "root",
+            :to => content["_target"]
+          next
+        else
+          mode = content["_mode"]
+          if content["_base64"]
+            content = content["_base64"]
+          else
+            content = content["_content"]
+          end
+        end
+      end
+      cookbook.cookbook_file pathname, content,
+        :backup => false,
+        :group => group || "root",
+        :mode => mode || "644",
+        :owner => owner || "root",
+        :source => pathname[1..-1]
+    end if files
+
+    # Packages come after files so managers can be configured before they
+    # run.  Packages are traversed in the same order as with the shell
     # code generator but passed off to the cookbook.
     walk(
       :before => lambda { |manager, command|
@@ -488,43 +531,6 @@ EOF
       }
     )
 
-    # Files are handled by the `cookbook_file` resource type and are
-    # preceded by the `directory` which contains them.  Just like the
-    # shell and Puppet generators, this code handles binary files and
-    # symbolic links (handled by the `link` resource type), too.
-    files.sort.each do |pathname, content|
-      cookbook.directory File.dirname(pathname),
-        :group => "root",
-        :mode => "755",
-        :owner => "root",
-        :recursive => true
-      owner = group = mode = nil
-      if Hash === content
-        owner = content["_owner"]
-        group = content["_group"]
-        if content["_target"]
-          cookbook.link pathname,
-            :group => group || "root",
-            :owner => owner || "root",
-            :to => content["_target"]
-          next
-        else
-          mode = content["_mode"]
-          if content["_base64"]
-            content = content["_base64"]
-          else
-            content = content["_content"]
-          end
-        end
-      end
-      cookbook.cookbook_file pathname, content,
-        :backup => false,
-        :group => group || "root",
-        :mode => mode || "644",
-        :owner => owner || "root",
-        :source => pathname[1..-1]
-    end if files
-
     # Source tarballs are lifted directly from the shell code generator
     # and wrapped in `execute` resources.
     sources.sort.each do |dirname, filename|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +00:00
+date: 2010-09-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency