We got rid of the '../../spec_helper' style requires, but a few of them snuck
back in in recent changes. This purges them out, replaced with the header:
#!/usr/bin/env rspec
require 'spec_helper'
Reviewed-By: Nick Lewis <[email protected]>
---
spec/unit/application/device_spec.rb | 5 ++---
spec/unit/indirector/facts/network_device_spec.rb | 8 ++------
spec/unit/provider/cisco_spec.rb | 7 +++----
spec/unit/provider/interface/cisco_spec.rb | 3 +--
spec/unit/provider/network_device_spec.rb | 3 +--
spec/unit/provider/package/pkgutil_spec.rb | 5 ++---
spec/unit/provider/vlan/cisco_spec.rb | 3 +--
spec/unit/type/interface_spec.rb | 3 +--
spec/unit/type/vlan_spec.rb | 3 +--
spec/unit/util/network_device/cisco/device_spec.rb | 3 +--
spec/unit/util/network_device/cisco/facts_spec.rb | 5 ++---
.../util/network_device/cisco/interface_spec.rb | 3 +--
spec/unit/util/network_device/config_spec.rb | 7 +++----
spec/unit/util/network_device/ipcalc_spec.rb | 3 +--
.../util/network_device/transport/base_spec.rb | 3 +--
.../unit/util/network_device/transport/ssh_spec.rb | 3 +--
.../util/network_device/transport/telnet_spec.rb | 3 +--
17 files changed, 25 insertions(+), 45 deletions(-)
mode change 100644 => 100755 spec/unit/indirector/facts/network_device_spec.rb
mode change 100644 => 100755 spec/unit/provider/cisco_spec.rb
mode change 100644 => 100755 spec/unit/util/network_device/cisco/facts_spec.rb
mode change 100644 => 100755 spec/unit/util/network_device/config_spec.rb
diff --git a/spec/unit/application/device_spec.rb
b/spec/unit/application/device_spec.rb
index df8cd3e..464827e 100755
--- a/spec/unit/application/device_spec.rb
+++ b/spec/unit/application/device_spec.rb
@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
require 'puppet/application/device'
require 'puppet/util/network_device/config'
diff --git a/spec/unit/indirector/facts/network_device_spec.rb
b/spec/unit/indirector/facts/network_device_spec.rb
old mode 100644
new mode 100755
index 302a810..93cd35d
--- a/spec/unit/indirector/facts/network_device_spec.rb
+++ b/spec/unit/indirector/facts/network_device_spec.rb
@@ -1,9 +1,5 @@
-#!/usr/bin/env ruby
-#
-# Created by Luke Kanies on 2007-9-23.
-# Copyright (c) 2007. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
require 'puppet/indirector/facts/network_device'
diff --git a/spec/unit/provider/cisco_spec.rb b/spec/unit/provider/cisco_spec.rb
old mode 100644
new mode 100755
index 0832073..0696221
--- a/spec/unit/provider/cisco_spec.rb
+++ b/spec/unit/provider/cisco_spec.rb
@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
require 'puppet/provider/cisco'
@@ -13,4 +12,4 @@ describe Puppet::Provider::Cisco do
Puppet::Util::NetworkDevice::Cisco::Device.expects(:new).returns :device
Puppet::Provider::Cisco.device(:url).should == :device
end
-end
\ No newline at end of file
+end
diff --git a/spec/unit/provider/interface/cisco_spec.rb
b/spec/unit/provider/interface/cisco_spec.rb
index c18f87c..3d400ea 100755
--- a/spec/unit/provider/interface/cisco_spec.rb
+++ b/spec/unit/provider/interface/cisco_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
require 'puppet/provider/interface/cisco'
diff --git a/spec/unit/provider/network_device_spec.rb
b/spec/unit/provider/network_device_spec.rb
index e2a87cf..aae6ad6 100755
--- a/spec/unit/provider/network_device_spec.rb
+++ b/spec/unit/provider/network_device_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
require 'puppet/provider/network_device'
require 'ostruct'
diff --git a/spec/unit/provider/package/pkgutil_spec.rb
b/spec/unit/provider/package/pkgutil_spec.rb
index 5549b3f..dcae212 100755
--- a/spec/unit/provider/package/pkgutil_spec.rb
+++ b/spec/unit/provider/package/pkgutil_spec.rb
@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
provider = Puppet::Type.type(:package).provider(:pkgutil)
diff --git a/spec/unit/provider/vlan/cisco_spec.rb
b/spec/unit/provider/vlan/cisco_spec.rb
index a67290e..4753cea 100755
--- a/spec/unit/provider/vlan/cisco_spec.rb
+++ b/spec/unit/provider/vlan/cisco_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
require 'puppet/provider/vlan/cisco'
diff --git a/spec/unit/type/interface_spec.rb b/spec/unit/type/interface_spec.rb
index 12ba225..74e3257 100755
--- a/spec/unit/type/interface_spec.rb
+++ b/spec/unit/type/interface_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
describe Puppet::Type.type(:interface) do
diff --git a/spec/unit/type/vlan_spec.rb b/spec/unit/type/vlan_spec.rb
index 3bee14b..7d7a0b1 100755
--- a/spec/unit/type/vlan_spec.rb
+++ b/spec/unit/type/vlan_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
describe Puppet::Type.type(:vlan) do
diff --git a/spec/unit/util/network_device/cisco/device_spec.rb
b/spec/unit/util/network_device/cisco/device_spec.rb
index 8971205..1c5a1a6 100755
--- a/spec/unit/util/network_device/cisco/device_spec.rb
+++ b/spec/unit/util/network_device/cisco/device_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device/cisco/device'
diff --git a/spec/unit/util/network_device/cisco/facts_spec.rb
b/spec/unit/util/network_device/cisco/facts_spec.rb
old mode 100644
new mode 100755
index bb29ac2..66842fd
--- a/spec/unit/util/network_device/cisco/facts_spec.rb
+++ b/spec/unit/util/network_device/cisco/facts_spec.rb
@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
require 'puppet/util/network_device'
require 'puppet/util/network_device/cisco/facts'
diff --git a/spec/unit/util/network_device/cisco/interface_spec.rb
b/spec/unit/util/network_device/cisco/interface_spec.rb
index 2421775..b0561c6 100755
--- a/spec/unit/util/network_device/cisco/interface_spec.rb
+++ b/spec/unit/util/network_device/cisco/interface_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device'
require 'puppet/util/network_device/cisco/interface'
diff --git a/spec/unit/util/network_device/config_spec.rb
b/spec/unit/util/network_device/config_spec.rb
old mode 100644
new mode 100755
index 52796f3..d69358a
--- a/spec/unit/util/network_device/config_spec.rb
+++ b/spec/unit/util/network_device/config_spec.rb
@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
require 'puppet/util/network_device/config'
@@ -99,4 +98,4 @@ describe Puppet::Util::NetworkDevice::Config do
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 0418c6a..82c5390 100755
--- a/spec/unit/util/network_device/ipcalc_spec.rb
+++ b/spec/unit/util/network_device/ipcalc_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device/ipcalc'
diff --git a/spec/unit/util/network_device/transport/base_spec.rb
b/spec/unit/util/network_device/transport/base_spec.rb
index c186d72..f05a62f 100755
--- a/spec/unit/util/network_device/transport/base_spec.rb
+++ b/spec/unit/util/network_device/transport/base_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device/transport/base'
diff --git a/spec/unit/util/network_device/transport/ssh_spec.rb
b/spec/unit/util/network_device/transport/ssh_spec.rb
index 8fc357d..04a86ba 100755
--- a/spec/unit/util/network_device/transport/ssh_spec.rb
+++ b/spec/unit/util/network_device/transport/ssh_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device/transport/ssh'
diff --git a/spec/unit/util/network_device/transport/telnet_spec.rb
b/spec/unit/util/network_device/transport/telnet_spec.rb
index 7528e07..cea5ab7 100755
--- a/spec/unit/util/network_device/transport/telnet_spec.rb
+++ b/spec/unit/util/network_device/transport/telnet_spec.rb
@@ -1,6 +1,5 @@
#!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
require 'puppet/util/network_device/transport/telnet'
--
1.7.5.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
