devstructure 0.4.0 → 0.5.0

data/lib/devstructure/blueprint.rb

@@ -235,8 +235,7 @@ EOF
 
   # This is the Puppet code generator.
   def puppet(io=StringIO.new)
-    io.puts disclaimer
-    manifest = Puppet::Manifest.new(@name)
+    manifest = Puppet::Manifest.new(@name, nil, disclaimer)
 
     # Right out of the gate, we set a default `PATH` because Puppet does not.
     manifest << Puppet::Exec.defaults(:path => ENV["PATH"].split(":"))
@@ -264,7 +263,7 @@ EOF
       if 0 < classes.length
         manifest << Puppet::File.defaults(:before => classes)
       end
-      files.sort.each do |pathname, content|
+      files.each do |pathname, content|
 
         # Resources for all parent directories are created ahead of
         # any file.  Puppet's autorequire mechanism will ensure that a
@@ -272,7 +271,7 @@ EOF
         dirnames = File.dirname(pathname).split("/")
         dirnames.shift
         (0..(dirnames.length - 1)).each do |i|
-          manifest << Puppet::File.new("/#{dirnames[0..i].join("/")}",
+          manifest << Puppet::File.new("/#{dirnames[0..i].join("/")}", nil,
             :ensure => :directory)
         end
 
@@ -284,10 +283,12 @@ EOF
           options[:group] = content["_group"] if content["_group"]
           if content["_target"]
             options[:ensure] = content["_target"]
+            content = nil
           else
             options[:mode] = content["_mode"] if content["_mode"]
             options[:ensure] = :file
-            options[:content] = if content["_base64"]
+            options[:content] = :"template(\"#{manifest.name}#{pathname}\")"
+            content = if content["_base64"]
               Base64.decode64(content["_base64"])
             else
               content["_content"]
@@ -299,12 +300,12 @@ EOF
         # be set according to the `umask`.
         else
           options = {
-            :content => content,
+            :content => :"template(\"#{manifest.name}#{pathname}\")",
             :ensure => :file,
           }
         end
 
-        manifest << Puppet::File.new(pathname, options)
+        manifest << Puppet::File.new(pathname, content, options)
       end
     end
 
@@ -426,7 +427,7 @@ EOF
     # such as this in a shell invocation.  This is a pretty direct Puppet
     # equivalent to the shell version above.
     if sources && 0 < sources.length
-      sources.sort.each do |dirname, filename|
+      sources.each do |dirname, filename|
         manifest << Puppet::Exec.new(filename,
           :command => "/bin/sh -c 'wget http://s3.amazonaws.com/blueprint-sources/#{filename}; tar xf #{filename}; rm #{filename}'",
           :cwd => dirname
@@ -434,9 +435,10 @@ EOF
       end
     end
 
-    io.puts manifest
-    io.close
-    io
+    # Generate a module tarball containing the manifest and any templates
+    # needed to compile a catalog that includes this module.
+    manifest.to_gz(io)
+
   end
 
   # This is the Chef code generator.  It is the first of its kind in

data/lib/devstructure/chef.rb

@@ -1,6 +1,6 @@
 # The Chef code generator is structured much like the shell code generator
 # because Chef doesn't include any sort of dependency management like
-# Puppet.  As expected, we'll start with packages, follow them with files,
+# Puppet.  As expected, we'll start with files, follow them with packages,
 # and finish with source tarballs.
 #
 # The monkeywrench is that the ultimate output is a tarball of a Chef
@@ -94,20 +94,20 @@ module Chef
         :mtime => mtime
       }) { |w| w.write resources }
 
-      # Included any files referenced by `cookbook_file` resources.  They
+      # Include any files referenced by `cookbook_file` resources.  They
       # all appear in `files/default/` as if that is the root of the
       # filesystem.
       if 0 < @files.length
         tar.mkdir "#{@name}/files", :mode => 0755, :mtime => mtime
         tar.mkdir "#{@name}/files/default", :mode => 0755, :mtime => mtime
-        @files.each do |name, content|
-          dirnames = File.dirname(name).split("/")
+        @files.each do |pathname, content|
+          dirnames = File.dirname(pathname).split("/")
           dirnames.shift
           (0..(dirnames.length - 1)).each do |i|
             tar.mkdir "#{@name}/files/default/#{dirnames[0..i].join("/")}",
               :mode => 0755, :mtime => mtime
           end
