puppet 0.13.0 → 0.13.1

data/lib/puppet/parser/ast/objectdef.rb

@@ -21,10 +21,10 @@ class Puppet::Parser::AST
             when Puppet::Type:
                 raise Puppet::Error,
                     "Built-in types must be provided with a name"
-            when HostClass:
+            when Node:
                 return type
             else
-                Puppet.info "Autogenerating name for object of type %s" %
+                Puppet.debug "Autogenerating name for object of type %s" %
                     type
                 return [type, "-", self.object_id].join("")
             end

data/lib/puppet/parser/scope.rb

@@ -564,6 +564,9 @@ module Puppet
             # in the scope tree, which is what provides some minimal closure-like
             # behaviour.
             def setobject(type, name, params, file, line)
+                # FIXME This objectlookup stuff should be looking up using both
+                # the name and the namevar.
+
                 # First see if we can look the object up using normal scope
                 # rules, i.e., one of our parent classes has defined the
                 # object or something
@@ -727,6 +730,7 @@ module Puppet
                 if defined? @name
                     bucket = TransBucket.new
                     bucket.name = @name
+                    bucket.autoname = self.autoname
 
                     # it'd be nice not to have to do this...
                     results.each { |result|
@@ -769,4 +773,4 @@ module Puppet
     end
 end
 
-# $Id: scope.rb 871 2006-02-07 05:58:00Z luke $
+# $Id: scope.rb 898 2006-02-13 17:13:09Z luke $

data/lib/puppet/sslcertificates/ca.rb

@@ -69,12 +69,10 @@ class Puppet::SSLCertificates::CA
                 #puts "Reading %s" % Puppet[:capass]
                 #system "ls -al %s" % Puppet[:capass]
                 #File.read Puppet[:capass]
-                Puppet.info "Getting pass"
                 @config[:password] = self.getpass
             else
                 # Don't create a password if the cert already exists
                 unless FileTest.exists?(@config[:cacert])
-                    Puppet.info "Genning pass"
                     @config[:password] = self.genpass
                 end
             end
@@ -288,4 +286,4 @@ class Puppet::SSLCertificates::CA
     end
 end
 
-# $Id: ca.rb 873 2006-02-07 23:12:33Z luke $
+# $Id: ca.rb 896 2006-02-10 22:00:30Z luke $

data/lib/puppet/statechange.rb

@@ -12,7 +12,7 @@ module Puppet
             @path = [state.path,"change"].flatten
             @is = state.is
 
-            if state.is == state.should
+            if state.insync?
                 raise Puppet::Error.new(
                     "Tried to create a change for in-sync state %s" % state.name
                 )
@@ -25,8 +25,8 @@ module Puppet
 
 		#---------------------------------------------------------------
         def go
-            if @state.is == @state.should
-                @state.info "already in sync"
+            if @state.insync?
+                @state.info "Already in sync"
                 return nil
             end
 
@@ -37,7 +37,8 @@ module Puppet
                 return nil
             end
 
-            #@state.info "Is: %s, Should: %s" % [@state.is.inspect, @state.should.inspect]
+            #@state.info "Is: %s, Should: %s" %
+            #    [@state.is.inspect, @state.should.inspect]
 
             begin
                 events = @state.sync
@@ -152,4 +153,4 @@ module Puppet
 	end
 end
 
-# $Id: statechange.rb 831 2006-01-16 20:01:20Z luke $
+# $Id: statechange.rb 899 2006-02-13 17:48:33Z luke $

data/lib/puppet/storage.rb

@@ -1,10 +1,12 @@
 require 'yaml'
+require 'sync'
+#require 'puppet/lockfile'
 
 module Puppet
     # a class for storing state
     class Storage
         include Singleton
-        
+
         def initialize
             self.class.load
         end
@@ -46,9 +48,7 @@ module Puppet
                 end
                 return
             end
-            #Puppet.debug "Loading statefile %s" % Puppet[:statefile]
-            Puppet::Util.lock(Puppet[:statefile]) { |file|
-                #@@state = Marshal.load(file)
+            Puppet::Util.readlock(Puppet[:statefile]) do |file|
                 begin
                     @@state = YAML.load(file)
                 rescue => detail
@@ -63,7 +63,7 @@ module Puppet
                             Puppet[:statefile]
                     end
                 end
-            }
+            end
 
             unless @@state.is_a?(Hash)
                 Puppet.err "State got corrupted"
@@ -78,7 +78,7 @@ module Puppet
         end
 
         def self.store
-            Puppet.debug "Storing state"
+            #Puppet.debug "Storing state"
             unless FileTest.directory?(File.dirname(Puppet[:statefile]))
                 begin
                     Puppet.recmkdir(File.dirname(Puppet[:statefile]))
@@ -94,13 +94,11 @@ module Puppet
                 Puppet.info "Creating state file %s" % Puppet[:statefile]
             end
 
-            Puppet::Util.lock(
-                Puppet[:statefile], "w", 0600
-            ) { |file|
+            Puppet::Util.writelock(Puppet[:statefile], 0600) do |file|
                 file.print YAML.dump(@@state)
-            }
+            end
         end
     end
 end
 
-# $Id: storage.rb 848 2006-01-24 06:01:58Z luke $
+# $Id: storage.rb 897 2006-02-12 18:08:39Z luke $

data/lib/puppet/transportable.rb

@@ -25,13 +25,13 @@ module Puppet
         def initialize(name,type)
             @type = type
             @name = name
-            @params = {"name" => name}
+            @params = {}
             #self.class.add(self)
             @tags = []
         end
 
         def longname
-            return [self.type,self[:name]].join('--')
+            return [@type,@name].join('--')
         end
 
         def tags
@@ -43,7 +43,7 @@ module Puppet
         end
 
         def to_s
-            return "%s(%s) => %s" % [@type,self[:name],super]
+            return "%s(%s) => %s" % [@type,@name,super]
         end
 
         def to_manifest
@@ -164,24 +164,51 @@ module Puppet
             unless defined? @type
                 Puppet.debug "TransBucket '%s' has no type" % @name
             end
-            hash = {
-                :name => @name,
-                :type => @type
-            }
-            if defined? @parameters
-                @parameters.each { |param,value|
-                    Puppet.debug "Defining %s on %s of type %s" %
-                        [param,@name,@type]
-                    hash[param] = value
-                }
+            usetrans = true
+
+            if usetrans
+                name = nil
+                #if self.autoname or @name =~ /-\d+$/
+                if self.autoname
+                    name = @type
+                else
+                    name = "%s[%s]" % [@type, @name]
+                end
+                trans = TransObject.new(name, :component)
+                if defined? @parameters
+                    @parameters.each { |param,value|
+                        Puppet.debug "Defining %s on %s of type %s" %
+                            [param,@name,@type]
+                        trans[param] = value
+                    }
+                else
+                    #Puppet.debug "%s[%s] has no parameters" % [@type, @name]
+                end
+
+                if parent
+                    trans[:parent] = parent
+                end
+                container = Puppet.type(:component).create(trans)
             else
-                #Puppet.debug "%s[%s] has no parameters" % [@type, @name]
-            end
+                hash = {
+                    :name => @name,
+                    :type => @type
+                }
+                if defined? @parameters
+                    @parameters.each { |param,value|
+                        Puppet.debug "Defining %s on %s of type %s" %
+                            [param,@name,@type]
+                        hash[param] = value
+                    }
+                else
+                    #Puppet.debug "%s[%s] has no parameters" % [@type, @name]
+                end
 
-            if parent
-                hash[:parent] = parent
+                if parent
+                    hash[:parent] = parent
+                end
+                container = Puppet.type(:component).create(hash)
             end
-            container = Puppet.type(:component).create(hash)
             #Puppet.info container.inspect
 
             if parent
@@ -228,4 +255,4 @@ module Puppet
     #------------------------------------------------------------
 end
 
-# $Id: transportable.rb 873 2006-02-07 23:12:33Z luke $
+# $Id: transportable.rb 896 2006-02-10 22:00:30Z luke $

data/lib/puppet/type.rb

@@ -1081,11 +1081,13 @@ class Type < Puppet::Element
         end
 
         name = nil
-        unless name =   hash["name"] || hash[:name] ||
-                    hash[self.namevar] || hash[self.namevar.to_s]
-            raise Puppet::Error, "You must specify a name for objects of type %s" %
-                self.to_s
+        unless hash.is_a? TransObject
+            # if it's not a transobject, then make it one, just to make people's
+            # lives easier
+            hash = self.hash2trans(hash)
         end
+        name = hash.name
+
         # if the object already exists
         if self.isomorphic? and retobj = self[name]
             # if only one of our objects is implicit, then it's easy to see
@@ -1132,9 +1134,51 @@ class Type < Puppet::Element
             obj.implicit = true
         end
 
+        # Store the object by name
+        self[obj.name] = obj
+
+        if name != obj[self.namevar]
+            self.alias(obj[self.namevar], obj)
+        end
+
         return obj
     end
 
+    # Convert a hash to a TransObject.
+    def self.hash2trans(hash)
+        name = nil
+        ["name", :name, self.namevar, self.namevar.to_s].each { |param|
+            if hash.include? param
+                name = hash[param]
+                hash.delete(param)
+            end
+        }
+        unless name
+            raise Puppet::Error,
+                "You must specify a name for objects of type %s" % self.to_s
+        end
+
+        [:type, "type"].each do |type|
+            if hash.include? type
+                unless self.validattr? :type
+                    hash.delete type
+                end
+            end
+        end
+        # okay, now make a transobject out of hash
+        begin
+            trans = TransObject.new(name, self.name.to_s)
+            hash.each { |param, value|
+                trans[param] = value
+            }
+        rescue => detail
+            raise Puppet::Error, "Could not create %s: %s" %
+                [name, detail]
+        end
+
+        return trans
+    end
+
     def self.implicitcreate(hash)
         unless hash.include?(:implicit)
             hash[:implicit] = true
@@ -1206,9 +1250,10 @@ class Type < Puppet::Element
         unless defined? @inited
             self.initvars
         end
+        namevar = self.class.namevar
 
         # If we got passed a transportable object, we just pull a bunch of info
-        # directly from it.
+        # directly from it.  This is the main object instantiation mechanism.
         if hash.is_a?(Puppet::TransObject)
             #self[:name] = hash[:name]
             [:file, :line, :tags].each { |getter|
@@ -1219,6 +1264,15 @@ class Type < Puppet::Element
                     end
                 end
             }
+
+            @name = hash.name
+
+            # If they did not provide a namevar,
+            if hash.include? namevar
+                self[:alias] = hash.name
+            else
+                hash[namevar] = hash.name
+            end
             hash = hash.to_hash
         end
 
@@ -1235,7 +1289,6 @@ class Type < Puppet::Element
         # we have the name but before anything else
 
         attrs = self.class.allattrs
-        namevar = self.class.namevar
 
         if hash.include?(namevar)
             #self.send(namevar.to_s + "=", hash[namevar])
@@ -1281,10 +1334,6 @@ class Type < Puppet::Element
                 [self.class.name, hash.keys.join(" ")])
         end
 
