puppet 0.22.4 → 0.23.0

data/lib/puppet/util/reference.rb

@@ -0,0 +1,189 @@
+require 'puppet/util/instance_loader'
+
+# Manage Reference Documentation.
+class Puppet::Util::Reference
+    include Puppet::Util
+    include Puppet::Util::Docs
+
+    extend Puppet::Util::InstanceLoader
+
+    autoload(:reference, 'puppet/reference')
+
+    def self.footer
+        "\n\n----------------\n\n*This page autogenerated on %s*\n" % Time.now
+    end
+
+    def self.modes
+        %w{pdf trac text}
+    end
+
+    def self.newreference(name, options = {}, &block)
+        ref = self.new(name, options, &block)
+        instance_hash(:reference)[symbolize(name)] = ref
+
+        ref
+    end
+
+    def self.page(*sections)
+        depth = 4
+        # Use the minimum depth
+        sections.each do |name|
+            section = reference(name) or raise "Could not find section %s" % name
+            depth = section.depth if section.depth < depth
+        end
+        text = ".. contents:: :depth: 2\n\n"
+    end
+
+    def self.pdf(text)
+        puts "creating pdf"
+        File.open("/tmp/puppetdoc.txt", "w") do |f|
+            f.puts text
+        end
+        rst2latex = %x{which rst2latex}
+        if $? != 0 or rst2latex =~ /no /
+            rst2latex = %x{which rst2latex.py}
+        end
+        if $? != 0 or rst2latex =~ /no /
+            raise "Could not find rst2latex"
+        end
+        rst2latex.chomp!
+        cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
+        output = %x{#{cmd}}
+        unless $? == 0
+            $stderr.puts "rst2latex failed"
+            $stderr.puts output
+            exit(1)
+        end
+        $stderr.puts output
+
+        # Now convert to pdf
+        puts "handling pdf"
+        Dir.chdir("/tmp") do
+            %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
+        end
+
+        #if FileTest.exists?("/tmp/puppetdoc.pdf")
+        #    FileUtils.mv("/tmp/puppetdoc.pdf", "/export/apache/docroots/reductivelabs.com/htdocs/downloads/puppet/reference.pdf")
+        #end
+    end
+
+    def self.references
+        instance_loader(:reference).loadall
+        loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
+    end
+
+    HEADER_LEVELS = [nil, "=", "-", "+", "'", "~"]
+
+    attr_accessor :page, :depth, :header, :title, :dynamic
+    attr_writer :doc
+
+    def doc
+        if defined?(@doc)
+            return "%s - %s" % [@name, @doc]
+        else
+            return @title
+        end
+    end
+
+    def dynamic?
+        self.dynamic
+    end
+
+    def h(name, level)
+        return "%s\n%s\n\n" % [name, HEADER_LEVELS[level] * name.to_s.length]
+    end
+
+    def initialize(name, options = {}, &block)
+        @name = name
+        options.each do |option, value|
+            send(option.to_s + "=", value)
+        end
+
+        meta_def(:generate, &block)
+
+        # Now handle the defaults
+        @title ||= "%s Reference" % @name.to_s.capitalize
+        @page ||= @title.gsub(/\s+/, '')
+        @depth ||= 2
+        @header ||= ""
+    end
+
+    # Indent every line in the chunk except those which begin with '..'.
+    def indent(text, tab)
+        return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
+    end
+
+    def option(name, value)
+        ":%s: %s\n" % [name.to_s.capitalize, value]
+    end
+
+    def paramwrap(name, text, options = {})
+        options[:level] ||= 5
+        #str = "%s : " % name
+        str = h(name, options[:level])
+        if options[:namevar]
+            str += "- **namevar**\n\n"
+        end
+        str += text
+        #str += text.gsub(/\n/, "\n    ")
+
+        str += "\n\n"
+        return str
+    end
+
+    # Remove all trac links.
+    def strip_trac(text)
+        text.gsub(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
+    end
+
+    def text
+        puts output
+    end
+
+    def to_rest(withcontents = true)
+        # First the header
+        text = h(@title, 1)
+        text += "\n\n**This page is autogenerated; any changes will get overwritten**\n\n"
+        if withcontents
+            text +=  ".. contents:: :depth: %s\n\n" % @depth
+        end
+
+        text += @header
+
+        text += generate()
+
+        if withcontents
+            text += self.class.footer
+        end
+
+        return text
+    end
+
+    def to_text(withcontents = true)
+        strip_trac(to_rest(withcontents))
+    end
+
+    def to_trac(with_contents = true)
+        "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
+    end
+
+    def trac
+        File.open("/tmp/puppetdoc.txt", "w") do |f|
+            f.puts self.to_trac
+        end
+
+        puts "Writing %s reference to trac as %s" % [@name, @page]
+        cmd = %{sudo trac-admin /export/svn/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page
+        output = %x{#{cmd}}
+        unless $? == 0
+            $stderr.puts "trac-admin failed"
+            $stderr.puts output
+            exit(1)
+        end
+        unless output =~ /^\s+/
+            $stderr.puts output
+        end
+    end
+end
+
+# $Id: reference.rb 2485 2007-05-08 19:29:38Z luke $

data/lib/puppet/util/storage.rb

@@ -46,7 +46,7 @@ class Puppet::Util::Storage
     self.init
 
     def self.load
-        Puppet.config.use(:puppet)
+        Puppet.config.use(:main)
 
         unless File.exists?(Puppet[:statefile])
             unless defined? @@state and ! @@state.nil?
@@ -100,4 +100,4 @@ class Puppet::Util::Storage
     end
 end
 
-# $Id: storage.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: storage.rb 2463 2007-05-04 23:09:34Z luke $

data/lib/puppet/util/subclass_loader.rb

@@ -1,6 +1,8 @@
 # A module for loading subclasses into an array and retrieving
 # them by name.  Also sets up a method for each class so
 # that you can just do Klass.subclass, rather than Klass.subclass(:subclass).
+#
+# This module is currently used by network handlers and clients.
 module Puppet::Util::SubclassLoader
     attr_accessor :loader, :classloader
 
@@ -48,7 +50,6 @@ module Puppet::Util::SubclassLoader
     # subclasses, thus the reason we're keeping track of the @@classloader.
     def inherited(sub)
         @subclasses ||= []
-        @subclasses << sub
         sub.classloader = self.classloader
         if self.classloader == self
             @subclasses << sub
@@ -78,6 +79,12 @@ module Puppet::Util::SubclassLoader
 
         return @name
     end
+
+    # Provide a list of all subclasses.
+    def subclasses
+        @loader.loadall
+        @subclasses.collect { |klass| klass.name }
+    end
 end
 
-# $Id: subclass_loader.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: subclass_loader.rb 2479 2007-05-07 22:29:44Z luke $

data/test/language/ast.rb

@@ -2,80 +2,17 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/rails'
+require 'puppettest'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/network/client'
-require 'puppettest'
 require 'puppettest/resourcetesting'
 require 'puppettest/parsertesting'
-require 'puppettest/railstesting'
+require 'puppettest/support/collection'
 
 class TestAST < Test::Unit::TestCase
-    include PuppetTest::RailsTesting
     include PuppetTest::ParserTesting
     include PuppetTest::ResourceTesting
-    
-    if defined? ActiveRecord
-    # Verify that our collection stuff works.
-    def test_collection
-        collectable = []
-        non = []
-        # First put some objects into the database.
-        bucket = mk_transtree do |object, depth, width|
-            # and mark some of them collectable
-            if width % 2 == 1
-                object.collectable = true
-                collectable << object
-            else
-                non << object
-            end
-        end
-
-        # Now collect our facts
-        facts = {}
-        Facter.each do |fact, value| facts[fact] = value end
-
-        assert_nothing_raised {
-            Puppet::Rails.init
-        }
-
-        # Now try storing our crap
-        assert_nothing_raised {
-            host = Puppet::Rails::Host.store(
-                :objects => bucket,
-                :facts => facts,
-                :host => facts["hostname"]
-            )
-        }
-
-        # Now create an ast tree that collects that.  They should all be files.
-        coll = nil
-        assert_nothing_raised {
-            coll = AST::Collection.new(
-                :type => nameobj("file")
-            )
-        }
-
-        top = nil
-        assert_nothing_raised("Could not create top object") {
-            top = AST::ASTArray.new(
-                :children => [coll]
-            )
-        }
-
-        objects = nil
-        assert_nothing_raised("Could not evaluate") {
-            scope = mkscope
-            objects = scope.evaluate(:ast => top).flatten
-        }
-
-        assert(objects.length > 0, "Did not receive any collected objects")
-    end
-    else
-        $stderr.puts "No ActiveRecord -- skipping collection tests"
-    end
+    include PuppetTest::Support::Collection
 
     def test_if
         astif = nil
@@ -251,87 +188,6 @@ class TestAST < Test::Unit::TestCase
             end
         end
     end
-
-    if defined? ActiveRecord::Base
-    def test_exported_collexp
-        railsinit
-        Puppet[:storeconfigs] = true
-        @interp, @scope, @source = mkclassframing
-
-        # make a rails resource
-        railsresource "file", "/tmp/testing", :owner => "root", :group => "bin",
-            :mode => "644" 
-
-        run_collection_queries(:exported) do |string, result, query|
-            code = nil
-            str = nil
-
-            # We don't support anything but the title in rails right now
-            retval = nil
-            bad = false
-            # Figure out if the search is for anything rails will ignore
-            string.scan(/(\w+) [!=]= \w+/) do |s|
-                unless s[0] == "title"
-                    bad = true
-                    break
-                end
-            end
-
-            # And if it is, make sure we throw an error.
-            if bad
-                assert_raise(Puppet::ParseError, "Evaluated '#{string}'") do
-                    str, code = query.evaluate :scope => @scope
-                end
-                next
-            else
-                assert_nothing_raised("Could not evaluate '#{string}'") do
-                    str, code = query.evaluate :scope => @scope
-                end
-            end
-            assert_nothing_raised("Could not find resource") do
-                retval = Puppet::Rails::Resource.find(:all,
-                    :include => :param_values,
-                    :conditions => str) 
-            end
-
-            if result
-                assert_equal(1, retval.length, "Did not find resource with '#{string}'")
-                res = retval.shift
-
-                assert_equal("file", res.restype)
-                assert_equal("/tmp/testing", res.title)
-            else
-                assert_equal(0, retval.length, "found a resource with '#{string}'")
-            end
-        end
-    end
-    end
-
-    def run_collection_queries(form)
-        {true => [%{title == "/tmp/testing"}, %{(title == "/tmp/testing")},
-            %{title == "/tmp/testing" and group == bin}, %{title == bin or group == bin},
-            %{title == "/tmp/testing" or title == bin}, %{title == "/tmp/testing"},
-            %{(title == "/tmp/testing" or title == bin) and group == bin}],
-        false => [%{title == bin}, %{title == bin or (title == bin and group == bin)},
-            %{title != "/tmp/testing"}, %{title != "/tmp/testing" and group != bin}]
-        }.each do |res, ary|
-            ary.each do |str|
-                if form == :virtual
-                    code = "File <| #{str} |>"
-                else
-                    code = "File <<| #{str} |>>"
-                end
-                parser = mkparser
-                query = nil
-
-                assert_nothing_raised("Could not parse '#{str}'") do
-                    query = parser.parse(code)[0].query
-                end
-
-                yield str, res, query
-            end
-        end
-    end
 end
 
-# $Id: ast.rb 2296 2007-03-18 22:48:57Z luke $
+# $Id: ast.rb 2597 2007-06-17 21:41:50Z luke $

data/test/language/ast/component.rb

@@ -129,5 +129,14 @@ class TestASTComponent < Test::Unit::TestCase
             end
         end
     end
+
+    # Testing the root cause of #615.  We should be using the fqname for the type, instead
+    # of just the short name.
+    def test_fully_qualified_types
+        interp = mkinterp
+        klass = interp.newclass("one::two")
+
+        assert_equal("one::two", klass.classname, "Class did not get fully qualified class name")
+    end
 end
-# $Id: component.rb 2301 2007-03-19 00:46:25Z luke $
+# $Id: component.rb 2458 2007-05-03 20:45:25Z luke $

data/test/language/collector.rb

@@ -2,17 +2,14 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet/rails'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
-require 'puppettest/railstesting'
 
 class TestCollector < Test::Unit::TestCase
 	include PuppetTest
     include PuppetTest::ParserTesting
     include PuppetTest::ResourceTesting
-    include PuppetTest::RailsTesting
     Parser = Puppet::Parser
     AST = Parser::AST
 
@@ -142,193 +139,6 @@ class TestCollector < Test::Unit::TestCase
         assert_equal(false, ret)
     end
 
-    if Puppet.features.rails?
-    def test_collect_exported
-        railsinit
-
-        # Set a hostname
-        @scope.host = Facter.value(:hostname)
-
-        # make an exported resource
-        exported = mkresource(:type => "file", :title => "/tmp/exported",
-            :exported => true, :params => {:owner => "root"})
-        @scope.setresource exported
-
-        assert(exported.exported?, "Object was not marked exported")
-        assert(exported.virtual?, "Object was not marked virtual")
-
-        # And a non-exported
-        real = mkresource(:type => "file", :title => "/tmp/real",
-            :params => {:owner => "root"})
-        @scope.setresource real
-
-        # Now make a collector
-        coll = nil
-        assert_nothing_raised do
-            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
-        end
-
-        # Set it in our scope
-        @scope.newcollection(coll)
-
-        # Make sure it's in the collections
-        assert_equal([coll], @scope.collections)
-
-        # And try to collect the virtual resources.
-        ret = nil
-        assert_nothing_raised do
-            ret = coll.collect_exported
-        end
-
-        assert_equal([exported], ret)
-
-        # Now make sure evaluate does the right thing.
-        assert_nothing_raised do
-            ret = coll.evaluate
-        end
-
-        # Make sure that the collection does not find the resource on the
-        # next run.
-        ret = nil
-        assert_nothing_raised do
-            ret = coll.collect_exported
-        end
-
-        assert(ret.empty?, "Exported resource was collected on the second run")
-
-
-        # And make sure our exported object is no longer exported
-        assert(! exported.virtual?, "Virtual object did not get realized")
-
-        # But it should still be marked exported.
-        assert(exported.exported?, "Resource got un-exported")
-
-        # Now make a new collector of a different type and make sure it
-        # finds nothing.
-        assert_nothing_raised do
-            coll = Puppet::Parser::Collector.new(@scope, "exec", nil, nil, :exported)
-        end
-
-        # Remark this as virtual
-        exported.virtual = true
-
-        assert_nothing_raised do
-            ret = coll.evaluate
-        end
-
-        assert(! ret, "got resources back")
-
-        # Now create a whole new scope and make sure we can actually retrieve
-        # the resource from the database, not just from the scope.
-        # First create a host object and store our resource in it.
-
-        # Now collect our facts
-        facts = {}
-        Facter.each do |fact, value| facts[fact] = value end 
-
-        # Now try storing our crap
-        # Remark this as exported
-        exported.exported = true
-        host = Puppet::Rails::Host.store(
-            :resources => [exported],
-            :facts => facts,
-            :name => facts["hostname"]
-        )
-        assert(host, "did not get rails host")
-        host.save
-
-        # And make sure it's in there
-        newres = host.resources.find_by_restype_and_title_and_exported("file", "/tmp/exported", true)
-        assert(newres, "Did not find resource in db")
-        interp, scope, source = mkclassframing
-        scope.host = "two"
-
-        # Now make a collector
-        coll = nil
-        assert_nothing_raised do
-            coll = Puppet::Parser::Collector.new(scope, "file", nil, nil, :exported)
-        end
-
-        # Set it in our scope
-        scope.newcollection(coll)
-
-        # Make sure it's in the collections
-        assert_equal([coll], scope.collections)
-
-        # And try to collect the virtual resources.
-        ret = nil
-        assert_nothing_raised do
-            ret = coll.collect_exported
-        end
-
-        assert_equal(["/tmp/exported"], ret.collect { |f| f.title })
-
-        # Make sure we can evaluate the same collection multiple times and
-        # that later collections do nothing
-        assert_nothing_raised("Collection found same resource twice") do
-            ret = coll.evaluate
-        end
-    end
-
-    def test_collection_conflicts
-        railsinit
-
-        # First make a railshost we can conflict with
-        host = Puppet::Rails::Host.new(:name => "myhost")
-
-        host.resources.build(:title => "/tmp/conflicttest", :restype => "file",
-            :exported => true)
-
-        host.save
-
-        # Now make a normal resource
-        normal = mkresource(:type => "file", :title => "/tmp/conflicttest",
-            :params => {:owner => "root"})
-        @scope.setresource normal
-        @scope.host = "otherhost"
-
-        # Now make a collector
-        coll = nil
-        assert_nothing_raised do
-            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
-        end
-
-        # And try to collect the virtual resources.
-        assert_raise(Puppet::ParseError) do
-            ret = coll.collect_exported
-        end
-    end
-
-    # Make sure we do not collect resources from the host we're on
-    def test_no_resources_from_me
-        railsinit
-
-        # Make our configuration
-        host = Puppet::Rails::Host.new(:name => "myhost")
-
-        host.resources.build(:title => "/tmp/hosttest", :type => "file",
-            :exported => true)
-
-        host.save
-
-        @scope.host = "myhost"
-
-        # Now make a collector
-        coll = nil
-        assert_nothing_raised do
-            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
-        end
-
-        # And make sure we get nada back
-        ret = nil
-        assert_nothing_raised do
-            ret = coll.collect_exported
-        end
-
-        assert(ret.empty?, "Found exports from our own host")
-    end
-    end
-
     # Collections that specify resources should be deleted when they succeed,
     # but others should remain until the very end.
     def test_normal_collections_remain
@@ -366,4 +176,4 @@ class TestCollector < Test::Unit::TestCase
     end
 end
 
-# $Id: collector.rb 2213 2007-02-18 05:58:27Z luke $
+# $Id: collector.rb 2597 2007-06-17 21:41:50Z luke $