summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/main.rb2
-rw-r--r--lib/puppet/application/server.rb2
-rw-r--r--lib/puppet/node/environment.rb2
-rw-r--r--lib/puppet/parser.rb2
-rw-r--r--lib/puppet/parser/compiler.rb6
-rw-r--r--lib/puppet/parser/parser_support.rb14
-rw-r--r--lib/puppet/parser/resource/reference.rb4
-rw-r--r--lib/puppet/parser/resource_type_collection_helper.rb7
-rw-r--r--lib/puppet/parser/scope.rb4
-rw-r--r--lib/puppet/resource/type.rb (renamed from lib/puppet/parser/resource_type.rb)2
-rw-r--r--lib/puppet/resource/type_collection.rb (renamed from lib/puppet/parser/resource_type_collection.rb)2
-rw-r--r--lib/puppet/resource/type_collection_helper.rb7
12 files changed, 27 insertions, 27 deletions
diff --git a/lib/puppet/application/main.rb b/lib/puppet/application/main.rb
index 3813df612..2952ef4ae 100644
--- a/lib/puppet/application/main.rb
+++ b/lib/puppet/application/main.rb
@@ -72,7 +72,7 @@ Puppet::Application.new(:main) do
Puppet[:manifest] = ARGV.shift
end
begin
- Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import
+ Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import
rescue => detail
Puppet.err detail
exit 1
diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/server.rb
index e9253c6f9..afdad54fb 100644
--- a/lib/puppet/application/server.rb
+++ b/lib/puppet/application/server.rb
@@ -69,7 +69,7 @@ Puppet::Application.new(:server) do
command(:parseonly) do
begin
- Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import
+ Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import
rescue => detail
Puppet.err detail
exit 1
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index a6e33703b..537a5dd26 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -44,7 +44,7 @@ class Puppet::Node::Environment
def known_resource_types
if @known_resource_types.nil? or @known_resource_types.stale?
- @known_resource_types = Puppet::Parser::ResourceTypeCollection.new(self)
+ @known_resource_types = Puppet::Resource::TypeCollection.new(self)
@known_resource_types.perform_initial_import
end
@known_resource_types
diff --git a/lib/puppet/parser.rb b/lib/puppet/parser.rb
index 3eda73885..4d274b43c 100644
--- a/lib/puppet/parser.rb
+++ b/lib/puppet/parser.rb
@@ -1,4 +1,4 @@
require 'puppet/parser/parser'
require 'puppet/parser/compiler'
-require 'puppet/parser/resource_type_collection'
+require 'puppet/resource/type_collection'
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index 25b064195..c669076bb 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -5,14 +5,14 @@ require 'puppet/node'
require 'puppet/resource/catalog'
require 'puppet/util/errors'
-require 'puppet/parser/resource_type_collection_helper'
+require 'puppet/resource/type_collection_helper'
# Maintain a graph of scopes, along with a bunch of data
# about the individual catalog we're compiling.
class Puppet::Parser::Compiler
include Puppet::Util
include Puppet::Util::Errors
- include Puppet::Parser::ResourceTypeCollectionHelper
+ include Puppet::Resource::TypeCollectionHelper
def self.compile(node)
new(node).compile.to_resource
@@ -275,7 +275,7 @@ class Puppet::Parser::Compiler
# Find and evaluate our main object, if possible.
def evaluate_main
- @main = known_resource_types.find_hostclass("", "") || known_resource_types.add(Puppet::Parser::ResourceType.new(:hostclass, ""))
+ @main = known_resource_types.find_hostclass("", "") || known_resource_types.add(Puppet::Resource::Type.new(:hostclass, ""))
@topscope.source = @main
@main_resource = Puppet::Parser::Resource.new(:type => "class", :title => :main, :scope => @topscope, :source => @main)
@topscope.resource = @main_resource
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb
index b21ead3af..e6bc46b86 100644
--- a/lib/puppet/parser/parser_support.rb
+++ b/lib/puppet/parser/parser_support.rb
@@ -3,14 +3,14 @@
class Puppet::Parser::Parser
require 'puppet/parser/functions'
require 'puppet/parser/files'
- require 'puppet/parser/resource_type_collection'
- require 'puppet/parser/resource_type_collection_helper'
- require 'puppet/parser/resource_type'
+ require 'puppet/resource/type_collection'
+ require 'puppet/resource/type_collection_helper'
+ require 'puppet/resource/type'
require 'monitor'
AST = Puppet::Parser::AST
- include Puppet::Parser::ResourceTypeCollectionHelper
+ include Puppet::Resource::TypeCollectionHelper
attr_reader :version, :environment
attr_accessor :files
@@ -278,12 +278,12 @@ class Puppet::Parser::Parser
# Create a new class, or merge with an existing class.
def newclass(name, options = {})
- known_resource_types.add Puppet::Parser::ResourceType.new(:hostclass, name, ast_context(true).merge(options))
+ known_resource_types.add Puppet::Resource::Type.new(:hostclass, name, ast_context(true).merge(options))
end
# Create a new definition.
def newdefine(name, options = {})
- known_resource_types.add Puppet::Parser::ResourceType.new(:definition, name, ast_context(true).merge(options))
+ known_resource_types.add Puppet::Resource::Type.new(:definition, name, ast_context(true).merge(options))
end
# Create a new node. Nodes are special, because they're stored in a global
@@ -292,7 +292,7 @@ class Puppet::Parser::Parser
names = [names] unless names.instance_of?(Array)
context = ast_context(true)
names.collect do |name|
- known_resource_types.add(Puppet::Parser::ResourceType.new(:node, name, context.merge(options)))
+ known_resource_types.add(Puppet::Resource::Type.new(:node, name, context.merge(options)))
end
end
diff --git a/lib/puppet/parser/resource/reference.rb b/lib/puppet/parser/resource/reference.rb
index bb50efdce..ac1c79aef 100644
--- a/lib/puppet/parser/resource/reference.rb
+++ b/lib/puppet/parser/resource/reference.rb
@@ -3,7 +3,7 @@ require 'puppet/resource/reference'
require 'puppet/file_collection/lookup'
require 'puppet/parser/yaml_trimmer'
-require 'puppet/parser/resource_type_collection_helper'
+require 'puppet/resource/type_collection_helper'
# A reference to a resource. Mostly just the type and title.
class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference
@@ -11,7 +11,7 @@ class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference
include Puppet::FileCollection::Lookup
include Puppet::Util::MethodHelper
include Puppet::Util::Errors
- include Puppet::Parser::ResourceTypeCollectionHelper
+ include Puppet::Resource::TypeCollectionHelper
attr_accessor :builtin, :file, :line, :scope
diff --git a/lib/puppet/parser/resource_type_collection_helper.rb b/lib/puppet/parser/resource_type_collection_helper.rb
deleted file mode 100644
index 51ccdc061..000000000
--- a/lib/puppet/parser/resource_type_collection_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'puppet/parser/resource_type_collection'
-
-module Puppet::Parser::ResourceTypeCollectionHelper
- def known_resource_types
- environment.known_resource_types
- end
-end
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 1f7fd7188..b79b344e3 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -6,10 +6,10 @@ require 'puppet/parser/templatewrapper'
require 'puppet/transportable'
require 'strscan'
-require 'puppet/parser/resource_type_collection_helper'
+require 'puppet/resource/type_collection_helper'
class Puppet::Parser::Scope
- include Puppet::Parser::ResourceTypeCollectionHelper
+ include Puppet::Resource::TypeCollectionHelper
require 'puppet/parser/resource'
AST = Puppet::Parser::AST
diff --git a/lib/puppet/parser/resource_type.rb b/lib/puppet/resource/type.rb
index c0d7f69ed..1a18b4e97 100644
--- a/lib/puppet/parser/resource_type.rb
+++ b/lib/puppet/resource/type.rb
@@ -4,7 +4,7 @@ require 'puppet/util/errors'
require 'puppet/util/inline_docs'
require 'puppet/parser/ast/leaf'
-class Puppet::Parser::ResourceType
+class Puppet::Resource::Type
include Puppet::Util::InlineDocs
include Puppet::Util::Warnings
include Puppet::Util::Errors
diff --git a/lib/puppet/parser/resource_type_collection.rb b/lib/puppet/resource/type_collection.rb
index cb90d9bb9..7ca95b1b8 100644
--- a/lib/puppet/parser/resource_type_collection.rb
+++ b/lib/puppet/resource/type_collection.rb
@@ -1,4 +1,4 @@
-class Puppet::Parser::ResourceTypeCollection
+class Puppet::Resource::TypeCollection
attr_reader :environment
def initialize(env)
diff --git a/lib/puppet/resource/type_collection_helper.rb b/lib/puppet/resource/type_collection_helper.rb
new file mode 100644
index 000000000..819cfba0b
--- /dev/null
+++ b/lib/puppet/resource/type_collection_helper.rb
@@ -0,0 +1,7 @@
+require 'puppet/resource/type_collection'
+
+module Puppet::Resource::TypeCollectionHelper
+ def known_resource_types
+ environment.known_resource_types
+ end
+end
generated by cgit (git 2.34.1) at 2024-09-23 18:26:12 +0000