-        # add this object to the specific class's list of objects
-        #puts caller
-        self.class[self.name] = self
-
         if self.respond_to?(:validate)
             self.validate
         end
@@ -1518,18 +1567,18 @@ class Type < Puppet::Element
 
         # if they're not using :name for the namevar but we got :name (probably
         # from the parser)
-        if namevar != :name and hash.include?(:name) and ! hash[:name].nil?
-            #self[namevar] = hash[:name]
-            hash[namevar] = hash[:name]
-            hash.delete(:name)
-        # else if we got the namevar
-        elsif hash.has_key?(namevar) and ! hash[namevar].nil?
-            #self[namevar] = hash[namevar]
-            #hash.delete(namevar)
-        # else something's screwy
-        else
-            # they didn't specify anything related to names
-        end
+#        if namevar != :name and hash.include?(:name) and ! hash[:name].nil?
+#            #self[namevar] = hash[:name]
+#            hash[namevar] = hash[:name]
+#            hash.delete(:name)
+#        # else if we got the namevar
+#        elsif hash.has_key?(namevar) and ! hash[namevar].nil?
+#            #self[namevar] = hash[namevar]
+#            #hash.delete(namevar)
+#        # else something's screwy
+#        else
+#            # they didn't specify anything related to names
+#        end
 
         return hash
     end
