diff options
| author | Tim Smith <tsmith84@gmail.com> | 2016-01-13 10:01:43 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2016-01-13 10:18:26 -0800 |
| commit | 03befb60127e10057d864b50844ae6d243e18bc3 (patch) | |
| tree | c550885ac3a3851979148264ecc930b7fe3b97a4 | |
| parent | 922c1b31b94cf9019c94d135e95c8ada3003bcae (diff) | |
| download | ohai-03befb60127e10057d864b50844ae6d243e18bc3.tar.gz | |
Update e-mails and copyrights
Opscode -> Chef Sofware Inc. and bring all copyrights to current. End
the needed to keep editing these on every commit. Lets just get it over
with.
186 files changed, 466 insertions, 467 deletions
@@ -77,7 +77,7 @@ Issues: Ohai - system information application * Author:: Adam Jacob (<adam@chef.io>) -* Copyright:: Copyright (c) 2008-2014 Chef Software, Inc. +* Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. * License:: Apache License, Version 2.0 ```text @@ -2,8 +2,8 @@ # # ./ohai - I'm in ur serverz, showin you the daters # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai.rb b/lib/ohai.rb index 1d80ed64..bf31dcc6 100644 --- a/lib/ohai.rb +++ b/lib/ohai.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/config.rb b/lib/ohai/config.rb index 8dea7f98..c6996695 100644 --- a/lib/ohai/config.rb +++ b/lib/ohai/config.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Claire McQuin (<claire@chef.io>) -# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/dsl.rb b/lib/ohai/dsl.rb index 8ebde9de..e33d96b5 100644 --- a/lib/ohai/dsl.rb +++ b/lib/ohai/dsl.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/dsl/plugin.rb b/lib/ohai/dsl/plugin.rb index 48048910..e2a0e5b8 100644 --- a/lib/ohai/dsl/plugin.rb +++ b/lib/ohai/dsl/plugin.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2008, 2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/dsl/plugin/versionvi.rb b/lib/ohai/dsl/plugin/versionvi.rb index ebac4e4b..11d9fdae 100644 --- a/lib/ohai/dsl/plugin/versionvi.rb +++ b/lib/ohai/dsl/plugin/versionvi.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,7 +33,7 @@ module Ohai end def name - # Ohai V6 doesn't have any name specification for plugins. + # Ohai V6 doesn't have any name specification for plugins. # So we are using the partial path to infer the name of the plugin partial_path = Pathname.new(@source).relative_path_from(Pathname.new(@plugin_dir_path)).to_s partial_path.chomp(".rb").gsub("/", "::") diff --git a/lib/ohai/dsl/plugin/versionvii.rb b/lib/ohai/dsl/plugin/versionvii.rb index 2e24322b..741c6823 100644 --- a/lib/ohai/dsl/plugin/versionvii.rb +++ b/lib/ohai/dsl/plugin/versionvii.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/exception.rb b/lib/ohai/exception.rb index 446d6e2b..5db9c597 100644 --- a/lib/ohai/exception.rb +++ b/lib/ohai/exception.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/hints.rb b/lib/ohai/hints.rb index 603a1e46..0ed9ae5c 100644 --- a/lib/ohai/hints.rb +++ b/lib/ohai/hints.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/loader.rb b/lib/ohai/loader.rb index 3c023413..2381d06f 100644 --- a/lib/ohai/loader.rb +++ b/lib/ohai/loader.rb @@ -1,6 +1,6 @@ # # Author:: Claire McQuin (<claire@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/log.rb b/lib/ohai/log.rb index 62a89e61..22dd39dd 100644 --- a/lib/ohai/log.rb +++ b/lib/ohai/log.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb index 48758eb5..d8e3252d 100644 --- a/lib/ohai/mixin/command.rb +++ b/lib/ohai/mixin/command.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/constant_helper.rb b/lib/ohai/mixin/constant_helper.rb index 63d5acb1..af2f0a52 100644 --- a/lib/ohai/mixin/constant_helper.rb +++ b/lib/ohai/mixin/constant_helper.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2014 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/dmi_decode.rb b/lib/ohai/mixin/dmi_decode.rb index f367e41d..9f39b910 100644 --- a/lib/ohai/mixin/dmi_decode.rb +++ b/lib/ohai/mixin/dmi_decode.rb @@ -1,6 +1,6 @@ # # Author:: Tim Smith <tsmith@chef.io> -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/ec2_metadata.rb b/lib/ohai/mixin/ec2_metadata.rb index 8d775719..02a99bd3 100644 --- a/lib/ohai/mixin/ec2_metadata.rb +++ b/lib/ohai/mixin/ec2_metadata.rb @@ -1,8 +1,8 @@ # # Author:: Tim Dysinger (<tim@dysinger.net>) -# Author:: Benjamin Black (<bb@opscode.com>) -# Author:: Christopher Brown (<cb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Author:: Christopher Brown (<cb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/network_constants.rb b/lib/ohai/mixin/network_constants.rb index 738ee546..6a529a14 100644 --- a/lib/ohai/mixin/network_constants.rb +++ b/lib/ohai/mixin/network_constants.rb @@ -1,6 +1,6 @@ # # Author:: Serdar Sutay (<serdar@chef.io>) -# Copyright:: Copyright (c) 2014-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,8 +26,8 @@ module Ohai } # From sigar: include/sigar.h sigar_net_route_t - SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags, - :refcnt, :use, :metric, :mtu, :window, + SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags, + :refcnt, :use, :metric, :mtu, :window, :irtt, :ifname] end end diff --git a/lib/ohai/mixin/os.rb b/lib/ohai/mixin/os.rb index 2fe8ca73..8aa8f77c 100644 --- a/lib/ohai/mixin/os.rb +++ b/lib/ohai/mixin/os.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/mixin/seconds_to_human.rb b/lib/ohai/mixin/seconds_to_human.rb index c5fad1b8..caeb4d8a 100644 --- a/lib/ohai/mixin/seconds_to_human.rb +++ b/lib/ohai/mixin/seconds_to_human.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/mixin/string.rb b/lib/ohai/mixin/string.rb index 169711a2..6f1e4da9 100644 --- a/lib/ohai/mixin/string.rb +++ b/lib/ohai/mixin/string.rb @@ -1,14 +1,14 @@ # # Author:: James Gartrell (<jgartrel@gmail.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,7 @@ class String # Add string function to handle WMI property conversion to json hash keys # Makes an underscored, lowercase form from the expression in the string. - # underscore will also change ’::’ to ’/’ to convert namespaces to paths. + # underscore will also change ’::’ to ’/’ to convert namespaces to paths. # This should implement the same functionality as underscore method in # ActiveSupport::CoreExtensions::String::Inflections def wmi_underscore diff --git a/lib/ohai/plugin_config.rb b/lib/ohai/plugin_config.rb index 65d651cc..fe38c02c 100644 --- a/lib/ohai/plugin_config.rb +++ b/lib/ohai/plugin_config.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/cpu.rb b/lib/ohai/plugins/aix/cpu.rb index 32e294dc..26e047d2 100644 --- a/lib/ohai/plugins/aix/cpu.rb +++ b/lib/ohai/plugins/aix/cpu.rb @@ -1,8 +1,8 @@ # -# Author:: Joshua Timberman <joshua@opscode.com> +# Author:: Joshua Timberman <joshua@chef.io> # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/filesystem.rb b/lib/ohai/plugins/aix/filesystem.rb index 8b7419a9..3569adcc 100644 --- a/lib/ohai/plugins/aix/filesystem.rb +++ b/lib/ohai/plugins/aix/filesystem.rb @@ -2,7 +2,7 @@ # Author:: Deepali Jagtap (<deepali.jagtap@clogeny.com>) # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/kernel.rb b/lib/ohai/plugins/aix/kernel.rb index 5fe61a70..0124f7e6 100644 --- a/lib/ohai/plugins/aix/kernel.rb +++ b/lib/ohai/plugins/aix/kernel.rb @@ -1,7 +1,7 @@ # -# Author:: Joshua Timberman <joshua@opscode.com> +# Author:: Joshua Timberman <joshua@chef.io> # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/memory.rb b/lib/ohai/plugins/aix/memory.rb index 9e3cf527..50b33408 100644 --- a/lib/ohai/plugins/aix/memory.rb +++ b/lib/ohai/plugins/aix/memory.rb @@ -1,7 +1,7 @@ # -# Author:: Joshua Timberman <joshua@opscode.com> +# Author:: Joshua Timberman <joshua@chef.io> # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/network.rb b/lib/ohai/plugins/aix/network.rb index 3ac01d7a..f576e1fe 100644 --- a/lib/ohai/plugins/aix/network.rb +++ b/lib/ohai/plugins/aix/network.rb @@ -2,7 +2,7 @@ # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/os.rb b/lib/ohai/plugins/aix/os.rb index fd2abfed..cdf1a0aa 100644 --- a/lib/ohai/plugins/aix/os.rb +++ b/lib/ohai/plugins/aix/os.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob (<adam@chef.io>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/platform.rb b/lib/ohai/plugins/aix/platform.rb index c65c511b..776bb2f2 100644 --- a/lib/ohai/plugins/aix/platform.rb +++ b/lib/ohai/plugins/aix/platform.rb @@ -1,7 +1,7 @@ # -# Author:: Joshua Timberman <joshua@opscode.com> +# Author:: Joshua Timberman <joshua@chef.io> # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/uptime.rb b/lib/ohai/plugins/aix/uptime.rb index 287b0ecf..d0bf5d56 100644 --- a/lib/ohai/plugins/aix/uptime.rb +++ b/lib/ohai/plugins/aix/uptime.rb @@ -1,7 +1,7 @@ # # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/aix/virtualization.rb b/lib/ohai/plugins/aix/virtualization.rb index 4653b462..0ffdb435 100644 --- a/lib/ohai/plugins/aix/virtualization.rb +++ b/lib/ohai/plugins/aix/virtualization.rb @@ -1,7 +1,7 @@ # -# Author:: Julian C. Dunn (<jdunn@getchef.com>) +# Author:: Julian C. Dunn (<jdunn@chef.io>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/azure.rb b/lib/ohai/plugins/azure.rb index f906b6e8..97ba1cc4 100644 --- a/lib/ohai/plugins/azure.rb +++ b/lib/ohai/plugins/azure.rb @@ -1,4 +1,4 @@ -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/bsd/filesystem.rb b/lib/ohai/plugins/bsd/filesystem.rb index 6c5d73f5..4842d3fc 100644 --- a/lib/ohai/plugins/bsd/filesystem.rb +++ b/lib/ohai/plugins/bsd/filesystem.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob (<adam@chef.io>) # Author:: Tim Smith (<tsmith@chef.io>) -# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/command.rb b/lib/ohai/plugins/command.rb index 930846a5..ddecde10 100644 --- a/lib/ohai/plugins/command.rb +++ b/lib/ohai/plugins/command.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/darwin/cpu.rb b/lib/ohai/plugins/darwin/cpu.rb index 9ff64ba5..4e218921 100644 --- a/lib/ohai/plugins/darwin/cpu.rb +++ b/lib/ohai/plugins/darwin/cpu.rb @@ -1,7 +1,7 @@ # # Author:: Nathan L Smith (<nlloyds@gmail.com>) # Author:: Tim Smith (<tsmith@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/darwin/filesystem.rb b/lib/ohai/plugins/darwin/filesystem.rb index a5c06539..c3534bbb 100644 --- a/lib/ohai/plugins/darwin/filesystem.rb +++ b/lib/ohai/plugins/darwin/filesystem.rb @@ -1,14 +1,14 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/darwin/filesystem2.rb b/lib/ohai/plugins/darwin/filesystem2.rb index b90d396e..25b9009a 100644 --- a/lib/ohai/plugins/darwin/filesystem2.rb +++ b/lib/ohai/plugins/darwin/filesystem2.rb @@ -1,16 +1,16 @@ # # Author:: Phil Dibowitz (<phil@ipom.com>) -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2015 Facebook, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/darwin/memory.rb b/lib/ohai/plugins/darwin/memory.rb index 62237a7d..c1c146bd 100644 --- a/lib/ohai/plugins/darwin/memory.rb +++ b/lib/ohai/plugins/darwin/memory.rb @@ -1,6 +1,6 @@ # # Author:: Patrick Collins (<pat@burned.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/darwin/network.rb b/lib/ohai/plugins/darwin/network.rb index 1257e82f..91454014 100644 --- a/lib/ohai/plugins/darwin/network.rb +++ b/lib/ohai/plugins/darwin/network.rb @@ -1,6 +1,6 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/darwin/platform.rb b/lib/ohai/plugins/darwin/platform.rb index fc26544c..1277f8e8 100644 --- a/lib/ohai/plugins/darwin/platform.rb +++ b/lib/ohai/plugins/darwin/platform.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/darwin/system_profiler.rb b/lib/ohai/plugins/darwin/system_profiler.rb index e3756d3f..59f7e2ab 100644 --- a/lib/ohai/plugins/darwin/system_profiler.rb +++ b/lib/ohai/plugins/darwin/system_profiler.rb @@ -1,6 +1,6 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/dragonflybsd/os.rb b/lib/ohai/plugins/dragonflybsd/os.rb index 39b05540..94977e52 100644 --- a/lib/ohai/plugins/dragonflybsd/os.rb +++ b/lib/ohai/plugins/dragonflybsd/os.rb @@ -1,7 +1,7 @@ # -# Authors:: Adam Jacob (<adam@opscode.com>) +# Authors:: Adam Jacob (<adam@chef.io>) # Richard Manyanza (<liseki@nyikacraftsmen.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2014 Richard Manyanza. # License:: Apache License, Version 2.0 # diff --git a/lib/ohai/plugins/ec2.rb b/lib/ohai/plugins/ec2.rb index 691e24b9..c6355dbc 100644 --- a/lib/ohai/plugins/ec2.rb +++ b/lib/ohai/plugins/ec2.rb @@ -1,8 +1,8 @@ # # Author:: Tim Dysinger (<tim@dysinger.net>) -# Author:: Benjamin Black (<bb@opscode.com>) -# Author:: Christopher Brown (<cb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Author:: Christopher Brown (<cb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/erlang.rb b/lib/ohai/plugins/erlang.rb index ebea9da7..26179fde 100644 --- a/lib/ohai/plugins/erlang.rb +++ b/lib/ohai/plugins/erlang.rb @@ -1,14 +1,14 @@ # # Author:: Joe Williams (<joe@joetify.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/eucalyptus.rb b/lib/ohai/plugins/eucalyptus.rb index 8c7c918c..eb04009d 100644 --- a/lib/ohai/plugins/eucalyptus.rb +++ b/lib/ohai/plugins/eucalyptus.rb @@ -1,8 +1,8 @@ # # Author:: Tim Dysinger (<tim@dysinger.net>) -# Author:: Benjamin Black (<bb@opscode.com>) -# Author:: Christopher Brown (<cb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Author:: Christopher Brown (<cb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/freebsd/os.rb b/lib/ohai/plugins/freebsd/os.rb index 5792ae22..d2c8a326 100644 --- a/lib/ohai/plugins/freebsd/os.rb +++ b/lib/ohai/plugins/freebsd/os.rb @@ -1,7 +1,7 @@ # -# Authors:: Adam Jacob (<adam@opscode.com>) +# Authors:: Adam Jacob (<adam@chef.io>) # Richard Manyanza (<liseki@nyikacraftsmen.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2014 Richard Manyanza. # License:: Apache License, Version 2.0 # diff --git a/lib/ohai/plugins/hostname.rb b/lib/ohai/plugins/hostname.rb index 02a83eb0..f12b1940 100644 --- a/lib/ohai/plugins/hostname.rb +++ b/lib/ohai/plugins/hostname.rb @@ -1,13 +1,12 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Benjamin Black (<nostromo@gmail.com>) # Author:: Bryan McLellan (<btm@loftninjas.org>) # Author:: Daniel DeLeo (<dan@kallistec.com>) # Author:: Doug MacEachern (<dougm@vmware.com>) # Author:: James Gartrell (<jgartrel@gmail.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2015 Chef Software, Inc. -# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2009 Bryan McLellan # Copyright:: Copyright (c) 2009 Daniel DeLeo # Copyright:: Copyright (c) 2010 VMware, Inc. diff --git a/lib/ohai/plugins/init_package.rb b/lib/ohai/plugins/init_package.rb index 5f38a361..f648240b 100644 --- a/lib/ohai/plugins/init_package.rb +++ b/lib/ohai/plugins/init_package.rb @@ -1,6 +1,6 @@ # # Author:: Caleb Tennis (<caleb.tennis@gmail.com>) -# Copyright:: Copyright (c) 2012-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/java.rb b/lib/ohai/plugins/java.rb index 3c83d7cc..60f18697 100644 --- a/lib/ohai/plugins/java.rb +++ b/lib/ohai/plugins/java.rb @@ -1,6 +1,6 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/kernel.rb b/lib/ohai/plugins/kernel.rb index e9c61549..bbbf5f62 100644 --- a/lib/ohai/plugins/kernel.rb +++ b/lib/ohai/plugins/kernel.rb @@ -1,10 +1,10 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Benjamin Black (<nostromo@gmail.com>) # Author:: Bryan McLellan (<btm@loftninjas.org>) -# Author:: Claire McQuin (<claire@opscode.com>) +# Author:: Claire McQuin (<claire@chef.io>) # Author:: James Gartrell (<jgartrel@gmail.com>) -# Copyright:: Copyright (c) 2008, 2009, 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2009 Bryan McLellan # License:: Apache License, Version 2.0 # diff --git a/lib/ohai/plugins/keys.rb b/lib/ohai/plugins/keys.rb index d786f4fd..72cb8b99 100644 --- a/lib/ohai/plugins/keys.rb +++ b/lib/ohai/plugins/keys.rb @@ -2,14 +2,14 @@ # Cookbook Name:: apache2 # Recipe:: default # -# Copyright 2008, OpsCode, Inc. +# Copyright 2008-2016 Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/languages.rb b/lib/ohai/plugins/languages.rb index 678c8a24..a0894f1f 100644 --- a/lib/ohai/plugins/languages.rb +++ b/lib/ohai/plugins/languages.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/linux/block_device.rb b/lib/ohai/plugins/linux/block_device.rb index bf379e32..f2366346 100644 --- a/lib/ohai/plugins/linux/block_device.rb +++ b/lib/ohai/plugins/linux/block_device.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/cpu.rb b/lib/ohai/plugins/linux/cpu.rb index d1bca6d0..174e9576 100644 --- a/lib/ohai/plugins/linux/cpu.rb +++ b/lib/ohai/plugins/linux/cpu.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/filesystem.rb b/lib/ohai/plugins/linux/filesystem.rb index 8f7989cb..37b42c6f 100644 --- a/lib/ohai/plugins/linux/filesystem.rb +++ b/lib/ohai/plugins/linux/filesystem.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/filesystem2.rb b/lib/ohai/plugins/linux/filesystem2.rb index c1a0d054..bb0b6464 100644 --- a/lib/ohai/plugins/linux/filesystem2.rb +++ b/lib/ohai/plugins/linux/filesystem2.rb @@ -1,7 +1,7 @@ # # Author:: Phil Dibowitz <phil@ipom.com> # Author:: Adam Jacob <adam@chef.io> -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2015 Facebook, Inc. # License:: Apache License, Version 2.0 # @@ -109,7 +109,7 @@ Ohai.plugin(:Filesystem2) do fs[key][:mount] = $6 end end - + # Grab filesystem inode data from df so = shell_out("df -iP") so.stdout.each_line do |line| @@ -159,7 +159,7 @@ Ohai.plugin(:Filesystem2) do fs.each_key do |key| keys_to_update << key if key.start_with?("#{parsed[:dev]},") end - + if keys_to_update.empty? key = "#{parsed[:dev]}," fs[key] = Mash.new diff --git a/lib/ohai/plugins/linux/lsb.rb b/lib/ohai/plugins/linux/lsb.rb index 7bd16b63..75baec83 100644 --- a/lib/ohai/plugins/linux/lsb.rb +++ b/lib/ohai/plugins/linux/lsb.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/memory.rb b/lib/ohai/plugins/linux/memory.rb index e5c76801..b663ed1e 100644 --- a/lib/ohai/plugins/linux/memory.rb +++ b/lib/ohai/plugins/linux/memory.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/network.rb b/lib/ohai/plugins/linux/network.rb index 0bc90ad1..c9dfe32d 100644 --- a/lib/ohai/plugins/linux/network.rb +++ b/lib/ohai/plugins/linux/network.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Chris Read <chris.read@gmail.com> -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index 659d69fd..d9835a2a 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index c53c06ae..66e51ccf 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -1,6 +1,6 @@ # # Author:: Thom May (<thom@clearairturbulence.org>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/network.rb b/lib/ohai/plugins/network.rb index ac55f1b0..4b6f8202 100644 --- a/lib/ohai/plugins/network.rb +++ b/lib/ohai/plugins/network.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/ohai_time.rb b/lib/ohai/plugins/ohai_time.rb index 9867ec7f..f0f0ba7f 100644 --- a/lib/ohai/plugins/ohai_time.rb +++ b/lib/ohai/plugins/ohai_time.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/lib/ohai/plugins/openstack.rb b/lib/ohai/plugins/openstack.rb index 28ba3970..305b7cb7 100644 --- a/lib/ohai/plugins/openstack.rb +++ b/lib/ohai/plugins/openstack.rb @@ -1,6 +1,6 @@ # -# Author:: Matt Ray (<matt@opscode.com>) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Author:: Matt Ray (<matt@chef.io>) +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/os.rb b/lib/ohai/plugins/os.rb index 2a9e7d5b..13493e37 100644 --- a/lib/ohai/plugins/os.rb +++ b/lib/ohai/plugins/os.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/perl.rb b/lib/ohai/plugins/perl.rb index 68baf2f5..8ec5e75b 100644 --- a/lib/ohai/plugins/perl.rb +++ b/lib/ohai/plugins/perl.rb @@ -1,14 +1,14 @@ # -# Author:: Joshua Timberman (<joshua@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Joshua Timberman (<joshua@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -35,7 +35,7 @@ Ohai.plugin(:Perl) do perl[:archname] = $1 end end - languages[:perl] = perl + languages[:perl] = perl end end diff --git a/lib/ohai/plugins/platform.rb b/lib/ohai/plugins/platform.rb index 07d8246e..1b4e6dc1 100644 --- a/lib/ohai/plugins/platform.rb +++ b/lib/ohai/plugins/platform.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/powershell.rb b/lib/ohai/plugins/powershell.rb index 9c67e0f6..79eadb82 100644 --- a/lib/ohai/plugins/powershell.rb +++ b/lib/ohai/plugins/powershell.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,7 +33,7 @@ Ohai.plugin(:Powershell) do # BuildVersion 6.3.9600.16394 # PSCompatibleVersions {1.0, 2.0, 3.0, 4.0} # PSRemotingProtocolVersion 2.2 - + if so.exitstatus == 0 version_info = {} so.stdout.strip.each_line do |line| diff --git a/lib/ohai/plugins/ps.rb b/lib/ohai/plugins/ps.rb index c4408bbd..2232e781 100644 --- a/lib/ohai/plugins/ps.rb +++ b/lib/ohai/plugins/ps.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Bryan McLellan (<btm@loftninjas.org>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2009 Bryan McLellan # License:: Apache License, Version 2.0 # diff --git a/lib/ohai/plugins/python.rb b/lib/ohai/plugins/python.rb index c6c4dfc8..bb93d0ea 100644 --- a/lib/ohai/plugins/python.rb +++ b/lib/ohai/plugins/python.rb @@ -1,6 +1,6 @@ # # Author:: Thom May (<thom@clearairturbulence.org>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/ruby.rb b/lib/ohai/plugins/ruby.rb index f5729791..d3116da9 100644 --- a/lib/ohai/plugins/ruby.rb +++ b/lib/ohai/plugins/ruby.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,7 +48,7 @@ Ohai.plugin(:Ruby) do # Create a query string from above hash env_string = "" - values.keys.each do |v| + values.keys.each do |v| env_string << "#{v}=\#{#{values[v]}}," end @@ -64,7 +64,7 @@ Ohai.plugin(:Ruby) do # Perform one more (conditional) query bin_dir = languages[:ruby][:bin_dir] ruby_bin = languages[:ruby][:ruby_bin] - gem_binaries = [ + gem_binaries = [ run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"), "gem" ].map {|bin| ::File.join(bin_dir, bin)} diff --git a/lib/ohai/plugins/sigar/network_route.rb b/lib/ohai/plugins/sigar/network_route.rb index 34dbe3ab..0275e5a5 100644 --- a/lib/ohai/plugins/sigar/network_route.rb +++ b/lib/ohai/plugins/sigar/network_route.rb @@ -1,6 +1,6 @@ # # Author:: Toomas Pelberg (<toomas.pelberg@playtech.com>) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/solaris2/filesystem.rb b/lib/ohai/plugins/solaris2/filesystem.rb index 4b8042fc..3c029e7b 100644 --- a/lib/ohai/plugins/solaris2/filesystem.rb +++ b/lib/ohai/plugins/solaris2/filesystem.rb @@ -1,6 +1,6 @@ # # Author:: Kurt Yoder (ktyopscode@yoderhome.com) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/solaris2/network.rb b/lib/ohai/plugins/solaris2/network.rb index 000276d1..2c78e60a 100644 --- a/lib/ohai/plugins/solaris2/network.rb +++ b/lib/ohai/plugins/solaris2/network.rb @@ -1,6 +1,6 @@ # # Author:: Benjamin Black (<nostromo@gmail.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/solaris2/platform.rb b/lib/ohai/plugins/solaris2/platform.rb index 4f9d9e9c..9aa88fb9 100644 --- a/lib/ohai/plugins/solaris2/platform.rb +++ b/lib/ohai/plugins/solaris2/platform.rb @@ -1,6 +1,6 @@ # # Author:: Benjamin Black (<nostromo@gmail.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb index 23429329..29abbe03 100644 --- a/lib/ohai/plugins/solaris2/virtualization.rb +++ b/lib/ohai/plugins/solaris2/virtualization.rb @@ -1,7 +1,7 @@ # # Author:: Sean Walbran (<seanwalbran@gmail.com>) # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2010 Kurt Yoder # License:: Apache License, Version 2.0 # @@ -46,12 +46,12 @@ Ohai.plugin(:Virtualization) do so = shell_out(smbios_path) case so.stdout when /Manufacturer: Microsoft/ - if so.stdout =~ /Product: Virtual Machine/ + if so.stdout =~ /Product: Virtual Machine/ virtualization[:system] = "virtualpc" virtualization[:role] = "guest" - end + end when /Manufacturer: VMware/ - if so.stdout =~ /Product: VMware Virtual Platform/ + if so.stdout =~ /Product: VMware Virtual Platform/ virtualization[:system] = "vmware" virtualization[:role] = "guest" end @@ -74,7 +74,7 @@ Ohai.plugin(:Virtualization) do 'ip' => info[6], } end - + if (zones.length == 1) first_zone = zones.keys[0] unless( first_zone == 'global') diff --git a/lib/ohai/plugins/solaris2/zpools.rb b/lib/ohai/plugins/solaris2/zpools.rb index b9b07287..94f0a3ac 100644 --- a/lib/ohai/plugins/solaris2/zpools.rb +++ b/lib/ohai/plugins/solaris2/zpools.rb @@ -1,6 +1,6 @@ # # Author:: Jason J. W. Williams (williamsjj@digitar.com) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -41,7 +41,7 @@ Ohai.plugin(:Zpools) do # Grab individual health for devices in the zpools for pool in pools.keys pools[pool][:devices] = Mash.new - # Run "zpool status" as non-root user (adm) so that + # Run "zpool status" as non-root user (adm) so that # the command won't try to open() each device which can # hang the command if any of the disks are bad. so = shell_out("su adm -c \"zpool status #{pool}\"") diff --git a/lib/ohai/plugins/ssh_host_key.rb b/lib/ohai/plugins/ssh_host_key.rb index cc19e07b..93fbff27 100644 --- a/lib/ohai/plugins/ssh_host_key.rb +++ b/lib/ohai/plugins/ssh_host_key.rb @@ -1,6 +1,6 @@ # -# Author:: Bryan McLellan <btm@opscode.com> -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Author:: Bryan McLellan <btm@chef.io> +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/uptime.rb b/lib/ohai/plugins/uptime.rb index 51f01614..f4bd5f4e 100644 --- a/lib/ohai/plugins/uptime.rb +++ b/lib/ohai/plugins/uptime.rb @@ -1,11 +1,11 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Bryan McLellan (<btm@loftninjas.org>) -# Author:: Claire McQuin (<claire@opscode.com>) +# Author:: Claire McQuin (<claire@chef.io>) # Author:: Doug MacEachern (<dougm@vmware.com>) # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>) -# Author:: Paul Mooring (<paul@opscode.com>) -# Copyright:: Copyright (c) 2008, 2012, 2013 Opscode, Inc. +# Author:: Paul Mooring (<paul@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2009 Bryan McLellan # Copyright:: Copyright (c) 2010 VMware, Inc. # License:: Apache License, Version 2.0 diff --git a/lib/ohai/plugins/virtualbox.rb b/lib/ohai/plugins/virtualbox.rb index 791fc39d..77e25c28 100644 --- a/lib/ohai/plugins/virtualbox.rb +++ b/lib/ohai/plugins/virtualbox.rb @@ -1,6 +1,6 @@ # # Author:: "Tim Smith" <tsmith@chef.io> -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/virtualization.rb b/lib/ohai/plugins/virtualization.rb index 71ad6c60..fa126f32 100644 --- a/lib/ohai/plugins/virtualization.rb +++ b/lib/ohai/plugins/virtualization.rb @@ -1,14 +1,14 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,7 @@ Ohai.plugin(:VirtualizationInfo) do virtualization[:capabilities] = Mash.new virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect {|line| line.strip}).join #xdoc = Hpricot virtualization[:capabilities][:xml_desc] - + virtualization[:nodeinfo] = Mash.new ni = virtconn.node_get_info ['cores','cpus','memory','mhz','model','nodes','sockets','threads'].each {|a| virtualization[:nodeinfo][a] = ni.send(a)} @@ -50,7 +50,7 @@ Ohai.plugin(:VirtualizationInfo) do ['os_type','uuid'].each {|a| virtualization[:domains][dv.name][a] = dv.send(a)} ['cpu_time','max_mem','memory','nr_virt_cpu','state'].each {|a| virtualization[:domains][dv.name][a] = dv.info.send(a)} #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc] - + end virtualization[:networks] = Mash.new @@ -60,7 +60,7 @@ Ohai.plugin(:VirtualizationInfo) do virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect {|line| line.strip}).join ['bridge_name','uuid'].each {|a| virtualization[:networks][n][a] = nv.send(a)} #xdoc = Hpricot virtualization[:networks][n][:xml_desc] - + end virtualization[:storage] = Mash.new diff --git a/lib/ohai/plugins/vmware.rb b/lib/ohai/plugins/vmware.rb index 45b1dac2..079f39e9 100644 --- a/lib/ohai/plugins/vmware.rb +++ b/lib/ohai/plugins/vmware.rb @@ -1,7 +1,7 @@ # # Author:: "Dan Robinson" <drobinson@chef.io> # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com> -# Copyright:: Copyright (c) 2014-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # Copyright (C) 2015 IBM Corp. # License:: Apache License, Version 2.0 # diff --git a/lib/ohai/plugins/windows/filesystem.rb b/lib/ohai/plugins/windows/filesystem.rb index 7609bd24..9d6efa58 100644 --- a/lib/ohai/plugins/windows/filesystem.rb +++ b/lib/ohai/plugins/windows/filesystem.rb @@ -1,6 +1,6 @@ # # Author:: James Gartrell (<jgartrel@gmail.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/windows/network.rb b/lib/ohai/plugins/windows/network.rb index 004d3bd7..d9e250eb 100644 --- a/lib/ohai/plugins/windows/network.rb +++ b/lib/ohai/plugins/windows/network.rb @@ -1,6 +1,6 @@ # # Author:: James Gartrell (<jgartrel@gmail.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/windows/platform.rb b/lib/ohai/plugins/windows/platform.rb index ceea7948..ba772408 100644 --- a/lib/ohai/plugins/windows/platform.rb +++ b/lib/ohai/plugins/windows/platform.rb @@ -1,6 +1,6 @@ # # Author:: James Gartrell (<jgartrel@gmail.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/plugins/windows/virtualization.rb b/lib/ohai/plugins/windows/virtualization.rb index 100900e3..a8b0d211 100644 --- a/lib/ohai/plugins/windows/virtualization.rb +++ b/lib/ohai/plugins/windows/virtualization.rb @@ -2,7 +2,7 @@ # Author:: Pavel Yudin (<pyudin@parallels.com>) # Author:: Tim Smith (<tsmith@chef.io>) # Copyright:: Copyright (c) 2015 Pavel Yudin -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/provides_map.rb b/lib/ohai/provides_map.rb index 18a76d25..4001844e 100644 --- a/lib/ohai/provides_map.rb +++ b/lib/ohai/provides_map.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Daniel DeLeo (<dan@opscode.com>) -# Copyright:: Copyright (c) 2008, 2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Daniel DeLeo (<dan@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/runner.rb b/lib/ohai/runner.rb index 1e788e5c..03bf4968 100644 --- a/lib/ohai/runner.rb +++ b/lib/ohai/runner.rb @@ -1,6 +1,6 @@ # -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); you diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb index 05d0d94b..d44c9d7c 100644 --- a/lib/ohai/system.rb +++ b/lib/ohai/system.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/ohai/util/file_helper.rb b/lib/ohai/util/file_helper.rb index 1864e5d4..2b1a83ef 100644 --- a/lib/ohai/util/file_helper.rb +++ b/lib/ohai/util/file_helper.rb @@ -1,4 +1,4 @@ -# Author:: Lamont Granquist (<lamont@opscode.com>) +# Author:: Lamont Granquist (<lamont@chef.io>) # # Copyright:: Copyright (c) 2013-14 Chef Software, Inc. # diff --git a/lib/ohai/util/win32.rb b/lib/ohai/util/win32.rb index a475979f..0fac63ac 100644 --- a/lib/ohai/util/win32.rb +++ b/lib/ohai/util/win32.rb @@ -1,4 +1,4 @@ -# Author:: Adam Edwards (<adamed@getchef.com>) +# Author:: Adam Edwards (<adamed@chef.io>) # # Copyright:: Copyright (c) 2013-14 Chef Software, Inc. # diff --git a/lib/ohai/util/win32/group_helper.rb b/lib/ohai/util/win32/group_helper.rb index ad51e0bf..6c4ed1dc 100644 --- a/lib/ohai/util/win32/group_helper.rb +++ b/lib/ohai/util/win32/group_helper.rb @@ -1,4 +1,4 @@ -# Author:: Adam Edwards (<adamed@getchef.com>) +# Author:: Adam Edwards (<adamed@chef.io>) # # Copyright:: Copyright (c) 2013-14 Chef Software, Inc. # diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index 763b5983..b988beae 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/common/ohai_plugin_common.rb b/platform_simulation_specs/common/ohai_plugin_common.rb index 9b012e4d..ee61609f 100644 --- a/platform_simulation_specs/common/ohai_plugin_common.rb +++ b/platform_simulation_specs/common/ohai_plugin_common.rb @@ -1,6 +1,6 @@ -# Author:: Theodore Nordsieck <theo@opscode.com> -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Theodore Nordsieck <theo@chef.io> +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/common/ohai_plugin_common_spec.rb b/platform_simulation_specs/common/ohai_plugin_common_spec.rb index 5ea81ee5..56ed74e6 100644 --- a/platform_simulation_specs/common/ohai_plugin_common_spec.rb +++ b/platform_simulation_specs/common/ohai_plugin_common_spec.rb @@ -1,6 +1,6 @@ -# Author:: Theodore Nordsieck <theo@opscode.com> -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Theodore Nordsieck <theo@chef.io> +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/erlang_spec.rb b/platform_simulation_specs/plugins/erlang_spec.rb index 36b709f4..2c33bae8 100644 --- a/platform_simulation_specs/plugins/erlang_spec.rb +++ b/platform_simulation_specs/plugins/erlang_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/java_spec.rb b/platform_simulation_specs/plugins/java_spec.rb index 96b156a7..00049d9b 100644 --- a/platform_simulation_specs/plugins/java_spec.rb +++ b/platform_simulation_specs/plugins/java_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2009-2013 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/kernel_spec.rb b/platform_simulation_specs/plugins/kernel_spec.rb index 8929c329..d397673b 100644 --- a/platform_simulation_specs/plugins/kernel_spec.rb +++ b/platform_simulation_specs/plugins/kernel_spec.rb @@ -1,15 +1,15 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/platform_simulation_specs/plugins/lua_spec.rb b/platform_simulation_specs/plugins/lua_spec.rb index 28d9166e..dd14dc5c 100644 --- a/platform_simulation_specs/plugins/lua_spec.rb +++ b/platform_simulation_specs/plugins/lua_spec.rb @@ -1,8 +1,8 @@ # # Author:: Doug MacEachern <dougm@vmware.com> -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) 2009 VMware, Inc. -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/nodejs_spec.rb b/platform_simulation_specs/plugins/nodejs_spec.rb index b2277039..042ecadb 100644 --- a/platform_simulation_specs/plugins/nodejs_spec.rb +++ b/platform_simulation_specs/plugins/nodejs_spec.rb @@ -1,8 +1,8 @@ # # Author:: Jacques Marneweck (<jacques@powertrip.co.za>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) Jacques Marneweck -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/perl_spec.rb b/platform_simulation_specs/plugins/perl_spec.rb index a275633f..69612d90 100644 --- a/platform_simulation_specs/plugins/perl_spec.rb +++ b/platform_simulation_specs/plugins/perl_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Joshua Timberman(<joshua@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2009-2013 Opscode, Inc. +# Author:: Joshua Timberman(<joshua@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/php_spec.rb b/platform_simulation_specs/plugins/php_spec.rb index 2956360c..e6094637 100644 --- a/platform_simulation_specs/plugins/php_spec.rb +++ b/platform_simulation_specs/plugins/php_spec.rb @@ -1,8 +1,8 @@ # # Author:: Doug MacEachern <dougm@vmware.com> -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) 2009 VMware, Inc. -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform_simulation_specs/plugins/python_spec.rb b/platform_simulation_specs/plugins/python_spec.rb index fbabb2e4..f4d58d4c 100644 --- a/platform_simulation_specs/plugins/python_spec.rb +++ b/platform_simulation_specs/plugins/python_spec.rb @@ -1,15 +1,15 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/platform_simulation_specs/tools/grab_data.rb b/platform_simulation_specs/tools/grab_data.rb index 10489d02..93ae56d0 100644 --- a/platform_simulation_specs/tools/grab_data.rb +++ b/platform_simulation_specs/tools/grab_data.rb @@ -1,6 +1,6 @@ -# Author:: Theodore Nordsieck <theo@opscode.com> -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Theodore Nordsieck <theo@chef.io> +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,7 +35,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec/unit/path/ohai_plugi #get options class MyCLI include Mixlib::CLI - + option :command, :short => "-c CMD", :long => "--command CMD", @@ -102,4 +102,4 @@ results.each do |r| data[platform][arch] << r end -puts OhaiPluginCommon.data_to_string data +puts OhaiPluginCommon.data_to_string data diff --git a/spec/functional/application_spec.rb b/spec/functional/application_spec.rb index 33992f5d..ea9803ce 100644 --- a/spec/functional/application_spec.rb +++ b/spec/functional/application_spec.rb @@ -1,6 +1,6 @@ # # Author:: Claire McQuin <claire@chef.io> -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/functional/loader_spec.rb b/spec/functional/loader_spec.rb index 34e3d7a1..bb9683e3 100644 --- a/spec/functional/loader_spec.rb +++ b/spec/functional/loader_spec.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/functional/plugins/powershell_spec.rb b/spec/functional/plugins/powershell_spec.rb index 37d81c62..34a8b61e 100644 --- a/spec/functional/plugins/powershell_spec.rb +++ b/spec/functional/plugins/powershell_spec.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # # License:: Apache License, Version 2.0 # diff --git a/spec/functional/plugins/root_group_spec.rb b/spec/functional/plugins/root_group_spec.rb index 936249ec..bf87b110 100644 --- a/spec/functional/plugins/root_group_spec.rb +++ b/spec/functional/plugins/root_group_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Edwards (<adamed@getchef.com>) +# Author:: Adam Edwards (<adamed@chef.io>) # -# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # # License:: Apache License, Version 2.0 # diff --git a/spec/ohai_spec.rb b/spec/ohai_spec.rb index 560d43f0..a8df8fcf 100644 --- a/spec/ohai_spec.rb +++ b/spec/ohai_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,9 +19,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb') describe Ohai do - + it "should have a version constant defined" do expect(Ohai::VERSION).to be_a_kind_of(String) end - + end diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index 3fbb5a2e..25a92824 100644 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -1,6 +1,6 @@ # # Author:: Claire McQuin <claire@chef.io> -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index 70dd356a..5cb591b2 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -1,6 +1,6 @@ # # Author:: Claire McQuin (<claire@chef.io>) -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/dsl/plugin_spec.rb b/spec/unit/dsl/plugin_spec.rb index fa2a7379..07873449 100644 --- a/spec/unit/dsl/plugin_spec.rb +++ b/spec/unit/dsl/plugin_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); you diff --git a/spec/unit/hints_spec.rb b/spec/unit/hints_spec.rb index 84c0e2a7..fa3b35f4 100644 --- a/spec/unit/hints_spec.rb +++ b/spec/unit/hints_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Serdar Sutay (<serdar@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Serdar Sutay (<serdar@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/loader_spec.rb b/spec/unit/loader_spec.rb index 5d79b193..f36c101a 100644 --- a/spec/unit/loader_spec.rb +++ b/spec/unit/loader_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/mixin/ec2_metadata_spec.rb b/spec/unit/mixin/ec2_metadata_spec.rb index 02e1cca9..e65fe5c6 100644 --- a/spec/unit/mixin/ec2_metadata_spec.rb +++ b/spec/unit/mixin/ec2_metadata_spec.rb @@ -1,6 +1,6 @@ # # Author:: Bryan McLellan <btm@loftninjas.org> -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugin_config_spec.rb b/spec/unit/plugin_config_spec.rb index 21ea5308..75b4f6f7 100644 --- a/spec/unit/plugin_config_spec.rb +++ b/spec/unit/plugin_config_spec.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/cpu_spec.rb b/spec/unit/plugins/aix/cpu_spec.rb index 5e9f4892..b2166e12 100644 --- a/spec/unit/plugins/aix/cpu_spec.rb +++ b/spec/unit/plugins/aix/cpu_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/filesystem_spec.rb b/spec/unit/plugins/aix/filesystem_spec.rb index 5365978f..522c91db 100644 --- a/spec/unit/plugins/aix/filesystem_spec.rb +++ b/spec/unit/plugins/aix/filesystem_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/hostname_spec.rb b/spec/unit/plugins/aix/hostname_spec.rb index 3512f77f..589c4e4a 100644 --- a/spec/unit/plugins/aix/hostname_spec.rb +++ b/spec/unit/plugins/aix/hostname_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/kernel_spec.rb b/spec/unit/plugins/aix/kernel_spec.rb index 621df339..25368438 100644 --- a/spec/unit/plugins/aix/kernel_spec.rb +++ b/spec/unit/plugins/aix/kernel_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/memory_spec.rb b/spec/unit/plugins/aix/memory_spec.rb index fed985aa..439df3a4 100644 --- a/spec/unit/plugins/aix/memory_spec.rb +++ b/spec/unit/plugins/aix/memory_spec.rb @@ -1,6 +1,6 @@ # # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/network_spec.rb b/spec/unit/plugins/aix/network_spec.rb index 446a58ff..a6212ade 100644 --- a/spec/unit/plugins/aix/network_spec.rb +++ b/spec/unit/plugins/aix/network_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/os_spec.rb b/spec/unit/plugins/aix/os_spec.rb index 3aefdf8c..57f02a79 100644 --- a/spec/unit/plugins/aix/os_spec.rb +++ b/spec/unit/plugins/aix/os_spec.rb @@ -1,6 +1,6 @@ # # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/platform_spec.rb b/spec/unit/plugins/aix/platform_spec.rb index 97df7f6d..343f3ce0 100644 --- a/spec/unit/plugins/aix/platform_spec.rb +++ b/spec/unit/plugins/aix/platform_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/uptime_spec.rb b/spec/unit/plugins/aix/uptime_spec.rb index 3af623f8..503dec9f 100644 --- a/spec/unit/plugins/aix/uptime_spec.rb +++ b/spec/unit/plugins/aix/uptime_spec.rb @@ -1,7 +1,7 @@ # # Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/aix/virtualization_spec.rb b/spec/unit/plugins/aix/virtualization_spec.rb index 271c930f..db0833b8 100644 --- a/spec/unit/plugins/aix/virtualization_spec.rb +++ b/spec/unit/plugins/aix/virtualization_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Julian C. Dunn (<jdunn@getchef.comm>) +# Author:: Julian C. Dunn (<jdunn@chef.iom>) # Author:: Isa Farnik (<isa@chef.io>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/azure_spec.rb b/spec/unit/plugins/azure_spec.rb index 242e11ab..0f29cdc7 100644 --- a/spec/unit/plugins/azure_spec.rb +++ b/spec/unit/plugins/azure_spec.rb @@ -1,6 +1,6 @@ # # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) -# Copyright:: Copyright (c) 2011-2013 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/bsd/filesystem_spec.rb b/spec/unit/plugins/bsd/filesystem_spec.rb index 030f9d08..e03db087 100644 --- a/spec/unit/plugins/bsd/filesystem_spec.rb +++ b/spec/unit/plugins/bsd/filesystem_spec.rb @@ -1,7 +1,7 @@ # # Author:: Matthew Kent (<mkent@magoazul.com>) # Author:: Tim Smith (<tsmith@chef.io>) -# Copyright:: Copyright (c) 2011-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/bsd/virtualization_spec.rb b/spec/unit/plugins/bsd/virtualization_spec.rb index 355df67f..0e01f16c 100644 --- a/spec/unit/plugins/bsd/virtualization_spec.rb +++ b/spec/unit/plugins/bsd/virtualization_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Bryan McLellan <btm@opscode.com> -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Author:: Bryan McLellan <btm@chef.io> +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/chef_spec.rb b/spec/unit/plugins/chef_spec.rb index 0ca0ff20..03034066 100644 --- a/spec/unit/plugins/chef_spec.rb +++ b/spec/unit/plugins/chef_spec.rb @@ -1,16 +1,16 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Tollef Fog Heen <tfheen@err.no> -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no> # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,9 +20,9 @@ begin require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb') - + require 'chef/version' - + describe Ohai::System, "plugin chef" do before(:each) do @plugin = get_plugin("chef") @@ -32,10 +32,10 @@ begin @plugin.run expect(@plugin[:chef_packages][:chef][:version]).to eq(Chef::VERSION) end - + pending "would set [:chef_packages][:chef][:version] if chef was available", :unless => defined?(Chef) end - + rescue LoadError # the chef module is not available, ignoring. diff --git a/spec/unit/plugins/darwin/cpu_spec.rb b/spec/unit/plugins/darwin/cpu_spec.rb index fab98b27..4cd1d92d 100644 --- a/spec/unit/plugins/darwin/cpu_spec.rb +++ b/spec/unit/plugins/darwin/cpu_spec.rb @@ -1,6 +1,6 @@ # # Author:: Nathan L Smith (<nlloyds@gmail.com>) -# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/darwin/hostname_spec.rb b/spec/unit/plugins/darwin/hostname_spec.rb index 9ee0ec1e..eb5f5437 100644 --- a/spec/unit/plugins/darwin/hostname_spec.rb +++ b/spec/unit/plugins/darwin/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/darwin/kernel_spec.rb b/spec/unit/plugins/darwin/kernel_spec.rb index c5f46b27..b364849b 100644 --- a/spec/unit/plugins/darwin/kernel_spec.rb +++ b/spec/unit/plugins/darwin/kernel_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/darwin/memory_spec.rb b/spec/unit/plugins/darwin/memory_spec.rb index 297a35be..5db76cb0 100644 --- a/spec/unit/plugins/darwin/memory_spec.rb +++ b/spec/unit/plugins/darwin/memory_spec.rb @@ -1,6 +1,6 @@ # # Author:: Patrick Collins (<pat@burned.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/darwin/network_spec.rb b/spec/unit/plugins/darwin/network_spec.rb index a6843ffb..474104ef 100644 --- a/spec/unit/plugins/darwin/network_spec.rb +++ b/spec/unit/plugins/darwin/network_spec.rb @@ -1,6 +1,6 @@ # # Author:: Alan Harper <alan@aussiegeek.net> -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/darwin/platform_spec.rb b/spec/unit/plugins/darwin/platform_spec.rb index aef55edd..6cc43558 100644 --- a/spec/unit/plugins/darwin/platform_spec.rb +++ b/spec/unit/plugins/darwin/platform_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,12 +36,12 @@ describe Ohai::System, "Darwin plugin platform" do @plugin.run expect(@plugin[:platform]).to eq("mac_os_x") end - + it "should set platform_version to ProductVersion" do @plugin.run expect(@plugin[:platform_version]).to eq("10.5.5") end - + it "should set platform_build to BuildVersion" do @plugin.run expect(@plugin[:platform_build]).to eq("9F33") diff --git a/spec/unit/plugins/darwin/system_profiler_spec.rb b/spec/unit/plugins/darwin/system_profiler_spec.rb index af2b463d..f108445d 100644 --- a/spec/unit/plugins/darwin/system_profiler_spec.rb +++ b/spec/unit/plugins/darwin/system_profiler_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Paul Mooring (<paul@opscode.com>) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Author:: Paul Mooring (<paul@chef.io>) +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/ec2_spec.rb b/spec/unit/plugins/ec2_spec.rb index 86fa2cca..86b53d2c 100644 --- a/spec/unit/plugins/ec2_spec.rb +++ b/spec/unit/plugins/ec2_spec.rb @@ -1,7 +1,7 @@ # # Author:: Tim Dysinger (<tim@dysinger.net>) -# Author:: Christopher Brown (cb@opscode.com) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Brown (cb@chef.io) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -51,7 +51,7 @@ describe Ohai::System, "plugin ec2" do end context "with common metadata paths" do - let(:paths) do + let(:paths) do { "meta-data/" => "instance_type\nami_id\nsecurity-groups", "meta-data/instance_type" => "c1.medium", "meta-data/ami_id" => "ami-5d2dc934", diff --git a/spec/unit/plugins/erlang_spec.rb b/spec/unit/plugins/erlang_spec.rb index ccda18aa..cdcd199a 100644 --- a/spec/unit/plugins/erlang_spec.rb +++ b/spec/unit/plugins/erlang_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/eucalyptus_spec.rb b/spec/unit/plugins/eucalyptus_spec.rb index 5da48780..ee964bf1 100644 --- a/spec/unit/plugins/eucalyptus_spec.rb +++ b/spec/unit/plugins/eucalyptus_spec.rb @@ -1,7 +1,7 @@ # # Author:: Tim Dysinger (<tim@dysinger.net>) -# Author:: Christopher Brown (cb@opscode.com) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Brown (cb@chef.io) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/fail_spec.rb b/spec/unit/plugins/fail_spec.rb index 10019f81..19bfa71c 100644 --- a/spec/unit/plugins/fail_spec.rb +++ b/spec/unit/plugins/fail_spec.rb @@ -1,15 +1,15 @@ # # Author:: Toomas Pelberg (toomas.pelberg@playtech.com>) -# Author:: Claire McQuin (claire@opscode.com) -# Copyright:: Copyright (c) 2011, 2013 Opscode, Inc. +# Author:: Claire McQuin (claire@chef.io) +# Copyright:: Copyright (c) 2011, 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -241,7 +241,7 @@ end describe "when using nonexistent DSL commands in Ohai.plugin block" do failstr = "Ohai.plugin do\n\tcreates \"fail\"\nend\n" - + it_behaves_like "a v7 loading failure" do let(:failstr) { failstr } end @@ -266,7 +266,7 @@ Ohai.plugin do end end EOF - + it_behaves_like "a v7 loading success" do let(:failstr) { failstr1 } end diff --git a/spec/unit/plugins/freebsd/hostname_spec.rb b/spec/unit/plugins/freebsd/hostname_spec.rb index cbbb82a8..9d4c4a00 100644 --- a/spec/unit/plugins/freebsd/hostname_spec.rb +++ b/spec/unit/plugins/freebsd/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/freebsd/kernel_spec.rb b/spec/unit/plugins/freebsd/kernel_spec.rb index cb08500e..2040b67f 100644 --- a/spec/unit/plugins/freebsd/kernel_spec.rb +++ b/spec/unit/plugins/freebsd/kernel_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/freebsd/platform_spec.rb b/spec/unit/plugins/freebsd/platform_spec.rb index 281face5..49a26a16 100644 --- a/spec/unit/plugins/freebsd/platform_spec.rb +++ b/spec/unit/plugins/freebsd/platform_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,12 +28,12 @@ describe Ohai::System, "FreeBSD plugin platform" do end it "should set platform to lowercased lsb[:id]" do - @plugin.run + @plugin.run expect(@plugin[:platform]).to eq("freebsd") end - + it "should set platform_version to lsb[:release]" do @plugin.run expect(@plugin[:platform_version]).to eq("7.1") end -end +end diff --git a/spec/unit/plugins/hostname_spec.rb b/spec/unit/plugins/hostname_spec.rb index c46d6a99..b7a1c045 100644 --- a/spec/unit/plugins/hostname_spec.rb +++ b/spec/unit/plugins/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/init_package_spec.rb b/spec/unit/plugins/init_package_spec.rb index c78538f3..f7c4e1be 100644 --- a/spec/unit/plugins/init_package_spec.rb +++ b/spec/unit/plugins/init_package_spec.rb @@ -1,6 +1,6 @@ # # Author:: Caleb Tennis (<caleb.tennis@gmail.com>) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/java_spec.rb b/spec/unit/plugins/java_spec.rb index 5e550e44..7960277b 100644 --- a/spec/unit/plugins/java_spec.rb +++ b/spec/unit/plugins/java_spec.rb @@ -1,15 +1,15 @@ # -# Author:: Benjamin Black (<bb@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2009-2013 Opscode, Inc. +# Author:: Benjamin Black (<bb@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/kernel_spec.rb b/spec/unit/plugins/kernel_spec.rb index e4030157..30539740 100644 --- a/spec/unit/plugins/kernel_spec.rb +++ b/spec/unit/plugins/kernel_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/cpu_spec.rb b/spec/unit/plugins/linux/cpu_spec.rb index 5d3f66b0..c3bf2f6a 100644 --- a/spec/unit/plugins/linux/cpu_spec.rb +++ b/spec/unit/plugins/linux/cpu_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/filesystem2_spec.rb b/spec/unit/plugins/linux/filesystem2_spec.rb index 0d0cc9ac..cd10ec97 100644 --- a/spec/unit/plugins/linux/filesystem2_spec.rb +++ b/spec/unit/plugins/linux/filesystem2_spec.rb @@ -1,14 +1,14 @@ # # Author:: Matthew Kent (<mkent@magoazul.com>) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -68,7 +68,7 @@ tmpfs 2030944 2960 2027984 1% /dev/shm /dev/md0 960492 36388 875312 4% /boot DF allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, "")) - + @inode_stdout = <<-DFi Filesystem Inodes IUsed IFree IUse% Mounted on /dev/xvda1 1310720 107407 1203313 9% / @@ -110,17 +110,17 @@ DFi plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special") end - + it "should set total_inodes to value from df -iP" do plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:total_inodes]).to eq("124865") end - + it "should set inodes_used to value from df -iP" do plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_used]).to eq("380") end - + it "should set inodes_available to value from df -iP" do plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_available]).to eq("124485") @@ -188,7 +188,7 @@ tmpfs 2030944 2960 2027984 1% /dev/shm /dev/md0 960492 36388 875312 4% /boot DF allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, "")) - + @inode_stdout = <<-DFi Filesystem Inodes IUsed IFree IUse% Mounted on /dev/xvda1 1310720 107407 1203313 9% / @@ -205,7 +205,7 @@ DFi /dev/sda1: LABEL=\"fuego:0\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" TYPE=\"linux_raid_member\" /dev/sda2: LABEL=\"fuego:1\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" TYPE=\"linux_raid_member\" /dev/md0: LABEL=\"/boot\" UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" TYPE=\"ext3\" -/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" TYPE=\"LVM2_member\" +/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" TYPE=\"LVM2_member\" /dev/mapper/sys.vg-root.lv: LABEL=\"/\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" TYPE=\"ext4\" /dev/mapper/sys.vg-swap.lv: UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\" TYPE=\"swap\" /dev/mapper/sys.vg-tmp.lv: LABEL=\"/tmp\" UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" TYPE=\"ext4\" @@ -244,7 +244,7 @@ tmpfs 2030944 2960 2027984 1% /dev/shm /dev/md0 960492 36388 875312 4% /boot DF allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, "")) - + @inode_stdout = <<-DFi Filesystem Inodes IUsed IFree IUse% Mounted on /dev/xvda1 1310720 107407 1203313 9% / @@ -330,12 +330,12 @@ MOUNTS plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special") end - + it "should set fs_type to value from /proc/mounts" do plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:fs_type]).to eq("xfs") end - + it "should set mount_options to an array of values from /proc/mounts" do plugin.run expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq([ "ro", "noatime", "attr2", "noquota" ]) @@ -360,7 +360,7 @@ tmpfs 2030944 2960 2027984 1% /dev/shm /dev/mapper/sys.vg-root.lv 4805760 378716 4182924 9% /var/chroot DF allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, "")) - + @inode_stdout = <<-DFi Filesystem Inodes IUsed IFree IUse% Mounted on /dev/mapper/sys.vg-root.lv 1310720 107407 1203313 9% / @@ -404,7 +404,7 @@ tmpfs 2030944 2960 2027984 1% /dev/shm /dev/sdc1 4805760 378716 4182924 9% /mnt DF allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, "")) - + @inode_stdout = <<-DFi Filesystem Inodes IUsed IFree IUse% Mounted on /dev/mapper/sys.vg-root.lv 1310720 107407 1203313 9% / diff --git a/spec/unit/plugins/linux/filesystem_spec.rb b/spec/unit/plugins/linux/filesystem_spec.rb index 42cd9b8c..e1c1b354 100644 --- a/spec/unit/plugins/linux/filesystem_spec.rb +++ b/spec/unit/plugins/linux/filesystem_spec.rb @@ -1,6 +1,6 @@ # # Author:: Matthew Kent (<mkent@magoazul.com>) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/hostname_spec.rb b/spec/unit/plugins/linux/hostname_spec.rb index 203f20fb..f6eb5ffb 100644 --- a/spec/unit/plugins/linux/hostname_spec.rb +++ b/spec/unit/plugins/linux/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/kernel_spec.rb b/spec/unit/plugins/linux/kernel_spec.rb index 262a0d04..0f964a3e 100644 --- a/spec/unit/plugins/linux/kernel_spec.rb +++ b/spec/unit/plugins/linux/kernel_spec.rb @@ -1,15 +1,15 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/linux/lsb_spec.rb b/spec/unit/plugins/linux/lsb_spec.rb index 5e2c0c36..162b4786 100644 --- a/spec/unit/plugins/linux/lsb_spec.rb +++ b/spec/unit/plugins/linux/lsb_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -35,7 +35,7 @@ describe Ohai::System, "Linux lsb plugin" do and_yield("DISTRIB_RELEASE=8.04"). and_yield("DISTRIB_CODENAME=hardy"). and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"') - allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file) + allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file) allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(true) end @@ -43,17 +43,17 @@ describe Ohai::System, "Linux lsb plugin" do @plugin.run expect(@plugin[:lsb][:id]).to eq("Ubuntu") end - + it "should set lsb[:release]" do @plugin.run expect(@plugin[:lsb][:release]).to eq("8.04") end - + it "should set lsb[:codename]" do @plugin.run expect(@plugin[:lsb][:codename]).to eq("hardy") end - + it "should set lsb[:description]" do @plugin.run expect(@plugin[:lsb][:description]).to eq("Ubuntu 8.04") @@ -64,7 +64,7 @@ describe Ohai::System, "Linux lsb plugin" do before(:each) do allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(false) allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(true) - + @stdin = double("STDIN", { :close => true }) @pid = 10 @stderr = double("STDERR") @@ -72,7 +72,7 @@ describe Ohai::System, "Linux lsb plugin" do @status = 0 end - + describe "on Centos 5.4 correctly" do before(:each) do @stdout = <<-LSB_RELEASE @@ -89,17 +89,17 @@ LSB_RELEASE @plugin.run expect(@plugin[:lsb][:id]).to eq("CentOS") end - + it "should set lsb[:release]" do @plugin.run expect(@plugin[:lsb][:release]).to eq("5.4") end - + it "should set lsb[:codename]" do @plugin.run expect(@plugin[:lsb][:codename]).to eq("Final") end - + it "should set lsb[:description]" do @plugin.run expect(@plugin[:lsb][:description]).to eq("CentOS release 5.4 (Final)") @@ -117,22 +117,22 @@ Codename: Laughlin LSB_RELEASE allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, "")) end - + it "should set lsb[:id]" do @plugin.run expect(@plugin[:lsb][:id]).to eq("Fedora") end - + it "should set lsb[:release]" do @plugin.run expect(@plugin[:lsb][:release]).to eq("14") end - + it "should set lsb[:codename]" do @plugin.run expect(@plugin[:lsb][:codename]).to eq("Laughlin") end - + it "should set lsb[:description]" do @plugin.run expect(@plugin[:lsb][:description]).to eq("Fedora release 14 (Laughlin)") diff --git a/spec/unit/plugins/linux/network_spec.rb b/spec/unit/plugins/linux/network_spec.rb index ab9387ef..cdc7ab1e 100644 --- a/spec/unit/plugins/linux/network_spec.rb +++ b/spec/unit/plugins/linux/network_spec.rb @@ -1,7 +1,7 @@ # # Author:: Caleb Tennis <caleb.tennis@gmail.com> # Author:: Chris Read <chris.read@gmail.com> -# Copyright:: Copyright (c) 2011-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index 025ea223..9ff73b94 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/linux/uptime_spec.rb b/spec/unit/plugins/linux/uptime_spec.rb index de621d2a..32cf110f 100644 --- a/spec/unit/plugins/linux/uptime_spec.rb +++ b/spec/unit/plugins/linux/uptime_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,22 +26,22 @@ describe Ohai::System, "Linux plugin uptime" do @double_file = double("/proc/uptime", { :gets => "18423 989" }) allow(File).to receive(:open).with("/proc/uptime").and_return(@double_file) end - + it "should set uptime_seconds to uptime" do @plugin.run expect(@plugin[:uptime_seconds]).to eq(18423) end - + it "should set uptime to a human readable date" do @plugin.run expect(@plugin[:uptime]).to eq("5 hours 07 minutes 03 seconds") end - + it "should set idletime_seconds to uptime" do @plugin.run expect(@plugin[:idletime_seconds]).to eq(989) end - + it "should set idletime to a human readable date" do @plugin.run expect(@plugin[:idletime]).to eq("16 minutes 29 seconds") diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb index 8509230a..165b65ed 100644 --- a/spec/unit/plugins/linux/virtualization_spec.rb +++ b/spec/unit/plugins/linux/virtualization_spec.rb @@ -1,6 +1,6 @@ # # Author:: Thom May (<thom@clearairturbulence.org>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/lua_spec.rb b/spec/unit/plugins/lua_spec.rb index f61a2d51..1698c7cd 100644 --- a/spec/unit/plugins/lua_spec.rb +++ b/spec/unit/plugins/lua_spec.rb @@ -1,8 +1,8 @@ # # Author:: Doug MacEachern <dougm@vmware.com> -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) 2009 VMware, Inc. -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/netbsd/hostname_spec.rb b/spec/unit/plugins/netbsd/hostname_spec.rb index 433d3d0c..7b955c17 100644 --- a/spec/unit/plugins/netbsd/hostname_spec.rb +++ b/spec/unit/plugins/netbsd/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/netbsd/kernel_spec.rb b/spec/unit/plugins/netbsd/kernel_spec.rb index c3fa73de..dc5a3fd8 100644 --- a/spec/unit/plugins/netbsd/kernel_spec.rb +++ b/spec/unit/plugins/netbsd/kernel_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/netbsd/platform_spec.rb b/spec/unit/plugins/netbsd/platform_spec.rb index f3536090..381fd339 100644 --- a/spec/unit/plugins/netbsd/platform_spec.rb +++ b/spec/unit/plugins/netbsd/platform_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/nodejs_spec.rb b/spec/unit/plugins/nodejs_spec.rb index 32b87c0d..135c7707 100644 --- a/spec/unit/plugins/nodejs_spec.rb +++ b/spec/unit/plugins/nodejs_spec.rb @@ -1,8 +1,8 @@ # # Author:: Jacques Marneweck (<jacques@powertrip.co.za>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) Jacques Marneweck -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/ohai_spec.rb b/spec/unit/plugins/ohai_spec.rb index 38eb907d..c350b0a3 100644 --- a/spec/unit/plugins/ohai_spec.rb +++ b/spec/unit/plugins/ohai_spec.rb @@ -1,16 +1,16 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Adam Jacob (<adam@chef.io>) # Author:: Tollef Fog Heen <tfheen@err.no> -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # Copyright:: Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no> # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,7 @@ describe Ohai::System, "plugin ohai" do before(:each) do @plugin = get_plugin("ohai") end - + it "should set [:chef_packages][:ohai][:version] to the current version" do @plugin.run expect(@plugin[:chef_packages][:ohai][:version]).to eq(Ohai::VERSION) diff --git a/spec/unit/plugins/ohai_time_spec.rb b/spec/unit/plugins/ohai_time_spec.rb index 6f503f21..633dd2f6 100644 --- a/spec/unit/plugins/ohai_time_spec.rb +++ b/spec/unit/plugins/ohai_time_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,23 +23,23 @@ describe Ohai::System, "plugin ohai_time" do before(:each) do @plugin = get_plugin("ohai_time") end - + it "should get the current time" do expect(Time).to receive(:now) @plugin.run end - + it "should turn the time into a floating point number" do time = Time.now expect(time).to receive(:to_f) allow(Time).to receive(:now).and_return(time) @plugin.run end - + it "should set ohai_time to the current time" do time = Time.now allow(Time).to receive(:now).and_return(time) @plugin.run - expect(@plugin[:ohai_time]).to eq(time.to_f) + expect(@plugin[:ohai_time]).to eq(time.to_f) end end diff --git a/spec/unit/plugins/openbsd/hostname_spec.rb b/spec/unit/plugins/openbsd/hostname_spec.rb index 9a0317da..6ee3c604 100644 --- a/spec/unit/plugins/openbsd/hostname_spec.rb +++ b/spec/unit/plugins/openbsd/hostname_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/openbsd/kernel_spec.rb b/spec/unit/plugins/openbsd/kernel_spec.rb index 90e49140..689c8d7e 100644 --- a/spec/unit/plugins/openbsd/kernel_spec.rb +++ b/spec/unit/plugins/openbsd/kernel_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/spec/unit/plugins/openbsd/platform_spec.rb b/spec/unit/plugins/openbsd/platform_spec.rb index 25dddfe1..39bfbf8c 100644 --- a/spec/unit/plugins/openbsd/platform_spec.rb +++ b/spec/unit/plugins/openbsd/platform_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,9 +26,9 @@ describe Ohai::System, "OpenBSD plugin platform" do allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "4.5\n", "")) allow(@plugin).to receive(:collect_os).and_return(:openbsd) end - + it "should set platform_version to lsb[:release]" do @plugin.run expect(@plugin[:platform_version]).to eq("4.5") end -end +end diff --git a/spec/unit/plugins/openstack_spec.rb b/spec/unit/plugins/openstack_spec.rb index a54e1217..2edc111d 100644 --- a/spec/unit/plugins/openstack_spec.rb +++ b/spec/unit/plugins/openstack_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Daniel DeLeo (dan@getchef.com) -# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# Author:: Daniel DeLeo (dan@chef.io) +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/os_spec.rb b/spec/unit/plugins/os_spec.rb index aaf235cf..76d55c4e 100644 --- a/spec/unit/plugins/os_spec.rb +++ b/spec/unit/plugins/os_spec.rb @@ -1,14 +1,14 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,7 @@ describe Ohai::System, "plugin os" do @plugin[:kernel] = Mash.new @plugin[:kernel][:release] = "kings of leon" end - + after do ::RbConfig::CONFIG['host_os'] = ORIGINAL_CONFIG_HOST_OS end @@ -36,34 +36,34 @@ describe Ohai::System, "plugin os" do @plugin.run expect(@plugin[:os_version]).to eq(@plugin[:kernel][:release]) end - + describe "on linux" do before(:each) do ::RbConfig::CONFIG['host_os'] = "linux" end - + it "should set the os to linux" do @plugin.run expect(@plugin[:os]).to eq("linux") end end - + describe "on darwin" do before(:each) do ::RbConfig::CONFIG['host_os'] = "darwin10.0" end - + it "should set the os to darwin" do @plugin.run expect(@plugin[:os]).to eq("darwin") end end - + describe "on solaris" do before do ::RbConfig::CONFIG['host_os'] = "solaris2.42" #heh end - + it "sets the os to solaris2" do @plugin.run expect(@plugin[:os]).to eq("solaris2") diff --git a/spec/unit/plugins/perl_spec.rb b/spec/unit/plugins/perl_spec.rb index c4f0f15c..b7eb0a7e 100644 --- a/spec/unit/plugins/perl_spec.rb +++ b/spec/unit/plugins/perl_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Joshua Timberman(<joshua@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2009-2013 Opscode, Inc. +# Author:: Joshua Timberman(<joshua@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/php_spec.rb b/spec/unit/plugins/php_spec.rb index 7aa25662..ab735c42 100644 --- a/spec/unit/plugins/php_spec.rb +++ b/spec/unit/plugins/php_spec.rb @@ -1,8 +1,8 @@ # # Author:: Doug MacEachern <dougm@vmware.com> -# Author:: Theodore Nordsieck (<theo@opscode.com>) +# Author:: Theodore Nordsieck (<theo@chef.io>) # Copyright:: Copyright (c) 2009 VMware, Inc. -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/platform_spec.rb b/spec/unit/plugins/platform_spec.rb index 0937549c..cbc98076 100644 --- a/spec/unit/plugins/platform_spec.rb +++ b/spec/unit/plugins/platform_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/python_spec.rb b/spec/unit/plugins/python_spec.rb index 2d4d90a1..81bfe90a 100644 --- a/spec/unit/plugins/python_spec.rb +++ b/spec/unit/plugins/python_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Theodore Nordsieck (<theo@opscode.com>) -# Copyright:: Copyright (c) 2008-2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Theodore Nordsieck (<theo@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/ruby_spec.rb b/spec/unit/plugins/ruby_spec.rb index 16f2577b..7162d7af 100644 --- a/spec/unit/plugins/ruby_spec.rb +++ b/spec/unit/plugins/ruby_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/sigar/network_route_spec.rb b/spec/unit/plugins/sigar/network_route_spec.rb index 638f6961..4543f7b7 100644 --- a/spec/unit/plugins/sigar/network_route_spec.rb +++ b/spec/unit/plugins/sigar/network_route_spec.rb @@ -1,6 +1,6 @@ # # Author:: Toomas Pelberg (<toomas.pelberg@playtech.com>) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/solaris2/filesystem.rb b/spec/unit/plugins/solaris2/filesystem.rb index e0ff7b8a..f8a8c29b 100644 --- a/spec/unit/plugins/solaris2/filesystem.rb +++ b/spec/unit/plugins/solaris2/filesystem.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/solaris2/network_spec.rb b/spec/unit/plugins/solaris2/network_spec.rb index 8313fc26..98ae0c11 100644 --- a/spec/unit/plugins/solaris2/network_spec.rb +++ b/spec/unit/plugins/solaris2/network_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Daniel DeLeo <dan@opscode.com> -# Copyright:: Copyright (c) 2010 Opscode, Inc. +# Author:: Daniel DeLeo <dan@chef.io> +# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -143,7 +143,7 @@ ROUTE_GET it "detects the encapsulation type of the interfaces" do expect(@plugin['network']['interfaces']['e1000g0:3']['encapsulation']).to eq('Ethernet') end - + it "detects the L3PROTECT network flag" do expect(@plugin['network']['interfaces']['net0']['flags']).to include('L3PROTECT') end diff --git a/spec/unit/plugins/solaris2/platform_spec.rb b/spec/unit/plugins/solaris2/platform_spec.rb index b52fa664..d0193d28 100644 --- a/spec/unit/plugins/solaris2/platform_spec.rb +++ b/spec/unit/plugins/solaris2/platform_spec.rb @@ -1,6 +1,6 @@ # # Author:: Trevor O (<trevoro@joyent.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ describe Ohai::System, "Solaris plugin platform" do allow(@plugin).to receive(:collect_os).and_return(:solaris2) allow(@plugin).to receive(:shell_out).with("/sbin/uname -X") end - + describe "on SmartOS" do before(:each) do @uname_x = <<-UNAME_X @@ -43,12 +43,12 @@ UNAME_X allow(File).to receive(:exists?).with("/sbin/uname").and_return(true) allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, "")) - + @release = StringIO.new(" SmartOS 20120130T201844Z x86_64\n") allow(File).to receive(:open).with("/etc/release").and_yield(@release) end - it "should run uname and set platform and build" do + it "should run uname and set platform and build" do @plugin.run expect(@plugin[:platform_build]).to eq("joyent_20120130T201844Z") end @@ -57,7 +57,7 @@ UNAME_X @plugin.run expect(@plugin[:platform]).to eq("smartos") end - + it "should set the platform_version" do @plugin.run expect(@plugin[:platform_version]).to eq("5.11") diff --git a/spec/unit/plugins/solaris2/virtualization_spec.rb b/spec/unit/plugins/solaris2/virtualization_spec.rb index ebe749fb..6c5c38fa 100644 --- a/spec/unit/plugins/solaris2/virtualization_spec.rb +++ b/spec/unit/plugins/solaris2/virtualization_spec.rb @@ -1,6 +1,6 @@ # # Author:: Sean Walbran (<seanwalbran@gmail.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/ssh_host_keys_spec.rb b/spec/unit/plugins/ssh_host_keys_spec.rb index 66b7ec88..8c765076 100644 --- a/spec/unit/plugins/ssh_host_keys_spec.rb +++ b/spec/unit/plugins/ssh_host_keys_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Bryan McLellan <btm@opscode.com> -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Author:: Bryan McLellan <btm@chef.io> +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/virtualbox_spec.rb b/spec/unit/plugins/virtualbox_spec.rb index 9719dd25..95a345cf 100644 --- a/spec/unit/plugins/virtualbox_spec.rb +++ b/spec/unit/plugins/virtualbox_spec.rb @@ -1,5 +1,5 @@ # Author:: Tim Smith (<tsmith@chef.io>) -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/plugins/windows/virtualization_spec.rb b/spec/unit/plugins/windows/virtualization_spec.rb index 2e4fd41f..584a1519 100644 --- a/spec/unit/plugins/windows/virtualization_spec.rb +++ b/spec/unit/plugins/windows/virtualization_spec.rb @@ -2,7 +2,7 @@ # Author:: Pavel Yudin (<pyudin@parallels.com>) # Author:: Tim Smith (<tsmith@chef.io>) # Copyright:: Copyright (c) 2015 Pavel Yudin -# Copyright:: Copyright (c) 2015 Chef Software, Inc. +# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/provides_map_spec.rb b/spec/unit/provides_map_spec.rb index 9fa9a8f5..fb444056 100644 --- a/spec/unit/provides_map_spec.rb +++ b/spec/unit/provides_map_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Daniel DeLeo (<dan@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Daniel DeLeo (<dan@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); you diff --git a/spec/unit/runner_spec.rb b/spec/unit/runner_spec.rb index 2efc244d..d4a9523f 100644 --- a/spec/unit/runner_spec.rb +++ b/spec/unit/runner_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); you diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb index e3c0b7b1..91e5e47f 100644 --- a/spec/unit/system_spec.rb +++ b/spec/unit/system_spec.rb @@ -1,7 +1,7 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Claire McQuin (<claire@opscode.com>) -# Copyright:: Copyright (c) 2008, 2013 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Claire McQuin (<claire@chef.io>) +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/util/file_helper_spec.rb b/spec/unit/util/file_helper_spec.rb index b5137d1e..3acec6ea 100644 --- a/spec/unit/util/file_helper_spec.rb +++ b/spec/unit/util/file_helper_spec.rb @@ -1,6 +1,6 @@ # Author:: Bryan McLellan <btm@loftninjas.org> # -# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc. # # License:: Apache License, Version 2.0 # |