diff options
61 files changed, 86 insertions, 86 deletions
diff --git a/acceptance/tests/modules/install/with_existing_module_directory.rb b/acceptance/tests/modules/install/with_existing_module_directory.rb index fd1f2d67d..5c351e263 100644 --- a/acceptance/tests/modules/install/with_existing_module_directory.rb +++ b/acceptance/tests/modules/install/with_existing_module_directory.rb @@ -33,7 +33,7 @@ file { } PP -step "Try to install an module with a name collision" +step "Try to install a module with a name collision" on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do assert_output <<-OUTPUT STDOUT> \e[mNotice: Preparing to install into /etc/puppet/modules ...\e[0m @@ -47,7 +47,7 @@ on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes end on master, '[ -f /etc/puppet/modules/nginx/extra.json ]' -step "Try to install an module with a path collision" +step "Try to install a module with a path collision" on master, puppet("module install pmtacceptance-apache"), :acceptable_exit_codes => [1] do assert_output <<-OUTPUT STDOUT> \e[mNotice: Preparing to install into /etc/puppet/modules ...\e[0m @@ -60,7 +60,7 @@ on master, puppet("module install pmtacceptance-apache"), :acceptable_exit_codes end on master, '[ -f /etc/puppet/modules/apache/extra.json ]' -step "Try to install an module with a dependency that has collides" +step "Try to install a module with a dependency that has collides" on master, puppet("module install pmtacceptance-php --version 0.0.1"), :acceptable_exit_codes => [1] do assert_output <<-OUTPUT STDOUT> \e[mNotice: Preparing to install into /etc/puppet/modules ...\e[0m @@ -73,7 +73,7 @@ on master, puppet("module install pmtacceptance-php --version 0.0.1"), :acceptab end on master, '[ -f /etc/puppet/modules/apache/extra.json ]' -step "Install an module with a name collision by using --force" +step "Install a module with a name collision by using --force" on master, puppet("module install pmtacceptance-nginx --force"), :acceptable_exit_codes => [0] do assert_output <<-OUTPUT \e[mNotice: Preparing to install into /etc/puppet/modules ...\e[0m @@ -85,7 +85,7 @@ on master, puppet("module install pmtacceptance-nginx --force"), :acceptable_exi end on master, '[ ! -f /etc/puppet/modules/nginx/extra.json ]' -step "Install an module with a name collision by using --force" +step "Install a module with a name collision by using --force" on master, puppet("module install pmtacceptance-apache --force"), :acceptable_exit_codes => [0] do assert_output <<-OUTPUT \e[mNotice: Preparing to install into /etc/puppet/modules ...\e[0m diff --git a/ext/gentoo/init.d/puppet b/ext/gentoo/init.d/puppet index 83d30b024..bfa4b1947 100644 --- a/ext/gentoo/init.d/puppet +++ b/ext/gentoo/init.d/puppet @@ -10,7 +10,7 @@ depend() { checkconfig() { if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then - eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory" + eerror "Please make sure PUPPET_PID_DIR is defined and points to an existing directory" return 1 fi diff --git a/ext/gentoo/init.d/puppetmaster b/ext/gentoo/init.d/puppetmaster index 9a48754a2..9a0184432 100755 --- a/ext/gentoo/init.d/puppetmaster +++ b/ext/gentoo/init.d/puppetmaster @@ -10,7 +10,7 @@ depend() { checkconfig() { if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then - eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory" + eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to an existing directory" return 1 fi diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 82820dbcb..e52e31229 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -97,7 +97,7 @@ module Puppet # === Execution state # The class attributes/methods of Puppet::Application serve as a global place to set and query the execution # status of the application: stopping, restarting, etc. The setting of the application status does not directly -# aftect its running status; it's assumed that the various components within the application will consult these +# affect its running status; it's assumed that the various components within the application will consult these # settings appropriately and affect their own processing accordingly. Control operations (signal handlers and # the like) should set the status appropriately to indicate to the overall system that it's the process of # stopping or restarting (or just running as usual). diff --git a/lib/puppet/application/kick.rb b/lib/puppet/application/kick.rb index 6720aecf0..e4cc38c98 100644 --- a/lib/puppet/application/kick.rb +++ b/lib/puppet/application/kick.rb @@ -157,7 +157,7 @@ with '--genconfig'. option requires LDAP support at this point. * --ping: - Do a ICMP echo against the target host. Skip hosts that don't respond + Do an ICMP echo against the target host. Skip hosts that don't respond to ping. diff --git a/lib/puppet/external/pson/pure/generator.rb b/lib/puppet/external/pson/pure/generator.rb index 95372941d..0f88880cd 100644 --- a/lib/puppet/external/pson/pure/generator.rb +++ b/lib/puppet/external/pson/pure/generator.rb @@ -58,7 +58,7 @@ module PSON module Pure module Generator # This class is used to create State instances, that are use to hold data - # while generating a PSON text from a a Ruby data structure. + # while generating a PSON text from a Ruby data structure. class State # Creates a State object from _opts_, which ought to be Hash to create # a new State instance configured by _opts_, something else to create diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb index d95fa7706..83523c78b 100644 --- a/lib/puppet/face/module/list.rb +++ b/lib/puppet/face/module/list.rb @@ -237,8 +237,8 @@ Puppet::Face.define(:module, '1.0.0') do # { :text => "puppetlabs-mysql (v1.0.0)" } # # The value of a module's :text is affected by three (3) factors: the format - # of the tree, it's dependency status, and the location in the modulepath - # relative to it's parent. + # of the tree, its dependency status, and the location in the modulepath + # relative to its parent. # # Returns a Hash # diff --git a/lib/puppet/indirector/exec.rb b/lib/puppet/indirector/exec.rb index 6acdbb5e9..19f028340 100644 --- a/lib/puppet/indirector/exec.rb +++ b/lib/puppet/indirector/exec.rb @@ -7,7 +7,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus name = request.key external_command = command - # Make sure it's an arry + # Make sure it's an array raise Puppet::DevError, "Exec commands must be an array" unless external_command.is_a?(Array) # Make sure it's fully qualified. diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb index 06db55f61..13babc4bf 100644 --- a/lib/puppet/indirector/request.rb +++ b/lib/puppet/indirector/request.rb @@ -5,7 +5,7 @@ require 'puppet/util/pson' require 'puppet/network/resolver' # This class encapsulates all of the information you need to make an -# Indirection call, and as a a result also handles REST calls. It's somewhat +# Indirection call, and as a result also handles REST calls. It's somewhat # analogous to an HTTP Request object, except tuned for our Indirector. class Puppet::Indirector::Request attr_accessor :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_terminus diff --git a/lib/puppet/interface/option_builder.rb b/lib/puppet/interface/option_builder.rb index f4d7c6cf0..72e09cacc 100644 --- a/lib/puppet/interface/option_builder.rb +++ b/lib/puppet/interface/option_builder.rb @@ -57,7 +57,7 @@ class Puppet::Interface::OptionBuilder def after_action(&block) block or raise ArgumentError, "#{@option} after_action requires a block" if @option.after_action - raise ArgumentError, "#{@option} already has a after_action set" + raise ArgumentError, "#{@option} already has an after_action set" end unless block.arity == 3 then raise ArgumentError, "after_action takes three arguments, action, args, and options" diff --git a/lib/puppet/module_tool.rb b/lib/puppet/module_tool.rb index f19b4395b..98876b6dd 100644 --- a/lib/puppet/module_tool.rb +++ b/lib/puppet/module_tool.rb @@ -17,7 +17,7 @@ module Puppet # Is this a directory that shouldn't be checksummed? # # TODO: Should this be part of Checksums? - # TODO: Rename this method to reflect it's purpose? + # TODO: Rename this method to reflect its purpose? # TODO: Shouldn't this be used when building packages too? def self.artifact?(path) case File.basename(path) diff --git a/lib/puppet/module_tool/applications/installer.rb b/lib/puppet/module_tool/applications/installer.rb index 08f736a0a..5bd689a0b 100644 --- a/lib/puppet/module_tool/applications/installer.rb +++ b/lib/puppet/module_tool/applications/installer.rb @@ -122,7 +122,7 @@ module Puppet::ModuleTool # # Resolve installation conflicts by checking if the requested module - # or one of it's dependencies conflicts with an installed module. + # or one of its dependencies conflicts with an installed module. # # Conflicts occur under the following conditions: # diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index fe26c17c0..44aeb6213 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -477,7 +477,7 @@ class Puppet::Parameter # @todo This original comment _"All of the checking should possibly be # late-binding (e.g., users might not exist when the value is assigned # but might when it is asked for)."_ does not seem to be correct, the implementation - # calls both validate an munge on the given value, so no late binding. + # calls both validate and munge on the given value, so no late binding. # # The given value is validated and then munged (if munging has been specified). The result is store # as the value of this arameter. diff --git a/lib/puppet/parameter/value_collection.rb b/lib/puppet/parameter/value_collection.rb index 144f8ba74..7e2bee331 100644 --- a/lib/puppet/parameter/value_collection.rb +++ b/lib/puppet/parameter/value_collection.rb @@ -189,7 +189,7 @@ class Puppet::Parameter::ValueCollection end # Returns a valid value matcher (a literal or regular expression) - # @todo This looks odd, asking for an instance that matches a symbol, or a instance that has + # @todo This looks odd, asking for an instance that matches a symbol, or an instance that has # a regexp. What is the intention here? Marking as api private... # # @return [Puppet::Parameter::Value] a valid valud matcher diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb index ac4d2c26a..53c47b218 100644 --- a/lib/puppet/parser/ast/leaf.rb +++ b/lib/puppet/parser/ast/leaf.rb @@ -148,7 +148,7 @@ class Puppet::Parser::AST def evaluate(scope) object = evaluate_container(scope) accesskey = evaluate_key(scope) - raise Puppet::ParseError, "#{variable} is not an hash or array when accessing it with #{accesskey}" unless object.is_a?(Hash) or object.is_a?(Array) + raise Puppet::ParseError, "#{variable} is not a hash or array when accessing it with #{accesskey}" unless object.is_a?(Hash) or object.is_a?(Array) object[array_index_or_key(object, accesskey)] || :undef end diff --git a/lib/puppet/parser/ast/nop.rb b/lib/puppet/parser/ast/nop.rb index bf35c6a5c..15383aa1f 100644 --- a/lib/puppet/parser/ast/nop.rb +++ b/lib/puppet/parser/ast/nop.rb @@ -2,7 +2,7 @@ require 'puppet/parser/ast/branch' class Puppet::Parser::AST # This class is a no-op, it doesn't produce anything - # when evaluated, hence it's name :-) + # when evaluated, hence its name :-) class Nop < AST::Leaf def evaluate(scope) # nothing to do diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index cd80ac663..60b85b993 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -135,7 +135,7 @@ class Puppet::Parser::Compiler # # Sometimes we evaluate classes with a fully qualified name already, in which # case, we tell scope.find_hostclass we've pre-qualified the name so it - # doesn't need to search it's namespaces again. This gets around a weird + # doesn't need to search its namespaces again. This gets around a weird # edge case of duplicate class names, one at top scope and one nested in our # namespace and the wrong one (or both!) getting selected. See ticket #13349 # for more detail. --jeffweiss 26 apr 2012 diff --git a/lib/puppet/parser/functions/extlookup.rb b/lib/puppet/parser/functions/extlookup.rb index d012bcd72..2a81ccc4e 100644 --- a/lib/puppet/parser/functions/extlookup.rb +++ b/lib/puppet/parser/functions/extlookup.rb @@ -9,7 +9,7 @@ uses CSV files but the concept can easily be adjust for databases, yaml or any other queryable data source. The object of this is to make it obvious when it's being used, rather than -magically loading data in when an module is loaded I prefer to look at the code +magically loading data in when a module is loaded I prefer to look at the code and see statements like: $snmp_contact = extlookup(\"snmp_contact\") @@ -26,7 +26,7 @@ Over time there will be a lot of this kind of thing spread all over your manifes and adding an additional client involves grepping through manifests to find all the places where you have constructs like this. -This is a data problem and shouldn't be handled in code, a using this function you +This is a data problem and shouldn't be handled in code, and using this function you can do just that. First you configure it in site.pp: diff --git a/lib/puppet/parser/functions/slice.rb b/lib/puppet/parser/functions/slice.rb index 41b693dd3..b34702a0f 100644 --- a/lib/puppet/parser/functions/slice.rb +++ b/lib/puppet/parser/functions/slice.rb @@ -78,7 +78,7 @@ Puppet::Parser::Functions::newfunction( end end raise ArgumentError, ("slice(): wrong argument type (#{args[1]}; must be number.") unless slice_size - raise ArgumentError, ("slice(): wrong argument value: #{slice_size}; is not an positive integer number > 0") unless slice_size.is_a?(Fixnum) && slice_size > 0 + raise ArgumentError, ("slice(): wrong argument value: #{slice_size}; is not a positive integer number > 0") unless slice_size.is_a?(Fixnum) && slice_size > 0 receiver = args[0] # the block is optional, ok if nil, function then produces an array diff --git a/lib/puppet/pops/model/ast_transformer.rb b/lib/puppet/pops/model/ast_transformer.rb index a9ce9946d..1dd649f75 100644 --- a/lib/puppet/pops/model/ast_transformer.rb +++ b/lib/puppet/pops/model/ast_transformer.rb @@ -541,7 +541,7 @@ class Puppet::Pops::Model::AstTransformer def transform_UnlessExpression(o) args = { :test => ast(o, AST::Not, :value => transform(o.test)), :statements => transform(o.then_expr) } - # AST 3.1 does not allow else on unless in the grammar, but it is ok since unless is encoded as a if !x + # AST 3.1 does not allow else on unless in the grammar, but it is ok since unless is encoded as an if !x args.merge!({:else => transform(o.else_expr)}) unless is_nop?(o.else_expr) result = ast o, AST::IfStatement, args end diff --git a/lib/puppet/pops/model/factory.rb b/lib/puppet/pops/model/factory.rb index 835a3415c..50918fb4e 100644 --- a/lib/puppet/pops/model/factory.rb +++ b/lib/puppet/pops/model/factory.rb @@ -457,7 +457,7 @@ class Puppet::Pops::Model::Factory a.documentation = doc_string end - # Returns symbolic information about a expected share of a resource expression given the LHS of a resource expr. + # Returns symbolic information about an expected share of a resource expression given the LHS of a resource expr. # # * `name { }` => `:resource`, create a resource of the given type # * `Name { }` => ':defaults`, set defauls for the referenced type diff --git a/lib/puppet/pops/model/model.rb b/lib/puppet/pops/model/model.rb index 82a9490e7..5f5302be3 100644 --- a/lib/puppet/pops/model/model.rb +++ b/lib/puppet/pops/model/model.rb @@ -5,7 +5,7 @@ # It describes a Metamodel containing DSL instructions, a description of PuppetType and related # classes needed to evaluate puppet logic. # The metamodel resembles the existing AST model, but it is a semantic model of instructions and -# the types that they operate on rather than a Abstract Syntax Tree, although closely related. +# the types that they operate on rather than an Abstract Syntax Tree, although closely related. # # The metamodel is anemic (has no behavior) except basic datatype and type # assertions and reference/containment assertions. diff --git a/lib/puppet/property/keyvalue.rb b/lib/puppet/property/keyvalue.rb index 8184b77b3..3f604d891 100644 --- a/lib/puppet/property/keyvalue.rb +++ b/lib/puppet/property/keyvalue.rb @@ -70,7 +70,7 @@ module Puppet ";" end - # Retrieves the key-hash from the provider by invoking it's method named the same as this property. + # Retrieves the key-hash from the provider by invoking its method named the same as this property. # @return [Hash] the hash from the provider, or `:absent` # def retrieve diff --git a/lib/puppet/provider/aixobject.rb b/lib/puppet/provider/aixobject.rb index dce452a0e..fcac8441f 100755 --- a/lib/puppet/provider/aixobject.rb +++ b/lib/puppet/provider/aixobject.rb @@ -152,7 +152,7 @@ class Puppet::Provider::AixObject < Puppet::Provider # Parse AIX command attributes from the output of an AIX command, that # which format is a list of space separated of key=value pairs: # "uid=100 groups=a,b,c". - # It returns an hash. + # It returns a hash. # # If a mapping is provided, the keys are translated as defined in the # mapping hash. And only values included in mapping will be added diff --git a/lib/puppet/provider/user/aix.rb b/lib/puppet/provider/user/aix.rb index d46b24778..f8ae942e2 100755 --- a/lib/puppet/provider/user/aix.rb +++ b/lib/puppet/provider/user/aix.rb @@ -38,7 +38,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do has_features :manages_expiry, :manages_password_age # Attribute verification (TODO) - #verify :gid, "GID must be an string or int of a valid group" do |value| + #verify :gid, "GID must be a string or int of a valid group" do |value| # value.is_a? String || value.is_a? Integer #end # diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index eefd52140..5f4333132 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -1044,7 +1044,7 @@ class Type end # Returns a hash of the current properties and their values. - # If a resource is absent, it's value is the symbol `:absent` + # If a resource is absent, its value is the symbol `:absent` # @return [Hash{Puppet::Property => Object}] mapping of property instance to its value # def currentpropvalues @@ -2351,14 +2351,14 @@ class Type end end - # Returns the title of this object, or it's name if title was not explicetly set. + # Returns the title of this object, or its name if title was not explicetly set. # If the title is not already set, it will be computed by looking up the {#name_var} and using # that value as the title. # @todo it is somewhat confusing that if the name_var is a valid parameter, it is assumed to # be the name_var called :name, but if it is a property, it uses the name_var. # It is further confusing as Type in some respects supports multiple namevars. # - # @return [String] Returns the title of this object, or it's name if title was not explicetly set. + # @return [String] Returns the title of this object, or its name if title was not explicetly set. # @raise [??? devfail] if title is not set, and name_var can not be found. def title unless @title diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb index 6820501cc..c379bec73 100755 --- a/lib/puppet/type/schedule.rb +++ b/lib/puppet/type/schedule.rb @@ -130,7 +130,7 @@ module Puppet def match?(previous, now) # The lowest-level array is of the hour, minute, second triad # then it's an array of two of those, to present the limits - # then it's array of those ranges + # then it's an array of those ranges @value = [@value] unless @value[0][0].is_a?(Array) @value.each do |value| diff --git a/lib/puppet/util/command_line/puppet_option_parser.rb b/lib/puppet/util/command_line/puppet_option_parser.rb index b80f7f679..fcc3e337c 100644 --- a/lib/puppet/util/command_line/puppet_option_parser.rb +++ b/lib/puppet/util/command_line/puppet_option_parser.rb @@ -11,7 +11,7 @@ module Puppet # This is a command line option parser. It is intended to have an API that is very similar to # the ruby stdlib 'OptionParser' API, for ease of integration into our existing code... however, # However, we've removed the OptionParser-based implementation and are only maintaining the - # it's impilemented based on the third-party "trollop" library. This was done because there + # it's implemented based on the third-party "trollop" library. This was done because there # are places where the stdlib OptionParser is not flexible enough to meet our needs. class PuppetOptionParser diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index 0f683b74d..becfa4ba3 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -45,7 +45,7 @@ module Puppet::Util::RDoc end end - # launch a output to console manifest doc + # launch an output to console manifest doc def manifestdoc(files) Puppet[:ignoreimport] = true files.select { |f| FileTest.file?(f) }.each do |f| diff --git a/man/man8/puppet-kick.8 b/man/man8/puppet-kick.8 index 3e587fcbe..fbd3959e4 100644 --- a/man/man8/puppet-kick.8 +++ b/man/man8/puppet-kick.8 @@ -114,7 +114,7 @@ Print the hosts you would connect to but do not actually connect\. This option r . .TP \-\-ping -Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\. +Do an ICMP echo against the target host\. Skip hosts that don\'t respond to ping\. . .SH "EXAMPLE" . diff --git a/spec/integration/configurer_spec.rb b/spec/integration/configurer_spec.rb index c91dfa8aa..355458f02 100755 --- a/spec/integration/configurer_spec.rb +++ b/spec/integration/configurer_spec.rb @@ -23,7 +23,7 @@ describe Puppet::Configurer do @catalog.add_resource(Puppet::Type.type(:notify).new(:title => "testing")) # Make sure we don't try to persist the local state after the transaction ran, - # because it will fail during test (the state file is in an not existing directory) + # because it will fail during test (the state file is in a not-existing directory) # and we need the transaction to be successful to be able to produce a summary report @catalog.host_config = false diff --git a/spec/unit/application/doc_spec.rb b/spec/unit/application/doc_spec.rb index 8528c3a49..e2dc0fe69 100755 --- a/spec/unit/application/doc_spec.rb +++ b/spec/unit/application/doc_spec.rb @@ -13,7 +13,7 @@ describe Puppet::Application::Doc do Puppet::Util::Log.stubs(:newdestination) end - it "should declare a other command" do + it "should declare an other command" do @doc.should respond_to(:other) end diff --git a/spec/unit/application/resource_spec.rb b/spec/unit/application/resource_spec.rb index 748bb5f0d..f2e2596ca 100755 --- a/spec/unit/application/resource_spec.rb +++ b/spec/unit/application/resource_spec.rb @@ -36,7 +36,7 @@ describe Puppet::Application::Resource do @resource_app.host.should == :whatever end - it "should load an display all types with types option" do + it "should load a display all types with types option" do type1 = stub_everything 'type1', :name => :type1 type2 = stub_everything 'type2', :name => :type2 Puppet::Type.stubs(:loadall) diff --git a/spec/unit/configurer_spec.rb b/spec/unit/configurer_spec.rb index c3b8a2dd6..a051a3160 100755 --- a/spec/unit/configurer_spec.rb +++ b/spec/unit/configurer_spec.rb @@ -104,7 +104,7 @@ describe Puppet::Configurer do @agent.run(:pluginsync => false) end - it "should carry on when it can't fetch it's node definition" do + it "should carry on when it can't fetch its node definition" do error = Net::HTTPError.new(400, 'dummy server communication error') Puppet::Node.indirection.expects(:find).raises(error) @agent.run.should == 0 diff --git a/spec/unit/file_serving/metadata_spec.rb b/spec/unit/file_serving/metadata_spec.rb index 6f511954b..1040634d2 100755 --- a/spec/unit/file_serving/metadata_spec.rb +++ b/spec/unit/file_serving/metadata_spec.rb @@ -33,7 +33,7 @@ describe Puppet::FileServing::Metadata do describe "when serializing" do let(:metadata) { Puppet::FileServing::Metadata.new(foobar) } - it "should perform pson serialization by calling to_pson on it's pson_data_hash" do + it "should perform pson serialization by calling to_pson on its pson_data_hash" do pdh = mock "data hash" pdh_as_pson = mock "data as pson" metadata.expects(:to_pson_data_hash).returns pdh diff --git a/spec/unit/hiera_puppet_spec.rb b/spec/unit/hiera_puppet_spec.rb index a3ff2bfa9..6c0f882a0 100644 --- a/spec/unit/hiera_puppet_spec.rb +++ b/spec/unit/hiera_puppet_spec.rb @@ -35,7 +35,7 @@ describe 'HieraPuppet' do end describe 'HieraPuppet#hiera_config_file' do - it "should return nil when we cannot derive the hiera config file form Puppet.settings" do + it "should return nil when we cannot derive the hiera config file from Puppet.settings" do begin Puppet.settings[:hiera_config] = nil rescue ArgumentError => detail diff --git a/spec/unit/indirector/face_spec.rb b/spec/unit/indirector/face_spec.rb index 73bee5645..b4c601f72 100755 --- a/spec/unit/indirector/face_spec.rb +++ b/spec/unit/indirector/face_spec.rb @@ -33,7 +33,7 @@ describe Puppet::Indirector::Face do describe "as an instance" do it "should be able to determine its indirection" do - # Loading actions here an get, um, complicated + # Loading actions here can get, um, complicated Puppet::Face.stubs(:load_actions) Puppet::Indirector::Face.new(:catalog, '0.0.1').indirection.should equal(Puppet::Resource::Catalog.indirection) end diff --git a/spec/unit/indirector/hiera_spec.rb b/spec/unit/indirector/hiera_spec.rb index 794a4b01f..36b598c37 100644 --- a/spec/unit/indirector/hiera_spec.rb +++ b/spec/unit/indirector/hiera_spec.rb @@ -127,7 +127,7 @@ describe Puppet::Indirector::Hiera do let(:data_binder) { @hiera_class.new } - it "support looking up an integer" do + it "should support looking up an integer" do data_binder.find(request_integer).should == 3000 end diff --git a/spec/unit/indirector/instrumentation_data/local_spec.rb b/spec/unit/indirector/instrumentation_data/local_spec.rb index e6344905f..062e5cf67 100644 --- a/spec/unit/indirector/instrumentation_data/local_spec.rb +++ b/spec/unit/indirector/instrumentation_data/local_spec.rb @@ -28,7 +28,7 @@ describe Puppet::Indirector::InstrumentationData::Local do end describe "when finding instrumentation data" do - it "should return a Instrumentation Data instance matching the key" do + it "should return an Instrumentation Data instance matching the key" do end end diff --git a/spec/unit/indirector/instrumentation_listener/local_spec.rb b/spec/unit/indirector/instrumentation_listener/local_spec.rb index 31ca04aea..195528167 100644 --- a/spec/unit/indirector/instrumentation_listener/local_spec.rb +++ b/spec/unit/indirector/instrumentation_listener/local_spec.rb @@ -28,7 +28,7 @@ describe Puppet::Indirector::InstrumentationListener::Local do end describe "when finding listeners" do - it "should return a Instrumentation Listener instance matching the key" do + it "should return an Instrumentation Listener instance matching the key" do Puppet::Util::Instrumentation.expects(:[]).with("me").returns(:instance) @listener.find(@request).should == :instance end diff --git a/spec/unit/network/authstore_spec.rb b/spec/unit/network/authstore_spec.rb index 54815ca32..75ea2c13e 100755 --- a/spec/unit/network/authstore_spec.rb +++ b/spec/unit/network/authstore_spec.rb @@ -82,7 +82,7 @@ describe Puppet::Network::AuthStore::Declaration do end (1..3).each { |n| - describe "when the pattern is a IP mask with #{n} numeric segments and a *" do + describe "when the pattern is an IP mask with #{n} numeric segments and a *" do before :each do @ip_pattern = ip.split('.')[0,n].join('.')+'.*' @declaration = Puppet::Network::AuthStore::Declaration.new(:allow_ip,@ip_pattern) diff --git a/spec/unit/parser/ast/leaf_spec.rb b/spec/unit/parser/ast/leaf_spec.rb index dda843383..297e58fb3 100755 --- a/spec/unit/parser/ast/leaf_spec.rb +++ b/spec/unit/parser/ast/leaf_spec.rb @@ -10,7 +10,7 @@ describe Puppet::Parser::AST::Leaf do @leaf = Puppet::Parser::AST::Leaf.new(:value => @value) end - it "should have a evaluate_match method" do + it "should have an evaluate_match method" do Puppet::Parser::AST::Leaf.new(:value => "value").should respond_to(:evaluate_match) end @@ -177,7 +177,7 @@ describe Puppet::Parser::AST::HashOrArrayAccess do access.evaluate(@scope).should == :undef end - it "should be able to return an hash value" do + it "should be able to return a hash value" do @scope["a"] = { "key1" => "val1", "key2" => "val2", "key3" => "val3" } access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" ) @@ -193,7 +193,7 @@ describe Puppet::Parser::AST::HashOrArrayAccess do access.evaluate(@scope).should == :undef end - it "should be able to return an hash value with a numerical key" do + it "should be able to return a hash value with a numerical key" do @scope["a"] = { "key1" => "val1", "key2" => "val2", "45" => "45", "key3" => "val3" } access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "45" ) @@ -201,7 +201,7 @@ describe Puppet::Parser::AST::HashOrArrayAccess do access.evaluate(@scope).should == "45" end - it "should raise an error if the variable lookup didn't return an hash or an array" do + it "should raise an error if the variable lookup didn't return a hash or an array" do @scope["a"] = "I'm a string" access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" ) @@ -274,7 +274,7 @@ describe Puppet::Parser::AST::HashOrArrayAccess do scope['a'].should == ["val2"] end - it "should raise an error when trying to overwrite an hash value" do + it "should raise an error when trying to overwrite a hash value" do @scope['a'] = { "key" => [ "a" , "b" ]} access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key") @@ -425,7 +425,7 @@ describe Puppet::Parser::AST::HostName do end it "should raise an error if hostname is not valid" do - lambda { Puppet::Parser::AST::HostName.new( :value => "not an hostname!" ) }.should raise_error + lambda { Puppet::Parser::AST::HostName.new( :value => "not a hostname!" ) }.should raise_error end it "should not raise an error if hostname is a regex" do diff --git a/spec/unit/parser/functions/extlookup_spec.rb b/spec/unit/parser/functions/extlookup_spec.rb index ecd7a817a..53c22a639 100755 --- a/spec/unit/parser/functions/extlookup_spec.rb +++ b/spec/unit/parser/functions/extlookup_spec.rb @@ -18,11 +18,11 @@ describe "the extlookup function" do Puppet::Parser::Functions.function("extlookup").should == "function_extlookup" end - it "should raise a ArgumentError if there is less than 1 arguments" do + it "should raise an ArgumentError if there is less than 1 arguments" do lambda { @scope.function_extlookup([]) }.should( raise_error(ArgumentError)) end - it "should raise a ArgumentError if there is more than 3 arguments" do + it "should raise an ArgumentError if there is more than 3 arguments" do lambda { @scope.function_extlookup(["foo", "bar", "baz", "gazonk"]) }.should( raise_error(ArgumentError)) end diff --git a/spec/unit/parser/functions/regsubst_spec.rb b/spec/unit/parser/functions/regsubst_spec.rb index c75b16c0e..1c65b370a 100755 --- a/spec/unit/parser/functions/regsubst_spec.rb +++ b/spec/unit/parser/functions/regsubst_spec.rb @@ -16,11 +16,11 @@ describe "the regsubst function" do Puppet::Parser::Functions.function("regsubst").should == "function_regsubst" end - it "should raise a ArgumentError if there is less than 3 arguments" do + it "should raise an ArgumentError if there is less than 3 arguments" do lambda { @scope.function_regsubst(["foo", "bar"]) }.should( raise_error(ArgumentError)) end - it "should raise a ArgumentError if there is more than 5 arguments" do + it "should raise an ArgumentError if there is more than 5 arguments" do lambda { @scope.function_regsubst(["foo", "bar", "gazonk", "del", "x", "y"]) }.should( raise_error(ArgumentError)) end diff --git a/spec/unit/parser/functions/split_spec.rb b/spec/unit/parser/functions/split_spec.rb index 5ddbe8d44..9a69c8f9f 100755 --- a/spec/unit/parser/functions/split_spec.rb +++ b/spec/unit/parser/functions/split_spec.rb @@ -16,11 +16,11 @@ describe "the split function" do Puppet::Parser::Functions.function("split").should == "function_split" end - it "should raise a ArgumentError if there is less than 2 arguments" do + it "should raise an ArgumentError if there is less than 2 arguments" do lambda { @scope.function_split(["foo"]) }.should( raise_error(ArgumentError)) end - it "should raise a ArgumentError if there is more than 2 arguments" do + it "should raise an ArgumentError if there is more than 2 arguments" do lambda { @scope.function_split(["foo", "bar", "gazonk"]) }.should( raise_error(ArgumentError)) end diff --git a/spec/unit/parser/functions/sprintf_spec.rb b/spec/unit/parser/functions/sprintf_spec.rb index 36c0ae1b7..8a749e4f1 100755 --- a/spec/unit/parser/functions/sprintf_spec.rb +++ b/spec/unit/parser/functions/sprintf_spec.rb @@ -16,7 +16,7 @@ describe "the sprintf function" do Puppet::Parser::Functions.function("sprintf").should == "function_sprintf" end - it "should raise a ArgumentError if there is less than 1 argument" do + it "should raise an ArgumentError if there is less than 1 argument" do lambda { @scope.function_sprintf([]) }.should( raise_error(ArgumentError)) end diff --git a/spec/unit/parser/functions/versioncmp_spec.rb b/spec/unit/parser/functions/versioncmp_spec.rb index 760a286c5..626f71108 100755 --- a/spec/unit/parser/functions/versioncmp_spec.rb +++ b/spec/unit/parser/functions/versioncmp_spec.rb @@ -16,11 +16,11 @@ describe "the versioncmp function" do Puppet::Parser::Functions.function("versioncmp").should == "function_versioncmp" end - it "should raise a ArgumentError if there is less than 2 arguments" do + it "should raise an ArgumentError if there is less than 2 arguments" do lambda { @scope.function_versioncmp(["1.2"]) }.should raise_error(ArgumentError) end - it "should raise a ArgumentError if there is more than 2 arguments" do + it "should raise an ArgumentError if there is more than 2 arguments" do lambda { @scope.function_versioncmp(["1.2", "2.4.5", "3.5.6"]) }.should raise_error(ArgumentError) end diff --git a/spec/unit/parser/lexer_spec.rb b/spec/unit/parser/lexer_spec.rb index e375bed39..fc8394cb1 100755 --- a/spec/unit/parser/lexer_spec.rb +++ b/spec/unit/parser/lexer_spec.rb @@ -855,7 +855,7 @@ describe "Puppet::Parser::Lexer in the old tests when lexing example files" do end end -describe "when trying to lex an non-existent file" do +describe "when trying to lex a non-existent file" do include PuppetSpec::Files it "should return an empty list of tokens" do diff --git a/spec/unit/parser/resource_spec.rb b/spec/unit/parser/resource_spec.rb index f843c895d..0a40a2024 100755 --- a/spec/unit/parser/resource_spec.rb +++ b/spec/unit/parser/resource_spec.rb @@ -82,7 +82,7 @@ describe Puppet::Parser::Resource do @resource = Puppet::Parser::Resource.new("whatever", "whatever", :scope => @scope, :source => @source).isomorphic?.should be_true end - it "should have a array-indexing method for retrieving parameter values" do + it "should have an array-indexing method for retrieving parameter values" do @resource = mkresource @resource[:one].should == "yay" end diff --git a/spec/unit/pops/parser/lexer_spec.rb b/spec/unit/pops/parser/lexer_spec.rb index d5232e9f1..985807261 100755 --- a/spec/unit/pops/parser/lexer_spec.rb +++ b/spec/unit/pops/parser/lexer_spec.rb @@ -763,7 +763,7 @@ describe "Puppet::Pops::Parser::Lexer in the old tests when lexing example files end end -describe "when trying to lex an non-existent file" do +describe "when trying to lex a non-existent file" do include PuppetSpec::Files it "should return an empty list of tokens" do diff --git a/spec/unit/property/list_spec.rb b/spec/unit/property/list_spec.rb index cac7dce65..e1782781f 100755 --- a/spec/unit/property/list_spec.rb +++ b/spec/unit/property/list_spec.rb @@ -44,7 +44,7 @@ describe list_class do @property.add_should_with_current(["foo"], ["bar"]).should == ["foo", "bar"] end - it "should return should if current is not a array" do + it "should return should if current is not an array" do @property.add_should_with_current(["foo"], :absent).should == ["foo"] end diff --git a/spec/unit/property/ordered_list_spec.rb b/spec/unit/property/ordered_list_spec.rb index bc84bd178..0155d8c51 100755 --- a/spec/unit/property/ordered_list_spec.rb +++ b/spec/unit/property/ordered_list_spec.rb @@ -24,7 +24,7 @@ describe ordered_list_class do @property.add_should_with_current(["should"], ["current"]).should == ["should", "current"] end - it "should return 'should' if current is not a array" do + it "should return 'should' if current is not an array" do @property.add_should_with_current(["should"], :absent).should == ["should"] end diff --git a/spec/unit/provider/mcx/mcxcontent_spec.rb b/spec/unit/provider/mcx/mcxcontent_spec.rb index a8154d2ae..cb152b48f 100755 --- a/spec/unit/provider/mcx/mcxcontent_spec.rb +++ b/spec/unit/provider/mcx/mcxcontent_spec.rb @@ -43,11 +43,11 @@ describe provider_class do @provider.should respond_to(:exists?) end - it "should have an content method." do + it "should have a content method." do @provider.should respond_to(:content) end - it "should have an content= method." do + it "should have a content= method." do @provider.should respond_to(:content=) end diff --git a/spec/unit/provider/ssh_authorized_key/parsed_spec.rb b/spec/unit/provider/ssh_authorized_key/parsed_spec.rb index b40658933..5cfa8994b 100755 --- a/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +++ b/spec/unit/provider/ssh_authorized_key/parsed_spec.rb @@ -51,7 +51,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do genkey(key).should == "ssh-dss AAAAfsfddsjldjgksdflgkjsfdlgkj Just_Testing\n" end - it "should be able to generate a authorized_keys file with options" do + it "should be able to generate an authorized_keys file with options" do key = mkkey(:name => "root@localhost", :key => "AAAAfsfddsjldjgksdflgkjsfdlgkj", @@ -246,7 +246,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do end end - describe "and a invalid user has been specified with no target" do + describe "and an invalid user has been specified with no target" do it "should catch an exception and raise a Puppet error" do @resource[:user] = "thisusershouldnotexist" diff --git a/spec/unit/provider/user/directoryservice_spec.rb b/spec/unit/provider/user/directoryservice_spec.rb index 4d7eb45f5..e464e2c6f 100755 --- a/spec/unit/provider/user/directoryservice_spec.rb +++ b/spec/unit/provider/user/directoryservice_spec.rb @@ -606,7 +606,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do }] end - it 'should return a array of hashes containing group data' do + it 'should return an array of hashes containing group data' do provider.class.expects(:dscl).with('-plist', '.', 'readall', '/Groups').returns(groups_xml) provider.class.get_list_of_groups.should == groups_hash end @@ -703,7 +703,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do let(:password_hash_file) { '/var/db/shadow/hash/user_guid' } let(:stub_password_file) { stub('connection') } - it 'should return a a sha1 hash read from disk' do + it 'should return a sha1 hash read from disk' do File.expects(:exists?).with(password_hash_file).returns(true) File.expects(:file?).with(password_hash_file).returns(true) File.expects(:readable?).with(password_hash_file).returns(true) @@ -780,7 +780,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do } end - it 'should call set_salted_sha512 on 10.7 when given a a salted-SHA512 password hash' do + it 'should call set_salted_sha512 on 10.7 when given a salted-SHA512 password hash' do provider.expects(:get_users_plist).returns(sample_users_plist) provider.expects(:get_shadow_hash_data).with(sample_users_plist).returns(sha512_shadowhashdata) provider.class.expects(:get_os_version).returns('10.7') diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb index f891d5cd0..7c85a9c45 100755 --- a/spec/unit/resource/type_spec.rb +++ b/spec/unit/resource/type_spec.rb @@ -80,7 +80,7 @@ describe Puppet::Resource::Type do lambda { Puppet::Resource::Type.new(:node, /foo/) }.should_not raise_error end - it "should allow a AST::HostName instance as its name" do + it "should allow an AST::HostName instance as its name" do regex = Puppet::Parser::AST::Regex.new(:value => /foo/) name = Puppet::Parser::AST::HostName.new(:value => regex) lambda { Puppet::Resource::Type.new(:node, name) }.should_not raise_error diff --git a/spec/unit/type/augeas_spec.rb b/spec/unit/type/augeas_spec.rb index 77e3ae93c..130a7e59a 100755 --- a/spec/unit/type/augeas_spec.rb +++ b/spec/unit/type/augeas_spec.rb @@ -15,17 +15,17 @@ describe augeas do end describe "basic structure" do - it "should be able to create a instance" do + it "should be able to create an instance" do provider_class = Puppet::Type::Augeas.provider(Puppet::Type::Augeas.providers[0]) Puppet::Type::Augeas.expects(:defaultprovider).returns provider_class augeas.new(:name => "bar").should_not be_nil end - it "should have an parse_commands feature" do + it "should have a parse_commands feature" do augeas.provider_feature(:parse_commands).should_not be_nil end - it "should have an need_to_run? feature" do + it "should have a need_to_run? feature" do augeas.provider_feature(:need_to_run?).should_not be_nil end diff --git a/spec/unit/type/computer_spec.rb b/spec/unit/type/computer_spec.rb index 773e1fc97..dd01e47bd 100755 --- a/spec/unit/type/computer_spec.rb +++ b/spec/unit/type/computer_spec.rb @@ -18,7 +18,7 @@ describe Puppet::Type.type(:computer), " when checking computer objects" do @ensure = Puppet::Type::Computer.attrclass(:ensure).new(:resource => @resource) end - it "should be able to create a instance" do + it "should be able to create an instance" do provider_class = Puppet::Type::Computer.provider(Puppet::Type::Computer.providers[0]) Puppet::Type::Computer.expects(:defaultprovider).returns provider_class computer.new(:name => "bar").should_not be_nil diff --git a/spec/unit/type/file/group_spec.rb b/spec/unit/type/file/group_spec.rb index f81d09241..c2a38d07b 100755 --- a/spec/unit/type/file/group_spec.rb +++ b/spec/unit/type/file/group_spec.rb @@ -23,7 +23,7 @@ describe Puppet::Type.type(:file).attrclass(:group) do resource.provider.stubs(:name2gid).with('bars').returns 1002 end - it "should fail if an group's id can't be found by name" do + it "should fail if a group's id can't be found by name" do resource.provider.stubs(:name2gid).returns nil expect { group.insync?(5) }.to raise_error(/Could not find group foos/) diff --git a/spec/unit/type/user_spec.rb b/spec/unit/type/user_spec.rb index 1ead32054..38d96176b 100755 --- a/spec/unit/type/user_spec.rb +++ b/spec/unit/type/user_spec.rb @@ -15,7 +15,7 @@ describe Puppet::Type.type(:user) do described_class.stubs(:defaultprovider).returns @provider_class end - it "should be able to create a instance" do + it "should be able to create an instance" do described_class.new(:name => "foo").should_not be_nil end @@ -23,11 +23,11 @@ describe Puppet::Type.type(:user) do described_class.provider_feature(:allows_duplicates).should_not be_nil end - it "should have an manages_homedir feature" do + it "should have a manages_homedir feature" do described_class.provider_feature(:manages_homedir).should_not be_nil end - it "should have an manages_passwords feature" do + it "should have a manages_passwords feature" do described_class.provider_feature(:manages_passwords).should_not be_nil end diff --git a/spec/unit/util/log_spec.rb b/spec/unit/util/log_spec.rb index dd285c839..d04af52e6 100755 --- a/spec/unit/util/log_spec.rb +++ b/spec/unit/util/log_spec.rb @@ -186,7 +186,7 @@ describe Puppet::Util::Log do log.tags.should be_include("bar") end - it "should use an passed-in source" do + it "should use a passed-in source" do Puppet::Util::Log.any_instance.expects(:source=).with "foo" Puppet::Util::Log.new(:level => "notice", :message => :foo, :source => "foo") end |