@@ -2048,9 +2097,10 @@ class Type < Puppet::Element
 
     newmetaparam(:loglevel) do
         desc "Sets the level that information will be logged:
-             debug, info, verbose, notice, warning, err, alert, emerg or crit.
-             The log levels have the biggest impact when logs are sent to
-             syslog (which is currently the default)."
+             ``debug``, ``info``, ``verbose``, ``notice``, ``warning``,
+             ``err``, ``alert``, ``emerg`` or ``crit``.  The log levels have
+             the biggest impact when logs are sent to syslog (which is
+             currently the default)."
         defaultto :notice
 
         validate do |loglevel|
@@ -2074,26 +2124,43 @@ class Type < Puppet::Element
     end
 
     newmetaparam(:alias) do
-        desc "Creates an alias for the object.  This simplifies lookup of the
-            object so is useful in the language.  It is especially useful when
-            you are creating long commands using exec or when many different
-            systems call a given package_ different names::
-
+        desc "Creates an alias for the object.  Puppet uses this internally when you
+            provide a symbolic name::
             
-                file { \"/usr/local/scripts/myscript\":
-                    source => \"puppet://server/module/myscript\",
-                    mode => 755,
-                    alias => myscript
+                file { sshdconfig:
+                    path => $operatingsystem ? {
+                        solaris => \"/usr/local/etc/ssh/sshd_config\",
+                        default => \"/etc/ssh/sshd_config\"
+                    },
+                    source => \"...\"
+                }
+
+                service { sshd:
+                    subscribe => file[sshdconfig]
+                }
+
+            When you use this feature, the parser sets ``sshdconfig`` as the name,
+            and the library sets that as an alias for the file so the dependency
+            lookup for ``sshd`` works.  You can use this parameter yourself,
+            but note that only the library can use these aliases; for instance,
+            the following code will not work::
+
+                file { \"/etc/ssh/sshd_config\":
+                    owner => root,
+                    group => root,
+                    alias => sshdconfig
                 }
 
-                exec { \"/usr/local/scripts/myscript\":
-                    require => file[myscript]
+                file { sshdconfig:
+                    mode => 644
                 }
+
+            There's no way here for the Puppet parser to know that these two stanzas
+            should be affecting the same file.
+
+            See the `language tutorial <http://reductivelabs.com/projects/puppet/documentation/languagetutorial>`__ for more information.
             
-            Again, this is somewhat redundant, since any sane person would
-            just use a variable (unless the two statements were in different
-            scopes), and Puppet will autorequire the script anyway, but it
-            gets the point across."
+            "
 
         munge do |aliases|
             unless aliases.is_a?(Array)
@@ -2132,4 +2199,4 @@ require 'puppet/type/user'
 require 'puppet/type/tidy'
 require 'puppet/type/parsedtype'
 
-# $Id: type.rb 886 2006-02-08 17:45:26Z luke $
+# $Id: type.rb 900 2006-02-13 18:00:17Z luke $