diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-13 00:38:53 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-13 00:38:53 -0700 |
| commit | b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4 (patch) | |
| tree | 95c35f65addba0d408cb7f5c9e2c5de53724a737 | |
| parent | 941c56a283265cdf5a951ecaae63580b60486c52 (diff) | |
| parent | db11770718c61f9ee3d5fcd703c5c0c7c05227ca (diff) | |
| download | puppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.tar.gz puppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.tar.xz puppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.zip | |
Merge branch 'bug/next/7056-use-face-rather-than-faces' into next
523 files changed, 639 insertions, 1014 deletions
diff --git a/lib/puppet/application/config.rb b/lib/puppet/application/config.rb index 41a46c339..a94441e7f 100644 --- a/lib/puppet/application/config.rb +++ b/lib/puppet/application/config.rb @@ -1,4 +1,4 @@ -require 'puppet/application/faces_base' +require 'puppet/application/face_base' -class Puppet::Application::Config < Puppet::Application::FacesBase +class Puppet::Application::Config < Puppet::Application::FaceBase end diff --git a/lib/puppet/application/configurer.rb b/lib/puppet/application/configurer.rb index 751e6b4d7..6e86cd2d4 100644 --- a/lib/puppet/application/configurer.rb +++ b/lib/puppet/application/configurer.rb @@ -1,5 +1,5 @@ require 'puppet/application' -require 'puppet/faces' +require 'puppet/face' class Puppet::Application::Configurer < Puppet::Application should_parse_config @@ -17,7 +17,7 @@ class Puppet::Application::Configurer < Puppet::Application end def run_command - report = Puppet::Faces[:configurer, '0.0.1'].synchronize(Puppet[:certname]) - Puppet::Faces[:report, '0.0.1'].submit(report) + report = Puppet::Face[:configurer, '0.0.1'].synchronize(Puppet[:certname]) + Puppet::Face[:report, '0.0.1'].submit(report) end end diff --git a/lib/puppet/application/faces_base.rb b/lib/puppet/application/face_base.rb index f1b77f285..2a048a532 100644 --- a/lib/puppet/application/faces_base.rb +++ b/lib/puppet/application/face_base.rb @@ -1,8 +1,8 @@ require 'puppet/application' -require 'puppet/faces' +require 'puppet/face' require 'optparse' -class Puppet::Application::FacesBase < Puppet::Application +class Puppet::Application::FaceBase < Puppet::Application should_parse_config run_mode :agent @@ -60,7 +60,7 @@ class Puppet::Application::FacesBase < Puppet::Application # REVISIT: These should be configurable versions, through a global # '--version' option, but we don't implement that yet... --daniel 2011-03-29 @type = self.class.name.to_s.sub(/.+:/, '').downcase.to_sym - @face = Puppet::Faces[@type, :current] + @face = Puppet::Face[@type, :current] @format = @face.default_format # Now, walk the command line and identify the action. We skip over diff --git a/lib/puppet/application/faces.rb b/lib/puppet/application/faces.rb index a7b227e23..3dd3f0312 100644 --- a/lib/puppet/application/faces.rb +++ b/lib/puppet/application/faces.rb @@ -1,5 +1,5 @@ require 'puppet/application' -require 'puppet/faces' +require 'puppet/face' class Puppet::Application::Faces < Puppet::Application @@ -12,7 +12,7 @@ class Puppet::Application::Faces < Puppet::Application option("--help", "-h") do |arg| puts "Usage: puppet faces [actions|terminuses] -Lists all available interfaces, and by default includes all available terminuses and actions. +Lists all available faces, and by default includes all available terminuses and actions. " end @@ -66,7 +66,7 @@ Lists all available interfaces, and by default includes all available terminuses end def faces - Puppet::Faces.faces + Puppet::Face.faces end def terminus_classes(indirection) @@ -74,9 +74,9 @@ Lists all available interfaces, and by default includes all available terminuses end def actions(indirection) - return [] unless faces = Puppet::Faces[indirection, '0.0.1'] - faces.load_actions - return faces.actions.sort { |a, b| a.to_s <=> b.to_s } + return [] unless face = Puppet::Face[indirection, '0.0.1'] + face.load_actions + return face.actions.sort { |a, b| a.to_s <=> b.to_s } end def load_applications diff --git a/lib/puppet/application/help.rb b/lib/puppet/application/help.rb index fd8818db0..0d7767632 100644 --- a/lib/puppet/application/help.rb +++ b/lib/puppet/application/help.rb @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -require 'puppet/application/faces_base' +require 'puppet/application/face_base' -class Puppet::Application::Help < Puppet::Application::FacesBase +class Puppet::Application::Help < Puppet::Application::FaceBase # Meh. Disable the default behaviour, which is to inspect the # string and return that – not so helpful. --daniel 2011-04-11 def render(result) result end diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb index 7455ebedf..580a0999a 100644 --- a/lib/puppet/application/indirection_base.rb +++ b/lib/puppet/application/indirection_base.rb @@ -1,4 +1,4 @@ -require 'puppet/application/faces_base' +require 'puppet/application/face_base' -class Puppet::Application::IndirectionBase < Puppet::Application::FacesBase +class Puppet::Application::IndirectionBase < Puppet::Application::FaceBase end diff --git a/lib/puppet/faces.rb b/lib/puppet/face.rb index 947eecf24..f73b2fc3b 100644 --- a/lib/puppet/faces.rb +++ b/lib/puppet/face.rb @@ -1,4 +1,4 @@ -# The public name of this feature is 'faces', but we have hidden all the +# The public name of this feature is 'face', but we have hidden all the # plumbing over in the 'interfaces' namespace to make clear the distinction # between the two. # @@ -9,4 +9,4 @@ # It isn't hidden to gratuitously hide things, just to make it easier to # separate out the interests people will have. --daniel 2011-04-07 require 'puppet/interface' -Puppet::Faces = Puppet::Interface +Puppet::Face = Puppet::Interface diff --git a/lib/puppet/faces/catalog.rb b/lib/puppet/face/catalog.rb index 3353d5d04..0dcde3591 100644 --- a/lib/puppet/faces/catalog.rb +++ b/lib/puppet/face/catalog.rb @@ -1,6 +1,6 @@ -require 'puppet/faces/indirector' +require 'puppet/face/indirector' -Puppet::Faces::Indirector.define(:catalog, '0.0.1') do +Puppet::Face::Indirector.define(:catalog, '0.0.1') do action(:apply) do when_invoked do |catalog, options| report = Puppet::Transaction::Report.new("apply") @@ -28,7 +28,7 @@ Puppet::Faces::Indirector.define(:catalog, '0.0.1') do facts_to_upload = {:facts_format => :b64_zlib_yaml, :facts => CGI.escape(facts.render(:b64_zlib_yaml))} catalog = nil retrieval_duration = thinmark do - catalog = Puppet::Faces[:catalog, '0.0.1'].find(certname, facts_to_upload) + catalog = Puppet::Face[:catalog, '0.0.1'].find(certname, facts_to_upload) end catalog = catalog.to_ral catalog.finalize diff --git a/lib/puppet/faces/catalog/select.rb b/lib/puppet/face/catalog/select.rb index e29d19970..ba27117bc 100644 --- a/lib/puppet/faces/catalog/select.rb +++ b/lib/puppet/face/catalog/select.rb @@ -1,5 +1,5 @@ # Select and show a list of resources of a given type. -Puppet::Faces.define(:catalog, '0.0.1') do +Puppet::Face.define(:catalog, '0.0.1') do action :select do when_invoked do |host, type, options| catalog = Puppet::Resource::Catalog.indirection.find(host) diff --git a/lib/puppet/faces/certificate.rb b/lib/puppet/face/certificate.rb index b10bee579..77e80f099 100644 --- a/lib/puppet/faces/certificate.rb +++ b/lib/puppet/face/certificate.rb @@ -1,7 +1,7 @@ -require 'puppet/faces/indirector' +require 'puppet/face/indirector' require 'puppet/ssl/host' -Puppet::Faces::Indirector.define(:certificate, '0.0.1') do +Puppet::Face::Indirector.define(:certificate, '0.0.1') do # REVISIT: This should use a pre-invoke hook to run the common code that # needs to happen before we invoke any action; that would be much nicer than # the "please repeat yourself" stuff found in here right now. diff --git a/lib/puppet/face/certificate_request.rb b/lib/puppet/face/certificate_request.rb new file mode 100644 index 000000000..1feba25ab --- /dev/null +++ b/lib/puppet/face/certificate_request.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:certificate_request, '0.0.1') do +end diff --git a/lib/puppet/face/certificate_revocation_list.rb b/lib/puppet/face/certificate_revocation_list.rb new file mode 100644 index 000000000..6a75aa578 --- /dev/null +++ b/lib/puppet/face/certificate_revocation_list.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:certificate_revocation_list, '0.0.1') do +end diff --git a/lib/puppet/faces/config.rb b/lib/puppet/face/config.rb index 647bf5052..45cb6b156 100644 --- a/lib/puppet/faces/config.rb +++ b/lib/puppet/face/config.rb @@ -1,6 +1,6 @@ -require 'puppet/faces' +require 'puppet/face' -Puppet::Faces.define(:config, '0.0.1') do +Puppet::Face.define(:config, '0.0.1') do action(:print) do when_invoked do |*args| options = args.pop diff --git a/lib/puppet/face/configurer.rb b/lib/puppet/face/configurer.rb new file mode 100644 index 000000000..74dfb854e --- /dev/null +++ b/lib/puppet/face/configurer.rb @@ -0,0 +1,12 @@ +require 'puppet/face' + +Puppet::Face.define(:configurer, '0.0.1') do + action(:synchronize) do + when_invoked do |certname, options| + facts = Puppet::Face[:facts, '0.0.1'].find(certname) + catalog = Puppet::Face[:catalog, '0.0.1'].download(certname, facts) + report = Puppet::Face[:catalog, '0.0.1'].apply(catalog) + report + end + end +end diff --git a/lib/puppet/faces/facts.rb b/lib/puppet/face/facts.rb index 33eacef38..8668b2531 100644 --- a/lib/puppet/faces/facts.rb +++ b/lib/puppet/face/facts.rb @@ -1,7 +1,7 @@ -require 'puppet/faces/indirector' +require 'puppet/face/indirector' require 'puppet/node/facts' -Puppet::Faces::Indirector.define(:facts, '0.0.1') do +Puppet::Face::Indirector.define(:facts, '0.0.1') do set_default_format :yaml # Upload our facts to the server diff --git a/lib/puppet/face/file.rb b/lib/puppet/face/file.rb new file mode 100644 index 000000000..1aa9462dd --- /dev/null +++ b/lib/puppet/face/file.rb @@ -0,0 +1,5 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:file, '0.0.1') do + set_indirection_name :file_bucket_file +end diff --git a/lib/puppet/faces/help.rb b/lib/puppet/face/help.rb index 1d8abe20e..1c2da9e83 100644 --- a/lib/puppet/faces/help.rb +++ b/lib/puppet/face/help.rb @@ -1,9 +1,9 @@ -require 'puppet/faces' +require 'puppet/face' require 'puppet/util/command_line' require 'pathname' require 'erb' -Puppet::Faces.define(:help, '0.0.1') do +Puppet::Face.define(:help, '0.0.1') do summary "Displays help about puppet subcommands" action(:help) do @@ -41,7 +41,7 @@ Puppet::Faces.define(:help, '0.0.1') do actionname and raise ArgumentError, "Legacy subcommands don't take actions" return Puppet::Application[facename].help else - face = Puppet::Faces[facename.to_sym, version] + face = Puppet::Face[facename.to_sym, version] actionname and action = face.get_action(actionname.to_sym) end end @@ -76,9 +76,9 @@ Puppet::Faces.define(:help, '0.0.1') do def legacy_applications # The list of applications, less those that are duplicated as a face. Puppet::Util::CommandLine.available_subcommands.reject do |appname| - Puppet::Faces.face? appname.to_sym, :current or + Puppet::Face.face? appname.to_sym, :current or # ...this is a nasty way to exclude non-applications. :( - %w{faces_base indirection_base}.include? appname + %w{face_base indirection_base}.include? appname end.sort end diff --git a/lib/puppet/faces/help/action.erb b/lib/puppet/face/help/action.erb index eaf131464..eaf131464 100644 --- a/lib/puppet/faces/help/action.erb +++ b/lib/puppet/face/help/action.erb diff --git a/lib/puppet/faces/help/face.erb b/lib/puppet/face/help/face.erb index efe5fd809..efe5fd809 100644 --- a/lib/puppet/faces/help/face.erb +++ b/lib/puppet/face/help/face.erb diff --git a/lib/puppet/faces/help/global.erb b/lib/puppet/face/help/global.erb index e123367a2..f4c761b2b 100644 --- a/lib/puppet/faces/help/global.erb +++ b/lib/puppet/face/help/global.erb @@ -1,8 +1,8 @@ puppet <subcommand> [options] <action> [options] Available subcommands, from Puppet Faces: -% Puppet::Faces.faces.sort.each do |name| -% face = Puppet::Faces[name, :current] +% Puppet::Face.faces.sort.each do |name| +% face = Puppet::Face[name, :current] <%= face.name.to_s.ljust(16) %> <%= face.summary %> % end diff --git a/lib/puppet/faces/indirector.rb b/lib/puppet/face/indirector.rb index 7e4e0f00f..f48611e4b 100644 --- a/lib/puppet/faces/indirector.rb +++ b/lib/puppet/face/indirector.rb @@ -1,7 +1,7 @@ require 'puppet' -require 'puppet/faces' +require 'puppet/face' -class Puppet::Faces::Indirector < Puppet::Faces +class Puppet::Face::Indirector < Puppet::Face option "--terminus TERMINUS" do desc "REVISIT: You can select a terminus, which has some bigger effect that we should describe in this file somehow." diff --git a/lib/puppet/face/key.rb b/lib/puppet/face/key.rb new file mode 100644 index 000000000..3a11ddb03 --- /dev/null +++ b/lib/puppet/face/key.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:key, '0.0.1') do +end diff --git a/lib/puppet/face/node.rb b/lib/puppet/face/node.rb new file mode 100644 index 000000000..fd1a548d6 --- /dev/null +++ b/lib/puppet/face/node.rb @@ -0,0 +1,5 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:node, '0.0.1') do + set_default_format :yaml +end diff --git a/lib/puppet/faces/report.rb b/lib/puppet/face/report.rb index 23a518981..6e6f0b335 100644 --- a/lib/puppet/faces/report.rb +++ b/lib/puppet/face/report.rb @@ -1,6 +1,6 @@ -require 'puppet/faces/indirector' +require 'puppet/face/indirector' -Puppet::Faces::Indirector.define(:report, '0.0.1') do +Puppet::Face::Indirector.define(:report, '0.0.1') do action(:submit) do when_invoked do |report, options| begin diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb new file mode 100644 index 000000000..d162f728a --- /dev/null +++ b/lib/puppet/face/resource.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:resource, '0.0.1') do +end diff --git a/lib/puppet/face/resource_type.rb b/lib/puppet/face/resource_type.rb new file mode 100644 index 000000000..0cdbd719f --- /dev/null +++ b/lib/puppet/face/resource_type.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:resource_type, '0.0.1') do +end diff --git a/lib/puppet/face/status.rb b/lib/puppet/face/status.rb new file mode 100644 index 000000000..7085e7cd7 --- /dev/null +++ b/lib/puppet/face/status.rb @@ -0,0 +1,4 @@ +require 'puppet/face/indirector' + +Puppet::Face::Indirector.define(:status, '0.0.1') do +end diff --git a/lib/puppet/faces/certificate_request.rb b/lib/puppet/faces/certificate_request.rb deleted file mode 100644 index 5e91bdb7f..000000000 --- a/lib/puppet/faces/certificate_request.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:certificate_request, '0.0.1') do -end diff --git a/lib/puppet/faces/certificate_revocation_list.rb b/lib/puppet/faces/certificate_revocation_list.rb deleted file mode 100644 index 2f2d72874..000000000 --- a/lib/puppet/faces/certificate_revocation_list.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:certificate_revocation_list, '0.0.1') do -end diff --git a/lib/puppet/faces/configurer.rb b/lib/puppet/faces/configurer.rb deleted file mode 100644 index d40987697..000000000 --- a/lib/puppet/faces/configurer.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'puppet/faces' - -Puppet::Faces.define(:configurer, '0.0.1') do - action(:synchronize) do - when_invoked do |certname, options| - facts = Puppet::Faces[:facts, '0.0.1'].find(certname) - catalog = Puppet::Faces[:catalog, '0.0.1'].download(certname, facts) - report = Puppet::Faces[:catalog, '0.0.1'].apply(catalog) - report - end - end -end diff --git a/lib/puppet/faces/file.rb b/lib/puppet/faces/file.rb deleted file mode 100644 index e8ad18c17..000000000 --- a/lib/puppet/faces/file.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:file, '0.0.1') do - set_indirection_name :file_bucket_file -end diff --git a/lib/puppet/faces/key.rb b/lib/puppet/faces/key.rb deleted file mode 100644 index 7b6ad52ac..000000000 --- a/lib/puppet/faces/key.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:key, '0.0.1') do -end diff --git a/lib/puppet/faces/node.rb b/lib/puppet/faces/node.rb deleted file mode 100644 index 7eed0df91..000000000 --- a/lib/puppet/faces/node.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:node, '0.0.1') do - set_default_format :yaml -end diff --git a/lib/puppet/faces/resource.rb b/lib/puppet/faces/resource.rb deleted file mode 100644 index 60b0d94db..000000000 --- a/lib/puppet/faces/resource.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:resource, '0.0.1') do -end diff --git a/lib/puppet/faces/resource_type.rb b/lib/puppet/faces/resource_type.rb deleted file mode 100644 index 4321d65e7..000000000 --- a/lib/puppet/faces/resource_type.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:resource_type, '0.0.1') do -end diff --git a/lib/puppet/faces/status.rb b/lib/puppet/faces/status.rb deleted file mode 100644 index e035f281f..000000000 --- a/lib/puppet/faces/status.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces/indirector' - -Puppet::Faces::Indirector.define(:status, '0.0.1') do -end diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb index 27b3584b9..6570ebe46 100644 --- a/lib/puppet/interface.rb +++ b/lib/puppet/interface.rb @@ -19,7 +19,7 @@ class Puppet::Interface # list of directories to search. # Can't we utilize an external autoloader, or simply use the $LOAD_PATH? -pvb def autoloader - @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/faces") + @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/face") end def faces @@ -90,7 +90,7 @@ class Puppet::Interface # Try to find actions defined in other files. def load_actions - path = "puppet/faces/#{name}" + path = "puppet/face/#{name}" loaded = [] [path, "#{name}@#{version}/#{path}"].each do |path| @@ -115,6 +115,6 @@ class Puppet::Interface end def to_s - "Puppet::Faces[#{name.inspect}, #{version.inspect}]" + "Puppet::Face[#{name.inspect}, #{version.inspect}]" end end diff --git a/lib/puppet/interface/face_collection.rb b/lib/puppet/interface/face_collection.rb index e4eb22fa3..591471d4b 100644 --- a/lib/puppet/interface/face_collection.rb +++ b/lib/puppet/interface/face_collection.rb @@ -12,7 +12,7 @@ module Puppet::Interface::FaceCollection $LOAD_PATH.each do |dir| next unless FileTest.directory?(dir) Dir.chdir(dir) do - Dir.glob("puppet/faces/*.rb").collect { |f| f.sub(/\.rb/, '') }.each do |file| + Dir.glob("puppet/face/*.rb").collect { |f| f.sub(/\.rb/, '') }.each do |file| iname = file.sub(/\.rb/, '') begin require iname @@ -66,7 +66,7 @@ module Puppet::Interface::FaceCollection # We use require to avoid executing the code multiple times, like any # other Ruby library that we might want to use. --daniel 2011-04-06 begin - require "puppet/faces/#{name}" + require "puppet/face/#{name}" # If we wanted :current, we need to index to find that; direct version # requests just work™ as they go. --daniel 2011-04-06 @@ -100,7 +100,7 @@ module Puppet::Interface::FaceCollection @faces[name][:current] = @faces[name][latest_ver] end rescue LoadError => e - raise unless e.message =~ %r{-- puppet/faces/#{name}$} + raise unless e.message =~ %r{-- puppet/face/#{name}$} # ...guess we didn't find the file; return a much better problem. end diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index fa462ee2d..a884b8658 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -70,8 +70,8 @@ module Puppet # Doing this at the top of the file is natural, but causes puppet.rb # to load too early, which causes things to break. This is a nasty # thing, found in #7065. --daniel 2011-04-11 - require 'puppet/faces/help' - puts Puppet::Faces[:help, :current].help + require 'puppet/face' + puts Puppet::Face[:help, :current].help end end diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index 9d0e0a715..cec8a57d9 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -1,4 +1,4 @@ -# Provides utility functions to help interfaces Puppet to SELinux. +# Provides utility functions to help interface Puppet to SELinux. # # This requires the very new SELinux Ruby bindings. These bindings closely # mirror the SELinux C library interface. diff --git a/spec/integration/application/apply_spec.rb b/spec/integration/application/apply_spec.rb index 33b00a1f6..84acc28b2 100755 --- a/spec/integration/application/apply_spec.rb +++ b/spec/integration/application/apply_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' require 'puppet/application/apply' diff --git a/spec/integration/application/doc_spec.rb b/spec/integration/application/doc_spec.rb index bcff8f756..df9b91608 100755 --- a/spec/integration/application/doc_spec.rb +++ b/spec/integration/application/doc_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/configurer_spec.rb b/spec/integration/configurer_spec.rb index f826b0f5d..f5d8bceb2 100755 --- a/spec/integration/configurer_spec.rb +++ b/spec/integration/configurer_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/configurer' diff --git a/spec/integration/defaults_spec.rb b/spec/integration/defaults_spec.rb index c9b41d331..8aa59288e 100755 --- a/spec/integration/defaults_spec.rb +++ b/spec/integration/defaults_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/defaults' diff --git a/spec/integration/file_serving/content_spec.rb b/spec/integration/file_serving/content_spec.rb index d9d79ec4f..a95ddc520 100755 --- a/spec/integration/file_serving/content_spec.rb +++ b/spec/integration/file_serving/content_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/file_serving/fileset_spec.rb b/spec/integration/file_serving/fileset_spec.rb index 858186794..f4b869847 100755 --- a/spec/integration/file_serving/fileset_spec.rb +++ b/spec/integration/file_serving/fileset_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/fileset' diff --git a/spec/integration/file_serving/metadata_spec.rb b/spec/integration/file_serving/metadata_spec.rb index f5ae616e1..ba7d3311f 100755 --- a/spec/integration/file_serving/metadata_spec.rb +++ b/spec/integration/file_serving/metadata_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/file_serving/terminus_helper_spec.rb b/spec/integration/file_serving/terminus_helper_spec.rb index 650ae4d7b..7500b1fc0 100755 --- a/spec/integration/file_serving/terminus_helper_spec.rb +++ b/spec/integration/file_serving/terminus_helper_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/terminus_helper' diff --git a/spec/integration/indirector/catalog/compiler_spec.rb b/spec/integration/indirector/catalog/compiler_spec.rb index 054b0377a..f51a3f24e 100755 --- a/spec/integration/indirector/catalog/compiler_spec.rb +++ b/spec/integration/indirector/catalog/compiler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/catalog' diff --git a/spec/integration/indirector/catalog/queue_spec.rb b/spec/integration/indirector/catalog/queue_spec.rb index 5c781c1ae..569f096bf 100755 --- a/spec/integration/indirector/catalog/queue_spec.rb +++ b/spec/integration/indirector/catalog/queue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/catalog' diff --git a/spec/integration/indirector/direct_file_server_spec.rb b/spec/integration/indirector/direct_file_server_spec.rb index 6ab3e4d83..e53b48d69 100755 --- a/spec/integration/indirector/direct_file_server_spec.rb +++ b/spec/integration/indirector/direct_file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-19. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/indirector/file_content/file_server_spec.rb b/spec/integration/indirector/file_content/file_server_spec.rb index e1eb28f91..88d2345d8 100755 --- a/spec/integration/indirector/file_content/file_server_spec.rb +++ b/spec/integration/indirector/file_content/file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/indirector/file_metadata/file_server_spec.rb b/spec/integration/indirector/file_metadata/file_server_spec.rb index 7a973fcca..9e84134a6 100755 --- a/spec/integration/indirector/file_metadata/file_server_spec.rb +++ b/spec/integration/indirector/file_metadata/file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/indirector/node/ldap_spec.rb b/spec/integration/indirector/node/ldap_spec.rb index 9891702bd..7e53141dc 100755 --- a/spec/integration/indirector/node/ldap_spec.rb +++ b/spec/integration/indirector/node/ldap_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/ldap' diff --git a/spec/integration/network/client_spec.rb b/spec/integration/network/client_spec.rb index 574da6a78..72174c75c 100755 --- a/spec/integration/network/client_spec.rb +++ b/spec/integration/network/client_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/client' diff --git a/spec/integration/network/formats_spec.rb b/spec/integration/network/formats_spec.rb index 44f153d33..af505f267 100755 --- a/spec/integration/network/formats_spec.rb +++ b/spec/integration/network/formats_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/formats' diff --git a/spec/integration/network/handler_spec.rb b/spec/integration/network/handler_spec.rb index 5012d3ab9..dc0837c13 100755 --- a/spec/integration/network/handler_spec.rb +++ b/spec/integration/network/handler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/client' diff --git a/spec/integration/network/server/mongrel_spec.rb b/spec/integration/network/server/mongrel_spec.rb index 2a18cb569..fd5903b9e 100755 --- a/spec/integration/network/server/mongrel_spec.rb +++ b/spec/integration/network/server/mongrel_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/server' require 'socket' diff --git a/spec/integration/network/server/webrick_spec.rb b/spec/integration/network/server/webrick_spec.rb index b39dd2378..81c35af4f 100755 --- a/spec/integration/network/server/webrick_spec.rb +++ b/spec/integration/network/server/webrick_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/server' require 'puppet/ssl/certificate_authority' diff --git a/spec/integration/node/environment_spec.rb b/spec/integration/node/environment_spec.rb index 1610e2efc..25a14afd4 100755 --- a/spec/integration/node/environment_spec.rb +++ b/spec/integration/node/environment_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/node/facts_spec.rb b/spec/integration/node/facts_spec.rb index a1f35a233..f54d7f9aa 100755 --- a/spec/integration/node/facts_spec.rb +++ b/spec/integration/node/facts_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-4-8. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/node_spec.rb b/spec/integration/node_spec.rb index afcb1cda5..e15ddfc1e 100755 --- a/spec/integration/node_spec.rb +++ b/spec/integration/node_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-23. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/parser/collector_spec.rb b/spec/integration/parser/collector_spec.rb index 148d105bf..c14fa4184 100755 --- a/spec/integration/parser/collector_spec.rb +++ b/spec/integration/parser/collector_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/collector' diff --git a/spec/integration/parser/compiler_spec.rb b/spec/integration/parser/compiler_spec.rb index 2eb91ec7d..9f6aae907 100755 --- a/spec/integration/parser/compiler_spec.rb +++ b/spec/integration/parser/compiler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::Compiler do diff --git a/spec/integration/parser/functions/require_spec.rb b/spec/integration/parser/functions/require_spec.rb index c9eb0ae32..aa15f92be 100755 --- a/spec/integration/parser/functions/require_spec.rb +++ b/spec/integration/parser/functions/require_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "The require function" do diff --git a/spec/integration/parser/functions_spec.rb b/spec/integration/parser/functions_spec.rb index 397576182..6791987d7 100755 --- a/spec/integration/parser/functions_spec.rb +++ b/spec/integration/parser/functions_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::Functions do diff --git a/spec/integration/parser/parser_spec.rb b/spec/integration/parser/parser_spec.rb index 1526be049..65c9ee302 100755 --- a/spec/integration/parser/parser_spec.rb +++ b/spec/integration/parser/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::Parser do diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb index 6955e89e5..7f3bb71e9 100755 --- a/spec/integration/parser/ruby_manifest_spec.rb +++ b/spec/integration/parser/ruby_manifest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'tempfile' diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb index ac8095ac7..232704e61 100755 --- a/spec/integration/provider/mailalias/aliases_spec.rb +++ b/spec/integration/provider/mailalias/aliases_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' require 'shared_behaviours/all_parsedfile_providers' diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb index 4af0dca4a..4af0dca4a 100644..100755 --- a/spec/integration/provider/mount_spec.rb +++ b/spec/integration/provider/mount_spec.rb diff --git a/spec/integration/provider/package_spec.rb b/spec/integration/provider/package_spec.rb index 00c52fc89..2d75826e8 100755 --- a/spec/integration/provider/package_spec.rb +++ b/spec/integration/provider/package_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "Package Provider" do diff --git a/spec/integration/provider/service/init_spec.rb b/spec/integration/provider/service/init_spec.rb index 17b74ed0a..ef7d98b4c 100755 --- a/spec/integration/provider/service/init_spec.rb +++ b/spec/integration/provider/service/init_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:service).provider(:init) diff --git a/spec/integration/reference/providers_spec.rb b/spec/integration/reference/providers_spec.rb index 23b22aae1..6d87ee02e 100755 --- a/spec/integration/reference/providers_spec.rb +++ b/spec/integration/reference/providers_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/reference' diff --git a/spec/integration/reports_spec.rb b/spec/integration/reports_spec.rb index b9a57bb17..d5a08d28a 100755 --- a/spec/integration/reports_spec.rb +++ b/spec/integration/reports_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-12. # Copyright (c) 2007. All rights reserved. diff --git a/spec/integration/resource/catalog_spec.rb b/spec/integration/resource/catalog_spec.rb index 5f646d4ad..41a475d98 100755 --- a/spec/integration/resource/catalog_spec.rb +++ b/spec/integration/resource/catalog_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-4-8. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/resource/type_collection_spec.rb b/spec/integration/resource/type_collection_spec.rb index 7d9f25a39..6ea2e7fe7 100755 --- a/spec/integration/resource/type_collection_spec.rb +++ b/spec/integration/resource/type_collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/ssl/certificate_authority_spec.rb b/spec/integration/ssl/certificate_authority_spec.rb index a29fc0275..c5e145459 100755 --- a/spec/integration/ssl/certificate_authority_spec.rb +++ b/spec/integration/ssl/certificate_authority_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-4-17. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/ssl/certificate_request_spec.rb b/spec/integration/ssl/certificate_request_spec.rb index eeb1a1ad8..688466c37 100755 --- a/spec/integration/ssl/certificate_request_spec.rb +++ b/spec/integration/ssl/certificate_request_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-4-17. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/ssl/certificate_revocation_list_spec.rb b/spec/integration/ssl/certificate_revocation_list_spec.rb index 24693cb27..051a81569 100755 --- a/spec/integration/ssl/certificate_revocation_list_spec.rb +++ b/spec/integration/ssl/certificate_revocation_list_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-5-5. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/ssl/host_spec.rb b/spec/integration/ssl/host_spec.rb index 2ea1d1bc6..e9c37c151 100755 --- a/spec/integration/ssl/host_spec.rb +++ b/spec/integration/ssl/host_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-4-17. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/transaction/report_spec.rb b/spec/integration/transaction/report_spec.rb index b4efbd754..183d93f76 100755 --- a/spec/integration/transaction/report_spec.rb +++ b/spec/integration/transaction/report_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-4-8. # Copyright (c) 2008. All rights reserved. diff --git a/spec/integration/transaction_spec.rb b/spec/integration/transaction_spec.rb index cb5d22c0d..41a1ebac3 100755 --- a/spec/integration/transaction_spec.rb +++ b/spec/integration/transaction_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/type/file_spec.rb b/spec/integration/type/file_spec.rb index 44d90a50b..4bed8c6c1 100755 --- a/spec/integration/type/file_spec.rb +++ b/spec/integration/type/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/type/package_spec.rb b/spec/integration/type/package_spec.rb index 191abd259..7d03cb9c0 100755 --- a/spec/integration/type/package_spec.rb +++ b/spec/integration/type/package_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:package), "when choosing a default package provider" do diff --git a/spec/integration/type/tidy_spec.rb b/spec/integration/type/tidy_spec.rb index f1b74c039..675aaf4cd 100755 --- a/spec/integration/type/tidy_spec.rb +++ b/spec/integration/type/tidy_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/integration/type_spec.rb b/spec/integration/type_spec.rb index 0a141924b..4be01d558 100755 --- a/spec/integration/type_spec.rb +++ b/spec/integration/type_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/type' diff --git a/spec/integration/util/autoload_spec.rb b/spec/integration/util/autoload_spec.rb index 8ae8339fe..92fc6554c 100755 --- a/spec/integration/util/autoload_spec.rb +++ b/spec/integration/util/autoload_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/autoload' diff --git a/spec/integration/util/feature_spec.rb b/spec/integration/util/feature_spec.rb index 6a5433efe..c3c13764d 100755 --- a/spec/integration/util/feature_spec.rb +++ b/spec/integration/util/feature_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/feature' diff --git a/spec/integration/util/file_locking_spec.rb b/spec/integration/util/file_locking_spec.rb index 6582a336c..9e829df0e 100755 --- a/spec/integration/util/file_locking_spec.rb +++ b/spec/integration/util/file_locking_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/file_locking' diff --git a/spec/integration/util/rdoc/parser_spec.rb b/spec/integration/util/rdoc/parser_spec.rb index b76846fae..ce316309b 100755 --- a/spec/integration/util/rdoc/parser_spec.rb +++ b/spec/integration/util/rdoc/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/type_collection' diff --git a/spec/integration/util/settings_spec.rb b/spec/integration/util/settings_spec.rb index f5bdb790f..b05c63107 100755 --- a/spec/integration/util/settings_spec.rb +++ b/spec/integration/util/settings_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/lib/puppet/face/basetest.rb b/spec/lib/puppet/face/basetest.rb new file mode 100755 index 000000000..00616f74f --- /dev/null +++ b/spec/lib/puppet/face/basetest.rb @@ -0,0 +1 @@ +Puppet::Face.define(:basetest, '0.0.1') diff --git a/spec/lib/puppet/faces/huzzah.rb b/spec/lib/puppet/face/huzzah.rb index e86730250..3428c6816 100644..100755 --- a/spec/lib/puppet/faces/huzzah.rb +++ b/spec/lib/puppet/face/huzzah.rb @@ -1,5 +1,5 @@ -require 'puppet/faces' -Puppet::Faces.define(:huzzah, '2.0.1') do +require 'puppet/face' +Puppet::Face.define(:huzzah, '2.0.1') do summary "life is a thing for celebration" action :bar do "is where beer comes from" end end diff --git a/spec/lib/puppet/faces/basetest.rb b/spec/lib/puppet/faces/basetest.rb deleted file mode 100644 index d20c52b97..000000000 --- a/spec/lib/puppet/faces/basetest.rb +++ /dev/null @@ -1 +0,0 @@ -Puppet::Faces.define(:basetest, '0.0.1') diff --git a/spec/lib/puppet_spec/files.rb b/spec/lib/puppet_spec/files.rb index 30fb4fc42..30fb4fc42 100644..100755 --- a/spec/lib/puppet_spec/files.rb +++ b/spec/lib/puppet_spec/files.rb diff --git a/spec/lib/puppet_spec/fixtures.rb b/spec/lib/puppet_spec/fixtures.rb index 7f6bc2a8f..7f6bc2a8f 100644..100755 --- a/spec/lib/puppet_spec/fixtures.rb +++ b/spec/lib/puppet_spec/fixtures.rb diff --git a/spec/lib/puppet_spec/verbose.rb b/spec/lib/puppet_spec/verbose.rb index d9834f2d7..d9834f2d7 100644..100755 --- a/spec/lib/puppet_spec/verbose.rb +++ b/spec/lib/puppet_spec/verbose.rb diff --git a/spec/monkey_patches/alias_should_to_must.rb b/spec/monkey_patches/alias_should_to_must.rb index 1a1111799..1a1111799 100644..100755 --- a/spec/monkey_patches/alias_should_to_must.rb +++ b/spec/monkey_patches/alias_should_to_must.rb diff --git a/spec/monkey_patches/publicize_methods.rb b/spec/monkey_patches/publicize_methods.rb index b39e9c002..b39e9c002 100644..100755 --- a/spec/monkey_patches/publicize_methods.rb +++ b/spec/monkey_patches/publicize_methods.rb diff --git a/spec/shared_behaviours/all_parsedfile_providers.rb b/spec/shared_behaviours/all_parsedfile_providers.rb index 9cb199b5f..9cb199b5f 100644..100755 --- a/spec/shared_behaviours/all_parsedfile_providers.rb +++ b/spec/shared_behaviours/all_parsedfile_providers.rb diff --git a/spec/shared_behaviours/file_server_terminus.rb b/spec/shared_behaviours/file_server_terminus.rb index 94a044d2e..f59169382 100644..100755 --- a/spec/shared_behaviours/file_server_terminus.rb +++ b/spec/shared_behaviours/file_server_terminus.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/shared_behaviours/file_serving.rb b/spec/shared_behaviours/file_serving.rb index 84173448a..3afab5b59 100644..100755 --- a/spec/shared_behaviours/file_serving.rb +++ b/spec/shared_behaviours/file_serving.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/shared_behaviours/memory_terminus.rb b/spec/shared_behaviours/memory_terminus.rb index f9325a969..f9325a969 100644..100755 --- a/spec/shared_behaviours/memory_terminus.rb +++ b/spec/shared_behaviours/memory_terminus.rb diff --git a/spec/shared_behaviours/path_parameters.rb b/spec/shared_behaviours/path_parameters.rb index b5a907900..b5a907900 100644..100755 --- a/spec/shared_behaviours/path_parameters.rb +++ b/spec/shared_behaviours/path_parameters.rb diff --git a/spec/shared_behaviours/things_that_declare_options.rb b/spec/shared_behaviours/things_that_declare_options.rb index 1b41c2279..1b41c2279 100644..100755 --- a/spec/shared_behaviours/things_that_declare_options.rb +++ b/spec/shared_behaviours/things_that_declare_options.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1187c1caf..1187c1caf 100644..100755 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb diff --git a/spec/unit/agent/locker_spec.rb b/spec/unit/agent/locker_spec.rb index c1eb9bbbb..341859e3b 100755 --- a/spec/unit/agent/locker_spec.rb +++ b/spec/unit/agent/locker_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/agent' require 'puppet/agent/locker' diff --git a/spec/unit/agent_spec.rb b/spec/unit/agent_spec.rb index 78fb5fde6..bfa44f61c 100755 --- a/spec/unit/agent_spec.rb +++ b/spec/unit/agent_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-12. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb index ad2748b7f..03cf14429 100755 --- a/spec/unit/application/agent_spec.rb +++ b/spec/unit/application/agent_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/agent' diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb index b4141fc17..66c658e7f 100755 --- a/spec/unit/application/apply_spec.rb +++ b/spec/unit/application/apply_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/apply' diff --git a/spec/unit/application/config_spec.rb b/spec/unit/application/config_spec.rb index 0c1279630..dc2fb5717 100755 --- a/spec/unit/application/config_spec.rb +++ b/spec/unit/application/config_spec.rb @@ -1,10 +1,9 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/config' describe Puppet::Application::Config do - it "should be a subclass of Puppet::Application::FacesBase" do - Puppet::Application::Config.superclass.should equal(Puppet::Application::FacesBase) + it "should be a subclass of Puppet::Application::FaceBase" do + Puppet::Application::Config.superclass.should equal(Puppet::Application::FaceBase) end end diff --git a/spec/unit/application/configurer_spec.rb b/spec/unit/application/configurer_spec.rb index 2db07565c..791a367ea 100755 --- a/spec/unit/application/configurer_spec.rb +++ b/spec/unit/application/configurer_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/configurer' require 'puppet/indirector/catalog/rest' diff --git a/spec/unit/application/describe_spec.rb b/spec/unit/application/describe_spec.rb index f1eb77869..e79ac21b7 100755 --- a/spec/unit/application/describe_spec.rb +++ b/spec/unit/application/describe_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/describe' diff --git a/spec/unit/application/doc_spec.rb b/spec/unit/application/doc_spec.rb index b5d1a39d4..66a833b9d 100755 --- a/spec/unit/application/doc_spec.rb +++ b/spec/unit/application/doc_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/doc' diff --git a/spec/unit/application/faces_base_spec.rb b/spec/unit/application/face_base_spec.rb index 18bd30295..939712ef8 100755 --- a/spec/unit/application/faces_base_spec.rb +++ b/spec/unit/application/face_base_spec.rb @@ -1,15 +1,14 @@ #!/usr/bin/env rspec - require 'spec_helper' -require 'puppet/application/faces_base' +require 'puppet/application/face_base' require 'tmpdir' -class Puppet::Application::FacesBase::Basetest < Puppet::Application::FacesBase +class Puppet::Application::FaceBase::Basetest < Puppet::Application::FaceBase end -describe Puppet::Application::FacesBase do +describe Puppet::Application::FaceBase do before :all do - Puppet::Faces.define(:basetest, '0.0.1') do + Puppet::Face.define(:basetest, '0.0.1') do option("--[no-]boolean") option("--mandatory MANDATORY") option("--optional [OPTIONAL]") @@ -22,7 +21,7 @@ describe Puppet::Application::FacesBase do end let :app do - app = Puppet::Application::FacesBase::Basetest.new + app = Puppet::Application::FaceBase::Basetest.new app.command_line.stubs(:subcommand_name).returns('subcommand') Puppet::Util::Log.stubs(:newdestination) app @@ -57,11 +56,11 @@ describe Puppet::Application::FacesBase do app.parse_options end - it "should set the faces based on the type" do + it "should set the face based on the type" do app.face.name.should == :basetest end - it "should set the format based on the faces default" do + it "should set the format based on the face default" do app.format.should == :pson end @@ -168,13 +167,13 @@ describe Puppet::Application::FacesBase do before :each do app.expects(:exit).with(0) - app.face = Puppet::Faces[:basetest, '0.0.1'] + app.face = Puppet::Face[:basetest, '0.0.1'] app.action = app.face.get_action(:foo) app.format = :pson app.arguments = ["myname", "myarg"] end - it "should send the specified verb and name to the faces" do + it "should send the specified verb and name to the face" do app.face.expects(:foo).with(*app.arguments) app.main end diff --git a/spec/unit/application/faces_spec.rb b/spec/unit/application/faces_spec.rb index c4d15a297..cc159b6a5 100755 --- a/spec/unit/application/faces_spec.rb +++ b/spec/unit/application/faces_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/faces' @@ -9,8 +8,7 @@ describe Puppet::Application::Faces do end it "should always call 'list'" do - faces = Puppet::Application::Faces.new - faces.expects(:list) - faces.main + subject.expects(:list) + subject.main end end diff --git a/spec/unit/application/filebucket_spec.rb b/spec/unit/application/filebucket_spec.rb index 1ee12d89c..8ba86be9e 100755 --- a/spec/unit/application/filebucket_spec.rb +++ b/spec/unit/application/filebucket_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/filebucket' diff --git a/spec/unit/application/indirection_base_spec.rb b/spec/unit/application/indirection_base_spec.rb index 98eb3a118..63ab11eed 100755 --- a/spec/unit/application/indirection_base_spec.rb +++ b/spec/unit/application/indirection_base_spec.rb @@ -1,20 +1,19 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/indirection_base' -require 'puppet/faces/indirector' +require 'puppet/face/indirector' ######################################################################## # Stub for testing; the names are critical, sadly. --daniel 2011-03-30 class Puppet::Application::TestIndirection < Puppet::Application::IndirectionBase end -face = Puppet::Faces::Indirector.define(:testindirection, '0.0.1') do +face = Puppet::Face::Indirector.define(:testindirection, '0.0.1') do end # REVISIT: This horror is required because we don't allow anything to be # :current except for if it lives on, and is loaded from, disk. --daniel 2011-03-29 face.instance_variable_set('@version', :current) -Puppet::Faces.register(face) +Puppet::Face.register(face) ######################################################################## diff --git a/spec/unit/application/inspect_spec.rb b/spec/unit/application/inspect_spec.rb index f1518299a..fda61c6e4 100755 --- a/spec/unit/application/inspect_spec.rb +++ b/spec/unit/application/inspect_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/inspect' diff --git a/spec/unit/application/kick_spec.rb b/spec/unit/application/kick_spec.rb index 8481ec227..29e4caea4 100755 --- a/spec/unit/application/kick_spec.rb +++ b/spec/unit/application/kick_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/kick' diff --git a/spec/unit/application/master_spec.rb b/spec/unit/application/master_spec.rb index ca4c5d0bc..890f8eebc 100755 --- a/spec/unit/application/master_spec.rb +++ b/spec/unit/application/master_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/master' diff --git a/spec/unit/application/queue_spec.rb b/spec/unit/application/queue_spec.rb index 8a2e25b25..87713ca97 100755 --- a/spec/unit/application/queue_spec.rb +++ b/spec/unit/application/queue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/queue' diff --git a/spec/unit/application/resource_spec.rb b/spec/unit/application/resource_spec.rb index a97fdc953..673bd65d7 100755 --- a/spec/unit/application/resource_spec.rb +++ b/spec/unit/application/resource_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application/resource' diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index a1a46c814..f46959092 100755 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/application' diff --git a/spec/unit/configurer/downloader_spec.rb b/spec/unit/configurer/downloader_spec.rb index 8c455cb5b..17b285d53 100755 --- a/spec/unit/configurer/downloader_spec.rb +++ b/spec/unit/configurer/downloader_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/configurer/downloader' diff --git a/spec/unit/configurer/fact_handler_spec.rb b/spec/unit/configurer/fact_handler_spec.rb index c7d061ad1..70d9b17c0 100755 --- a/spec/unit/configurer/fact_handler_spec.rb +++ b/spec/unit/configurer/fact_handler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/configurer' require 'puppet/configurer/fact_handler' diff --git a/spec/unit/configurer/plugin_handler_spec.rb b/spec/unit/configurer/plugin_handler_spec.rb index bd2ed3855..7d99960df 100755 --- a/spec/unit/configurer/plugin_handler_spec.rb +++ b/spec/unit/configurer/plugin_handler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/configurer' require 'puppet/configurer/plugin_handler' diff --git a/spec/unit/configurer_spec.rb b/spec/unit/configurer_spec.rb index c2482e6be..7b76c3221 100755 --- a/spec/unit/configurer_spec.rb +++ b/spec/unit/configurer_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-12. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb index 7b01f831b..ed8dec2a3 100755 --- a/spec/unit/daemon_spec.rb +++ b/spec/unit/daemon_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/daemon' diff --git a/spec/unit/dsl/resource_api_spec.rb b/spec/unit/dsl/resource_api_spec.rb index 30273affe..559a43333 100755 --- a/spec/unit/dsl/resource_api_spec.rb +++ b/spec/unit/dsl/resource_api_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/dsl/resource_api' diff --git a/spec/unit/dsl/resource_type_api_spec.rb b/spec/unit/dsl/resource_type_api_spec.rb index c8f6cca52..ea81f7da4 100755 --- a/spec/unit/dsl/resource_type_api_spec.rb +++ b/spec/unit/dsl/resource_type_api_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/dsl/resource_type_api' diff --git a/spec/unit/face/catalog_spec.rb b/spec/unit/face/catalog_spec.rb new file mode 100755 index 000000000..28c2aa9be --- /dev/null +++ b/spec/unit/face/catalog_spec.rb @@ -0,0 +1,4 @@ +require 'puppet/face' +describe Puppet::Face[:catalog, '0.0.1'] do + it "should actually have some testing..." +end diff --git a/spec/unit/face/certificate_request_spec.rb b/spec/unit/face/certificate_request_spec.rb new file mode 100755 index 000000000..a83a92df8 --- /dev/null +++ b/spec/unit/face/certificate_request_spec.rb @@ -0,0 +1,3 @@ +describe Puppet::Face[:certificate_request, '0.0.1'] do + it "should actually have some tests..." +end diff --git a/spec/unit/face/certificate_revocation_list_spec.rb b/spec/unit/face/certificate_revocation_list_spec.rb new file mode 100755 index 000000000..22c0fa2bf --- /dev/null +++ b/spec/unit/face/certificate_revocation_list_spec.rb @@ -0,0 +1,3 @@ +describe Puppet::Face[:certificate_revocation_list, '0.0.1'] do + it "should actually have some tests..." +end diff --git a/spec/unit/faces/certificate_spec.rb b/spec/unit/face/certificate_spec.rb index ba264f967..dbcc888ad 100755 --- a/spec/unit/faces/certificate_spec.rb +++ b/spec/unit/face/certificate_spec.rb @@ -1,12 +1,12 @@ require 'puppet/ssl/host' -describe Puppet::Faces[:certificate, '0.0.1'] do +describe Puppet::Face[:certificate, '0.0.1'] do it "should have a ca-location option" do subject.should be_option :ca_location end it "should set the ca location when invoked" do - pending "#6983: This is broken in the actual faces..." + pending "#6983: This is broken in the actual face..." Puppet::SSL::Host.expects(:ca_location=).with(:foo) Puppet::SSL::Host.indirection.expects(:save) subject.sign :ca_location => :foo diff --git a/spec/unit/faces/config_spec.rb b/spec/unit/face/config_spec.rb index b71995e9f..6004d700f 100755 --- a/spec/unit/faces/config_spec.rb +++ b/spec/unit/face/config_spec.rb @@ -1,8 +1,7 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' -describe Puppet::Faces[:config, '0.0.1'] do +describe Puppet::Face[:config, '0.0.1'] do it "should use Settings#print_config_options when asked to print" do Puppet.settings.stubs(:puts) Puppet.settings.expects(:print_config_options) diff --git a/spec/unit/faces/configurer_spec.rb b/spec/unit/face/configurer_spec.rb index 6982c00ae..56b45031f 100755 --- a/spec/unit/faces/configurer_spec.rb +++ b/spec/unit/face/configurer_spec.rb @@ -1,10 +1,9 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/catalog/rest' require 'tempfile' -describe Puppet::Faces[:configurer, '0.0.1'] do +describe Puppet::Face[:configurer, '0.0.1'] do describe "#synchronize" do it "should retrieve and apply a catalog and return a report" do pending "REVISIT: 2.7 changes broke this, and we want the merge published" diff --git a/spec/unit/faces/facts_spec.rb b/spec/unit/face/facts_spec.rb index 46496a839..e6411f836 100755 --- a/spec/unit/faces/facts_spec.rb +++ b/spec/unit/face/facts_spec.rb @@ -1,8 +1,7 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' -describe Puppet::Faces[:facts, '0.0.1'] do +describe Puppet::Face[:facts, '0.0.1'] do it "should define an 'upload' fact" do subject.should be_action(:upload) end diff --git a/spec/unit/faces/file_spec.rb b/spec/unit/face/file_spec.rb index fcb52c67e..97e8bcc08 100755 --- a/spec/unit/faces/file_spec.rb +++ b/spec/unit/face/file_spec.rb @@ -1,3 +1,3 @@ -describe Puppet::Faces[:file, '0.0.1'] do +describe Puppet::Face[:file, '0.0.1'] do it "should actually have some tests..." end diff --git a/spec/unit/faces/help_spec.rb b/spec/unit/face/help_spec.rb index cd74a5bf1..e67f29e07 100644..100755 --- a/spec/unit/faces/help_spec.rb +++ b/spec/unit/face/help_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' -require 'puppet/faces/help' +require 'puppet/face/help' -describe Puppet::Faces[:help, '0.0.1'] do +describe Puppet::Face[:help, '0.0.1'] do it "should have a help action" do subject.should be_action :help end @@ -38,41 +38,41 @@ describe Puppet::Faces[:help, '0.0.1'] do end it "should find a face by version" do - face = Puppet::Faces[:huzzah, :current] + face = Puppet::Face[:huzzah, :current] subject.help(:huzzah, :version => face.version). should == subject.help(:huzzah, :version => :current) end context "when listing subcommands" do - subject { Puppet::Faces[:help, :current].help } + subject { Puppet::Face[:help, :current].help } # Check a precondition for the next block; if this fails you have - # something odd in your set of faces, and we skip testing things that + # something odd in your set of face, and we skip testing things that # matter. --daniel 2011-04-10 it "should have at least one face with a summary" do - Puppet::Faces.faces.should be_any do |name| - Puppet::Faces[name, :current].summary + Puppet::Face.faces.should be_any do |name| + Puppet::Face[name, :current].summary end end - Puppet::Faces.faces.each do |name| - face = Puppet::Faces[name, :current] + Puppet::Face.faces.each do |name| + face = Puppet::Face[name, :current] summary = face.summary it { should =~ %r{ #{name} } } it { should =~ %r{ #{name} +#{summary}} } if summary end - Puppet::Faces[:help, :current].legacy_applications.each do |appname| + Puppet::Face[:help, :current].legacy_applications.each do |appname| it { should =~ %r{ #{appname} } } - summary = Puppet::Faces[:help, :current].horribly_extract_summary_from(appname) + summary = Puppet::Face[:help, :current].horribly_extract_summary_from(appname) summary and it { should =~ %r{ #{summary}\b} } end end context "#legacy_applications" do - subject { Puppet::Faces[:help, :current].legacy_applications } + subject { Puppet::Face[:help, :current].legacy_applications } # If we don't, these tests are ... less than useful, because they assume # it. When this breaks you should consider ditching the entire feature @@ -83,13 +83,13 @@ describe Puppet::Faces[:help, '0.0.1'] do # bug that caused these to be listed is annoyingly subtle and has a nasty # fix, so better to have a "fail if you do something daft" trigger in # place here, I think. --daniel 2011-04-11 - %w{faces_base indirection_base}.each do |name| + %w{face_base indirection_base}.each do |name| it { should_not include name } end end context "help for legacy applications" do - subject { Puppet::Faces[:help, :current] } + subject { Puppet::Face[:help, :current] } let :appname do subject.legacy_applications.first end # This test is purposely generic, so that as we eliminate legacy commands diff --git a/spec/unit/faces/indirector_spec.rb b/spec/unit/face/indirector_spec.rb index c1aed9617..bb06fcfe2 100755 --- a/spec/unit/faces/indirector_spec.rb +++ b/spec/unit/face/indirector_spec.rb @@ -1,11 +1,10 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' -require 'puppet/faces/indirector' +require 'puppet/face/indirector' -describe Puppet::Faces::Indirector do +describe Puppet::Face::Indirector do subject do - instance = Puppet::Faces::Indirector.new(:test, '0.0.1') + instance = Puppet::Face::Indirector.new(:test, '0.0.1') indirection = stub('indirection', :name => :stub_indirection, :reset_terminus_class => nil) @@ -14,24 +13,24 @@ describe Puppet::Faces::Indirector do end it "should be able to return a list of indirections" do - Puppet::Faces::Indirector.indirections.should be_include("catalog") + Puppet::Face::Indirector.indirections.should be_include("catalog") end it "should be able to return a list of terminuses for a given indirection" do - Puppet::Faces::Indirector.terminus_classes(:catalog).should be_include("compiler") + Puppet::Face::Indirector.terminus_classes(:catalog).should be_include("compiler") end describe "as an instance" do it "should be able to determine its indirection" do # Loading actions here an get, um, complicated - Puppet::Faces.stubs(:load_actions) - Puppet::Faces::Indirector.new(:catalog, '0.0.1').indirection.should equal(Puppet::Resource::Catalog.indirection) + Puppet::Face.stubs(:load_actions) + Puppet::Face::Indirector.new(:catalog, '0.0.1').indirection.should equal(Puppet::Resource::Catalog.indirection) end end [:find, :search, :save, :destroy].each do |method| it "should define a '#{method}' action" do - Puppet::Faces::Indirector.should be_action(method) + Puppet::Face::Indirector.should be_action(method) end it "should call the indirection method with options when the '#{method}' action is invoked" do @@ -55,6 +54,6 @@ describe Puppet::Faces::Indirector do end it "should define a class-level 'info' action" do - Puppet::Faces::Indirector.should be_action(:info) + Puppet::Face::Indirector.should be_action(:info) end end diff --git a/spec/unit/faces/key_spec.rb b/spec/unit/face/key_spec.rb index 9b7a58706..10d664790 100755 --- a/spec/unit/faces/key_spec.rb +++ b/spec/unit/face/key_spec.rb @@ -1,3 +1,3 @@ -describe Puppet::Faces[:key, '0.0.1'] do +describe Puppet::Face[:key, '0.0.1'] do it "should actually have some tests..." end diff --git a/spec/unit/faces/node_spec.rb b/spec/unit/face/node_spec.rb index c6ed71f59..90d258db9 100755 --- a/spec/unit/faces/node_spec.rb +++ b/spec/unit/face/node_spec.rb @@ -1,8 +1,7 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' -describe Puppet::Faces[:node, '0.0.1'] do +describe Puppet::Face[:node, '0.0.1'] do it "should set its default format to :yaml" do subject.default_format.should == :yaml end diff --git a/spec/unit/faces/report_spec.rb b/spec/unit/face/report_spec.rb index 30897d5e7..b1b28167e 100755 --- a/spec/unit/faces/report_spec.rb +++ b/spec/unit/face/report_spec.rb @@ -1,3 +1,3 @@ -describe Puppet::Faces[:report, '0.0.1'] do +describe Puppet::Face[:report, '0.0.1'] do it "should actually have some tests..." end diff --git a/spec/unit/faces/resource_spec.rb b/spec/unit/face/resource_spec.rb index e3f2e1c62..084e2a6a9 100755 --- a/spec/unit/faces/resource_spec.rb +++ b/spec/unit/face/resource_spec.rb @@ -1,3 +1,3 @@ -describe Puppet::Faces[:resource, '0.0.1'] do +describe Puppet::Face[:resource, '0.0.1'] do it "should actually have some tests..." end diff --git a/spec/unit/face/resource_type_spec.rb b/spec/unit/face/resource_type_spec.rb new file mode 100755 index 000000000..2adaedca1 --- /dev/null +++ b/spec/unit/face/resource_type_spec.rb @@ -0,0 +1,3 @@ +describe Puppet::Face[:resource_type, '0.0.1'] do + it "should actually have some tests..." +end diff --git a/spec/unit/faces_spec.rb b/spec/unit/face_spec.rb index b6c49d917..b6c49d917 100644..100755 --- a/spec/unit/faces_spec.rb +++ b/spec/unit/face_spec.rb diff --git a/spec/unit/faces/catalog_spec.rb b/spec/unit/faces/catalog_spec.rb deleted file mode 100755 index e0a771d10..000000000 --- a/spec/unit/faces/catalog_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'puppet/faces' -describe Puppet::Faces[:catalog, '0.0.1'] do - it "should actually have some testing..." -end diff --git a/spec/unit/faces/certificate_request_spec.rb b/spec/unit/faces/certificate_request_spec.rb deleted file mode 100755 index 1a71a8379..000000000 --- a/spec/unit/faces/certificate_request_spec.rb +++ /dev/null @@ -1,3 +0,0 @@ -describe Puppet::Faces[:certificate_request, '0.0.1'] do - it "should actually have some tests..." -end diff --git a/spec/unit/faces/certificate_revocation_list_spec.rb b/spec/unit/faces/certificate_revocation_list_spec.rb deleted file mode 100755 index 4f41edef6..000000000 --- a/spec/unit/faces/certificate_revocation_list_spec.rb +++ /dev/null @@ -1,3 +0,0 @@ -describe Puppet::Faces[:certificate_revocation_list, '0.0.1'] do - it "should actually have some tests..." -end diff --git a/spec/unit/faces/resource_type_spec.rb b/spec/unit/faces/resource_type_spec.rb deleted file mode 100755 index fcbf07520..000000000 --- a/spec/unit/faces/resource_type_spec.rb +++ /dev/null @@ -1,3 +0,0 @@ -describe Puppet::Faces[:resource_type, '0.0.1'] do - it "should actually have some tests..." -end diff --git a/spec/unit/file_bucket/dipper_spec.rb b/spec/unit/file_bucket/dipper_spec.rb index e218e8616..910b2808d 100755 --- a/spec/unit/file_bucket/dipper_spec.rb +++ b/spec/unit/file_bucket/dipper_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'pathname' diff --git a/spec/unit/file_bucket/file_spec.rb b/spec/unit/file_bucket/file_spec.rb index d7dfb8d70..c4444ae77 100755 --- a/spec/unit/file_bucket/file_spec.rb +++ b/spec/unit/file_bucket/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_bucket/file' diff --git a/spec/unit/file_collection/lookup_spec.rb b/spec/unit/file_collection/lookup_spec.rb index 2ab6b56c0..2b0f8bfab 100755 --- a/spec/unit/file_collection/lookup_spec.rb +++ b/spec/unit/file_collection/lookup_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_collection/lookup' diff --git a/spec/unit/file_collection_spec.rb b/spec/unit/file_collection_spec.rb index 69b1ede93..518763629 100755 --- a/spec/unit/file_collection_spec.rb +++ b/spec/unit/file_collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_collection' diff --git a/spec/unit/file_serving/base_spec.rb b/spec/unit/file_serving/base_spec.rb index 0323490c1..17d59460e 100755 --- a/spec/unit/file_serving/base_spec.rb +++ b/spec/unit/file_serving/base_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/base' diff --git a/spec/unit/file_serving/configuration/parser_spec.rb b/spec/unit/file_serving/configuration/parser_spec.rb index 1321eafc4..3d6b3e234 100755 --- a/spec/unit/file_serving/configuration/parser_spec.rb +++ b/spec/unit/file_serving/configuration/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/configuration/parser' diff --git a/spec/unit/file_serving/configuration_spec.rb b/spec/unit/file_serving/configuration_spec.rb index 4aba165e2..6ee1a4f38 100755 --- a/spec/unit/file_serving/configuration_spec.rb +++ b/spec/unit/file_serving/configuration_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/configuration' diff --git a/spec/unit/file_serving/content_spec.rb b/spec/unit/file_serving/content_spec.rb index 806515a63..2637ba6ce 100755 --- a/spec/unit/file_serving/content_spec.rb +++ b/spec/unit/file_serving/content_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/content' diff --git a/spec/unit/file_serving/fileset_spec.rb b/spec/unit/file_serving/fileset_spec.rb index 6a83621d2..a369ad39c 100755 --- a/spec/unit/file_serving/fileset_spec.rb +++ b/spec/unit/file_serving/fileset_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/fileset' diff --git a/spec/unit/file_serving/indirection_hooks_spec.rb b/spec/unit/file_serving/indirection_hooks_spec.rb index 0ee2de5ea..4890505ab 100755 --- a/spec/unit/file_serving/indirection_hooks_spec.rb +++ b/spec/unit/file_serving/indirection_hooks_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/file_serving/metadata_spec.rb b/spec/unit/file_serving/metadata_spec.rb index 24761027c..39f2a9548 100755 --- a/spec/unit/file_serving/metadata_spec.rb +++ b/spec/unit/file_serving/metadata_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/metadata' diff --git a/spec/unit/file_serving/mount/file_spec.rb b/spec/unit/file_serving/mount/file_spec.rb index 5af680188..70c804abd 100755 --- a/spec/unit/file_serving/mount/file_spec.rb +++ b/spec/unit/file_serving/mount/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/mount/file' diff --git a/spec/unit/file_serving/mount/modules_spec.rb b/spec/unit/file_serving/mount/modules_spec.rb index 27c56e6f8..2d582daa2 100755 --- a/spec/unit/file_serving/mount/modules_spec.rb +++ b/spec/unit/file_serving/mount/modules_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/mount/modules' diff --git a/spec/unit/file_serving/mount/plugins_spec.rb b/spec/unit/file_serving/mount/plugins_spec.rb index 0ba8d489e..b6bed72a0 100755 --- a/spec/unit/file_serving/mount/plugins_spec.rb +++ b/spec/unit/file_serving/mount/plugins_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/mount/plugins' diff --git a/spec/unit/file_serving/mount_spec.rb b/spec/unit/file_serving/mount_spec.rb index 1586984de..5d8e64f82 100755 --- a/spec/unit/file_serving/mount_spec.rb +++ b/spec/unit/file_serving/mount_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_serving/mount' diff --git a/spec/unit/file_serving/terminus_helper_spec.rb b/spec/unit/file_serving/terminus_helper_spec.rb index cd669109f..7efe3fb98 100755 --- a/spec/unit/file_serving/terminus_helper_spec.rb +++ b/spec/unit/file_serving/terminus_helper_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-22. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/active_record_spec.rb b/spec/unit/indirector/active_record_spec.rb index 376822c9d..2baef33fe 100755 --- a/spec/unit/indirector/active_record_spec.rb +++ b/spec/unit/indirector/active_record_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/indirector/catalog/active_record_spec.rb b/spec/unit/indirector/catalog/active_record_spec.rb index ddf6548fb..35d01179b 100755 --- a/spec/unit/indirector/catalog/active_record_spec.rb +++ b/spec/unit/indirector/catalog/active_record_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' diff --git a/spec/unit/indirector/catalog/compiler_spec.rb b/spec/unit/indirector/catalog/compiler_spec.rb index f6cb8f7bb..cd84031e5 100755 --- a/spec/unit/indirector/catalog/compiler_spec.rb +++ b/spec/unit/indirector/catalog/compiler_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-23. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/catalog/queue_spec.rb b/spec/unit/indirector/catalog/queue_spec.rb index 5b24bee1a..d396ad897 100755 --- a/spec/unit/indirector/catalog/queue_spec.rb +++ b/spec/unit/indirector/catalog/queue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/catalog/queue' diff --git a/spec/unit/indirector/catalog/rest_spec.rb b/spec/unit/indirector/catalog/rest_spec.rb index 498084dce..3e674dde9 100755 --- a/spec/unit/indirector/catalog/rest_spec.rb +++ b/spec/unit/indirector/catalog/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/catalog/rest' diff --git a/spec/unit/indirector/catalog/yaml_spec.rb b/spec/unit/indirector/catalog/yaml_spec.rb index 1c6fb7df3..ddaa173c6 100755 --- a/spec/unit/indirector/catalog/yaml_spec.rb +++ b/spec/unit/indirector/catalog/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/catalog' diff --git a/spec/unit/indirector/certificate/ca_spec.rb b/spec/unit/indirector/certificate/ca_spec.rb index 2dc4f48e0..277d2209d 100755 --- a/spec/unit/indirector/certificate/ca_spec.rb +++ b/spec/unit/indirector/certificate/ca_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate/file_spec.rb b/spec/unit/indirector/certificate/file_spec.rb index e1960b8ec..f398e1115 100755 --- a/spec/unit/indirector/certificate/file_spec.rb +++ b/spec/unit/indirector/certificate/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate/rest_spec.rb b/spec/unit/indirector/certificate/rest_spec.rb index 6efd50207..21e10e316 100755 --- a/spec/unit/indirector/certificate/rest_spec.rb +++ b/spec/unit/indirector/certificate/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/certificate/rest' diff --git a/spec/unit/indirector/certificate_request/ca_spec.rb b/spec/unit/indirector/certificate_request/ca_spec.rb index 08055e08b..ebd64a2fb 100755 --- a/spec/unit/indirector/certificate_request/ca_spec.rb +++ b/spec/unit/indirector/certificate_request/ca_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate_request/file_spec.rb b/spec/unit/indirector/certificate_request/file_spec.rb index c7a565491..69dc5eb9c 100755 --- a/spec/unit/indirector/certificate_request/file_spec.rb +++ b/spec/unit/indirector/certificate_request/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate_request/rest_spec.rb b/spec/unit/indirector/certificate_request/rest_spec.rb index 6e940b1f9..398b91b84 100755 --- a/spec/unit/indirector/certificate_request/rest_spec.rb +++ b/spec/unit/indirector/certificate_request/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/certificate_request/rest' diff --git a/spec/unit/indirector/certificate_revocation_list/ca_spec.rb b/spec/unit/indirector/certificate_revocation_list/ca_spec.rb index b6f814a9c..d76373b97 100755 --- a/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +++ b/spec/unit/indirector/certificate_revocation_list/ca_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate_revocation_list/file_spec.rb b/spec/unit/indirector/certificate_revocation_list/file_spec.rb index cd047410c..f4b8c36d3 100755 --- a/spec/unit/indirector/certificate_revocation_list/file_spec.rb +++ b/spec/unit/indirector/certificate_revocation_list/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/certificate_revocation_list/rest_spec.rb b/spec/unit/indirector/certificate_revocation_list/rest_spec.rb index c77992182..238ba75ff 100755 --- a/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +++ b/spec/unit/indirector/certificate_revocation_list/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/certificate_revocation_list/rest' diff --git a/spec/unit/indirector/certificate_status/file_spec.rb b/spec/unit/indirector/certificate_status/file_spec.rb index 72e9f5851..ae03aa9cb 100755 --- a/spec/unit/indirector/certificate_status/file_spec.rb +++ b/spec/unit/indirector/certificate_status/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/host' require 'puppet/indirector/certificate_status' diff --git a/spec/unit/indirector/certificate_status/rest_spec.rb b/spec/unit/indirector/certificate_status/rest_spec.rb index 5367c96c6..39fbb7024 100755 --- a/spec/unit/indirector/certificate_status/rest_spec.rb +++ b/spec/unit/indirector/certificate_status/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/host' require 'puppet/indirector/certificate_status' diff --git a/spec/unit/indirector/code_spec.rb b/spec/unit/indirector/code_spec.rb index 7fe7e2fb2..29369bf5e 100755 --- a/spec/unit/indirector/code_spec.rb +++ b/spec/unit/indirector/code_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/code' diff --git a/spec/unit/indirector/direct_file_server_spec.rb b/spec/unit/indirector/direct_file_server_spec.rb index 41ec85ec7..abd7172b7 100755 --- a/spec/unit/indirector/direct_file_server_spec.rb +++ b/spec/unit/indirector/direct_file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-24. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/envelope_spec.rb b/spec/unit/indirector/envelope_spec.rb index 7f7540227..e056b768c 100755 --- a/spec/unit/indirector/envelope_spec.rb +++ b/spec/unit/indirector/envelope_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/envelope' diff --git a/spec/unit/indirector/exec_spec.rb b/spec/unit/indirector/exec_spec.rb index 147bb8a5c..1050ed4cc 100755 --- a/spec/unit/indirector/exec_spec.rb +++ b/spec/unit/indirector/exec_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/exec' diff --git a/spec/unit/indirector/facts/active_record_spec.rb b/spec/unit/indirector/facts/active_record_spec.rb index cccf1352c..01a906716 100755 --- a/spec/unit/indirector/facts/active_record_spec.rb +++ b/spec/unit/indirector/facts/active_record_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/indirector/facts/couch_spec.rb b/spec/unit/indirector/facts/couch_spec.rb index 3ac085251..d0862486c 100755 --- a/spec/unit/indirector/facts/couch_spec.rb +++ b/spec/unit/indirector/facts/couch_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node/facts' diff --git a/spec/unit/indirector/facts/facter_spec.rb b/spec/unit/indirector/facts/facter_spec.rb index 76a1e29ce..9f5a0249b 100755 --- a/spec/unit/indirector/facts/facter_spec.rb +++ b/spec/unit/indirector/facts/facter_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-23. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/facts/inventory_active_record_spec.rb b/spec/unit/indirector/facts/inventory_active_record_spec.rb index 0d5573999..edd03d8e4 100755 --- a/spec/unit/indirector/facts/inventory_active_record_spec.rb +++ b/spec/unit/indirector/facts/inventory_active_record_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' begin require 'sqlite3' diff --git a/spec/unit/indirector/facts/rest_spec.rb b/spec/unit/indirector/facts/rest_spec.rb index cf03d30bc..6a2a23f8b 100755 --- a/spec/unit/indirector/facts/rest_spec.rb +++ b/spec/unit/indirector/facts/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/facts/rest' diff --git a/spec/unit/indirector/facts/yaml_spec.rb b/spec/unit/indirector/facts/yaml_spec.rb index 45f5a1b67..a22d690b8 100755 --- a/spec/unit/indirector/facts/yaml_spec.rb +++ b/spec/unit/indirector/facts/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node/facts' diff --git a/spec/unit/indirector/file_bucket_file/file_spec.rb b/spec/unit/indirector/file_bucket_file/file_spec.rb index 242018882..e0612cb21 100755 --- a/spec/unit/indirector/file_bucket_file/file_spec.rb +++ b/spec/unit/indirector/file_bucket_file/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/file_bucket_file/file' diff --git a/spec/unit/indirector/file_bucket_file/rest_spec.rb b/spec/unit/indirector/file_bucket_file/rest_spec.rb index 61dab2935..ae2e033c6 100755 --- a/spec/unit/indirector/file_bucket_file/rest_spec.rb +++ b/spec/unit/indirector/file_bucket_file/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/file_bucket_file/rest' diff --git a/spec/unit/indirector/file_content/file_server_spec.rb b/spec/unit/indirector/file_content/file_server_spec.rb index 6661e8786..99a535dc3 100755 --- a/spec/unit/indirector/file_content/file_server_spec.rb +++ b/spec/unit/indirector/file_content/file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/file_content/file_spec.rb b/spec/unit/indirector/file_content/file_spec.rb index 7ba01263f..b629981c5 100755 --- a/spec/unit/indirector/file_content/file_spec.rb +++ b/spec/unit/indirector/file_content/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/file_content/rest_spec.rb b/spec/unit/indirector/file_content/rest_spec.rb index dbcf7c2f8..06ad16e77 100755 --- a/spec/unit/indirector/file_content/rest_spec.rb +++ b/spec/unit/indirector/file_content/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/file_content' diff --git a/spec/unit/indirector/file_metadata/file_server_spec.rb b/spec/unit/indirector/file_metadata/file_server_spec.rb index 507da16ef..e16829035 100755 --- a/spec/unit/indirector/file_metadata/file_server_spec.rb +++ b/spec/unit/indirector/file_metadata/file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/file_metadata/file_spec.rb b/spec/unit/indirector/file_metadata/file_spec.rb index e3a766699..28a974290 100755 --- a/spec/unit/indirector/file_metadata/file_spec.rb +++ b/spec/unit/indirector/file_metadata/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/file_metadata/rest_spec.rb b/spec/unit/indirector/file_metadata/rest_spec.rb index 9cdd2ee06..511f7c758 100755 --- a/spec/unit/indirector/file_metadata/rest_spec.rb +++ b/spec/unit/indirector/file_metadata/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/file_metadata' diff --git a/spec/unit/indirector/file_server_spec.rb b/spec/unit/indirector/file_server_spec.rb index 9f677399f..6df715fb1 100755 --- a/spec/unit/indirector/file_server_spec.rb +++ b/spec/unit/indirector/file_server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-10-19. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/file_spec.rb b/spec/unit/indirector/file_spec.rb index 50b1706bf..b72bf4d67 100755 --- a/spec/unit/indirector/file_spec.rb +++ b/spec/unit/indirector/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/file' diff --git a/spec/unit/indirector/indirection_spec.rb b/spec/unit/indirector/indirection_spec.rb index 114062a20..4bbc855b1 100755 --- a/spec/unit/indirector/indirection_spec.rb +++ b/spec/unit/indirector/indirection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/indirection' diff --git a/spec/unit/indirector/inventory/yaml_spec.rb b/spec/unit/indirector/inventory/yaml_spec.rb index fddbf9d33..54ab9c72c 100755 --- a/spec/unit/indirector/inventory/yaml_spec.rb +++ b/spec/unit/indirector/inventory/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node/inventory' diff --git a/spec/unit/indirector/key/ca_spec.rb b/spec/unit/indirector/key/ca_spec.rb index 033a70c3f..ba3d1aae2 100755 --- a/spec/unit/indirector/key/ca_spec.rb +++ b/spec/unit/indirector/key/ca_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/key/file_spec.rb b/spec/unit/indirector/key/file_spec.rb index a87c3b1d8..bf9b293d8 100755 --- a/spec/unit/indirector/key/file_spec.rb +++ b/spec/unit/indirector/key/file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-7. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/ldap_spec.rb b/spec/unit/indirector/ldap_spec.rb index 289d2fa0f..2b40325de 100755 --- a/spec/unit/indirector/ldap_spec.rb +++ b/spec/unit/indirector/ldap_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/ldap' diff --git a/spec/unit/indirector/memory_spec.rb b/spec/unit/indirector/memory_spec.rb index 4f0e6e9fe..676acfcca 100755 --- a/spec/unit/indirector/memory_spec.rb +++ b/spec/unit/indirector/memory_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/memory' diff --git a/spec/unit/indirector/node/active_record_spec.rb b/spec/unit/indirector/node/active_record_spec.rb index ac53419ca..6fed940b9 100755 --- a/spec/unit/indirector/node/active_record_spec.rb +++ b/spec/unit/indirector/node/active_record_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node' diff --git a/spec/unit/indirector/node/exec_spec.rb b/spec/unit/indirector/node/exec_spec.rb index 372b2df9b..f14990cd5 100755 --- a/spec/unit/indirector/node/exec_spec.rb +++ b/spec/unit/indirector/node/exec_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/exec' diff --git a/spec/unit/indirector/node/ldap_spec.rb b/spec/unit/indirector/node/ldap_spec.rb index 710951e9c..5e57db3c4 100755 --- a/spec/unit/indirector/node/ldap_spec.rb +++ b/spec/unit/indirector/node/ldap_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/ldap' diff --git a/spec/unit/indirector/node/memory_spec.rb b/spec/unit/indirector/node/memory_spec.rb index 77cfa4af7..8b26a47c1 100755 --- a/spec/unit/indirector/node/memory_spec.rb +++ b/spec/unit/indirector/node/memory_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/memory' diff --git a/spec/unit/indirector/node/plain_spec.rb b/spec/unit/indirector/node/plain_spec.rb index 9cdd8f35b..c6ba84e67 100755 --- a/spec/unit/indirector/node/plain_spec.rb +++ b/spec/unit/indirector/node/plain_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/plain' diff --git a/spec/unit/indirector/node/rest_spec.rb b/spec/unit/indirector/node/rest_spec.rb index 8c91297d6..fa5d1baf7 100755 --- a/spec/unit/indirector/node/rest_spec.rb +++ b/spec/unit/indirector/node/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/node/rest' diff --git a/spec/unit/indirector/node/yaml_spec.rb b/spec/unit/indirector/node/yaml_spec.rb index ce196c221..db9ffe435 100755 --- a/spec/unit/indirector/node/yaml_spec.rb +++ b/spec/unit/indirector/node/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node' diff --git a/spec/unit/indirector/plain_spec.rb b/spec/unit/indirector/plain_spec.rb index 8efdc7894..0894f70f0 100755 --- a/spec/unit/indirector/plain_spec.rb +++ b/spec/unit/indirector/plain_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/plain' diff --git a/spec/unit/indirector/queue_spec.rb b/spec/unit/indirector/queue_spec.rb index 40c87e248..b84ed2aea 100755 --- a/spec/unit/indirector/queue_spec.rb +++ b/spec/unit/indirector/queue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/queue' diff --git a/spec/unit/indirector/report/processor_spec.rb b/spec/unit/indirector/report/processor_spec.rb index 545294644..bafbe6ee7 100755 --- a/spec/unit/indirector/report/processor_spec.rb +++ b/spec/unit/indirector/report/processor_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-23. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/report/rest_spec.rb b/spec/unit/indirector/report/rest_spec.rb index 1e7ac7732..806ae6efd 100755 --- a/spec/unit/indirector/report/rest_spec.rb +++ b/spec/unit/indirector/report/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/report/rest' diff --git a/spec/unit/indirector/report/yaml_spec.rb b/spec/unit/indirector/report/yaml_spec.rb index d164bea54..7df4bb2e9 100755 --- a/spec/unit/indirector/report/yaml_spec.rb +++ b/spec/unit/indirector/report/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction/report' diff --git a/spec/unit/indirector/request_spec.rb b/spec/unit/indirector/request_spec.rb index c1718bf11..965d54188 100755 --- a/spec/unit/indirector/request_spec.rb +++ b/spec/unit/indirector/request_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/request' diff --git a/spec/unit/indirector/resource/ral_spec.rb b/spec/unit/indirector/resource/ral_spec.rb index 74acec536..61290f7a7 100755 --- a/spec/unit/indirector/resource/ral_spec.rb +++ b/spec/unit/indirector/resource/ral_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "Puppet::Resource::Ral" do diff --git a/spec/unit/indirector/resource/rest_spec.rb b/spec/unit/indirector/resource/rest_spec.rb index 8857c552e..70c9a7f11 100755 --- a/spec/unit/indirector/resource/rest_spec.rb +++ b/spec/unit/indirector/resource/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/resource/rest' diff --git a/spec/unit/indirector/resource_type/parser_spec.rb b/spec/unit/indirector/resource_type/parser_spec.rb index 4eaf680a2..c4fc455a0 100755 --- a/spec/unit/indirector/resource_type/parser_spec.rb +++ b/spec/unit/indirector/resource_type/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/resource_type/parser' diff --git a/spec/unit/indirector/resource_type/rest_spec.rb b/spec/unit/indirector/resource_type/rest_spec.rb index 11071107a..3d8ddf44c 100755 --- a/spec/unit/indirector/resource_type/rest_spec.rb +++ b/spec/unit/indirector/resource_type/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/resource_type/rest' diff --git a/spec/unit/indirector/rest_spec.rb b/spec/unit/indirector/rest_spec.rb index 29d00f1eb..513eb8352 100755 --- a/spec/unit/indirector/rest_spec.rb +++ b/spec/unit/indirector/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/rest' diff --git a/spec/unit/indirector/run/local_spec.rb b/spec/unit/indirector/run/local_spec.rb index 1fbda7f34..8fb61d962 100755 --- a/spec/unit/indirector/run/local_spec.rb +++ b/spec/unit/indirector/run/local_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/run/local' diff --git a/spec/unit/indirector/run/rest_spec.rb b/spec/unit/indirector/run/rest_spec.rb index 3997d9c2f..4b80962d1 100755 --- a/spec/unit/indirector/run/rest_spec.rb +++ b/spec/unit/indirector/run/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/run/rest' diff --git a/spec/unit/indirector/ssl_file_spec.rb b/spec/unit/indirector/ssl_file_spec.rb index 011bdfa9c..5d0859598 100755 --- a/spec/unit/indirector/ssl_file_spec.rb +++ b/spec/unit/indirector/ssl_file_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-10. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/indirector/status/rest_spec.rb b/spec/unit/indirector/status/rest_spec.rb index 24b10df07..b203e6e20 100755 --- a/spec/unit/indirector/status/rest_spec.rb +++ b/spec/unit/indirector/status/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/status/rest' diff --git a/spec/unit/indirector/terminus_spec.rb b/spec/unit/indirector/terminus_spec.rb index 2abdab4f6..41770e1e3 100755 --- a/spec/unit/indirector/terminus_spec.rb +++ b/spec/unit/indirector/terminus_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/defaults' require 'puppet/indirector' diff --git a/spec/unit/indirector/yaml_spec.rb b/spec/unit/indirector/yaml_spec.rb index d2d12e74f..c43dbcaf6 100755 --- a/spec/unit/indirector/yaml_spec.rb +++ b/spec/unit/indirector/yaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/indirector/yaml' diff --git a/spec/unit/indirector_spec.rb b/spec/unit/indirector_spec.rb index cca86e218..0c09831db 100755 --- a/spec/unit/indirector_spec.rb +++ b/spec/unit/indirector_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/defaults' diff --git a/spec/unit/interface/action_builder_spec.rb b/spec/unit/interface/action_builder_spec.rb index 666575605..5b04df900 100755 --- a/spec/unit/interface/action_builder_spec.rb +++ b/spec/unit/interface/action_builder_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/interface/action_builder' diff --git a/spec/unit/interface/action_manager_spec.rb b/spec/unit/interface/action_manager_spec.rb index 42daf763e..c4b21eaac 100755 --- a/spec/unit/interface/action_manager_spec.rb +++ b/spec/unit/interface/action_manager_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' # This is entirely an internal class for Interface, so we have to load it instead of our class. diff --git a/spec/unit/interface/action_spec.rb b/spec/unit/interface/action_spec.rb index 957198427..8c6782976 100755 --- a/spec/unit/interface/action_spec.rb +++ b/spec/unit/interface/action_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/interface/action' diff --git a/spec/unit/interface/face_collection_spec.rb b/spec/unit/interface/face_collection_spec.rb index 752871035..d1114dde7 100755 --- a/spec/unit/interface/face_collection_spec.rb +++ b/spec/unit/interface/face_collection_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' require 'tmpdir' @@ -15,7 +15,7 @@ describe Puppet::Interface::FaceCollection do before :each do @original_faces = subject.instance_variable_get("@faces").dup @original_required = $".dup - $".delete_if do |path| path =~ %r{/faces/.*\.rb$} end + $".delete_if do |path| path =~ %r{/face/.*\.rb$} end subject.instance_variable_get("@faces").clear end @@ -59,82 +59,71 @@ describe Puppet::Interface::FaceCollection do subject.instance_variable_get("@faces")[:foo]['0.0.1'] = 10 end - before :each do - @dir = Dir.mktmpdir - @lib = FileUtils.mkdir_p(File.join @dir, 'puppet', 'faces') - $LOAD_PATH.push(@dir) - end - - after :each do - FileUtils.remove_entry_secure @dir - $LOAD_PATH.pop - end - - it "should return the faces with the given name" do + it "should return the face with the given name" do subject["foo", '0.0.1'].should == 10 end - it "should attempt to load the faces if it isn't found" do - subject.expects(:require).with('puppet/faces/bar') + it "should attempt to load the face if it isn't found" do + subject.expects(:require).with('puppet/face/bar') subject["bar", '0.0.1'] end - it "should attempt to load the default faces for the specified version :current" do - subject.expects(:require).with('puppet/faces/fozzie') + it "should attempt to load the default face for the specified version :current" do + subject.expects(:require).with('puppet/face/fozzie') subject['fozzie', :current] end end describe "::face?" do - it "should return true if the faces specified is registered" do + it "should return true if the face specified is registered" do subject.instance_variable_get("@faces")[:foo]['0.0.1'] = 10 subject.face?("foo", '0.0.1').should == true end - it "should attempt to require the faces if it is not registered" do + it "should attempt to require the face if it is not registered" do subject.expects(:require).with do |file| subject.instance_variable_get("@faces")[:bar]['0.0.1'] = true - file == 'puppet/faces/bar' + file == 'puppet/face/bar' end subject.face?("bar", '0.0.1').should == true end - it "should return true if requiring the faces registered it" do + it "should return true if requiring the face registered it" do subject.stubs(:require).with do subject.instance_variable_get("@faces")[:bar]['0.0.1'] = 20 end end - it "should return false if the faces is not registered" do + it "should return false if the face is not registered" do subject.stubs(:require).returns(true) subject.face?("bar", '0.0.1').should be_false end - it "should return false if the faces file itself is missing" do + it "should return false if the face file itself is missing" do subject.stubs(:require). - raises(LoadError, 'no such file to load -- puppet/faces/bar') + raises(LoadError, 'no such file to load -- puppet/face/bar') subject.face?("bar", '0.0.1').should be_false end it "should register the version loaded by `:current` as `:current`" do subject.expects(:require).with do |file| - subject.instance_variable_get("@faces")[:huzzah]['2.0.1'] = :huzzah_faces - file == 'puppet/faces/huzzah' + subject.instance_variable_get("@faces")[:huzzah]['2.0.1'] = :huzzah_face + file == 'puppet/face/huzzah' end subject.face?("huzzah", :current) - subject.instance_variable_get("@faces")[:huzzah][:current].should == :huzzah_faces + subject.instance_variable_get("@faces")[:huzzah][:current].should == :huzzah_face end context "with something on disk" do - it "should register the version loaded from `puppet/faces/{name}` as `:current`" do + it "should register the version loaded from `puppet/face/{name}` as `:current`" do subject.should be_face "huzzah", '2.0.1' subject.should be_face "huzzah", :current - Puppet::Faces[:huzzah, '2.0.1'].should == Puppet::Faces[:huzzah, :current] + Puppet::Face[:huzzah, '2.0.1'].should == Puppet::Face[:huzzah, :current] end it "should index :current when the code was pre-required" do subject.instance_variable_get("@faces")[:huzzah].should_not be_key :current - require 'puppet/faces/huzzah' + require 'puppet/face/huzzah' subject.face?(:huzzah, :current).should be_true end end @@ -146,10 +135,10 @@ describe Puppet::Interface::FaceCollection do end describe "::register" do - it "should store the faces by name" do - faces = Puppet::Faces.new(:my_faces, '0.0.1') - subject.register(faces) - subject.instance_variable_get("@faces").should == {:my_faces => {'0.0.1' => faces}} + it "should store the face by name" do + face = Puppet::Face.new(:my_face, '0.0.1') + subject.register(face) + subject.instance_variable_get("@faces").should == {:my_face => {'0.0.1' => face}} end end diff --git a/spec/unit/interface/option_builder_spec.rb b/spec/unit/interface/option_builder_spec.rb index fae48324e..fae48324e 100644..100755 --- a/spec/unit/interface/option_builder_spec.rb +++ b/spec/unit/interface/option_builder_spec.rb diff --git a/spec/unit/interface/option_spec.rb b/spec/unit/interface/option_spec.rb index 3bcd121e2..3bcd121e2 100644..100755 --- a/spec/unit/interface/option_spec.rb +++ b/spec/unit/interface/option_spec.rb diff --git a/spec/unit/interface_spec.rb b/spec/unit/interface_spec.rb index 7e6b7de77..2365d5cac 100755 --- a/spec/unit/interface_spec.rb +++ b/spec/unit/interface_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'puppet/faces' +require 'puppet/face' require 'puppet/interface' describe Puppet::Interface do @@ -116,7 +116,7 @@ describe Puppet::Interface do it "should try to require faces that are not known" do pending "mocking require causes random stack overflow" - subject::FaceCollection.expects(:require).with "puppet/faces/foo" + subject::FaceCollection.expects(:require).with "puppet/face/foo" subject[:foo, '0.0.1'] end diff --git a/spec/unit/module_spec.rb b/spec/unit/module_spec.rb index 2daf85347..8d38657f9 100755 --- a/spec/unit/module_spec.rb +++ b/spec/unit/module_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet_spec/files' diff --git a/spec/unit/network/authconfig_spec.rb b/spec/unit/network/authconfig_spec.rb index 99accefb2..c47b2e0c5 100755 --- a/spec/unit/network/authconfig_spec.rb +++ b/spec/unit/network/authconfig_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/authconfig' diff --git a/spec/unit/network/authstore_spec.rb b/spec/unit/network/authstore_spec.rb index 535e1bdff..d62c8abaa 100755 --- a/spec/unit/network/authstore_spec.rb +++ b/spec/unit/network/authstore_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/authconfig' diff --git a/spec/unit/network/client_spec.rb b/spec/unit/network/client_spec.rb index 75825879f..102a053c0 100755 --- a/spec/unit/network/client_spec.rb +++ b/spec/unit/network/client_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-24. # Copyright (c) 2008. All rights reserved. diff --git a/spec/unit/network/format_handler_spec.rb b/spec/unit/network/format_handler_spec.rb index 25a988dbc..8b535c3ab 100755 --- a/spec/unit/network/format_handler_spec.rb +++ b/spec/unit/network/format_handler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/format_handler' diff --git a/spec/unit/network/format_spec.rb b/spec/unit/network/format_spec.rb index c54fdfd31..f59593479 100755 --- a/spec/unit/network/format_spec.rb +++ b/spec/unit/network/format_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/format' diff --git a/spec/unit/network/formats_spec.rb b/spec/unit/network/formats_spec.rb index 34b83f3ed..72d355192 100755 --- a/spec/unit/network/formats_spec.rb +++ b/spec/unit/network/formats_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/formats' diff --git a/spec/unit/network/handler/fileserver_spec.rb b/spec/unit/network/handler/fileserver_spec.rb index 5d88edbf2..52c4a71f5 100755 --- a/spec/unit/network/handler/fileserver_spec.rb +++ b/spec/unit/network/handler/fileserver_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/handler/fileserver' diff --git a/spec/unit/network/http/api/v1_spec.rb b/spec/unit/network/http/api/v1_spec.rb index d16ff122a..bd95071c1 100755 --- a/spec/unit/network/http/api/v1_spec.rb +++ b/spec/unit/network/http/api/v1_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/http/api/v1' diff --git a/spec/unit/network/http/compression_spec.rb b/spec/unit/network/http/compression_spec.rb index 32ffd6a72..5c919c6c5 100755 --- a/spec/unit/network/http/compression_spec.rb +++ b/spec/unit/network/http/compression_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "http compression" do diff --git a/spec/unit/network/http/handler_spec.rb b/spec/unit/network/http/handler_spec.rb index 868efa72b..83969c504 100755 --- a/spec/unit/network/http/handler_spec.rb +++ b/spec/unit/network/http/handler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/http/handler' require 'puppet/network/rest_authorization' diff --git a/spec/unit/network/http/mongrel/rest_spec.rb b/spec/unit/network/http/mongrel/rest_spec.rb index cd3a59994..3e454cf8f 100755 --- a/spec/unit/network/http/mongrel/rest_spec.rb +++ b/spec/unit/network/http/mongrel/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/http' diff --git a/spec/unit/network/http/mongrel_spec.rb b/spec/unit/network/http/mongrel_spec.rb index a200de384..56d0afbed 100755 --- a/spec/unit/network/http/mongrel_spec.rb +++ b/spec/unit/network/http/mongrel_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Rick Bradley on 2007-10-15. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/network/http/rack/rest_spec.rb b/spec/unit/network/http/rack/rest_spec.rb index daa3af351..8a5666f56 100755 --- a/spec/unit/network/http/rack/rest_spec.rb +++ b/spec/unit/network/http/rack/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/http/rack' if Puppet.features.rack? require 'puppet/network/http/rack/rest' diff --git a/spec/unit/network/http/rack/xmlrpc_spec.rb b/spec/unit/network/http/rack/xmlrpc_spec.rb index 4b3023a36..9173438a6 100755 --- a/spec/unit/network/http/rack/xmlrpc_spec.rb +++ b/spec/unit/network/http/rack/xmlrpc_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/handler' require 'puppet/network/http/rack' if Puppet.features.rack? diff --git a/spec/unit/network/http/rack_spec.rb b/spec/unit/network/http/rack_spec.rb index bf61a1355..9e1ee3d1e 100755 --- a/spec/unit/network/http/rack_spec.rb +++ b/spec/unit/network/http/rack_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/handler' require 'puppet/network/http/rack' if Puppet.features.rack? diff --git a/spec/unit/network/http/webrick/rest_spec.rb b/spec/unit/network/http/webrick/rest_spec.rb index c582ac046..267ddcc72 100755 --- a/spec/unit/network/http/webrick/rest_spec.rb +++ b/spec/unit/network/http/webrick/rest_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/http' require 'webrick' diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb index 7b7f46c5d..be74a1052 100755 --- a/spec/unit/network/http/webrick_spec.rb +++ b/spec/unit/network/http/webrick_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Rick Bradley on 2007-10-15. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/network/http_pool_spec.rb b/spec/unit/network/http_pool_spec.rb index 83f901f09..c5d3e0470 100755 --- a/spec/unit/network/http_pool_spec.rb +++ b/spec/unit/network/http_pool_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-26. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/network/http_spec.rb b/spec/unit/network/http_spec.rb index 27b652c71..550c15bf7 100755 --- a/spec/unit/network/http_spec.rb +++ b/spec/unit/network/http_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Rick Bradley on 2007-10-03. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/network/rest_authconfig_spec.rb b/spec/unit/network/rest_authconfig_spec.rb index 736521b54..499a14b78 100755 --- a/spec/unit/network/rest_authconfig_spec.rb +++ b/spec/unit/network/rest_authconfig_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/rest_authconfig' diff --git a/spec/unit/network/rights_spec.rb b/spec/unit/network/rights_spec.rb index 70e38ba24..b709f10fa 100755 --- a/spec/unit/network/rights_spec.rb +++ b/spec/unit/network/rights_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/network/rights' diff --git a/spec/unit/network/server_spec.rb b/spec/unit/network/server_spec.rb index f0f824272..912275a20 100755 --- a/spec/unit/network/server_spec.rb +++ b/spec/unit/network/server_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Rick Bradley on 2007-10-03. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/network/xmlrpc/client_spec.rb b/spec/unit/network/xmlrpc/client_spec.rb index 012907a00..b9be0a906 100755 --- a/spec/unit/network/xmlrpc/client_spec.rb +++ b/spec/unit/network/xmlrpc/client_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'puppet/network/client' require 'spec_helper' diff --git a/spec/unit/node/environment_spec.rb b/spec/unit/node/environment_spec.rb index b8e7f6890..d1badfa3a 100755 --- a/spec/unit/node/environment_spec.rb +++ b/spec/unit/node/environment_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node/environment' diff --git a/spec/unit/node/facts_spec.rb b/spec/unit/node/facts_spec.rb index b548e4d99..a130ae3f8 100755 --- a/spec/unit/node/facts_spec.rb +++ b/spec/unit/node/facts_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/node/facts' diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb index cd5fadada..7d813ba30 100755 --- a/spec/unit/node_spec.rb +++ b/spec/unit/node_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Node do diff --git a/spec/unit/other/selinux_spec.rb b/spec/unit/other/selinux_spec.rb index a936fdf9d..216feaf1f 100755 --- a/spec/unit/other/selinux_spec.rb +++ b/spec/unit/other/selinux_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/type/selboolean' diff --git a/spec/unit/other/transbucket_spec.rb b/spec/unit/other/transbucket_spec.rb index 8b8cdeb0f..b95a4abca 100755 --- a/spec/unit/other/transbucket_spec.rb +++ b/spec/unit/other/transbucket_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::TransBucket do diff --git a/spec/unit/other/transobject_spec.rb b/spec/unit/other/transobject_spec.rb index a56ecef9d..4715e2fa1 100755 --- a/spec/unit/other/transobject_spec.rb +++ b/spec/unit/other/transobject_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transportable' diff --git a/spec/unit/parameter/path_spec.rb b/spec/unit/parameter/path_spec.rb index 0826265c3..d113a1581 100755 --- a/spec/unit/parameter/path_spec.rb +++ b/spec/unit/parameter/path_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parameter/path' diff --git a/spec/unit/parameter/value_collection_spec.rb b/spec/unit/parameter/value_collection_spec.rb index 7e85574a8..af70160c1 100755 --- a/spec/unit/parameter/value_collection_spec.rb +++ b/spec/unit/parameter/value_collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parameter' diff --git a/spec/unit/parameter/value_spec.rb b/spec/unit/parameter/value_spec.rb index f874d7736..f3414e4e0 100755 --- a/spec/unit/parameter/value_spec.rb +++ b/spec/unit/parameter/value_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parameter' diff --git a/spec/unit/parameter_spec.rb b/spec/unit/parameter_spec.rb index 714c391a8..04556c013 100755 --- a/spec/unit/parameter_spec.rb +++ b/spec/unit/parameter_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parameter' diff --git a/spec/unit/parser/ast/arithmetic_operator_spec.rb b/spec/unit/parser/ast/arithmetic_operator_spec.rb index 9b54f09d8..144ebd78c 100755 --- a/spec/unit/parser/ast/arithmetic_operator_spec.rb +++ b/spec/unit/parser/ast/arithmetic_operator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ArithmeticOperator do diff --git a/spec/unit/parser/ast/astarray_spec.rb b/spec/unit/parser/ast/astarray_spec.rb index 4429ab1fe..a3f56052a 100755 --- a/spec/unit/parser/ast/astarray_spec.rb +++ b/spec/unit/parser/ast/astarray_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ASTArray do diff --git a/spec/unit/parser/ast/asthash_spec.rb b/spec/unit/parser/ast/asthash_spec.rb index 09033284e..d7fbbfae9 100755 --- a/spec/unit/parser/ast/asthash_spec.rb +++ b/spec/unit/parser/ast/asthash_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ASTHash do diff --git a/spec/unit/parser/ast/boolean_operator_spec.rb b/spec/unit/parser/ast/boolean_operator_spec.rb index 2251d0827..287f466a7 100755 --- a/spec/unit/parser/ast/boolean_operator_spec.rb +++ b/spec/unit/parser/ast/boolean_operator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::BooleanOperator do diff --git a/spec/unit/parser/ast/casestatement_spec.rb b/spec/unit/parser/ast/casestatement_spec.rb index d507beb58..e21190706 100755 --- a/spec/unit/parser/ast/casestatement_spec.rb +++ b/spec/unit/parser/ast/casestatement_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::CaseStatement do diff --git a/spec/unit/parser/ast/collection_spec.rb b/spec/unit/parser/ast/collection_spec.rb index fd7bf75c1..78094e68d 100755 --- a/spec/unit/parser/ast/collection_spec.rb +++ b/spec/unit/parser/ast/collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Collection do diff --git a/spec/unit/parser/ast/collexpr_spec.rb b/spec/unit/parser/ast/collexpr_spec.rb index f5e340ce8..454e7481b 100755 --- a/spec/unit/parser/ast/collexpr_spec.rb +++ b/spec/unit/parser/ast/collexpr_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::CollExpr do diff --git a/spec/unit/parser/ast/comparison_operator_spec.rb b/spec/unit/parser/ast/comparison_operator_spec.rb index 060827390..96f4562e9 100755 --- a/spec/unit/parser/ast/comparison_operator_spec.rb +++ b/spec/unit/parser/ast/comparison_operator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ComparisonOperator do diff --git a/spec/unit/parser/ast/definition_spec.rb b/spec/unit/parser/ast/definition_spec.rb index f2a211ad2..8b2f7f26f 100755 --- a/spec/unit/parser/ast/definition_spec.rb +++ b/spec/unit/parser/ast/definition_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Definition do diff --git a/spec/unit/parser/ast/function_spec.rb b/spec/unit/parser/ast/function_spec.rb index 6f9f33b8e..c52e806e9 100755 --- a/spec/unit/parser/ast/function_spec.rb +++ b/spec/unit/parser/ast/function_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Function do diff --git a/spec/unit/parser/ast/hostclass_spec.rb b/spec/unit/parser/ast/hostclass_spec.rb index 9c320d1be..ee154fac8 100755 --- a/spec/unit/parser/ast/hostclass_spec.rb +++ b/spec/unit/parser/ast/hostclass_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Hostclass do diff --git a/spec/unit/parser/ast/ifstatement_spec.rb b/spec/unit/parser/ast/ifstatement_spec.rb index 24e07f5fe..4b6e0b8e5 100755 --- a/spec/unit/parser/ast/ifstatement_spec.rb +++ b/spec/unit/parser/ast/ifstatement_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::IfStatement do diff --git a/spec/unit/parser/ast/in_operator_spec.rb b/spec/unit/parser/ast/in_operator_spec.rb index 95349d45d..b6b6fbb89 100755 --- a/spec/unit/parser/ast/in_operator_spec.rb +++ b/spec/unit/parser/ast/in_operator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/ast/in_operator' diff --git a/spec/unit/parser/ast/leaf_spec.rb b/spec/unit/parser/ast/leaf_spec.rb index cd09eaf94..ff3fed5e9 100755 --- a/spec/unit/parser/ast/leaf_spec.rb +++ b/spec/unit/parser/ast/leaf_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Leaf do diff --git a/spec/unit/parser/ast/match_operator_spec.rb b/spec/unit/parser/ast/match_operator_spec.rb index 188b837b3..0f9235aeb 100755 --- a/spec/unit/parser/ast/match_operator_spec.rb +++ b/spec/unit/parser/ast/match_operator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::MatchOperator do diff --git a/spec/unit/parser/ast/minus_spec.rb b/spec/unit/parser/ast/minus_spec.rb index c8e5339a7..8ebd14e80 100755 --- a/spec/unit/parser/ast/minus_spec.rb +++ b/spec/unit/parser/ast/minus_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Minus do diff --git a/spec/unit/parser/ast/node_spec.rb b/spec/unit/parser/ast/node_spec.rb index 434cb95bf..c2e187184 100755 --- a/spec/unit/parser/ast/node_spec.rb +++ b/spec/unit/parser/ast/node_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Node do diff --git a/spec/unit/parser/ast/nop_spec.rb b/spec/unit/parser/ast/nop_spec.rb index d2307c84a..81302fa55 100755 --- a/spec/unit/parser/ast/nop_spec.rb +++ b/spec/unit/parser/ast/nop_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Nop do diff --git a/spec/unit/parser/ast/not_spec.rb b/spec/unit/parser/ast/not_spec.rb index 60fc11c5c..6569af699 100755 --- a/spec/unit/parser/ast/not_spec.rb +++ b/spec/unit/parser/ast/not_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Not do diff --git a/spec/unit/parser/ast/relationship_spec.rb b/spec/unit/parser/ast/relationship_spec.rb index 871b05c30..441ac45b1 100755 --- a/spec/unit/parser/ast/relationship_spec.rb +++ b/spec/unit/parser/ast/relationship_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Relationship do diff --git a/spec/unit/parser/ast/resource_defaults_spec.rb b/spec/unit/parser/ast/resource_defaults_spec.rb index 7402be8ea..8164828e1 100755 --- a/spec/unit/parser/ast/resource_defaults_spec.rb +++ b/spec/unit/parser/ast/resource_defaults_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ResourceDefaults do diff --git a/spec/unit/parser/ast/resource_override_spec.rb b/spec/unit/parser/ast/resource_override_spec.rb index cb126ce62..458d9a4bf 100755 --- a/spec/unit/parser/ast/resource_override_spec.rb +++ b/spec/unit/parser/ast/resource_override_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ResourceOverride do diff --git a/spec/unit/parser/ast/resource_reference_spec.rb b/spec/unit/parser/ast/resource_reference_spec.rb index b581e9305..627754dd1 100755 --- a/spec/unit/parser/ast/resource_reference_spec.rb +++ b/spec/unit/parser/ast/resource_reference_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::ResourceReference do diff --git a/spec/unit/parser/ast/resource_spec.rb b/spec/unit/parser/ast/resource_spec.rb index 883b71866..68ad9c229 100755 --- a/spec/unit/parser/ast/resource_spec.rb +++ b/spec/unit/parser/ast/resource_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Resource do diff --git a/spec/unit/parser/ast/selector_spec.rb b/spec/unit/parser/ast/selector_spec.rb index 787a3360f..1bf5f6757 100755 --- a/spec/unit/parser/ast/selector_spec.rb +++ b/spec/unit/parser/ast/selector_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::Selector do diff --git a/spec/unit/parser/ast/vardef_spec.rb b/spec/unit/parser/ast/vardef_spec.rb index 5a851bb13..7dd2b31e7 100755 --- a/spec/unit/parser/ast/vardef_spec.rb +++ b/spec/unit/parser/ast/vardef_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::AST::VarDef do diff --git a/spec/unit/parser/ast_spec.rb b/spec/unit/parser/ast_spec.rb index ba8724242..4d4871219 100755 --- a/spec/unit/parser/ast_spec.rb +++ b/spec/unit/parser/ast_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/ast' diff --git a/spec/unit/parser/collector_spec.rb b/spec/unit/parser/collector_spec.rb index 75c113eae..01918d2a0 100755 --- a/spec/unit/parser/collector_spec.rb +++ b/spec/unit/parser/collector_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/parser/compiler_spec.rb b/spec/unit/parser/compiler_spec.rb index de4bee3e9..ced760b76 100755 --- a/spec/unit/parser/compiler_spec.rb +++ b/spec/unit/parser/compiler_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' class CompilerTestResource diff --git a/spec/unit/parser/files_spec.rb b/spec/unit/parser/files_spec.rb index 7710871dc..04777f0ec 100755 --- a/spec/unit/parser/files_spec.rb +++ b/spec/unit/parser/files_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/files' diff --git a/spec/unit/parser/functions/defined_spec.rb b/spec/unit/parser/functions/defined_spec.rb index 8b0fb4e2f..0651864fb 100755 --- a/spec/unit/parser/functions/defined_spec.rb +++ b/spec/unit/parser/functions/defined_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the 'defined' function" do diff --git a/spec/unit/parser/functions/extlookup_spec.rb b/spec/unit/parser/functions/extlookup_spec.rb index ad89f6575..f68daaf3f 100755 --- a/spec/unit/parser/functions/extlookup_spec.rb +++ b/spec/unit/parser/functions/extlookup_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'tempfile' diff --git a/spec/unit/parser/functions/fqdn_rand_spec.rb b/spec/unit/parser/functions/fqdn_rand_spec.rb index 90792e182..90fc0ef41 100755 --- a/spec/unit/parser/functions/fqdn_rand_spec.rb +++ b/spec/unit/parser/functions/fqdn_rand_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the fqdn_rand function" do diff --git a/spec/unit/parser/functions/generate_spec.rb b/spec/unit/parser/functions/generate_spec.rb index 3351291d5..6c90ae531 100755 --- a/spec/unit/parser/functions/generate_spec.rb +++ b/spec/unit/parser/functions/generate_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the generate function" do diff --git a/spec/unit/parser/functions/include_spec.rb b/spec/unit/parser/functions/include_spec.rb index b477f1439..15206cd7c 100755 --- a/spec/unit/parser/functions/include_spec.rb +++ b/spec/unit/parser/functions/include_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the 'include' function" do diff --git a/spec/unit/parser/functions/inline_template_spec.rb b/spec/unit/parser/functions/inline_template_spec.rb index e009870c5..a9ac0c2d0 100755 --- a/spec/unit/parser/functions/inline_template_spec.rb +++ b/spec/unit/parser/functions/inline_template_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the inline_template function" do diff --git a/spec/unit/parser/functions/realize_spec.rb b/spec/unit/parser/functions/realize_spec.rb index 7a039c002..159805cbd 100755 --- a/spec/unit/parser/functions/realize_spec.rb +++ b/spec/unit/parser/functions/realize_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the realize function" do diff --git a/spec/unit/parser/functions/regsubst_spec.rb b/spec/unit/parser/functions/regsubst_spec.rb index 0cab3d18c..4ed3bcf68 100755 --- a/spec/unit/parser/functions/regsubst_spec.rb +++ b/spec/unit/parser/functions/regsubst_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the regsubst function" do diff --git a/spec/unit/parser/functions/require_spec.rb b/spec/unit/parser/functions/require_spec.rb index cb89db3a1..692b35305 100755 --- a/spec/unit/parser/functions/require_spec.rb +++ b/spec/unit/parser/functions/require_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the require function" do diff --git a/spec/unit/parser/functions/shellquote_spec.rb b/spec/unit/parser/functions/shellquote_spec.rb index 86181dee0..b100b4913 100755 --- a/spec/unit/parser/functions/shellquote_spec.rb +++ b/spec/unit/parser/functions/shellquote_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the shellquote function" do diff --git a/spec/unit/parser/functions/split_spec.rb b/spec/unit/parser/functions/split_spec.rb index e321b6d9f..18a21a0cf 100755 --- a/spec/unit/parser/functions/split_spec.rb +++ b/spec/unit/parser/functions/split_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the split function" do diff --git a/spec/unit/parser/functions/sprintf_spec.rb b/spec/unit/parser/functions/sprintf_spec.rb index 49c5324f8..bd4863f23 100755 --- a/spec/unit/parser/functions/sprintf_spec.rb +++ b/spec/unit/parser/functions/sprintf_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the sprintf function" do diff --git a/spec/unit/parser/functions/tag_spec.rb b/spec/unit/parser/functions/tag_spec.rb index a8c57b7a4..e8a07e1bb 100755 --- a/spec/unit/parser/functions/tag_spec.rb +++ b/spec/unit/parser/functions/tag_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the 'tag' function" do diff --git a/spec/unit/parser/functions/template_spec.rb b/spec/unit/parser/functions/template_spec.rb index 64d992297..e7ee974d3 100755 --- a/spec/unit/parser/functions/template_spec.rb +++ b/spec/unit/parser/functions/template_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the template function" do diff --git a/spec/unit/parser/functions/versioncmp_spec.rb b/spec/unit/parser/functions/versioncmp_spec.rb index d7ae0152a..6fc724c38 100755 --- a/spec/unit/parser/functions/versioncmp_spec.rb +++ b/spec/unit/parser/functions/versioncmp_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the versioncmp function" do diff --git a/spec/unit/parser/functions_spec.rb b/spec/unit/parser/functions_spec.rb index 79585f12d..8240a184c 100755 --- a/spec/unit/parser/functions_spec.rb +++ b/spec/unit/parser/functions_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::Functions do diff --git a/spec/unit/parser/lexer_spec.rb b/spec/unit/parser/lexer_spec.rb index 2eb2581a2..6cdb0553a 100755 --- a/spec/unit/parser/lexer_spec.rb +++ b/spec/unit/parser/lexer_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/lexer' diff --git a/spec/unit/parser/parser_spec.rb b/spec/unit/parser/parser_spec.rb index cb90939fa..78adc30ee 100755 --- a/spec/unit/parser/parser_spec.rb +++ b/spec/unit/parser/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser do diff --git a/spec/unit/parser/relationship_spec.rb b/spec/unit/parser/relationship_spec.rb index f44a5c844..5a49831e1 100755 --- a/spec/unit/parser/relationship_spec.rb +++ b/spec/unit/parser/relationship_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/relationship' diff --git a/spec/unit/parser/resource_spec.rb b/spec/unit/parser/resource_spec.rb index 078b7de95..b03c18e5f 100755 --- a/spec/unit/parser/resource_spec.rb +++ b/spec/unit/parser/resource_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' # LAK: FIXME This is just new tests for resources; I have diff --git a/spec/unit/parser/scope_spec.rb b/spec/unit/parser/scope_spec.rb index 8215535dd..bf4d1e29e 100755 --- a/spec/unit/parser/scope_spec.rb +++ b/spec/unit/parser/scope_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Parser::Scope do diff --git a/spec/unit/parser/templatewrapper_spec.rb b/spec/unit/parser/templatewrapper_spec.rb index 0c7199ba1..600293bbf 100755 --- a/spec/unit/parser/templatewrapper_spec.rb +++ b/spec/unit/parser/templatewrapper_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/templatewrapper' diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb index dfbd2f278..9367b61c8 100755 --- a/spec/unit/parser/type_loader_spec.rb +++ b/spec/unit/parser/type_loader_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/parser/type_loader' diff --git a/spec/unit/property/ensure_spec.rb b/spec/unit/property/ensure_spec.rb index e1e0f0c52..35151553b 100755 --- a/spec/unit/property/ensure_spec.rb +++ b/spec/unit/property/ensure_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/property/ensure' diff --git a/spec/unit/property/keyvalue_spec.rb b/spec/unit/property/keyvalue_spec.rb index 9310934ea..821c61799 100755 --- a/spec/unit/property/keyvalue_spec.rb +++ b/spec/unit/property/keyvalue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/property/keyvalue' diff --git a/spec/unit/property/list_spec.rb b/spec/unit/property/list_spec.rb index 9dc8fdae4..a29d65751 100755 --- a/spec/unit/property/list_spec.rb +++ b/spec/unit/property/list_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/property/list' diff --git a/spec/unit/property/ordered_list_spec.rb b/spec/unit/property/ordered_list_spec.rb index 7a09edb68..2ad05367c 100755 --- a/spec/unit/property/ordered_list_spec.rb +++ b/spec/unit/property/ordered_list_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/property/ordered_list' diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb index f3cc79eca..7728b5d40 100755 --- a/spec/unit/property_spec.rb +++ b/spec/unit/property_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/property' diff --git a/spec/unit/provider/augeas/augeas_spec.rb b/spec/unit/provider/augeas/augeas_spec.rb index a7823f21f..5bb98eadf 100755 --- a/spec/unit/provider/augeas/augeas_spec.rb +++ b/spec/unit/provider/augeas/augeas_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:augeas).provider(:augeas) diff --git a/spec/unit/provider/confine/exists_spec.rb b/spec/unit/provider/confine/exists_spec.rb index 9ab307eb3..1e2d7f86f 100755 --- a/spec/unit/provider/confine/exists_spec.rb +++ b/spec/unit/provider/confine/exists_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine/exists' diff --git a/spec/unit/provider/confine/false_spec.rb b/spec/unit/provider/confine/false_spec.rb index 1b4c69f2a..1afa57cbc 100755 --- a/spec/unit/provider/confine/false_spec.rb +++ b/spec/unit/provider/confine/false_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine/false' diff --git a/spec/unit/provider/confine/feature_spec.rb b/spec/unit/provider/confine/feature_spec.rb index 88ce496a1..959c7a3bb 100755 --- a/spec/unit/provider/confine/feature_spec.rb +++ b/spec/unit/provider/confine/feature_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine/feature' diff --git a/spec/unit/provider/confine/true_spec.rb b/spec/unit/provider/confine/true_spec.rb index c26c2ca75..795819bd3 100755 --- a/spec/unit/provider/confine/true_spec.rb +++ b/spec/unit/provider/confine/true_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine/true' diff --git a/spec/unit/provider/confine/variable_spec.rb b/spec/unit/provider/confine/variable_spec.rb index 9156bc4cc..7b9f53c3d 100755 --- a/spec/unit/provider/confine/variable_spec.rb +++ b/spec/unit/provider/confine/variable_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine/variable' diff --git a/spec/unit/provider/confine_collection_spec.rb b/spec/unit/provider/confine_collection_spec.rb index ffc905b3d..f1dbaf35d 100755 --- a/spec/unit/provider/confine_collection_spec.rb +++ b/spec/unit/provider/confine_collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine_collection' diff --git a/spec/unit/provider/confine_spec.rb b/spec/unit/provider/confine_spec.rb index 060ae8dc3..ade444276 100755 --- a/spec/unit/provider/confine_spec.rb +++ b/spec/unit/provider/confine_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confine' diff --git a/spec/unit/provider/confiner_spec.rb b/spec/unit/provider/confiner_spec.rb index fe1ffd86f..23ec162a5 100755 --- a/spec/unit/provider/confiner_spec.rb +++ b/spec/unit/provider/confiner_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/confiner' diff --git a/spec/unit/provider/exec/posix_spec.rb b/spec/unit/provider/exec/posix_spec.rb index a1d887215..50697d826 100755 --- a/spec/unit/provider/exec/posix_spec.rb +++ b/spec/unit/provider/exec/posix_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:exec).provider(:posix) diff --git a/spec/unit/provider/exec/shell_spec.rb b/spec/unit/provider/exec/shell_spec.rb index b84f48fe3..90047b9d6 100755 --- a/spec/unit/provider/exec/shell_spec.rb +++ b/spec/unit/provider/exec/shell_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:exec).provider(:shell) diff --git a/spec/unit/provider/group/groupadd_spec.rb b/spec/unit/provider/group/groupadd_spec.rb index 65cb14503..8709fe7f8 100755 --- a/spec/unit/provider/group/groupadd_spec.rb +++ b/spec/unit/provider/group/groupadd_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:group).provider(:groupadd) diff --git a/spec/unit/provider/group/ldap_spec.rb b/spec/unit/provider/group/ldap_spec.rb index 00c42ea40..947007f10 100755 --- a/spec/unit/provider/group/ldap_spec.rb +++ b/spec/unit/provider/group/ldap_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-10. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/provider/host/parsed_spec.rb b/spec/unit/provider/host/parsed_spec.rb index b6a78e411..9cb5890cc 100755 --- a/spec/unit/provider/host/parsed_spec.rb +++ b/spec/unit/provider/host/parsed_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'shared_behaviours/all_parsedfile_providers' diff --git a/spec/unit/provider/interface/cisco_spec.rb b/spec/unit/provider/interface/cisco_spec.rb index 7904711f5..d1f70609f 100644..100755 --- a/spec/unit/provider/interface/cisco_spec.rb +++ b/spec/unit/provider/interface/cisco_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../spec_helper' diff --git a/spec/unit/provider/ldap_spec.rb b/spec/unit/provider/ldap_spec.rb index 3e0562b73..012a22b99 100755 --- a/spec/unit/provider/ldap_spec.rb +++ b/spec/unit/provider/ldap_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-21. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/provider/macauthorization_spec.rb b/spec/unit/provider/macauthorization_spec.rb index cb546edbe..a76f917f7 100755 --- a/spec/unit/provider/macauthorization_spec.rb +++ b/spec/unit/provider/macauthorization_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the macauthorization provider # diff --git a/spec/unit/provider/mcx/mcxcontent_spec.rb b/spec/unit/provider/mcx/mcxcontent_spec.rb index 27aae6807..4676575be 100755 --- a/spec/unit/provider/mcx/mcxcontent_spec.rb +++ b/spec/unit/provider/mcx/mcxcontent_spec.rb @@ -1,5 +1,4 @@ -#! /usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:mcx).provider(:mcxcontent) diff --git a/spec/unit/provider/mount/parsed_spec.rb b/spec/unit/provider/mount/parsed_spec.rb index 86c35f7da..0293e0758 100755 --- a/spec/unit/provider/mount/parsed_spec.rb +++ b/spec/unit/provider/mount/parsed_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-12. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/provider/mount_spec.rb b/spec/unit/provider/mount_spec.rb index 0db4ae918..963bfba7c 100755 --- a/spec/unit/provider/mount_spec.rb +++ b/spec/unit/provider/mount_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/mount' diff --git a/spec/unit/provider/naginator_spec.rb b/spec/unit/provider/naginator_spec.rb index 5841bc012..1d8e78015 100755 --- a/spec/unit/provider/naginator_spec.rb +++ b/spec/unit/provider/naginator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/naginator' diff --git a/spec/unit/provider/nameservice/directoryservice_spec.rb b/spec/unit/provider/nameservice/directoryservice_spec.rb index 798d511c0..47f2ad0cd 100755 --- a/spec/unit/provider/nameservice/directoryservice_spec.rb +++ b/spec/unit/provider/nameservice/directoryservice_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' # We use this as a reasonable way to obtain all the support infrastructure. diff --git a/spec/unit/provider/network_device_spec.rb b/spec/unit/provider/network_device_spec.rb index 3e6d382ee..83d2bdc01 100644..100755 --- a/spec/unit/provider/network_device_spec.rb +++ b/spec/unit/provider/network_device_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../spec_helper' diff --git a/spec/unit/provider/package/aix_spec.rb b/spec/unit/provider/package/aix_spec.rb index 8feac3c55..fba29d7a7 100755 --- a/spec/unit/provider/package/aix_spec.rb +++ b/spec/unit/provider/package/aix_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:aix) diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb index 59342750e..b020b0f4f 100755 --- a/spec/unit/provider/package/apt_spec.rb +++ b/spec/unit/provider/package/apt_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:package).provider(:apt) diff --git a/spec/unit/provider/package/dpkg_spec.rb b/spec/unit/provider/package/dpkg_spec.rb index 7c83f90ee..e64146056 100755 --- a/spec/unit/provider/package/dpkg_spec.rb +++ b/spec/unit/provider/package/dpkg_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:package).provider(:dpkg) diff --git a/spec/unit/provider/package/freebsd_spec.rb b/spec/unit/provider/package/freebsd_spec.rb index 4229cba1f..9c8038791 100755 --- a/spec/unit/provider/package/freebsd_spec.rb +++ b/spec/unit/provider/package/freebsd_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:freebsd) diff --git a/spec/unit/provider/package/gem_spec.rb b/spec/unit/provider/package/gem_spec.rb index ef06ef5ba..284e63c23 100755 --- a/spec/unit/provider/package/gem_spec.rb +++ b/spec/unit/provider/package/gem_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:gem) diff --git a/spec/unit/provider/package/hpux_spec.rb b/spec/unit/provider/package/hpux_spec.rb index 3c5b81c1b..b781f6540 100755 --- a/spec/unit/provider/package/hpux_spec.rb +++ b/spec/unit/provider/package/hpux_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:hpux) diff --git a/spec/unit/provider/package/nim_spec.rb b/spec/unit/provider/package/nim_spec.rb index 69538e9b9..0fa9f580d 100755 --- a/spec/unit/provider/package/nim_spec.rb +++ b/spec/unit/provider/package/nim_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:nim) diff --git a/spec/unit/provider/package/pip_spec.rb b/spec/unit/provider/package/pip_spec.rb index 2cca29b35..b56271029 100755 --- a/spec/unit/provider/package/pip_spec.rb +++ b/spec/unit/provider/package/pip_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:pip) diff --git a/spec/unit/provider/package/pkg_spec.rb b/spec/unit/provider/package/pkg_spec.rb index 93aeac004..04a4ae607 100755 --- a/spec/unit/provider/package/pkg_spec.rb +++ b/spec/unit/provider/package/pkg_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:package).provider(:pkg) diff --git a/spec/unit/provider/package/pkgdmg_spec.rb b/spec/unit/provider/package/pkgdmg_spec.rb index c59a87ffd..155f12e7b 100755 --- a/spec/unit/provider/package/pkgdmg_spec.rb +++ b/spec/unit/provider/package/pkgdmg_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:package).provider(:pkgdmg) diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb index 1dd4a5231..601c24009 100755 --- a/spec/unit/provider/package/yum_spec.rb +++ b/spec/unit/provider/package/yum_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider = Puppet::Type.type(:package).provider(:yum) diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb index eb17de4dd..4218b14c7 100755 --- a/spec/unit/provider/package/zypper_spec.rb +++ b/spec/unit/provider/package/zypper_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:package).provider(:zypper) diff --git a/spec/unit/provider/parsedfile_spec.rb b/spec/unit/provider/parsedfile_spec.rb index 4f70111f2..2ff904b7f 100755 --- a/spec/unit/provider/parsedfile_spec.rb +++ b/spec/unit/provider/parsedfile_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/provider/parsedfile' diff --git a/spec/unit/provider/selboolean_spec.rb b/spec/unit/provider/selboolean_spec.rb index b45c3f713..64f925e1e 100755 --- a/spec/unit/provider/selboolean_spec.rb +++ b/spec/unit/provider/selboolean_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:selboolean).provider(:getsetsebool) diff --git a/spec/unit/provider/selmodule_spec.rb b/spec/unit/provider/selmodule_spec.rb index 9ac5a7a5d..67196667f 100755 --- a/spec/unit/provider/selmodule_spec.rb +++ b/spec/unit/provider/selmodule_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # Note: This unit test depends on having a sample SELinux policy file # in the same directory as this test called selmodule-example.pp diff --git a/spec/unit/provider/service/daemontools_spec.rb b/spec/unit/provider/service/daemontools_spec.rb index 98652cb88..64eeb9fa4 100755 --- a/spec/unit/provider/service/daemontools_spec.rb +++ b/spec/unit/provider/service/daemontools_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the Daemontools service Provider # diff --git a/spec/unit/provider/service/debian_spec.rb b/spec/unit/provider/service/debian_spec.rb index 174aac9ff..4e3d30d61 100755 --- a/spec/unit/provider/service/debian_spec.rb +++ b/spec/unit/provider/service/debian_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the debian service provider # diff --git a/spec/unit/provider/service/freebsd_spec.rb b/spec/unit/provider/service/freebsd_spec.rb index 6c778f1dd..c1a6d26f7 100755 --- a/spec/unit/provider/service/freebsd_spec.rb +++ b/spec/unit/provider/service/freebsd_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:service).provider(:freebsd) diff --git a/spec/unit/provider/service/init_spec.rb b/spec/unit/provider/service/init_spec.rb index 531f9901d..d64e0fc5d 100755 --- a/spec/unit/provider/service/init_spec.rb +++ b/spec/unit/provider/service/init_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the Init service Provider # diff --git a/spec/unit/provider/service/launchd_spec.rb b/spec/unit/provider/service/launchd_spec.rb index 9db9d5a19..8ae7f003d 100755 --- a/spec/unit/provider/service/launchd_spec.rb +++ b/spec/unit/provider/service/launchd_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the launchd service provider # diff --git a/spec/unit/provider/service/redhat_spec.rb b/spec/unit/provider/service/redhat_spec.rb index 0648772b4..b7f56e089 100755 --- a/spec/unit/provider/service/redhat_spec.rb +++ b/spec/unit/provider/service/redhat_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the RedHat service Provider # diff --git a/spec/unit/provider/service/runit_spec.rb b/spec/unit/provider/service/runit_spec.rb index c184038d5..38855a451 100755 --- a/spec/unit/provider/service/runit_spec.rb +++ b/spec/unit/provider/service/runit_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the Runit service Provider # diff --git a/spec/unit/provider/service/smf_spec.rb b/spec/unit/provider/service/smf_spec.rb index c78847631..5212d540a 100755 --- a/spec/unit/provider/service/smf_spec.rb +++ b/spec/unit/provider/service/smf_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the SMF service Provider # diff --git a/spec/unit/provider/service/src_spec.rb b/spec/unit/provider/service/src_spec.rb index 4502eb643..17f49994e 100755 --- a/spec/unit/provider/service/src_spec.rb +++ b/spec/unit/provider/service/src_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Unit testing for the AIX System Resource Controller (src) provider # diff --git a/spec/unit/provider/service/upstart.rb b/spec/unit/provider/service/upstart.rb index 61e191b8a..0febc939d 100755 --- a/spec/unit/provider/service/upstart.rb +++ b/spec/unit/provider/service/upstart.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:service).provider(:upstart) diff --git a/spec/unit/provider/ssh_authorized_key/parsed_spec.rb b/spec/unit/provider/ssh_authorized_key/parsed_spec.rb index 0203014a4..69d29c674 100755 --- a/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +++ b/spec/unit/provider/ssh_authorized_key/parsed_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'shared_behaviours/all_parsedfile_providers' require 'puppet_spec/files' diff --git a/spec/unit/provider/sshkey/parsed_spec.rb b/spec/unit/provider/sshkey/parsed_spec.rb index 664316f14..e66032bc4 100755 --- a/spec/unit/provider/sshkey/parsed_spec.rb +++ b/spec/unit/provider/sshkey/parsed_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:sshkey).provider(:parsed) diff --git a/spec/unit/provider/user/hpux_spec.rb b/spec/unit/provider/user/hpux_spec.rb index def7f27ba..f7779a98d 100755 --- a/spec/unit/provider/user/hpux_spec.rb +++ b/spec/unit/provider/user/hpux_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd) diff --git a/spec/unit/provider/user/ldap_spec.rb b/spec/unit/provider/user/ldap_spec.rb index 97290c6e4..065b3b423 100755 --- a/spec/unit/provider/user/ldap_spec.rb +++ b/spec/unit/provider/user/ldap_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-10. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/provider/user/user_role_add_spec.rb b/spec/unit/provider/user/user_role_add_spec.rb index a790c5669..b17ba68c8 100755 --- a/spec/unit/provider/user/user_role_add_spec.rb +++ b/spec/unit/provider/user/user_role_add_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:user).provider(:user_role_add) diff --git a/spec/unit/provider/user/useradd_spec.rb b/spec/unit/provider/user/useradd_spec.rb index e7d99ac2b..724fc12c0 100755 --- a/spec/unit/provider/user/useradd_spec.rb +++ b/spec/unit/provider/user/useradd_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:user).provider(:useradd) diff --git a/spec/unit/provider/vlan/cisco_spec.rb b/spec/unit/provider/vlan/cisco_spec.rb index 0951367e6..bb243a75e 100644..100755 --- a/spec/unit/provider/vlan/cisco_spec.rb +++ b/spec/unit/provider/vlan/cisco_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../spec_helper' diff --git a/spec/unit/provider/zfs/solaris_spec.rb b/spec/unit/provider/zfs/solaris_spec.rb index 2e9b81b3c..8a0cd23b1 100755 --- a/spec/unit/provider/zfs/solaris_spec.rb +++ b/spec/unit/provider/zfs/solaris_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:zfs).provider(:solaris) diff --git a/spec/unit/provider/zone/solaris_spec.rb b/spec/unit/provider/zone/solaris_spec.rb index 669a26b4f..17ec8f68f 100755 --- a/spec/unit/provider/zone/solaris_spec.rb +++ b/spec/unit/provider/zone/solaris_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:zone).provider(:solaris) diff --git a/spec/unit/provider/zpool/solaris_spec.rb b/spec/unit/provider/zpool/solaris_spec.rb index 0ab0b25fa..7e3048a7a 100755 --- a/spec/unit/provider/zpool/solaris_spec.rb +++ b/spec/unit/provider/zpool/solaris_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' provider_class = Puppet::Type.type(:zpool).provider(:solaris) diff --git a/spec/unit/provider_spec.rb b/spec/unit/provider_spec.rb index 23d8ae2af..4eb5e12de 100755 --- a/spec/unit/provider_spec.rb +++ b/spec/unit/provider_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Provider do diff --git a/spec/unit/puppet_spec.rb b/spec/unit/puppet_spec.rb index e0eb49bad..50d3a4718 100755 --- a/spec/unit/puppet_spec.rb +++ b/spec/unit/puppet_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby" +#!/usr/bin/env rspec" require 'spec_helper' require 'puppet' diff --git a/spec/unit/rails/host_spec.rb b/spec/unit/rails/host_spec.rb index 07399a361..df0b2fa1d 100755 --- a/spec/unit/rails/host_spec.rb +++ b/spec/unit/rails/host_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "Puppet::Rails::Host", :if => Puppet.features.rails? do diff --git a/spec/unit/rails/param_value_spec.rb b/spec/unit/rails/param_value_spec.rb index 6aff12b51..7f0086252 100755 --- a/spec/unit/rails/param_value_spec.rb +++ b/spec/unit/rails/param_value_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/rails/resource_spec.rb b/spec/unit/rails/resource_spec.rb index 9791f49cb..22e5267f4 100755 --- a/spec/unit/rails/resource_spec.rb +++ b/spec/unit/rails/resource_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb index eba85afc7..fe7fd8e29 100755 --- a/spec/unit/rails_spec.rb +++ b/spec/unit/rails_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/rails' diff --git a/spec/unit/relationship_spec.rb b/spec/unit/relationship_spec.rb index 349be7c1a..a7e787b46 100755 --- a/spec/unit/relationship_spec.rb +++ b/spec/unit/relationship_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-1. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/reports/http_spec.rb b/spec/unit/reports/http_spec.rb index acf0c045c..d7c37bfdd 100755 --- a/spec/unit/reports/http_spec.rb +++ b/spec/unit/reports/http_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/reports' diff --git a/spec/unit/reports/rrdgraph_spec.rb b/spec/unit/reports/rrdgraph_spec.rb index 1443b53e0..3c2704a7a 100755 --- a/spec/unit/reports/rrdgraph_spec.rb +++ b/spec/unit/reports/rrdgraph_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/reports' diff --git a/spec/unit/reports/store_spec.rb b/spec/unit/reports/store_spec.rb index 659940aa1..73a7e353f 100755 --- a/spec/unit/reports/store_spec.rb +++ b/spec/unit/reports/store_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/reports' diff --git a/spec/unit/reports/tagmail_spec.rb b/spec/unit/reports/tagmail_spec.rb index 9d67e7acb..a53d11978 100755 --- a/spec/unit/reports/tagmail_spec.rb +++ b/spec/unit/reports/tagmail_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/reports' diff --git a/spec/unit/reports_spec.rb b/spec/unit/reports_spec.rb index 52608aeb3..a4b2e04a9 100755 --- a/spec/unit/reports_spec.rb +++ b/spec/unit/reports_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/reports' diff --git a/spec/unit/resource/catalog_spec.rb b/spec/unit/resource/catalog_spec.rb index 59073c351..ae65aa91a 100755 --- a/spec/unit/resource/catalog_spec.rb +++ b/spec/unit/resource/catalog_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Resource::Catalog, "when compiling" do diff --git a/spec/unit/resource/status_spec.rb b/spec/unit/resource/status_spec.rb index d9bb2755d..bb88518c0 100755 --- a/spec/unit/resource/status_spec.rb +++ b/spec/unit/resource/status_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/status' diff --git a/spec/unit/resource/type_collection_helper_spec.rb b/spec/unit/resource/type_collection_helper_spec.rb index 9bfba008f..ad8d75271 100755 --- a/spec/unit/resource/type_collection_helper_spec.rb +++ b/spec/unit/resource/type_collection_helper_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/type_collection_helper' diff --git a/spec/unit/resource/type_collection_spec.rb b/spec/unit/resource/type_collection_spec.rb index 914d9fbba..b5f0a0ec7 100755 --- a/spec/unit/resource/type_collection_spec.rb +++ b/spec/unit/resource/type_collection_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/type_collection' diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb index 45c880440..352f767e4 100755 --- a/spec/unit/resource/type_spec.rb +++ b/spec/unit/resource/type_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/type' diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb index 1b1839981..79ea69e9c 100755 --- a/spec/unit/resource_spec.rb +++ b/spec/unit/resource_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource' diff --git a/spec/unit/run_spec.rb b/spec/unit/run_spec.rb index d9a5690cb..ea6ec74b1 100755 --- a/spec/unit/run_spec.rb +++ b/spec/unit/run_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/agent' require 'puppet/run' diff --git a/spec/unit/simple_graph_spec.rb b/spec/unit/simple_graph_spec.rb index 38d37c2e2..c8fea3b58 100755 --- a/spec/unit/simple_graph_spec.rb +++ b/spec/unit/simple_graph_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-1. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/ssl/base_spec.rb b/spec/unit/ssl/base_spec.rb index 263a3b9be..125623b70 100755 --- a/spec/unit/ssl/base_spec.rb +++ b/spec/unit/ssl/base_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate' diff --git a/spec/unit/ssl/certificate_authority/interface_spec.rb b/spec/unit/ssl/certificate_authority/interface_spec.rb index 3e3f261e0..9e858dd54 100755 --- a/spec/unit/ssl/certificate_authority/interface_spec.rb +++ b/spec/unit/ssl/certificate_authority/interface_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate_authority' diff --git a/spec/unit/ssl/certificate_authority_spec.rb b/spec/unit/ssl/certificate_authority_spec.rb index 518b4be4d..3aedfdc25 100755 --- a/spec/unit/ssl/certificate_authority_spec.rb +++ b/spec/unit/ssl/certificate_authority_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate_authority' diff --git a/spec/unit/ssl/certificate_factory_spec.rb b/spec/unit/ssl/certificate_factory_spec.rb index 7f305f768..f34dafe43 100755 --- a/spec/unit/ssl/certificate_factory_spec.rb +++ b/spec/unit/ssl/certificate_factory_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate_factory' diff --git a/spec/unit/ssl/certificate_request_spec.rb b/spec/unit/ssl/certificate_request_spec.rb index 3a2e7f4d8..e45f0130b 100755 --- a/spec/unit/ssl/certificate_request_spec.rb +++ b/spec/unit/ssl/certificate_request_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate_request' diff --git a/spec/unit/ssl/certificate_revocation_list_spec.rb b/spec/unit/ssl/certificate_revocation_list_spec.rb index e84208c5a..99058b353 100755 --- a/spec/unit/ssl/certificate_revocation_list_spec.rb +++ b/spec/unit/ssl/certificate_revocation_list_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate_revocation_list' diff --git a/spec/unit/ssl/certificate_spec.rb b/spec/unit/ssl/certificate_spec.rb index afee70999..0b635f2bc 100755 --- a/spec/unit/ssl/certificate_spec.rb +++ b/spec/unit/ssl/certificate_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/certificate' diff --git a/spec/unit/ssl/host_spec.rb b/spec/unit/ssl/host_spec.rb index be53f5f8f..2624c2234 100755 --- a/spec/unit/ssl/host_spec.rb +++ b/spec/unit/ssl/host_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/host' diff --git a/spec/unit/ssl/inventory_spec.rb b/spec/unit/ssl/inventory_spec.rb index 613f420a9..d8606b1b4 100755 --- a/spec/unit/ssl/inventory_spec.rb +++ b/spec/unit/ssl/inventory_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/inventory' diff --git a/spec/unit/ssl/key_spec.rb b/spec/unit/ssl/key_spec.rb index aabc92c6d..cddf9f8ea 100755 --- a/spec/unit/ssl/key_spec.rb +++ b/spec/unit/ssl/key_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/ssl/key' diff --git a/spec/unit/sslcertificates/ca_spec.rb b/spec/unit/sslcertificates/ca_spec.rb index 46cdbd0e9..eea246ba1 100755 --- a/spec/unit/sslcertificates/ca_spec.rb +++ b/spec/unit/sslcertificates/ca_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require 'spec_helper' require 'puppet' diff --git a/spec/unit/status_spec.rb b/spec/unit/status_spec.rb index 4e8f551bc..820807638 100755 --- a/spec/unit/status_spec.rb +++ b/spec/unit/status_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Status do diff --git a/spec/unit/transaction/event_manager_spec.rb b/spec/unit/transaction/event_manager_spec.rb index 378948ebc..d127d0391 100755 --- a/spec/unit/transaction/event_manager_spec.rb +++ b/spec/unit/transaction/event_manager_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction/event_manager' diff --git a/spec/unit/transaction/event_spec.rb b/spec/unit/transaction/event_spec.rb index 115c30dc0..1227802a7 100755 --- a/spec/unit/transaction/event_spec.rb +++ b/spec/unit/transaction/event_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction/event' diff --git a/spec/unit/transaction/report_spec.rb b/spec/unit/transaction/report_spec.rb index 07ac62415..191a30eb7 100755 --- a/spec/unit/transaction/report_spec.rb +++ b/spec/unit/transaction/report_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction/report' diff --git a/spec/unit/transaction/resource_harness_spec.rb b/spec/unit/transaction/resource_harness_spec.rb index d7b873c6b..20a42d27b 100755 --- a/spec/unit/transaction/resource_harness_spec.rb +++ b/spec/unit/transaction/resource_harness_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction/resource_harness' diff --git a/spec/unit/transaction_spec.rb b/spec/unit/transaction_spec.rb index baeab14af..4157e58ac 100755 --- a/spec/unit/transaction_spec.rb +++ b/spec/unit/transaction_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/transaction' diff --git a/spec/unit/transportable_spec.rb b/spec/unit/transportable_spec.rb index e69de29bb..e69de29bb 100644..100755 --- a/spec/unit/transportable_spec.rb +++ b/spec/unit/transportable_spec.rb diff --git a/spec/unit/type/augeas_spec.rb b/spec/unit/type/augeas_spec.rb index 896c66587..c8dc207f9 100755 --- a/spec/unit/type/augeas_spec.rb +++ b/spec/unit/type/augeas_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' augeas = Puppet::Type.type(:augeas) diff --git a/spec/unit/type/component_spec.rb b/spec/unit/type/component_spec.rb index 193d82fcc..9d6d71926 100755 --- a/spec/unit/type/component_spec.rb +++ b/spec/unit/type/component_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' component = Puppet::Type.type(:component) diff --git a/spec/unit/type/computer_spec.rb b/spec/unit/type/computer_spec.rb index 9bce5106c..1e15d7a4f 100755 --- a/spec/unit/type/computer_spec.rb +++ b/spec/unit/type/computer_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' computer = Puppet::Type.type(:computer) diff --git a/spec/unit/type/cron_spec.rb b/spec/unit/type/cron_spec.rb index e98529c60..7bf92eb02 100755 --- a/spec/unit/type/cron_spec.rb +++ b/spec/unit/type/cron_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:cron) do diff --git a/spec/unit/type/exec_spec.rb b/spec/unit/type/exec_spec.rb index 42c79e737..47d1b8523 100755 --- a/spec/unit/type/exec_spec.rb +++ b/spec/unit/type/exec_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:exec) do diff --git a/spec/unit/type/file/checksum_spec.rb b/spec/unit/type/file/checksum_spec.rb index d4b0382ce..b47f617cc 100755 --- a/spec/unit/type/file/checksum_spec.rb +++ b/spec/unit/type/file/checksum_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' checksum = Puppet::Type.type(:file).attrclass(:checksum) diff --git a/spec/unit/type/file/content_spec.rb b/spec/unit/type/file/content_spec.rb index a63437768..7af5f9d83 100755 --- a/spec/unit/type/file/content_spec.rb +++ b/spec/unit/type/file/content_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' content = Puppet::Type.type(:file).attrclass(:content) diff --git a/spec/unit/type/file/ctime.rb b/spec/unit/type/file/ctime.rb index 72a10b568..1700d4928 100755 --- a/spec/unit/type/file/ctime.rb +++ b/spec/unit/type/file/ctime.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:file).attrclass(:ctime) do diff --git a/spec/unit/type/file/ensure_spec.rb b/spec/unit/type/file/ensure_spec.rb index 5f51bdcc0..8555ef035 100755 --- a/spec/unit/type/file/ensure_spec.rb +++ b/spec/unit/type/file/ensure_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' property = Puppet::Type.type(:file).attrclass(:ensure) diff --git a/spec/unit/type/file/group_spec.rb b/spec/unit/type/file/group_spec.rb index 7aeb4f7eb..707a37cd6 100755 --- a/spec/unit/type/file/group_spec.rb +++ b/spec/unit/type/file/group_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' property = Puppet::Type.type(:file).attrclass(:group) diff --git a/spec/unit/type/file/mtime.rb b/spec/unit/type/file/mtime.rb index f00692f5e..3222df095 100755 --- a/spec/unit/type/file/mtime.rb +++ b/spec/unit/type/file/mtime.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:file).attrclass(:mtime) do diff --git a/spec/unit/type/file/owner_spec.rb b/spec/unit/type/file/owner_spec.rb index bf99a99e7..ed3bef1fe 100755 --- a/spec/unit/type/file/owner_spec.rb +++ b/spec/unit/type/file/owner_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' property = Puppet::Type.type(:file).attrclass(:owner) diff --git a/spec/unit/type/file/selinux_spec.rb b/spec/unit/type/file/selinux_spec.rb index 27a0e5863..2622948d0 100755 --- a/spec/unit/type/file/selinux_spec.rb +++ b/spec/unit/type/file/selinux_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' diff --git a/spec/unit/type/file/source_spec.rb b/spec/unit/type/file/source_spec.rb index 95a3618a2..e8683b712 100755 --- a/spec/unit/type/file/source_spec.rb +++ b/spec/unit/type/file/source_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' source = Puppet::Type.type(:file).attrclass(:source) diff --git a/spec/unit/type/file/type.rb b/spec/unit/type/file/type.rb index 26ec3b5cd..7d4af0e16 100755 --- a/spec/unit/type/file/type.rb +++ b/spec/unit/type/file/type.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:file).attrclass(:type) do diff --git a/spec/unit/type/file_spec.rb b/spec/unit/type/file_spec.rb index d0b60e01b..683c3654b 100755 --- a/spec/unit/type/file_spec.rb +++ b/spec/unit/type/file_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:file) do diff --git a/spec/unit/type/filebucket_spec.rb b/spec/unit/type/filebucket_spec.rb index f13fb00a5..3c5311184 100755 --- a/spec/unit/type/filebucket_spec.rb +++ b/spec/unit/type/filebucket_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:filebucket) do diff --git a/spec/unit/type/group_spec.rb b/spec/unit/type/group_spec.rb index a16f35925..b32204aa6 100755 --- a/spec/unit/type/group_spec.rb +++ b/spec/unit/type/group_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:group) do diff --git a/spec/unit/type/host_spec.rb b/spec/unit/type/host_spec.rb index b0d5a16e3..602c428af 100755 --- a/spec/unit/type/host_spec.rb +++ b/spec/unit/type/host_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' host = Puppet::Type.type(:host) diff --git a/spec/unit/type/interface_spec.rb b/spec/unit/type/interface_spec.rb index 630e45aa9..68f4c765f 100644..100755 --- a/spec/unit/type/interface_spec.rb +++ b/spec/unit/type/interface_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../spec_helper' diff --git a/spec/unit/type/macauthorization_spec.rb b/spec/unit/type/macauthorization_spec.rb index 01a78f196..8ab30834b 100755 --- a/spec/unit/type/macauthorization_spec.rb +++ b/spec/unit/type/macauthorization_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' macauth_type = Puppet::Type.type(:macauthorization) diff --git a/spec/unit/type/maillist_spec.rb b/spec/unit/type/maillist_spec.rb index 8427f5306..ae5fcd5b3 100755 --- a/spec/unit/type/maillist_spec.rb +++ b/spec/unit/type/maillist_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' maillist = Puppet::Type.type(:maillist) diff --git a/spec/unit/type/mcx_spec.rb b/spec/unit/type/mcx_spec.rb index b35355a29..02f691a52 100755 --- a/spec/unit/type/mcx_spec.rb +++ b/spec/unit/type/mcx_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/type/mcx' diff --git a/spec/unit/type/mount_spec.rb b/spec/unit/type/mount_spec.rb index 5bcc438fd..9ef76992a 100755 --- a/spec/unit/type/mount_spec.rb +++ b/spec/unit/type/mount_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:mount) do diff --git a/spec/unit/type/nagios_spec.rb b/spec/unit/type/nagios_spec.rb index 63122b2c9..d650723c8 100755 --- a/spec/unit/type/nagios_spec.rb +++ b/spec/unit/type/nagios_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/external/nagios' diff --git a/spec/unit/type/noop_metaparam_spec.rb b/spec/unit/type/noop_metaparam_spec.rb index 5c1a9853a..f4241d417 100755 --- a/spec/unit/type/noop_metaparam_spec.rb +++ b/spec/unit/type/noop_metaparam_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/type' diff --git a/spec/unit/type/package_spec.rb b/spec/unit/type/package_spec.rb index f3b9e6ac5..e75f7d290 100755 --- a/spec/unit/type/package_spec.rb +++ b/spec/unit/type/package_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:package) do diff --git a/spec/unit/type/resources_spec.rb b/spec/unit/type/resources_spec.rb index 9e1f09588..aedc58c7c 100755 --- a/spec/unit/type/resources_spec.rb +++ b/spec/unit/type/resources_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' resources = Puppet::Type.type(:resources) diff --git a/spec/unit/type/schedule_spec.rb b/spec/unit/type/schedule_spec.rb index c4189d410..7599411e4 100755 --- a/spec/unit/type/schedule_spec.rb +++ b/spec/unit/type/schedule_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' module ScheduleTesting diff --git a/spec/unit/type/selboolean_spec.rb b/spec/unit/type/selboolean_spec.rb index a64724432..aa495af4a 100755 --- a/spec/unit/type/selboolean_spec.rb +++ b/spec/unit/type/selboolean_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:selboolean), "when validating attributes" do diff --git a/spec/unit/type/selmodule_spec.rb b/spec/unit/type/selmodule_spec.rb index a9e193f3e..c067de01d 100755 --- a/spec/unit/type/selmodule_spec.rb +++ b/spec/unit/type/selmodule_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:selmodule), "when validating attributes" do diff --git a/spec/unit/type/service_spec.rb b/spec/unit/type/service_spec.rb index 3391f704c..40270e7c8 100755 --- a/spec/unit/type/service_spec.rb +++ b/spec/unit/type/service_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:service) do diff --git a/spec/unit/type/ssh_authorized_key_spec.rb b/spec/unit/type/ssh_authorized_key_spec.rb index 7cbf44c28..a5f167165 100755 --- a/spec/unit/type/ssh_authorized_key_spec.rb +++ b/spec/unit/type/ssh_authorized_key_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' ssh_authorized_key = Puppet::Type.type(:ssh_authorized_key) diff --git a/spec/unit/type/sshkey_spec.rb b/spec/unit/type/sshkey_spec.rb index d476e1908..ba3406976 100755 --- a/spec/unit/type/sshkey_spec.rb +++ b/spec/unit/type/sshkey_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' sshkey = Puppet::Type.type(:sshkey) diff --git a/spec/unit/type/stage_spec.rb b/spec/unit/type/stage_spec.rb index a43e4bffc..f5fed6c3c 100755 --- a/spec/unit/type/stage_spec.rb +++ b/spec/unit/type/stage_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type.type(:stage) do diff --git a/spec/unit/type/tidy_spec.rb b/spec/unit/type/tidy_spec.rb index dec1e189c..cb030634b 100755 --- a/spec/unit/type/tidy_spec.rb +++ b/spec/unit/type/tidy_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/file_bucket/dipper' diff --git a/spec/unit/type/user_spec.rb b/spec/unit/type/user_spec.rb index 92c88abfb..71c9e1857 100755 --- a/spec/unit/type/user_spec.rb +++ b/spec/unit/type/user_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' user = Puppet::Type.type(:user) diff --git a/spec/unit/type/vlan_spec.rb b/spec/unit/type/vlan_spec.rb index 607d7116d..2983a58e9 100644..100755 --- a/spec/unit/type/vlan_spec.rb +++ b/spec/unit/type/vlan_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../spec_helper' diff --git a/spec/unit/type/whit_spec.rb b/spec/unit/type/whit_spec.rb index cc5365ed6..4d0949900 100755 --- a/spec/unit/type/whit_spec.rb +++ b/spec/unit/type/whit_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' whit = Puppet::Type.type(:whit).new(:name => "Foo::Bar") diff --git a/spec/unit/type/zfs_spec.rb b/spec/unit/type/zfs_spec.rb index a08de574f..e53c25e02 100755 --- a/spec/unit/type/zfs_spec.rb +++ b/spec/unit/type/zfs_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' zfs = Puppet::Type.type(:zfs) diff --git a/spec/unit/type/zone_spec.rb b/spec/unit/type/zone_spec.rb index 5c7a760e1..eb3d33bb0 100755 --- a/spec/unit/type/zone_spec.rb +++ b/spec/unit/type/zone_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' zone = Puppet::Type.type(:zone) diff --git a/spec/unit/type/zpool_spec.rb b/spec/unit/type/zpool_spec.rb index 21a5ba0c6..9f1800073 100755 --- a/spec/unit/type/zpool_spec.rb +++ b/spec/unit/type/zpool_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' zpool = Puppet::Type.type(:zpool) diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb index 9859c5e08..ca291c4fa 100755 --- a/spec/unit/type_spec.rb +++ b/spec/unit/type_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Type do diff --git a/spec/unit/util/autoload/file_cache_spec.rb b/spec/unit/util/autoload/file_cache_spec.rb index 97ca4912d..cdde9bb48 100755 --- a/spec/unit/util/autoload/file_cache_spec.rb +++ b/spec/unit/util/autoload/file_cache_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/autoload/file_cache' diff --git a/spec/unit/util/autoload_spec.rb b/spec/unit/util/autoload_spec.rb index 59a491ba8..6d49b57dc 100755 --- a/spec/unit/util/autoload_spec.rb +++ b/spec/unit/util/autoload_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/autoload' diff --git a/spec/unit/util/backups_spec.rb b/spec/unit/util/backups_spec.rb index c580a4588..611c19304 100755 --- a/spec/unit/util/backups_spec.rb +++ b/spec/unit/util/backups_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/backups' diff --git a/spec/unit/util/cache_accumulator_spec.rb b/spec/unit/util/cache_accumulator_spec.rb index f4741c530..9c35cc353 100755 --- a/spec/unit/util/cache_accumulator_spec.rb +++ b/spec/unit/util/cache_accumulator_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/rails/cache_accumulator' diff --git a/spec/unit/util/cacher_spec.rb b/spec/unit/util/cacher_spec.rb index 890960693..2e43b4e20 100755 --- a/spec/unit/util/cacher_spec.rb +++ b/spec/unit/util/cacher_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/cacher' diff --git a/spec/unit/util/checksums_spec.rb b/spec/unit/util/checksums_spec.rb index 4e7bc9d18..146544201 100755 --- a/spec/unit/util/checksums_spec.rb +++ b/spec/unit/util/checksums_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-9-22. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/util/command_line_spec.rb b/spec/unit/util/command_line_spec.rb index 6cf90475b..81612ee5c 100755 --- a/spec/unit/util/command_line_spec.rb +++ b/spec/unit/util/command_line_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' @@ -99,7 +98,7 @@ describe Puppet::Util::CommandLine do Puppet::Util.expects(:which).with('puppet-whatever').returns(nil) commandline.expects(:system).never - text = Puppet::Faces[:help, :current].help + text = Puppet::Face[:help, :current].help commandline.expects(:puts).with { |x| x =~ /Unknown Puppet subcommand/ } commandline.expects(:puts).with text diff --git a/spec/unit/util/constant_inflector_spec.rb b/spec/unit/util/constant_inflector_spec.rb index 20283cb59..cf2e8f892 100755 --- a/spec/unit/util/constant_inflector_spec.rb +++ b/spec/unit/util/constant_inflector_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-02-12. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/util/errors_spec.rb b/spec/unit/util/errors_spec.rb index 9b4984ce3..d51a15ef4 100755 --- a/spec/unit/util/errors_spec.rb +++ b/spec/unit/util/errors_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/errors' diff --git a/spec/unit/util/execution_spec.rb b/spec/unit/util/execution_spec.rb index 337a05ffe..5b8b8a527 100755 --- a/spec/unit/util/execution_spec.rb +++ b/spec/unit/util/execution_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Util::Execution do diff --git a/spec/unit/util/execution_stub_spec.rb b/spec/unit/util/execution_stub_spec.rb index 2a478f008..34987689c 100755 --- a/spec/unit/util/execution_stub_spec.rb +++ b/spec/unit/util/execution_stub_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Util::ExecutionStub do diff --git a/spec/unit/util/feature_spec.rb b/spec/unit/util/feature_spec.rb index e7632fc4d..15375e0b1 100755 --- a/spec/unit/util/feature_spec.rb +++ b/spec/unit/util/feature_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/feature' diff --git a/spec/unit/util/file_locking_spec.rb b/spec/unit/util/file_locking_spec.rb index 32712429f..261474263 100755 --- a/spec/unit/util/file_locking_spec.rb +++ b/spec/unit/util/file_locking_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/file_locking' diff --git a/spec/unit/util/filetype_spec.rb b/spec/unit/util/filetype_spec.rb index 492691e0b..a2c0da660 100755 --- a/spec/unit/util/filetype_spec.rb +++ b/spec/unit/util/filetype_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/filetype' diff --git a/spec/unit/util/inline_docs_spec.rb b/spec/unit/util/inline_docs_spec.rb index 3baecc426..1d88180b3 100755 --- a/spec/unit/util/inline_docs_spec.rb +++ b/spec/unit/util/inline_docs_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/inline_docs' diff --git a/spec/unit/util/ldap/connection_spec.rb b/spec/unit/util/ldap/connection_spec.rb index 3fb5e388e..f97c72d77 100755 --- a/spec/unit/util/ldap/connection_spec.rb +++ b/spec/unit/util/ldap/connection_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-19. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/util/ldap/generator_spec.rb b/spec/unit/util/ldap/generator_spec.rb index 7c820759f..b3e664d6b 100755 --- a/spec/unit/util/ldap/generator_spec.rb +++ b/spec/unit/util/ldap/generator_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-28. # Copyright (c) 2008. All rights reserved. diff --git a/spec/unit/util/ldap/manager_spec.rb b/spec/unit/util/ldap/manager_spec.rb index a1b3f01ea..5cce626b5 100755 --- a/spec/unit/util/ldap/manager_spec.rb +++ b/spec/unit/util/ldap/manager_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-3-19. # Copyright (c) 2006. All rights reserved. diff --git a/spec/unit/util/loadedfile_spec.rb b/spec/unit/util/loadedfile_spec.rb index 6b6949b2f..dcea53e45 100755 --- a/spec/unit/util/loadedfile_spec.rb +++ b/spec/unit/util/loadedfile_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'tempfile' diff --git a/spec/unit/util/log/destinations_spec.rb b/spec/unit/util/log/destinations_spec.rb index a05736980..873c5f0c7 100755 --- a/spec/unit/util/log/destinations_spec.rb +++ b/spec/unit/util/log/destinations_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/log' diff --git a/spec/unit/util/log_spec.rb b/spec/unit/util/log_spec.rb index 9eacf58ae..78411d187 100755 --- a/spec/unit/util/log_spec.rb +++ b/spec/unit/util/log_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/log' diff --git a/spec/unit/util/logging_spec.rb b/spec/unit/util/logging_spec.rb index bc2eaff43..6a77e70ef 100755 --- a/spec/unit/util/logging_spec.rb +++ b/spec/unit/util/logging_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/logging' diff --git a/spec/unit/util/metric_spec.rb b/spec/unit/util/metric_spec.rb index b0d320478..07a9e4945 100755 --- a/spec/unit/util/metric_spec.rb +++ b/spec/unit/util/metric_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/metric' diff --git a/spec/unit/util/monkey_patches_spec.rb b/spec/unit/util/monkey_patches_spec.rb index 4ff6438ce..4b609ad09 100755 --- a/spec/unit/util/monkey_patches_spec.rb +++ b/spec/unit/util/monkey_patches_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/monkey_patches' diff --git a/spec/unit/util/nagios_maker_spec.rb b/spec/unit/util/nagios_maker_spec.rb index 7245cc3fc..b61f4fe9d 100755 --- a/spec/unit/util/nagios_maker_spec.rb +++ b/spec/unit/util/nagios_maker_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2007-11-18. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/util/network_device/cisco/device_spec.rb b/spec/unit/util/network_device/cisco/device_spec.rb index 31aec920e..82b0666e6 100644..100755 --- a/spec/unit/util/network_device/cisco/device_spec.rb +++ b/spec/unit/util/network_device/cisco/device_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../../spec_helper' diff --git a/spec/unit/util/network_device/cisco/interface_spec.rb b/spec/unit/util/network_device/cisco/interface_spec.rb index f6aa14747..24217750c 100644..100755 --- a/spec/unit/util/network_device/cisco/interface_spec.rb +++ b/spec/unit/util/network_device/cisco/interface_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../../spec_helper' @@ -86,4 +86,4 @@ describe Puppet::Util::NetworkDevice::Cisco::Interface do @interface.command("sh ver") end end -end
\ No newline at end of file +end diff --git a/spec/unit/util/network_device/ipcalc_spec.rb b/spec/unit/util/network_device/ipcalc_spec.rb index 6f55a66e4..0418c6a84 100644..100755 --- a/spec/unit/util/network_device/ipcalc_spec.rb +++ b/spec/unit/util/network_device/ipcalc_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../spec_helper' @@ -60,4 +60,4 @@ describe Puppet::Util::NetworkDevice::IPCalc do @ipcalc.prefix_length(IPAddr.new('fffe::0')).should == 15 end end -end
\ No newline at end of file +end diff --git a/spec/unit/util/network_device/transport/base_spec.rb b/spec/unit/util/network_device/transport/base_spec.rb index 5d52574f7..c186d72e5 100644..100755 --- a/spec/unit/util/network_device/transport/base_spec.rb +++ b/spec/unit/util/network_device/transport/base_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../../spec_helper' @@ -39,4 +39,4 @@ describe Puppet::Util::NetworkDevice::Transport::Base do @transport.command("line").should == "output" end end -end
\ No newline at end of file +end diff --git a/spec/unit/util/network_device/transport/ssh_spec.rb b/spec/unit/util/network_device/transport/ssh_spec.rb index 706dee43a..0e91ed9f9 100644..100755 --- a/spec/unit/util/network_device/transport/ssh_spec.rb +++ b/spec/unit/util/network_device/transport/ssh_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../../spec_helper' diff --git a/spec/unit/util/network_device/transport/telnet_spec.rb b/spec/unit/util/network_device/transport/telnet_spec.rb index 7499b528e..7528e0740 100644..100755 --- a/spec/unit/util/network_device/transport/telnet_spec.rb +++ b/spec/unit/util/network_device/transport/telnet_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec require File.dirname(__FILE__) + '/../../../../spec_helper' @@ -73,4 +73,4 @@ describe Puppet::Util::NetworkDevice::Transport::Telnet do @transport.close end end -end
\ No newline at end of file +end diff --git a/spec/unit/util/package_spec.rb b/spec/unit/util/package_spec.rb index 3a1933bd5..78c114afc 100755 --- a/spec/unit/util/package_spec.rb +++ b/spec/unit/util/package_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/package' diff --git a/spec/unit/util/posix_spec.rb b/spec/unit/util/posix_spec.rb index 65f826bd4..db7c5c3a7 100755 --- a/spec/unit/util/posix_spec.rb +++ b/spec/unit/util/posix_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/posix' diff --git a/spec/unit/util/pson_spec.rb b/spec/unit/util/pson_spec.rb index 216e8b5a3..63d085a66 100755 --- a/spec/unit/util/pson_spec.rb +++ b/spec/unit/util/pson_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/pson' diff --git a/spec/unit/util/queue/stomp_spec.rb b/spec/unit/util/queue/stomp_spec.rb index 76df0581f..f67189cf5 100755 --- a/spec/unit/util/queue/stomp_spec.rb +++ b/spec/unit/util/queue/stomp_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/queue' diff --git a/spec/unit/util/queue_spec.rb b/spec/unit/util/queue_spec.rb index 8ec75c3d8..59ea57d9b 100755 --- a/spec/unit/util/queue_spec.rb +++ b/spec/unit/util/queue_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/queue' require 'spec/mocks' diff --git a/spec/unit/util/rdoc/parser_spec.rb b/spec/unit/util/rdoc/parser_spec.rb index af2058197..c7f99051f 100755 --- a/spec/unit/util/rdoc/parser_spec.rb +++ b/spec/unit/util/rdoc/parser_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/resource/type_collection' diff --git a/spec/unit/util/rdoc_spec.rb b/spec/unit/util/rdoc_spec.rb index 13e22eec9..067b5b8a7 100755 --- a/spec/unit/util/rdoc_spec.rb +++ b/spec/unit/util/rdoc_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/rdoc' diff --git a/spec/unit/util/reference_serializer_spec.rb b/spec/unit/util/reference_serializer_spec.rb index d696dc193..de53ab9bb 100755 --- a/spec/unit/util/reference_serializer_spec.rb +++ b/spec/unit/util/reference_serializer_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/rails/reference_serializer' diff --git a/spec/unit/util/resource_template_spec.rb b/spec/unit/util/resource_template_spec.rb index f83979607..4f7cafdb7 100755 --- a/spec/unit/util/resource_template_spec.rb +++ b/spec/unit/util/resource_template_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/resource_template' diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb index 168936f44..c8d2b31f6 100755 --- a/spec/unit/util/run_mode_spec.rb +++ b/spec/unit/util/run_mode_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Util::RunMode do diff --git a/spec/unit/util/selinux_spec.rb b/spec/unit/util/selinux_spec.rb index bad52f09f..0eaf43cbb 100755 --- a/spec/unit/util/selinux_spec.rb +++ b/spec/unit/util/selinux_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/selinux' diff --git a/spec/unit/util/settings/file_setting_spec.rb b/spec/unit/util/settings/file_setting_spec.rb index 3d3a3ca0c..734b41f3a 100755 --- a/spec/unit/util/settings/file_setting_spec.rb +++ b/spec/unit/util/settings/file_setting_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/settings' diff --git a/spec/unit/util/settings_spec.rb b/spec/unit/util/settings_spec.rb index a26cf86b8..aa50c8f3a 100755 --- a/spec/unit/util/settings_spec.rb +++ b/spec/unit/util/settings_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Util::Settings do diff --git a/spec/unit/util/storage_spec.rb b/spec/unit/util/storage_spec.rb index 85d6596e4..90c11aa69 100755 --- a/spec/unit/util/storage_spec.rb +++ b/spec/unit/util/storage_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'yaml' diff --git a/spec/unit/util/tagging_spec.rb b/spec/unit/util/tagging_spec.rb index 5a3cc97a5..018871bef 100755 --- a/spec/unit/util/tagging_spec.rb +++ b/spec/unit/util/tagging_spec.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/env rspec # # Created by Luke Kanies on 2008-01-19. # Copyright (c) 2007. All rights reserved. diff --git a/spec/unit/util/user_attr_spec.rb b/spec/unit/util/user_attr_spec.rb index fc7c177be..2d6ba8b5a 100755 --- a/spec/unit/util/user_attr_spec.rb +++ b/spec/unit/util/user_attr_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/user_attr' diff --git a/spec/unit/util/warnings_spec.rb b/spec/unit/util/warnings_spec.rb index b0a6d027f..cc2c44711 100755 --- a/spec/unit/util/warnings_spec.rb +++ b/spec/unit/util/warnings_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe Puppet::Util::Warnings do diff --git a/spec/unit/util/zaml_spec.rb b/spec/unit/util/zaml_spec.rb index b211b4b30..d77cf99d2 100755 --- a/spec/unit/util/zaml_spec.rb +++ b/spec/unit/util/zaml_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' require 'puppet/util/monkey_patches' diff --git a/spec/watchr.rb b/spec/watchr.rb index 26919d1a1..26919d1a1 100644..100755 --- a/spec/watchr.rb +++ b/spec/watchr.rb |