-          tar.add_file_simple("#{@name}/files/default#{name}", {
+          tar.add_file_simple("#{@name}/files/default#{pathname}", {
             :mode => 0644,
             :size => content.length,
             :mtime => mtime

data/lib/devstructure/puppet.rb

@@ -14,6 +14,13 @@
 # [sandbox-blueprint]: http://devstructure.github.com/contractor/sandbox-blueprint.1.html
 require 'devstructure'
 
+# Unfortunately, RubyGems rears its ugly head.  The call to `gem` here is
+# just because the gem's name is different than the path being `require`d.
+gem 'archive-tar-minitar', :require => 'archive/tar/minitar'
+require 'archive/tar/minitar'
+
+require 'zlib'
+
 # Make `Symbol`s and `nil`s `Comparable` so we can sort each list of resource
 # attributes before converting to a string.
 class Symbol
@@ -37,11 +44,13 @@ module DevStructure::Puppet
 
     # Each class must have a name and might have a parent.  If a manifest
     # has a parent, this signals it to `include` itself in the parent.
-    def initialize(name, parent=nil)
-      @name, @parent = name, parent
+    def initialize(name, parent=nil, comment=nil)
+      @name, @parent, @comment = name.gsub(".", "--"), parent, comment
       @manifests, @resources = {}, {}
     end
 
+    attr_reader :name
+
     # Manifests behave a bit like hashes in that their children can be
     # traversed.  Note the children can't be assigned directly because
     # we must maintain parent-child relationships.
@@ -68,6 +77,18 @@ module DevStructure::Puppet
       end
     end
 
+    # Return a hash of `pathname`s to `content`s for all the templates
+    # referenced in this manifest.  `file` resources which define the
+    # `content` attribute must have a template containing the file itself.
+    def templates
+      out = {}
+      (@resources["file"] || {}).select do |name, resource|
+        next unless resource[:content] && resource.content
+        out[name] = resource.content
+      end
+      out
+    end
+
     # Turn this manifest into a Puppet class.  We start with a base level
     # of indentation that we carry through our resources and manifests.
     # Order is again not important so we don't make much effort.  The
@@ -80,7 +101,8 @@ module DevStructure::Puppet
     # ourselves in the parent.
     def to_s(tab="")
       out = []
-      out << "#{tab}class #{@name.gsub(".", "--")} {"
+      out << @comment if @comment
+      out << "#{tab}class #{@name} {"
       @manifests.each_value do |manifest|
         out << manifest.to_s("#{tab}\t")
       end
@@ -100,10 +122,54 @@ module DevStructure::Puppet
         end
       end
       out << "#{tab}}"
-      out << "#{tab}include #{@name.gsub(".", "--")}" if @parent
+      out << "#{tab}include #{@name}" if @parent
       out.join("\n")
     end
 
+    # Create a Puppet module containing a manifest and the files being
+    # distributed as templates.
+    def to_gz(io)
+      mtime = Time.now
+      gz = Zlib::GzipWriter.new(io)
+      tar = Archive::Tar::Minitar::Writer.new(gz)
+      tar.mkdir @name, :mode => 0755, :mtime => mtime
+
+      # Store the manifest in the tarball.
+      manifest = to_s
+      tar.mkdir "#{@name}/manifests", :mode => 0755, :mtime => mtime
+      tar.add_file_simple("#{@name}/manifests/init.pp", {
+        :mode => 0644,
+        :size => manifest.length,
+        :mtime => mtime
+      }) { |w| w.write manifest }
+
+      # Include as templates the content of any files in the module.
+      templates = self.templates
+      @manifests.each_value { |manifest| templates.merge! manifest.templates }
+      if 0 < templates.length
+        tar.mkdir "#{@name}/templates", :mode => 0755, :mtime => mtime
+        templates.each do |pathname, content|
+          dirnames = ::File.dirname(pathname).split("/")
+          dirnames.shift
+          (0..(dirnames.length - 1)).each do |i|
+            tar.mkdir "#{@name}/templates/#{dirnames[0..i].join("/")}",
+              :mode => 0755, :mtime => mtime
+          end
+          tar.add_file_simple("#{@name}/templates#{pathname}", {
+            :mode => 0644,
+            :size => content.length,
+            :mtime => mtime
+          }) { |w| w.write content }
+        end
+      end
+
+      # Return the finalized tarball.
+      tar.close
+      gz.close
+      io
+
+    end
+
   end
 
   # A Puppet resource is basically a named hash.  The name is unique
@@ -113,12 +179,13 @@ module DevStructure::Puppet
   # name to determine the type, so do not instantiate `Resource`
   # directly.
   class Resource < Hash
-    attr_accessor :type, :name, :style
+    attr_reader :type
+    attr_accessor :name, :style
 
     def initialize(name, options={})
       super nil
       clear
-      options.each { |k, v| self[k.to_s] = v }
+      options.each { |k, v| self[k.to_sym] = v }
       @type = self.class.to_s.downcase[/[^:]+$/]
       @name = name && name.to_s
       @style = :complete
@@ -237,7 +304,16 @@ module DevStructure::Puppet
   # type.  The most common types are `Package`, `Exec`, and `File`.
   class Package < Resource; end
   class Exec < Resource; end
-  class File < Resource; end
+
+  # `File` resources are a special because they need their content stored
+  # in a template.
+  class File < Resource
+    def initialize(name, content, options={})
+      super name, options
+      @content = content
+    end
+    attr_reader :content
+  end
 
   # `Class` is also a useful resource type but needs a little more help
   # because of the stricter rules governing class names in the Puppet

metadata

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