puppet 8.5.1-universal-darwin → 8.6.0-universal-darwin
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +23 -20
- data/ext/windows/service/daemon.rb +49 -55
- data/lib/hiera/scope.rb +3 -3
- data/lib/hiera_puppet.rb +1 -1
- data/lib/puppet/agent/disabler.rb +1 -1
- data/lib/puppet/application/agent.rb +2 -2
- data/lib/puppet/application/apply.rb +2 -2
- data/lib/puppet/application/describe.rb +6 -6
- data/lib/puppet/application/device.rb +99 -100
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/face_base.rb +7 -7
- data/lib/puppet/application/filebucket.rb +1 -1
- data/lib/puppet/application/lookup.rb +5 -5
- data/lib/puppet/application/resource.rb +10 -3
- data/lib/puppet/application/ssl.rb +3 -3
- data/lib/puppet/application.rb +16 -18
- data/lib/puppet/coercion.rb +1 -1
- data/lib/puppet/configurer/downloader.rb +9 -4
- data/lib/puppet/configurer/fact_handler.rb +12 -13
- data/lib/puppet/configurer.rb +16 -18
- data/lib/puppet/confine/feature.rb +1 -1
- data/lib/puppet/confine/variable.rb +1 -1
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine_collection.rb +1 -1
- data/lib/puppet/confiner.rb +2 -2
- data/lib/puppet/daemon.rb +3 -3
- data/lib/puppet/datatypes.rb +5 -6
- data/lib/puppet/defaults.rb +14 -8
- data/lib/puppet/environments.rb +3 -7
- data/lib/puppet/error.rb +3 -3
- data/lib/puppet/external/dot.rb +42 -34
- data/lib/puppet/face/catalog/select.rb +1 -1
- data/lib/puppet/face/epp.rb +7 -9
- data/lib/puppet/face/help.rb +12 -12
- data/lib/puppet/face/module/changes.rb +1 -3
- data/lib/puppet/face/module/list.rb +37 -37
- data/lib/puppet/face/node/clean.rb +1 -1
- data/lib/puppet/face/parser.rb +6 -8
- data/lib/puppet/face/report.rb +5 -7
- data/lib/puppet/facter_impl.rb +1 -1
- data/lib/puppet/feature/base.rb +9 -11
- data/lib/puppet/feature/pe_license.rb +1 -1
- data/lib/puppet/feature/ssh.rb +1 -1
- data/lib/puppet/feature/telnet.rb +3 -5
- data/lib/puppet/feature/zlib.rb +1 -1
- data/lib/puppet/ffi/windows/constants.rb +1 -1
- data/lib/puppet/ffi/windows/functions.rb +2 -2
- data/lib/puppet/ffi/windows/structs.rb +3 -3
- data/lib/puppet/file_bucket/dipper.rb +4 -4
- data/lib/puppet/file_bucket/file.rb +4 -4
- data/lib/puppet/file_serving/base.rb +5 -5
- data/lib/puppet/file_serving/configuration/parser.rb +9 -9
- data/lib/puppet/file_serving/configuration.rb +3 -3
- data/lib/puppet/file_serving/fileset.rb +13 -13
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/metadata.rb +13 -9
- data/lib/puppet/file_serving/mount/file.rb +6 -6
- data/lib/puppet/file_serving/mount/locales.rb +2 -4
- data/lib/puppet/file_serving/mount/pluginfacts.rb +2 -4
- data/lib/puppet/file_serving/mount/plugins.rb +2 -4
- data/lib/puppet/file_serving/mount.rb +1 -1
- data/lib/puppet/file_system/file_impl.rb +3 -3
- data/lib/puppet/file_system/memory_impl.rb +1 -1
- data/lib/puppet/file_system/path_pattern.rb +1 -1
- data/lib/puppet/file_system/uniquefile.rb +17 -16
- data/lib/puppet/file_system/windows.rb +26 -18
- data/lib/puppet/forge/cache.rb +2 -2
- data/lib/puppet/forge/errors.rb +1 -1
- data/lib/puppet/forge/repository.rb +2 -2
- data/lib/puppet/forge.rb +13 -19
- data/lib/puppet/functions/abs.rb +2 -2
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/compare.rb +2 -2
- data/lib/puppet/functions/contain.rb +1 -1
- data/lib/puppet/functions/defined.rb +2 -2
- data/lib/puppet/functions/dig.rb +1 -1
- data/lib/puppet/functions/eyaml_lookup_key.rb +11 -13
- data/lib/puppet/functions/get.rb +1 -1
- data/lib/puppet/functions/hocon_data.rb +3 -5
- data/lib/puppet/functions/import.rb +1 -1
- data/lib/puppet/functions/json_data.rb +4 -6
- data/lib/puppet/functions/max.rb +2 -2
- data/lib/puppet/functions/min.rb +2 -2
- data/lib/puppet/functions/new.rb +1 -1
- data/lib/puppet/functions/reduce.rb +6 -10
- data/lib/puppet/functions/regsubst.rb +2 -2
- data/lib/puppet/functions/require.rb +1 -1
- data/lib/puppet/functions/yaml_data.rb +11 -13
- data/lib/puppet/functions.rb +32 -37
- data/lib/puppet/generate/type.rb +2 -2
- data/lib/puppet/gettext/config.rb +9 -9
- data/lib/puppet/graph/rb_tree_map.rb +31 -23
- data/lib/puppet/graph/relationship_graph.rb +12 -12
- data/lib/puppet/graph/simple_graph.rb +8 -10
- data/lib/puppet/http/client.rb +1 -1
- data/lib/puppet/http/dns.rb +4 -4
- data/lib/puppet/http/external_client.rb +1 -1
- data/lib/puppet/http/factory.rb +1 -1
- data/lib/puppet/http/proxy.rb +15 -15
- data/lib/puppet/http/redirector.rb +6 -2
- data/lib/puppet/http/resolver.rb +2 -2
- data/lib/puppet/http/retry_after_handler.rb +2 -2
- data/lib/puppet/http/service/ca.rb +1 -1
- data/lib/puppet/http/service/compiler.rb +4 -4
- data/lib/puppet/http/service/file_server.rb +1 -1
- data/lib/puppet/http/service/report.rb +2 -2
- data/lib/puppet/http/service.rb +9 -13
- data/lib/puppet/http/session.rb +1 -1
- data/lib/puppet/http/site.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +44 -45
- data/lib/puppet/indirector/catalog/rest.rb +7 -5
- data/lib/puppet/indirector/catalog/store_configs.rb +1 -1
- data/lib/puppet/indirector/exec.rb +2 -2
- data/lib/puppet/indirector/face.rb +7 -9
- data/lib/puppet/indirector/fact_search.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +6 -6
- data/lib/puppet/indirector/facts/json.rb +1 -1
- data/lib/puppet/indirector/facts/store_configs.rb +1 -1
- data/lib/puppet/indirector/file_bucket_file/file.rb +17 -17
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -3
- data/lib/puppet/indirector/file_content/rest.rb +1 -1
- data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
- data/lib/puppet/indirector/hiera.rb +1 -1
- data/lib/puppet/indirector/indirection.rb +27 -29
- data/lib/puppet/indirector/json.rb +4 -4
- data/lib/puppet/indirector/memory.rb +2 -2
- data/lib/puppet/indirector/msgpack.rb +5 -5
- data/lib/puppet/indirector/node/store_configs.rb +1 -1
- data/lib/puppet/indirector/none.rb +1 -1
- data/lib/puppet/indirector/report/json.rb +1 -1
- data/lib/puppet/indirector/report/yaml.rb +1 -1
- data/lib/puppet/indirector/request.rb +4 -4
- data/lib/puppet/indirector/resource/ral.rb +2 -4
- data/lib/puppet/indirector/resource/store_configs.rb +1 -1
- data/lib/puppet/indirector/terminus.rb +4 -4
- data/lib/puppet/indirector/yaml.rb +3 -3
- data/lib/puppet/info_service/class_information_service.rb +5 -8
- data/lib/puppet/info_service/task_information_service.rb +6 -7
- data/lib/puppet/interface/action.rb +5 -5
- data/lib/puppet/interface/action_manager.rb +5 -5
- data/lib/puppet/interface/documentation.rb +5 -5
- data/lib/puppet/interface/face_collection.rb +7 -7
- data/lib/puppet/interface/option.rb +2 -2
- data/lib/puppet/interface/option_manager.rb +6 -6
- data/lib/puppet/interface.rb +4 -4
- data/lib/puppet/metatype/manager.rb +2 -2
- data/lib/puppet/module/plan.rb +10 -10
- data/lib/puppet/module/task.rb +8 -8
- data/lib/puppet/module.rb +39 -41
- data/lib/puppet/module_tool/applications/application.rb +10 -8
- data/lib/puppet/module_tool/applications/installer.rb +53 -50
- data/lib/puppet/module_tool/applications/unpacker.rb +6 -8
- data/lib/puppet/module_tool/applications/upgrader.rb +37 -34
- data/lib/puppet/module_tool/checksums.rb +2 -2
- data/lib/puppet/module_tool/dependency.rb +1 -1
- data/lib/puppet/module_tool/errors/base.rb +1 -1
- data/lib/puppet/module_tool/install_directory.rb +1 -1
- data/lib/puppet/module_tool/local_tarball.rb +3 -5
- data/lib/puppet/module_tool/metadata.rb +12 -8
- data/lib/puppet/module_tool/shared_behaviors.rb +27 -12
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/module_tool.rb +4 -4
- data/lib/puppet/network/client_request.rb +5 -3
- data/lib/puppet/network/format.rb +2 -2
- data/lib/puppet/network/format_support.rb +1 -1
- data/lib/puppet/network/formats.rb +1 -1
- data/lib/puppet/network/http/api/indirected_routes.rb +24 -44
- data/lib/puppet/network/http/api/server/v3.rb +1 -1
- data/lib/puppet/network/http/connection.rb +1 -1
- data/lib/puppet/network/http/handler.rb +8 -12
- data/lib/puppet/network/http/request.rb +1 -1
- data/lib/puppet/network/http/route.rb +9 -9
- data/lib/puppet/node/environment.rb +21 -23
- data/lib/puppet/node/facts.rb +1 -1
- data/lib/puppet/node.rb +5 -5
- data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
- data/lib/puppet/pal/pal_impl.rb +48 -50
- data/lib/puppet/pal/plan_signature.rb +1 -1
- data/lib/puppet/pal/task_signature.rb +1 -1
- data/lib/puppet/parameter/package_options.rb +1 -1
- data/lib/puppet/parameter/value.rb +2 -2
- data/lib/puppet/parameter/value_collection.rb +7 -7
- data/lib/puppet/parameter.rb +8 -9
- data/lib/puppet/parser/ast/block_expression.rb +2 -2
- data/lib/puppet/parser/ast/hostclass.rb +1 -1
- data/lib/puppet/parser/ast/pops_bridge.rb +3 -4
- data/lib/puppet/parser/ast/resource.rb +4 -4
- data/lib/puppet/parser/ast/resourceparam.rb +4 -4
- data/lib/puppet/parser/ast.rb +14 -15
- data/lib/puppet/parser/compiler.rb +26 -28
- data/lib/puppet/parser/functions/create_resources.rb +3 -3
- data/lib/puppet/parser/functions/fail.rb +1 -1
- data/lib/puppet/parser/functions/generate.rb +2 -2
- data/lib/puppet/parser/functions/tag.rb +1 -1
- data/lib/puppet/parser/functions.rb +2 -2
- data/lib/puppet/parser/relationship.rb +3 -1
- data/lib/puppet/parser/resource/param.rb +2 -2
- data/lib/puppet/parser/resource.rb +23 -23
- data/lib/puppet/parser/scope.rb +10 -10
- data/lib/puppet/parser/script_compiler.rb +1 -1
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/parser/type_loader.rb +10 -12
- data/lib/puppet/parser.rb +1 -1
- data/lib/puppet/pops/adaptable.rb +1 -1
- data/lib/puppet/pops/evaluator/access_operator.rb +8 -8
- data/lib/puppet/pops/evaluator/callable_signature.rb +4 -4
- data/lib/puppet/pops/evaluator/collector_transformer.rb +4 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +7 -7
- data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +6 -6
- data/lib/puppet/pops/evaluator/compare_operator.rb +10 -10
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +56 -60
- data/lib/puppet/pops/evaluator/relationship_operator.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/functions/dispatcher.rb +3 -3
- data/lib/puppet/pops/functions/function.rb +14 -16
- data/lib/puppet/pops/issue_reporter.rb +2 -2
- data/lib/puppet/pops/label_provider.rb +2 -2
- data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
- data/lib/puppet/pops/loader/loader.rb +4 -4
- data/lib/puppet/pops/loader/loader_paths.rb +3 -3
- data/lib/puppet/pops/loader/module_loaders.rb +11 -11
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/static_loader.rb +3 -3
- data/lib/puppet/pops/loaders.rb +3 -3
- data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
- data/lib/puppet/pops/lookup/explainer.rb +2 -2
- data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
- data/lib/puppet/pops/lookup/interpolation.rb +3 -3
- data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
- data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
- data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
- data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
- data/lib/puppet/pops/merge_strategy.rb +6 -6
- data/lib/puppet/pops/migration/migration_checker.rb +1 -1
- data/lib/puppet/pops/model/ast_transformer.rb +9 -11
- data/lib/puppet/pops/model/factory.rb +4 -5
- data/lib/puppet/pops/parser/epp_parser.rb +2 -2
- data/lib/puppet/pops/parser/epp_support.rb +1 -1
- data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
- data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
- data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
- data/lib/puppet/pops/parser/lexer2.rb +20 -12
- data/lib/puppet/pops/parser/lexer_support.rb +1 -1
- data/lib/puppet/pops/parser/locator.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +12 -14
- data/lib/puppet/pops/parser/pn_parser.rb +3 -3
- data/lib/puppet/pops/parser/slurp_support.rb +8 -8
- data/lib/puppet/pops/patterns.rb +12 -12
- data/lib/puppet/pops/pcore.rb +1 -1
- data/lib/puppet/pops/pn.rb +2 -2
- data/lib/puppet/pops/puppet_stack.rb +1 -1
- data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
- data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
- data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
- data/lib/puppet/pops/time/timestamp.rb +1 -1
- data/lib/puppet/pops/types/class_loader.rb +4 -6
- data/lib/puppet/pops/types/iterable.rb +1 -1
- data/lib/puppet/pops/types/p_binary_type.rb +1 -1
- data/lib/puppet/pops/types/p_init_type.rb +1 -1
- data/lib/puppet/pops/types/p_object_type.rb +5 -5
- data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
- data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
- data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
- data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
- data/lib/puppet/pops/types/p_uri_type.rb +4 -4
- data/lib/puppet/pops/types/recursion_guard.rb +4 -4
- data/lib/puppet/pops/types/ruby_generator.rb +2 -2
- data/lib/puppet/pops/types/string_converter.rb +12 -8
- data/lib/puppet/pops/types/tree_iterators.rb +4 -6
- data/lib/puppet/pops/types/type_calculator.rb +10 -10
- data/lib/puppet/pops/types/type_factory.rb +7 -3
- data/lib/puppet/pops/types/type_formatter.rb +22 -24
- data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
- data/lib/puppet/pops/types/types.rb +28 -24
- data/lib/puppet/pops/utils.rb +38 -42
- data/lib/puppet/pops/validation/checker4_0.rb +10 -10
- data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
- data/lib/puppet/pops/validation.rb +4 -4
- data/lib/puppet/pops/visitor.rb +2 -2
- data/lib/puppet/property/ensure.rb +12 -14
- data/lib/puppet/property/keyvalue.rb +4 -4
- data/lib/puppet/property/list.rb +4 -4
- data/lib/puppet/property/ordered_list.rb +1 -1
- data/lib/puppet/property.rb +31 -33
- data/lib/puppet/provider/exec.rb +2 -2
- data/lib/puppet/provider/file/posix.rb +19 -17
- data/lib/puppet/provider/file/windows.rb +13 -19
- data/lib/puppet/provider/group/directoryservice.rb +3 -2
- data/lib/puppet/provider/group/groupadd.rb +4 -4
- data/lib/puppet/provider/group/windows_adsi.rb +2 -2
- data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
- data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
- data/lib/puppet/provider/nameservice/pw.rb +1 -2
- data/lib/puppet/provider/nameservice.rb +8 -8
- data/lib/puppet/provider/package/aix.rb +19 -19
- data/lib/puppet/provider/package/appdmg.rb +2 -2
- data/lib/puppet/provider/package/apple.rb +1 -1
- data/lib/puppet/provider/package/apt.rb +18 -18
- data/lib/puppet/provider/package/aptitude.rb +1 -3
- data/lib/puppet/provider/package/aptrpm.rb +9 -9
- data/lib/puppet/provider/package/blastwave.rb +10 -14
- data/lib/puppet/provider/package/dnfmodule.rb +3 -3
- data/lib/puppet/provider/package/dpkg.rb +11 -13
- data/lib/puppet/provider/package/fink.rb +14 -14
- data/lib/puppet/provider/package/freebsd.rb +1 -1
- data/lib/puppet/provider/package/gem.rb +12 -14
- data/lib/puppet/provider/package/macports.rb +2 -2
- data/lib/puppet/provider/package/nim.rb +10 -10
- data/lib/puppet/provider/package/openbsd.rb +22 -22
- data/lib/puppet/provider/package/opkg.rb +6 -6
- data/lib/puppet/provider/package/pacman.rb +35 -29
- data/lib/puppet/provider/package/pip.rb +25 -24
- data/lib/puppet/provider/package/pkg.rb +15 -15
- data/lib/puppet/provider/package/pkgdmg.rb +10 -10
- data/lib/puppet/provider/package/pkgin.rb +2 -2
- data/lib/puppet/provider/package/pkgng.rb +5 -5
- data/lib/puppet/provider/package/pkgutil.rb +17 -21
- data/lib/puppet/provider/package/portage.rb +59 -61
- data/lib/puppet/provider/package/ports.rb +12 -11
- data/lib/puppet/provider/package/portupgrade.rb +35 -35
- data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
- data/lib/puppet/provider/package/rpm.rb +26 -26
- data/lib/puppet/provider/package/rug.rb +7 -9
- data/lib/puppet/provider/package/sun.rb +4 -4
- data/lib/puppet/provider/package/up2date.rb +5 -7
- data/lib/puppet/provider/package/urpmi.rb +6 -6
- data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
- data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
- data/lib/puppet/provider/package/windows/package.rb +2 -2
- data/lib/puppet/provider/package/windows.rb +3 -5
- data/lib/puppet/provider/package/yum.rb +33 -37
- data/lib/puppet/provider/package/zypper.rb +12 -14
- data/lib/puppet/provider/package.rb +1 -1
- data/lib/puppet/provider/package_targetable.rb +1 -1
- data/lib/puppet/provider/parsedfile.rb +9 -9
- data/lib/puppet/provider/service/base.rb +16 -21
- data/lib/puppet/provider/service/bsd.rb +4 -4
- data/lib/puppet/provider/service/daemontools.rb +31 -31
- data/lib/puppet/provider/service/debian.rb +6 -6
- data/lib/puppet/provider/service/freebsd.rb +36 -36
- data/lib/puppet/provider/service/gentoo.rb +6 -6
- data/lib/puppet/provider/service/init.rb +19 -19
- data/lib/puppet/provider/service/launchd.rb +22 -22
- data/lib/puppet/provider/service/openbsd.rb +10 -10
- data/lib/puppet/provider/service/openrc.rb +1 -1
- data/lib/puppet/provider/service/openwrt.rb +3 -3
- data/lib/puppet/provider/service/rcng.rb +3 -3
- data/lib/puppet/provider/service/redhat.rb +4 -4
- data/lib/puppet/provider/service/runit.rb +6 -6
- data/lib/puppet/provider/service/service.rb +5 -7
- data/lib/puppet/provider/service/smf.rb +28 -27
- data/lib/puppet/provider/service/src.rb +7 -7
- data/lib/puppet/provider/service/systemd.rb +31 -37
- data/lib/puppet/provider/service/upstart.rb +17 -17
- data/lib/puppet/provider/service/windows.rb +7 -7
- data/lib/puppet/provider/user/aix.rb +4 -2
- data/lib/puppet/provider/user/directoryservice.rb +34 -36
- data/lib/puppet/provider/user/hpux.rb +10 -14
- data/lib/puppet/provider/user/pw.rb +1 -1
- data/lib/puppet/provider/user/user_role_add.rb +16 -18
- data/lib/puppet/provider/user/useradd.rb +7 -7
- data/lib/puppet/provider/user/windows_adsi.rb +1 -1
- data/lib/puppet/provider.rb +8 -8
- data/lib/puppet/reference/indirection.rb +3 -0
- data/lib/puppet/reference/metaparameter.rb +1 -1
- data/lib/puppet/reference/providers.rb +3 -3
- data/lib/puppet/reference/type.rb +1 -1
- data/lib/puppet/relationship.rb +4 -5
- data/lib/puppet/reports/http.rb +1 -1
- data/lib/puppet/reports/log.rb +2 -2
- data/lib/puppet/reports/store.rb +4 -4
- data/lib/puppet/reports.rb +2 -2
- data/lib/puppet/resource/catalog.rb +16 -16
- data/lib/puppet/resource/status.rb +3 -3
- data/lib/puppet/resource/type.rb +8 -8
- data/lib/puppet/resource/type_collection.rb +1 -1
- data/lib/puppet/resource.rb +41 -41
- data/lib/puppet/scheduler/scheduler.rb +1 -1
- data/lib/puppet/settings/alias_setting.rb +3 -5
- data/lib/puppet/settings/base_setting.rb +11 -11
- data/lib/puppet/settings/boolean_setting.rb +2 -2
- data/lib/puppet/settings/config_file.rb +5 -4
- data/lib/puppet/settings/duration_setting.rb +2 -2
- data/lib/puppet/settings/environment_conf.rb +3 -3
- data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
- data/lib/puppet/settings/file_setting.rb +11 -11
- data/lib/puppet/settings/ini_file.rb +3 -3
- data/lib/puppet/settings/port_setting.rb +1 -1
- data/lib/puppet/settings/priority_setting.rb +2 -2
- data/lib/puppet/settings/ttl_setting.rb +2 -2
- data/lib/puppet/settings/value_translator.rb +8 -8
- data/lib/puppet/settings.rb +65 -70
- data/lib/puppet/ssl/base.rb +2 -4
- data/lib/puppet/ssl/certificate_request.rb +18 -22
- data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
- data/lib/puppet/ssl/oids.rb +2 -2
- data/lib/puppet/ssl/openssl_loader.rb +4 -4
- data/lib/puppet/syntax_checkers/base64.rb +3 -3
- data/lib/puppet/syntax_checkers/epp.rb +3 -3
- data/lib/puppet/syntax_checkers/json.rb +3 -3
- data/lib/puppet/syntax_checkers/pp.rb +3 -3
- data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
- data/lib/puppet/transaction/event.rb +2 -2
- data/lib/puppet/transaction/event_manager.rb +5 -5
- data/lib/puppet/transaction/persistence.rb +12 -14
- data/lib/puppet/transaction/report.rb +4 -4
- data/lib/puppet/transaction/resource_harness.rb +2 -2
- data/lib/puppet/transaction.rb +14 -18
- data/lib/puppet/type/component.rb +3 -3
- data/lib/puppet/type/exec.rb +43 -45
- data/lib/puppet/type/file/checksum_value.rb +1 -1
- data/lib/puppet/type/file/content.rb +6 -6
- data/lib/puppet/type/file/ctime.rb +2 -2
- data/lib/puppet/type/file/data_sync.rb +3 -3
- data/lib/puppet/type/file/ensure.rb +16 -15
- data/lib/puppet/type/file/mode.rb +9 -9
- data/lib/puppet/type/file/mtime.rb +2 -2
- data/lib/puppet/type/file/selcontext.rb +14 -14
- data/lib/puppet/type/file/source.rb +19 -21
- data/lib/puppet/type/file/target.rb +11 -11
- data/lib/puppet/type/file.rb +21 -21
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/group.rb +3 -3
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +4 -4
- data/lib/puppet/type/resources.rb +6 -6
- data/lib/puppet/type/schedule.rb +9 -9
- data/lib/puppet/type/service.rb +6 -8
- data/lib/puppet/type/tidy.rb +22 -24
- data/lib/puppet/type/user.rb +13 -13
- data/lib/puppet/type.rb +76 -88
- data/lib/puppet/util/at_fork/solaris.rb +33 -37
- data/lib/puppet/util/autoload.rb +2 -2
- data/lib/puppet/util/backups.rb +9 -9
- data/lib/puppet/util/character_encoding.rb +7 -6
- data/lib/puppet/util/checksums.rb +2 -2
- data/lib/puppet/util/classgen.rb +8 -8
- data/lib/puppet/util/colors.rb +1 -1
- data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
- data/lib/puppet/util/command_line/trollop.rb +42 -46
- data/lib/puppet/util/command_line.rb +2 -2
- data/lib/puppet/util/constant_inflector.rb +2 -2
- data/lib/puppet/util/diff.rb +19 -21
- data/lib/puppet/util/docs.rb +2 -2
- data/lib/puppet/util/errors.rb +9 -9
- data/lib/puppet/util/execution.rb +32 -9
- data/lib/puppet/util/feature.rb +1 -1
- data/lib/puppet/util/fileparsing.rb +12 -16
- data/lib/puppet/util/filetype.rb +36 -40
- data/lib/puppet/util/inifile.rb +6 -12
- data/lib/puppet/util/ldap/connection.rb +1 -1
- data/lib/puppet/util/ldap/manager.rb +10 -12
- data/lib/puppet/util/lockfile.rb +6 -8
- data/lib/puppet/util/log/destination.rb +2 -2
- data/lib/puppet/util/log/destinations.rb +4 -4
- data/lib/puppet/util/log.rb +12 -9
- data/lib/puppet/util/logging.rb +11 -11
- data/lib/puppet/util/metric.rb +3 -3
- data/lib/puppet/util/monkey_patches.rb +5 -7
- data/lib/puppet/util/network_device/config.rb +3 -3
- data/lib/puppet/util/package/version/debian.rb +27 -28
- data/lib/puppet/util/package/version/pip.rb +5 -5
- data/lib/puppet/util/package/version/range/eq.rb +1 -1
- data/lib/puppet/util/package/version/rpm.rb +1 -1
- data/lib/puppet/util/package.rb +2 -2
- data/lib/puppet/util/pidlock.rb +2 -2
- data/lib/puppet/util/platform.rb +1 -1
- data/lib/puppet/util/plist.rb +8 -10
- data/lib/puppet/util/posix.rb +17 -17
- data/lib/puppet/util/profiler/aggregate.rb +1 -1
- data/lib/puppet/util/provider_features.rb +3 -3
- data/lib/puppet/util/rdoc/code_objects.rb +3 -3
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
- data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
- data/lib/puppet/util/rdoc/parser.rb +1 -1
- data/lib/puppet/util/reference.rb +13 -9
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rpm_compare.rb +17 -18
- data/lib/puppet/util/rubygems.rb +1 -1
- data/lib/puppet/util/selinux.rb +7 -7
- data/lib/puppet/util/storage.rb +10 -12
- data/lib/puppet/util/suidmanager.rb +18 -19
- data/lib/puppet/util/symbolic_file_mode.rb +71 -75
- data/lib/puppet/util/tag_set.rb +2 -2
- data/lib/puppet/util/tagging.rb +8 -10
- data/lib/puppet/util/terminal.rb +4 -4
- data/lib/puppet/util/user_attr.rb +7 -7
- data/lib/puppet/util/watcher.rb +3 -5
- data/lib/puppet/util/windows/access_control_list.rb +1 -1
- data/lib/puppet/util/windows/adsi.rb +42 -42
- data/lib/puppet/util/windows/daemon.rb +64 -68
- data/lib/puppet/util/windows/error.rb +2 -2
- data/lib/puppet/util/windows/file.rb +18 -25
- data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
- data/lib/puppet/util/windows/principal.rb +8 -8
- data/lib/puppet/util/windows/process.rb +16 -28
- data/lib/puppet/util/windows/registry.rb +16 -15
- data/lib/puppet/util/windows/root_certs.rb +2 -2
- data/lib/puppet/util/windows/security.rb +31 -31
- data/lib/puppet/util/windows/service.rb +11 -11
- data/lib/puppet/util/windows/sid.rb +8 -8
- data/lib/puppet/util/windows/user.rb +18 -20
- data/lib/puppet/util/yaml.rb +1 -1
- data/lib/puppet/util.rb +55 -46
- data/lib/puppet/version.rb +2 -2
- data/lib/puppet/x509/pem_store.rb +1 -1
- data/lib/puppet.rb +3 -3
- data/man/man5/puppet.conf.5 +10 -2
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +5 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- metadata +2 -2
@@ -38,7 +38,7 @@ module Puppet::Util::Package::Version
|
|
38
38
|
def self.parse(version)
|
39
39
|
raise ValidationFailure, version.to_s unless version.is_a? String
|
40
40
|
|
41
|
-
matched = version.match(Regexp.new(
|
41
|
+
matched = version.match(Regexp.new("^\\s*" + VERSION_PATTERN + "\\s*$", Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
|
42
42
|
raise ValidationFailure, version unless matched
|
43
43
|
|
44
44
|
new(matched)
|
@@ -59,7 +59,7 @@ module Puppet::Util::Package::Version
|
|
59
59
|
parts.push(@pre_data.join) if @pre_data
|
60
60
|
parts.push(".post#{@post_data[1]}") if @post_data
|
61
61
|
parts.push(".dev#{@dev_data[1]}") if @dev_data
|
62
|
-
parts.push("+#{@local_data.join(
|
62
|
+
parts.push("+#{@local_data.join('.')}") if @local_data
|
63
63
|
|
64
64
|
parts.join
|
65
65
|
end
|
@@ -93,16 +93,16 @@ module Puppet::Util::Package::Version
|
|
93
93
|
|
94
94
|
def parse_letter_version(letter, number)
|
95
95
|
if letter
|
96
|
-
number
|
96
|
+
number ||= 0
|
97
97
|
letter.downcase!
|
98
98
|
|
99
99
|
if letter == "alpha"
|
100
100
|
letter = "a"
|
101
101
|
elsif letter == "beta"
|
102
102
|
letter = "b"
|
103
|
-
elsif [
|
103
|
+
elsif %w[c pre preview].include?(letter)
|
104
104
|
letter = "rc"
|
105
|
-
elsif [
|
105
|
+
elsif %w[rev r].include?(letter)
|
106
106
|
letter = "post"
|
107
107
|
end
|
108
108
|
|
@@ -41,7 +41,7 @@ module Puppet::Util::Package::Version
|
|
41
41
|
def <=>(other)
|
42
42
|
raise ArgumentError, _("Cannot compare, as %{other} is not a Rpm Version") % { other: other } unless other.is_a?(self.class)
|
43
43
|
|
44
|
-
rpm_compare_evr(
|
44
|
+
rpm_compare_evr(to_s, other.to_s)
|
45
45
|
end
|
46
46
|
|
47
47
|
private
|
data/lib/puppet/util/package.rb
CHANGED
@@ -12,7 +12,7 @@ module Puppet::Util::Package
|
|
12
12
|
ax = version_a.scan(vre)
|
13
13
|
bx = version_b.scan(vre)
|
14
14
|
|
15
|
-
while
|
15
|
+
while ax.length > 0 && bx.length > 0
|
16
16
|
a = ax.shift
|
17
17
|
b = bx.shift
|
18
18
|
|
@@ -35,7 +35,7 @@ module Puppet::Util::Package
|
|
35
35
|
|
36
36
|
def self.normalize(version)
|
37
37
|
version = version.split('-')
|
38
|
-
version.first.sub!(/([
|
38
|
+
version.first.sub!(/([.0]+)$/, '')
|
39
39
|
|
40
40
|
version.join('-')
|
41
41
|
end
|
data/lib/puppet/util/pidlock.rb
CHANGED
@@ -25,7 +25,7 @@ class Puppet::Util::Pidlock
|
|
25
25
|
|
26
26
|
def unlock
|
27
27
|
if mine?
|
28
|
-
|
28
|
+
@lockfile.unlock
|
29
29
|
else
|
30
30
|
false
|
31
31
|
end
|
@@ -59,7 +59,7 @@ class Puppet::Util::Pidlock
|
|
59
59
|
|
60
60
|
def clear_if_stale
|
61
61
|
pid = lock_pid
|
62
|
-
return @lockfile.unlock if pid
|
62
|
+
return @lockfile.unlock if pid.nil?
|
63
63
|
return if Process.pid == pid
|
64
64
|
|
65
65
|
errors = [Errno::ESRCH]
|
data/lib/puppet/util/platform.rb
CHANGED
data/lib/puppet/util/plist.rb
CHANGED
@@ -51,12 +51,12 @@ module Puppet::Util::Plist
|
|
51
51
|
Puppet.warning(message)
|
52
52
|
end
|
53
53
|
end
|
54
|
-
|
54
|
+
nil
|
55
55
|
end
|
56
56
|
|
57
57
|
# Read plist text using the CFPropertyList gem.
|
58
58
|
def parse_plist(plist_data, file_path = '')
|
59
|
-
bad_xml_doctype =
|
59
|
+
bad_xml_doctype = %r{^.*<!DOCTYPE plist PUBLIC -//Apple Computer.*$}
|
60
60
|
# Depending on where parse_plist is called from, plist_data can be either XML or binary.
|
61
61
|
# If we get XML, make sure ruby knows it's UTF-8 so we avoid invalid byte sequence errors.
|
62
62
|
if plist_data.include?('encoding="UTF-8"') && plist_data.encoding != Encoding::UTF_8
|
@@ -138,20 +138,18 @@ module Puppet::Util::Plist
|
|
138
138
|
when :plain
|
139
139
|
CFPropertyList::List::FORMAT_PLAIN
|
140
140
|
else
|
141
|
-
raise FormatError
|
141
|
+
raise FormatError, "Unknown plist format #{format}"
|
142
142
|
end
|
143
143
|
end
|
144
144
|
|
145
145
|
# This method will write a plist file using a specified format (or XML
|
146
146
|
# by default)
|
147
147
|
def write_plist_file(plist, file_path, format = :xml)
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
|
154
|
-
end
|
148
|
+
plist_to_save = CFPropertyList::List.new
|
149
|
+
plist_to_save.value = CFPropertyList.guess(plist)
|
150
|
+
plist_to_save.save(file_path, to_format(format), :formatted => true)
|
151
|
+
rescue IOError => e
|
152
|
+
Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
|
155
153
|
end
|
156
154
|
|
157
155
|
def dump_plist(plist_data, format = :xml)
|
data/lib/puppet/util/posix.rb
CHANGED
@@ -3,12 +3,12 @@
|
|
3
3
|
# Utility methods for interacting with POSIX objects; mostly user and group
|
4
4
|
module Puppet::Util::POSIX
|
5
5
|
# This is a list of environment variables that we will set when we want to override the POSIX locale
|
6
|
-
LOCALE_ENV_VARS = [
|
7
|
-
|
6
|
+
LOCALE_ENV_VARS = %w[LANG LC_ALL LC_MESSAGES LANGUAGE
|
7
|
+
LC_COLLATE LC_CTYPE LC_MONETARY LC_NUMERIC LC_TIME]
|
8
8
|
|
9
9
|
# This is a list of user-related environment variables that we will unset when we want to provide a pristine
|
10
10
|
# environment for "exec" runs
|
11
|
-
USER_ENV_VARS = [
|
11
|
+
USER_ENV_VARS = %w[HOME USER LOGNAME]
|
12
12
|
|
13
13
|
class << self
|
14
14
|
# Returns an array of all the groups that the user's a member of.
|
@@ -87,10 +87,10 @@ module Puppet::Util::POSIX
|
|
87
87
|
end
|
88
88
|
|
89
89
|
begin
|
90
|
-
|
90
|
+
Etc.send(method, id).send(field)
|
91
91
|
rescue NoMethodError, ArgumentError
|
92
92
|
# ignore it; we couldn't find the object
|
93
|
-
|
93
|
+
nil
|
94
94
|
end
|
95
95
|
end
|
96
96
|
|
@@ -128,30 +128,30 @@ module Puppet::Util::POSIX
|
|
128
128
|
# Determine what the field name is for users and groups.
|
129
129
|
def idfield(space)
|
130
130
|
case space.intern
|
131
|
-
when :gr, :group;
|
132
|
-
when :pw, :user, :passwd;
|
131
|
+
when :gr, :group; :gid
|
132
|
+
when :pw, :user, :passwd; :uid
|
133
133
|
else
|
134
|
-
raise ArgumentError
|
134
|
+
raise ArgumentError, _("Can only handle users and groups")
|
135
135
|
end
|
136
136
|
end
|
137
137
|
|
138
138
|
# Determine what the method is to get users and groups by id
|
139
139
|
def methodbyid(space)
|
140
140
|
case space.intern
|
141
|
-
when :gr, :group;
|
142
|
-
when :pw, :user, :passwd;
|
141
|
+
when :gr, :group; :getgrgid
|
142
|
+
when :pw, :user, :passwd; :getpwuid
|
143
143
|
else
|
144
|
-
raise ArgumentError
|
144
|
+
raise ArgumentError, _("Can only handle users and groups")
|
145
145
|
end
|
146
146
|
end
|
147
147
|
|
148
148
|
# Determine what the method is to get users and groups by name
|
149
149
|
def methodbyname(space)
|
150
150
|
case space.intern
|
151
|
-
when :gr, :group;
|
152
|
-
when :pw, :user, :passwd;
|
151
|
+
when :gr, :group; :getgrnam
|
152
|
+
when :pw, :user, :passwd; :getpwnam
|
153
153
|
else
|
154
|
-
raise ArgumentError
|
154
|
+
raise ArgumentError, _("Can only handle users and groups")
|
155
155
|
end
|
156
156
|
end
|
157
157
|
|
@@ -194,13 +194,13 @@ module Puppet::Util::POSIX
|
|
194
194
|
|
195
195
|
if id == check_value_id
|
196
196
|
Puppet.debug("Multiple entries found for resource: '#{location}' with #{id_field}: #{id}")
|
197
|
-
|
197
|
+
id
|
198
198
|
else
|
199
199
|
Puppet.debug("The value retrieved: '#{check_value}' is different than the required state: '#{field}', searching in all entries")
|
200
|
-
|
200
|
+
search_posix_field(location, id_field, field)
|
201
201
|
end
|
202
202
|
else
|
203
|
-
|
203
|
+
id
|
204
204
|
end
|
205
205
|
end
|
206
206
|
end
|
@@ -22,13 +22,13 @@ module Puppet::Util::ProviderFeatures
|
|
22
22
|
# @param obj [Object, Class] the object or class to check if requirements are met
|
23
23
|
# @return [Boolean] whether all requirements for this feature are met or not.
|
24
24
|
def available?(obj)
|
25
|
-
if
|
26
|
-
|
25
|
+
if methods
|
26
|
+
!!methods_available?(obj)
|
27
27
|
else
|
28
28
|
# In this case, the provider has to declare support for this
|
29
29
|
# feature, and that's been checked before we ever get to the
|
30
30
|
# method checks.
|
31
|
-
|
31
|
+
false
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
@@ -73,7 +73,7 @@ module RDoc
|
|
73
73
|
|
74
74
|
@node_container ||= add_module(NormalModule, "__nodes__")
|
75
75
|
cls = @node_container.add_class(PuppetNode, name, superclass)
|
76
|
-
@nodes[name] = cls
|
76
|
+
@nodes[name] = cls unless @done_documenting
|
77
77
|
cls
|
78
78
|
end
|
79
79
|
|
@@ -147,7 +147,7 @@ module RDoc
|
|
147
147
|
# ourselves.
|
148
148
|
def find_symbol(symbol, method = nil)
|
149
149
|
result = super(symbol)
|
150
|
-
if
|
150
|
+
if !result and symbol =~ /::/
|
151
151
|
modules = symbol.split(/::/)
|
152
152
|
unless modules.empty?
|
153
153
|
module_name = modules.shift
|
@@ -168,7 +168,7 @@ module RDoc
|
|
168
168
|
end
|
169
169
|
end
|
170
170
|
if result && method
|
171
|
-
|
171
|
+
unless result.respond_to?(:find_local_symbol)
|
172
172
|
p result.name
|
173
173
|
p method
|
174
174
|
fail
|
@@ -40,7 +40,7 @@ module Generators
|
|
40
40
|
def new_markup(str, remove_para = false)
|
41
41
|
first = @markup.nil?
|
42
42
|
res = old_markup(str, remove_para)
|
43
|
-
if first and
|
43
|
+
if first and !@markup.nil?
|
44
44
|
@markup.add_special(/\b([a-z]\w+(::\w+)*)/, :CROSSREF)
|
45
45
|
# we need to call it again, since we added a rule
|
46
46
|
res = old_markup(str, remove_para)
|
@@ -138,22 +138,22 @@ module Generators
|
|
138
138
|
end
|
139
139
|
|
140
140
|
classes.each do |k|
|
141
|
-
@allclasses[k.index_name] = k
|
141
|
+
@allclasses[k.index_name] = k unless @allclasses.has_key?(k.index_name)
|
142
142
|
end
|
143
143
|
|
144
144
|
# generate nodes and plugins found
|
145
145
|
classes.each do |k|
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
146
|
+
next unless k.context.is_module?
|
147
|
+
|
148
|
+
k.context.each_node do |_name, node|
|
149
|
+
nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
|
150
|
+
@nodes << nodes.last
|
151
|
+
end
|
152
|
+
k.context.each_plugin do |plugin|
|
153
|
+
@plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
|
154
|
+
end
|
155
|
+
k.context.each_fact do |fact|
|
156
|
+
@plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
|
157
157
|
end
|
158
158
|
end
|
159
159
|
|
@@ -164,11 +164,11 @@ module Generators
|
|
164
164
|
# scan all classes to create the child's references
|
165
165
|
@allclasses.values.each do |klass|
|
166
166
|
superklass = klass.context.superclass
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
167
|
+
next unless superklass
|
168
|
+
|
169
|
+
superklass = AllReferences[superklass]
|
170
|
+
if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
|
171
|
+
superklass.context.add_child(klass.context)
|
172
172
|
end
|
173
173
|
end
|
174
174
|
|
@@ -237,14 +237,13 @@ module Generators
|
|
237
237
|
def gen_class_index
|
238
238
|
gen_an_index(@classes, 'All Classes', RDoc::Page::CLASS_INDEX, "fr_class_index.html")
|
239
239
|
@allfiles.each do |file|
|
240
|
-
|
240
|
+
next if file['file'].context.file_relative_name =~ /\.rb$/
|
241
241
|
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
end
|
242
|
+
gen_composite_index(
|
243
|
+
file,
|
244
|
+
RDoc::Page::COMBO_INDEX,
|
245
|
+
"#{MODULE_DIR}/fr_#{file['file'].context.module_name}.html"
|
246
|
+
)
|
248
247
|
end
|
249
248
|
end
|
250
249
|
|
@@ -274,10 +273,10 @@ module Generators
|
|
274
273
|
res3 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{fact.name})"].path), "name" => CGI.escapeHTML(fact.name) }
|
275
274
|
end
|
276
275
|
end
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
276
|
+
next if f.plugins.nil?
|
277
|
+
|
278
|
+
f.plugins.each do |plugin|
|
279
|
+
res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
|
281
280
|
end
|
282
281
|
end
|
283
282
|
|
@@ -396,14 +395,14 @@ module Generators
|
|
396
395
|
resources = @resources.sort
|
397
396
|
resources.each do |r|
|
398
397
|
row = {}
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
398
|
+
next unless r.section == section and r.document_self
|
399
|
+
|
400
|
+
row["name"] = CGI.escapeHTML(r.name)
|
401
|
+
desc = r.description.strip
|
402
|
+
row["m_desc"] = desc unless desc.empty?
|
403
|
+
row["aref"] = r.aref
|
404
|
+
row["params"] = r.params
|
405
|
+
outer << row
|
407
406
|
end
|
408
407
|
outer
|
409
408
|
end
|
@@ -419,12 +418,12 @@ module Generators
|
|
419
418
|
|
420
419
|
@context.sections.each do |section|
|
421
420
|
secdata = @values["sections"].select { |s| s["secsequence"] == section.sequence }
|
422
|
-
|
423
|
-
secdata = secdata[0]
|
421
|
+
next unless secdata.size == 1
|
424
422
|
|
425
|
-
|
426
|
-
|
427
|
-
|
423
|
+
secdata = secdata[0]
|
424
|
+
|
425
|
+
rdl = build_resource_detail_list(section)
|
426
|
+
secdata["resource_list"] = rdl unless rdl.empty?
|
428
427
|
end
|
429
428
|
|
430
429
|
rl = build_require_list(@context)
|
@@ -483,7 +482,7 @@ module Generators
|
|
483
482
|
# which is also its url
|
484
483
|
def http_url(full_name, prefix)
|
485
484
|
path = full_name.dup
|
486
|
-
path.gsub!(/<<\s*(\w*)/) { "from
|
485
|
+
path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
|
487
486
|
File.join(prefix, path.split("::").collect { |p| Digest::MD5.hexdigest(p) }) + ".html"
|
488
487
|
end
|
489
488
|
|
@@ -571,17 +570,17 @@ module Generators
|
|
571
570
|
atts.each do |att|
|
572
571
|
next unless att.section == section
|
573
572
|
|
574
|
-
|
575
|
-
|
576
|
-
|
577
|
-
|
578
|
-
|
579
|
-
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
res << entry
|
573
|
+
next unless att.visibility == :public || att.visibility == :protected || @options.show_all
|
574
|
+
|
575
|
+
entry = {
|
576
|
+
"name" => CGI.escapeHTML(att.name),
|
577
|
+
"rw" => att.rw,
|
578
|
+
"a_desc" => markup(att.comment, true)
|
579
|
+
}
|
580
|
+
unless att.visibility == :public || att.visibility == :protected
|
581
|
+
entry["rw"] << "-"
|
584
582
|
end
|
583
|
+
res << entry
|
585
584
|
end
|
586
585
|
res
|
587
586
|
end
|
@@ -643,7 +642,7 @@ module Generators
|
|
643
642
|
end
|
644
643
|
|
645
644
|
def <=>(other)
|
646
|
-
|
645
|
+
name <=> other.name
|
647
646
|
end
|
648
647
|
end
|
649
648
|
|
@@ -668,13 +667,13 @@ module Generators
|
|
668
667
|
prefix = " ::" * level;
|
669
668
|
|
670
669
|
context.nodes.sort.each do |node|
|
671
|
-
|
672
|
-
|
673
|
-
|
674
|
-
|
675
|
-
|
676
|
-
|
677
|
-
|
670
|
+
next unless node.document_self
|
671
|
+
|
672
|
+
res <<
|
673
|
+
prefix <<
|
674
|
+
"Node " <<
|
675
|
+
href(url(node.viewer.path), "link", node.full_name) <<
|
676
|
+
"<br />\n"
|
678
677
|
end
|
679
678
|
res
|
680
679
|
end
|
@@ -725,7 +724,7 @@ module Generators
|
|
725
724
|
# which is also its url
|
726
725
|
def http_url(full_name, prefix)
|
727
726
|
path = full_name.dup
|
728
|
-
path.gsub!(/<<\s*(\w*)/) { "from
|
727
|
+
path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
|
729
728
|
File.join(prefix, path.split("::")) + ".html"
|
730
729
|
end
|
731
730
|
|
@@ -810,7 +809,7 @@ module Generators
|
|
810
809
|
end
|
811
810
|
|
812
811
|
def <=>(other)
|
813
|
-
|
812
|
+
name <=> other.name
|
814
813
|
end
|
815
814
|
end
|
816
815
|
|
@@ -850,7 +849,7 @@ module Generators
|
|
850
849
|
end
|
851
850
|
|
852
851
|
def index_name
|
853
|
-
|
852
|
+
@context.name.to_s
|
854
853
|
end
|
855
854
|
|
856
855
|
def params
|