summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml6
-rw-r--r--.travis.yml1
-rw-r--r--Gemfile1
-rw-r--r--README.md2
-rw-r--r--Rakefile6
-rwxr-xr-xbin/ohai4
-rw-r--r--lib/ohai.rb8
-rw-r--r--lib/ohai/config.rb4
-rw-r--r--lib/ohai/dsl.rb4
-rw-r--r--lib/ohai/dsl/plugin.rb6
-rw-r--r--lib/ohai/dsl/plugin/versionvi.rb6
-rw-r--r--lib/ohai/dsl/plugin/versionvii.rb4
-rw-r--r--lib/ohai/exception.rb4
-rw-r--r--lib/ohai/hints.rb4
-rw-r--r--lib/ohai/loader.rb2
-rw-r--r--lib/ohai/log.rb4
-rw-r--r--lib/ohai/mixin/command.rb4
-rw-r--r--lib/ohai/mixin/constant_helper.rb4
-rw-r--r--lib/ohai/mixin/dmi_decode.rb2
-rw-r--r--lib/ohai/mixin/ec2_metadata.rb6
-rw-r--r--lib/ohai/mixin/network_constants.rb6
-rw-r--r--lib/ohai/mixin/os.rb4
-rw-r--r--lib/ohai/mixin/seconds_to_human.rb8
-rw-r--r--lib/ohai/mixin/string.rb8
-rw-r--r--lib/ohai/plugin_config.rb2
-rw-r--r--lib/ohai/plugins/aix/cpu.rb4
-rw-r--r--lib/ohai/plugins/aix/filesystem.rb2
-rw-r--r--lib/ohai/plugins/aix/kernel.rb4
-rw-r--r--lib/ohai/plugins/aix/memory.rb4
-rw-r--r--lib/ohai/plugins/aix/network.rb2
-rw-r--r--lib/ohai/plugins/aix/os.rb2
-rw-r--r--lib/ohai/plugins/aix/platform.rb4
-rw-r--r--lib/ohai/plugins/aix/uptime.rb2
-rw-r--r--lib/ohai/plugins/aix/virtualization.rb4
-rw-r--r--lib/ohai/plugins/azure.rb2
-rw-r--r--lib/ohai/plugins/bsd/filesystem.rb2
-rw-r--r--lib/ohai/plugins/command.rb8
-rw-r--r--lib/ohai/plugins/darwin/cpu.rb2
-rw-r--r--lib/ohai/plugins/darwin/filesystem.rb8
-rw-r--r--lib/ohai/plugins/darwin/filesystem2.rb8
-rw-r--r--lib/ohai/plugins/darwin/memory.rb11
-rw-r--r--lib/ohai/plugins/darwin/network.rb4
-rw-r--r--lib/ohai/plugins/darwin/platform.rb4
-rw-r--r--lib/ohai/plugins/darwin/system_profiler.rb4
-rw-r--r--lib/ohai/plugins/dragonflybsd/os.rb4
-rw-r--r--lib/ohai/plugins/ec2.rb6
-rw-r--r--lib/ohai/plugins/erlang.rb6
-rw-r--r--lib/ohai/plugins/eucalyptus.rb6
-rw-r--r--lib/ohai/plugins/freebsd/os.rb4
-rw-r--r--lib/ohai/plugins/hostname.rb5
-rw-r--r--lib/ohai/plugins/init_package.rb2
-rw-r--r--lib/ohai/plugins/java.rb4
-rw-r--r--lib/ohai/plugins/kernel.rb6
-rw-r--r--lib/ohai/plugins/keys.rb6
-rw-r--r--lib/ohai/plugins/languages.rb8
-rw-r--r--lib/ohai/plugins/linux/block_device.rb4
-rw-r--r--lib/ohai/plugins/linux/cpu.rb4
-rw-r--r--lib/ohai/plugins/linux/filesystem.rb4
-rw-r--r--lib/ohai/plugins/linux/filesystem2.rb6
-rw-r--r--lib/ohai/plugins/linux/lsb.rb4
-rw-r--r--lib/ohai/plugins/linux/memory.rb4
-rw-r--r--lib/ohai/plugins/linux/network.rb4
-rw-r--r--lib/ohai/plugins/linux/platform.rb7
-rw-r--r--lib/ohai/plugins/linux/virtualization.rb2
-rw-r--r--lib/ohai/plugins/network.rb2
-rw-r--r--lib/ohai/plugins/ohai_time.rb8
-rw-r--r--lib/ohai/plugins/openstack.rb4
-rw-r--r--lib/ohai/plugins/os.rb4
-rw-r--r--lib/ohai/plugins/packages.rb122
-rw-r--r--lib/ohai/plugins/perl.rb10
-rw-r--r--lib/ohai/plugins/platform.rb4
-rw-r--r--lib/ohai/plugins/powershell.rb4
-rw-r--r--lib/ohai/plugins/ps.rb4
-rw-r--r--lib/ohai/plugins/python.rb2
-rw-r--r--lib/ohai/plugins/ruby.rb12
-rw-r--r--lib/ohai/plugins/sigar/network_route.rb2
-rw-r--r--lib/ohai/plugins/solaris2/filesystem.rb2
-rw-r--r--lib/ohai/plugins/solaris2/network.rb2
-rw-r--r--lib/ohai/plugins/solaris2/platform.rb2
-rw-r--r--lib/ohai/plugins/solaris2/virtualization.rb10
-rw-r--r--lib/ohai/plugins/solaris2/zpools.rb4
-rw-r--r--lib/ohai/plugins/ssh_host_key.rb4
-rw-r--r--lib/ohai/plugins/uptime.rb8
-rw-r--r--lib/ohai/plugins/virtualbox.rb2
-rw-r--r--lib/ohai/plugins/virtualization.rb14
-rw-r--r--lib/ohai/plugins/vmware.rb2
-rw-r--r--lib/ohai/plugins/windows/filesystem.rb2
-rw-r--r--lib/ohai/plugins/windows/network.rb2
-rw-r--r--lib/ohai/plugins/windows/platform.rb2
-rw-r--r--lib/ohai/plugins/windows/virtualization.rb2
-rw-r--r--lib/ohai/provides_map.rb6
-rw-r--r--lib/ohai/runner.rb4
-rw-r--r--lib/ohai/system.rb4
-rw-r--r--lib/ohai/util/file_helper.rb2
-rw-r--r--lib/ohai/util/win32.rb2
-rw-r--r--lib/ohai/util/win32/group_helper.rb2
-rw-r--r--lib/ohai/version.rb4
-rw-r--r--platform_simulation_specs/common/ohai_plugin_common.rb4
-rw-r--r--platform_simulation_specs/common/ohai_plugin_common_spec.rb4
-rw-r--r--platform_simulation_specs/plugins/erlang_spec.rb6
-rw-r--r--platform_simulation_specs/plugins/java_spec.rb6
-rw-r--r--platform_simulation_specs/plugins/kernel_spec.rb10
-rw-r--r--platform_simulation_specs/plugins/lua_spec.rb4
-rw-r--r--platform_simulation_specs/plugins/nodejs_spec.rb4
-rw-r--r--platform_simulation_specs/plugins/perl_spec.rb6
-rw-r--r--platform_simulation_specs/plugins/php_spec.rb4
-rw-r--r--platform_simulation_specs/plugins/python_spec.rb10
-rw-r--r--platform_simulation_specs/tools/grab_data.rb8
-rw-r--r--spec/data/plugins/dpkg-query.output1087
-rw-r--r--spec/data/plugins/lslpp.output49
-rw-r--r--spec/data/plugins/pkginfo.output50
-rw-r--r--spec/data/plugins/pkglist.output24
-rw-r--r--spec/data/plugins/rpmquery.output388
-rw-r--r--spec/functional/application_spec.rb2
-rw-r--r--spec/functional/loader_spec.rb2
-rw-r--r--spec/functional/plugins/powershell_spec.rb2
-rw-r--r--spec/functional/plugins/root_group_spec.rb4
-rw-r--r--spec/ohai_spec.rb12
-rw-r--r--spec/unit/application_spec.rb2
-rw-r--r--spec/unit/config_spec.rb2
-rw-r--r--spec/unit/dsl/plugin_spec.rb4
-rw-r--r--spec/unit/hints_spec.rb4
-rw-r--r--spec/unit/loader_spec.rb4
-rw-r--r--spec/unit/mixin/ec2_metadata_spec.rb2
-rw-r--r--spec/unit/plugin_config_spec.rb2
-rw-r--r--spec/unit/plugins/aix/cpu_spec.rb2
-rw-r--r--spec/unit/plugins/aix/filesystem_spec.rb2
-rw-r--r--spec/unit/plugins/aix/hostname_spec.rb2
-rw-r--r--spec/unit/plugins/aix/kernel_spec.rb2
-rw-r--r--spec/unit/plugins/aix/memory_spec.rb4
-rw-r--r--spec/unit/plugins/aix/network_spec.rb2
-rw-r--r--spec/unit/plugins/aix/os_spec.rb2
-rw-r--r--spec/unit/plugins/aix/platform_spec.rb2
-rw-r--r--spec/unit/plugins/aix/uptime_spec.rb2
-rw-r--r--spec/unit/plugins/aix/virtualization_spec.rb4
-rw-r--r--spec/unit/plugins/azure_spec.rb2
-rw-r--r--spec/unit/plugins/bsd/filesystem_spec.rb2
-rw-r--r--spec/unit/plugins/bsd/virtualization_spec.rb4
-rw-r--r--spec/unit/plugins/chef_spec.rb16
-rw-r--r--spec/unit/plugins/darwin/cpu_spec.rb2
-rw-r--r--spec/unit/plugins/darwin/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/darwin/kernel_spec.rb8
-rw-r--r--spec/unit/plugins/darwin/memory_spec.rb2
-rw-r--r--spec/unit/plugins/darwin/network_spec.rb2
-rw-r--r--spec/unit/plugins/darwin/platform_spec.rb12
-rw-r--r--spec/unit/plugins/darwin/system_profiler_output.rb1
-rw-r--r--spec/unit/plugins/darwin/system_profiler_spec.rb8
-rw-r--r--spec/unit/plugins/ec2_spec.rb6
-rw-r--r--spec/unit/plugins/erlang_spec.rb6
-rw-r--r--spec/unit/plugins/eucalyptus_spec.rb4
-rw-r--r--spec/unit/plugins/fail_spec.rb12
-rw-r--r--spec/unit/plugins/freebsd/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/freebsd/kernel_spec.rb8
-rw-r--r--spec/unit/plugins/freebsd/platform_spec.rb14
-rw-r--r--spec/unit/plugins/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/init_package_spec.rb2
-rw-r--r--spec/unit/plugins/java_spec.rb10
-rw-r--r--spec/unit/plugins/kernel_spec.rb4
-rw-r--r--spec/unit/plugins/linux/cpu_spec.rb4
-rw-r--r--spec/unit/plugins/linux/filesystem2_spec.rb28
-rw-r--r--spec/unit/plugins/linux/filesystem_spec.rb2
-rw-r--r--spec/unit/plugins/linux/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/linux/kernel_spec.rb10
-rw-r--r--spec/unit/plugins/linux/lsb_spec.rb34
-rw-r--r--spec/unit/plugins/linux/network_spec.rb2
-rw-r--r--spec/unit/plugins/linux/platform_spec.rb21
-rw-r--r--spec/unit/plugins/linux/uptime_spec.rb16
-rw-r--r--spec/unit/plugins/linux/virtualization_spec.rb2
-rw-r--r--spec/unit/plugins/lua_spec.rb4
-rw-r--r--spec/unit/plugins/netbsd/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/netbsd/kernel_spec.rb4
-rw-r--r--spec/unit/plugins/netbsd/platform_spec.rb4
-rw-r--r--spec/unit/plugins/nodejs_spec.rb4
-rw-r--r--spec/unit/plugins/ohai_spec.rb10
-rw-r--r--spec/unit/plugins/ohai_time_spec.rb16
-rw-r--r--spec/unit/plugins/openbsd/hostname_spec.rb4
-rw-r--r--spec/unit/plugins/openbsd/kernel_spec.rb8
-rw-r--r--spec/unit/plugins/openbsd/platform_spec.rb12
-rw-r--r--spec/unit/plugins/openstack_spec.rb4
-rw-r--r--spec/unit/plugins/os_spec.rb22
-rw-r--r--spec/unit/plugins/packages_spec.rb241
-rw-r--r--spec/unit/plugins/perl_spec.rb6
-rw-r--r--spec/unit/plugins/php_spec.rb4
-rw-r--r--spec/unit/plugins/platform_spec.rb4
-rw-r--r--spec/unit/plugins/python_spec.rb6
-rw-r--r--spec/unit/plugins/ruby_spec.rb6
-rw-r--r--spec/unit/plugins/sigar/network_route_spec.rb2
-rw-r--r--spec/unit/plugins/solaris2/cpu_spec.rb2
-rw-r--r--spec/unit/plugins/solaris2/filesystem.rb2
-rw-r--r--spec/unit/plugins/solaris2/network_spec.rb6
-rw-r--r--spec/unit/plugins/solaris2/platform_spec.rb10
-rw-r--r--spec/unit/plugins/solaris2/virtualization_spec.rb2
-rw-r--r--spec/unit/plugins/ssh_host_keys_spec.rb4
-rw-r--r--spec/unit/plugins/virtualbox_spec.rb2
-rw-r--r--spec/unit/plugins/windows/virtualization_spec.rb2
-rw-r--r--spec/unit/provides_map_spec.rb4
-rw-r--r--spec/unit/runner_spec.rb4
-rw-r--r--spec/unit/system_spec.rb6
-rw-r--r--spec/unit/util/file_helper_spec.rb2
199 files changed, 2473 insertions, 475 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 00000000..bb40a25f
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,6 @@
+AllCops:
+ Exclude:
+ - "spec/data/**/*"
+ - "vendor/**/*"
+ - "pkg/**/*"
+ - "spec/unit/plugins/darwin/system_profiler_output.rb"
diff --git a/.travis.yml b/.travis.yml
index cb194cd9..4788d07b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,5 +16,6 @@ rvm:
- 2.2
script:
+ - bundle exec chefstyle
- bundle exec rake spec
- bundle exec ohai
diff --git a/Gemfile b/Gemfile
index 20ed5cd2..d2b8c2a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ group :development do
gem "sigar", :platform => "ruby"
gem 'plist'
+ gem "chefstyle", "= 0.1.0"
# gem 'pry-byebug'
# gem 'pry-stack_explorer'
end
diff --git a/README.md b/README.md
index cdbaaa0f..3ca689df 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/Rakefile b/Rakefile
index a2ee35b6..6be0c8eb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,3 +16,9 @@ rescue LoadError
end
task :default => :spec
+
+require "chefstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+ task.options += ["--display-cop-names", "--no-color"]
+end
diff --git a/bin/ohai b/bin/ohai
index a078b209..d6ec07da 100755
--- a/bin/ohai
+++ b/bin/ohai
@@ -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..64494666 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");
@@ -31,10 +31,11 @@ Ohai.plugin(:Memory) do
vm_stat = shell_out("vm_stat").stdout
vm_stat_match = /page size of (\d+) bytes/.match(vm_stat)
page_size = if vm_stat_match and vm_stat_match[1]
- vm_stat_match[1].to_i
- else
- 4096
- end
+ vm_stat_match[1].to_i
+ else
+ 4096
+ end
+
vm_stat.split("\n").each do |line|
['wired down', 'active', 'inactive'].each do |match|
unless line.index("Pages #{match}:").nil?
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..6a655b85 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");
@@ -142,6 +142,9 @@ Ohai.plugin(:Platform) do
# no way to determine platform_version in a rolling release distribution
# kernel release will be used - ex. 3.13
platform_version `uname -r`.strip
+ elsif File.exist?('/etc/alpine-release')
+ platform "alpine"
+ platform_version File.read("/etc/alpine-release").strip()
elsif os_release_file_is_cisco?
raise 'unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field' if
os_release_info['ID_LIKE'].nil? || ! os_release_info['ID_LIKE'].include?('wrlinux')
@@ -191,6 +194,8 @@ Ohai.plugin(:Platform) do
platform_family "arch"
when /exherbo/
platform_family "exherbo"
+ when /alpine/
+ platform_family "alpine"
end
end
end
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/packages.rb b/lib/ohai/plugins/packages.rb
new file mode 100644
index 00000000..de031b9e
--- /dev/null
+++ b/lib/ohai/plugins/packages.rb
@@ -0,0 +1,122 @@
+# Author:: "Christian Höltje" <choltje@us.ibm.com>
+# Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
+# Author:: Shahul Khajamohideen (<skhajamohid1@bloomberg.net>)
+# Copyright (C) 2015 IBM Corp.
+# Copyright (C) 2015 Bloomberg Finance L.P.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+Ohai.plugin(:Packages) do
+ provides 'packages'
+ depends 'platform_family'
+
+ collect_data(:linux) do
+ packages Mash.new
+
+ if %w(debian).include? platform_family
+ so = shell_out('dpkg-query -W')
+ pkgs = so.stdout.lines
+
+ pkgs.each do |pkg|
+ name, version = pkg.split
+ packages[name] = { 'version' => version }
+ end
+
+ elsif %w(rhel fedora suse).include? platform_family
+ require 'shellwords'
+ format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
+ so = shell_out("rpm -qa --queryformat #{format}")
+ pkgs = so.stdout.lines
+
+ pkgs.each do |pkg|
+ name, version, release = pkg.split
+ packages[name] = { 'version' => version, 'release' => release }
+ end
+ end
+ end
+
+ collect_data(:windows) do
+ packages Mash.new
+
+ require 'wmi-lite'
+
+ wmi = WmiLite::Wmi.new
+ w32_product = wmi.instances_of('Win32_Product')
+
+ w32_product.find_all.each do |product|
+ name = product['name']
+ package = packages[name] = Mash.new
+ %w(version vendor installdate).each do |attr|
+ package[attr] = product[attr]
+ end
+ end
+ end
+
+ collect_data(:aix) do
+ packages Mash.new
+ so = shell_out('lslpp -L -q -c')
+ pkgs = so.stdout.lines
+
+ # Output format is
+ # Package Name:Fileset:Level
+ # On aix, filesets are packages and levels are versions
+ pkgs.each do |pkg|
+ _, name, version = pkg.split(':')
+ packages[name] = { 'version' => version }
+ end
+ end
+
+ def collect_ips_packages
+ so = shell_out('pkg list -H')
+ # Output format is
+ # NAME (PUBLISHER) VERSION IFO
+ so.stdout.lines.each do |pkg|
+ tokens = pkg.split
+ if tokens.length == 3 # No publisher info
+ name, version, = tokens
+ else
+ name, publisher, version, = tokens
+ publisher = publisher[1..-2]
+ end
+ packages[name] = { 'version' => version }
+ packages[name]['publisher'] = publisher if publisher
+ end
+ end
+
+ def collect_sysv_packages
+ so = shell_out('pkginfo -l')
+ # Each package info is separated by a blank line
+ chunked_lines = so.stdout.lines.map(&:strip).chunk do |line|
+ !line.empty? || nil
+ end
+ chunked_lines.each do |_, lines|
+ package = {}
+ lines.each do |line|
+ key, value = line.split(':', 2)
+ package[key.strip.downcase] = value.strip unless value.nil?
+ end
+ # pkginst is the installed package name
+ packages[package['pkginst']] = package.tap do |p|
+ p.delete('pkginst')
+ end
+ end
+ end
+
+ collect_data(:solaris2) do
+ packages Mash.new
+ collect_ips_packages
+ collect_sysv_packages
+ end
+end
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/data/plugins/dpkg-query.output b/spec/data/plugins/dpkg-query.output
new file mode 100644
index 00000000..c92993d9
--- /dev/null
+++ b/spec/data/plugins/dpkg-query.output
@@ -0,0 +1,1087 @@
+accountsservice 0.6.35-0ubuntu7.2
+ack-grep 2.12-1
+acl 2.2.52-1
+adduser 3.113+nmu3ubuntu3
+amavisd-new 1:2.7.1-2ubuntu3
+ant 1.9.3-2build1
+ant-optional 1.9.3-2build1
+apache2 2.4.7-1ubuntu4.4
+apache2-bin 2.4.7-1ubuntu4.4
+apache2-data 2.4.7-1ubuntu4.4
+apache2-mpm-worker 2.4.7-1ubuntu4.4
+apache2-utils 2.4.7-1ubuntu4.4
+apache2.2-bin 2.4.7-1ubuntu4.4
+apport 2.14.1-0ubuntu3.11
+apport-symptoms 0.20
+apt 1.0.1ubuntu2.8
+apt-listchanges 2.85.13ubuntu2
+apt-transport-https 1.0.1ubuntu2.8
+apt-utils 1.0.1ubuntu2.8
+apt-xapian-index 0.45ubuntu4
+apticron 1.1.55
+aptitude 0.6.8.2-1ubuntu4
+aptitude-common 0.6.8.2-1ubuntu4
+arj 3.10.22-11
+aspell 0.60.7~20110707-1ubuntu1
+aspell-en 7.1-0-1
+at 3.1.14-1ubuntu1
+at-spi2-core 2.10.2.is.2.10.1-0ubuntu1
+aufs-tools 1:3.2+20130722-1.1
+authbind 2.1.1
+autoconf 2.69-6
+automake 1:1.14.1-2ubuntu1
+autotools-dev 20130810.1
+base-files 7.2ubuntu5.2
+base-passwd 3.5.33
+bash 4.3-7ubuntu1.5
+bash-completion 1:2.1-4
+bc 1.06.95-8ubuntu1
+bind9-host 1:9.9.5.dfsg-3ubuntu0.2
+binutils 2.24-5ubuntu3.1
+bison 2:3.0.2.dfsg-2
+bsdmainutils 9.0.5ubuntu1
+bsdutils 1:2.20.1-5.1ubuntu20.4
+build-essential 11.6ubuntu6
+busybox-initramfs 1:1.21.0-1ubuntu1
+busybox-static 1:1.21.0-1ubuntu1
+byobu 5.77-0ubuntu1.2
+bzip2 1.0.6-5
+ca-certificates 20141019ubuntu0.14.04.1
+ca-certificates-java 20130815ubuntu1
+cabextract 1.4-4
+ccze 0.2.1-2ubuntu1
+cgroup-lite 1.9
+chkrootkit 0.49-4.1ubuntu1.14.04.1
+clamav 0.98.7+dfsg-0ubuntu0.14.04.1
+clamav-base 0.98.7+dfsg-0ubuntu0.14.04.1
+clamav-daemon 0.98.7+dfsg-0ubuntu0.14.04.1
+clamav-freshclam 0.98.7+dfsg-0ubuntu0.14.04.1
+collectl 3.6.9-1
+colord 1.0.6-1
+comerr-dev 2.1-1.42.9-3ubuntu1.2
+command-not-found 0.3ubuntu12
+command-not-found-data 0.3ubuntu12
+console-setup 1.70ubuntu8
+coreutils 8.21-1ubuntu5.1
+cpio 2.11+dfsg-1ubuntu1.1
+cpp 4:4.8.2-1ubuntu6
+cpp-4.4 4.4.7-8ubuntu1
+cpp-4.6 4.6.4-6ubuntu2
+cpp-4.8 4.8.2-19ubuntu1
+cron 3.0pl1-124ubuntu2
+curl 7.35.0-1ubuntu2.5
+dash 0.5.7-4ubuntu1
+db-util 1:5.3.21~exp1ubuntu1
+db5.1-util 5.1.29-7ubuntu1
+db5.3-util 5.3.28-3ubuntu3
+dbconfig-common 1.8.47+nmu1
+dbus 1.6.18-0ubuntu4.3
+dbus-x11 1.6.18-0ubuntu4.3
+dconf-gsettings-backend:amd64 0.20.0-1
+dconf-service 0.20.0-1
+dctrl-tools 2.23ubuntu1
+debconf 1.5.51ubuntu2
+debconf-i18n 1.5.51ubuntu2
+debhelper 9.20131227ubuntu1
+debianutils 4.4
+desktop-file-utils 0.22-1ubuntu1
+dh-apparmor 2.8.95~2430-0ubuntu5.2
+dh-python 1.20140128-1ubuntu8
+dictionaries-common 1.20.5
+diffutils 1:3.3-1
+dlocate 1.02+nmu3
+dmidecode 2.12-2
+dmsetup 2:1.02.77-6ubuntu2
+dnsutils 1:9.9.5.dfsg-3ubuntu0.2
+docbook-xml 4.5-7.2
+dosfstools 3.0.26-1
+dovecot-core 1:2.2.9-1ubuntu2.1
+dovecot-imapd 1:2.2.9-1ubuntu2.1
+dovecot-solr 1:2.2.9-1ubuntu2.1
+dpkg 1.17.5ubuntu5.4
+dpkg-dev 1.17.5ubuntu5.4
+e2fslibs:amd64 1.42.9-3ubuntu1.2
+e2fsprogs 1.42.9-3ubuntu1.2
+ed 1.9-2
+eject 2.1.5+deb1+cvs20081104-13.1
+elinks 0.12~pre6-4ubuntu1
+elinks-data 0.12~pre6-4ubuntu1
+elinks-lite 0.12~pre6-4ubuntu1
+etckeeper 1.9ubuntu2
+exuberant-ctags 1:5.9~svn20110310-7ubuntu0.1
+fakeroot 1.20-3ubuntu2
+file 1:5.14-2ubuntu3.3
+findutils 4.4.2-7
+fontconfig 2.11.0-0ubuntu4.1
+fontconfig-config 2.11.0-0ubuntu4.1
+fonts-dejavu-core 2.34-1ubuntu1
+fonts-dejavu-extra 2.34-1ubuntu1
+fonts-ubuntu-font-family-console 0.80-0ubuntu6
+friendly-recovery 0.2.25
+ftp 0.17-28
+fuse 2.9.2-4ubuntu4.14.04.1
+g++ 4:4.8.2-1ubuntu6
+g++-4.4 4.4.7-8ubuntu1
+g++-4.6 4.6.4-6ubuntu2
+g++-4.8 4.8.2-19ubuntu1
+gawk 1:4.0.1+dfsg-2.1ubuntu2
+gcc 4:4.8.2-1ubuntu6
+gcc-4.4 4.4.7-8ubuntu1
+gcc-4.4-base:amd64 4.4.7-8ubuntu1
+gcc-4.6 4.6.4-6ubuntu2
+gcc-4.6-base:amd64 4.6.4-6ubuntu2
+gcc-4.8 4.8.2-19ubuntu1
+gcc-4.8-base:amd64 4.8.2-19ubuntu1
+gcc-4.9-base:amd64 4.9.1-0ubuntu1
+gconf-service 3.2.6-0ubuntu2
+gconf-service-backend 3.2.6-0ubuntu2
+gconf2 3.2.6-0ubuntu2
+gconf2-common 3.2.6-0ubuntu2
+gdisk 0.8.8-1build1
+geoip-database 20140313-1
+gettext 0.18.3.1-1ubuntu3
+gettext-base 0.18.3.1-1ubuntu3
+ghostscript 9.10~dfsg-0ubuntu10.2
+gir1.2-glib-2.0 1.40.0-1ubuntu0.2
+git 1:1.9.1-1ubuntu0.1
+git-core 1:1.9.1-1ubuntu0.1
+git-doc 1:1.9.1-1ubuntu0.1
+git-man 1:1.9.1-1ubuntu0.1
+gnupg 1.4.16-1ubuntu2.3
+gnupg-curl 1.4.16-1ubuntu2.3
+gpgv 1.4.16-1ubuntu2.3
+grep 2.16-1
+groff-base 1.22.2-5
+gsfonts 1:8.11+urwcyr1.0.7~pre44-4.2ubuntu1
+guile-2.0-libs 2.0.9+1-1ubuntu1
+gvfs:amd64 1.20.3-0ubuntu1.1
+gvfs-common 1.20.3-0ubuntu1.1
+gvfs-daemons 1.20.3-0ubuntu1.1
+gvfs-libs:amd64 1.20.3-0ubuntu1.1
+gzip 1.6-3ubuntu1
+hardlink 0.2.0
+hicolor-icon-theme 0.13-1
+hostname 3.15ubuntu1
+htop 1.0.2-3
+iftop 1.0~pre2-5
+ifupdown 0.7.47.2ubuntu4.1
+imagemagick 8:6.7.7.10-6ubuntu3
+imagemagick-common 8:6.7.7.10-6ubuntu3
+info 5.2.0.dfsg.1-2
+init-system-helpers 1.14
+initramfs-tools 0.103ubuntu4.2
+initramfs-tools-bin 0.103ubuntu4.2
+initscripts 2.88dsf-41ubuntu6.2
+insserv 1.14.0-5ubuntu2
+install-info 5.2.0.dfsg.1-2
+installation-report 2.54ubuntu1
+intltool-debian 0.35.0+20060710.1
+iotop 0.6-1
+iproute 1:3.12.0-2
+iproute2 3.12.0-2
+iptables 1.4.21-1ubuntu1
+iputils-ping 3:20121221-4ubuntu1.1
+iputils-tracepath 3:20121221-4ubuntu1.1
+irqbalance 1.0.6-2ubuntu0.14.04.1
+isc-dhcp-client 4.2.4-7ubuntu12.2
+isc-dhcp-common 4.2.4-7ubuntu12.2
+iso-codes 3.52-1
+java-common 0.51
+javascript-common 11
+jetty 6.1.26-1ubuntu1.1
+jsvc 1.0.15-5ubuntu2
+kbd 1.15.5-1ubuntu1
+keyboard-configuration 1.70ubuntu8
+keychain 2.7.1-1
+klibc-utils 2.0.3-0ubuntu1
+kmod 15-0ubuntu6
+krb5-locales 1.12+dfsg-2ubuntu5.1
+krb5-multidev 1.12+dfsg-2ubuntu5.1
+landscape-common 14.12-0ubuntu0.14.04
+language-pack-en 1:14.04+20150219
+language-pack-en-base 1:14.04+20150219
+language-selector-common 0.129.3
+laptop-detect 0.13.7ubuntu2
+less 458-2
+libaccountsservice0:amd64 0.6.35-0ubuntu7.2
+libacl1:amd64 2.2.52-1
+libaio1:amd64 0.3.109-4
+libalgorithm-diff-perl 1.19.02-3
+libalgorithm-diff-xs-perl 0.04-2build4
+libalgorithm-merge-perl 0.08-2
+libapache-pom-java 10-2build1
+libapache2-mod-authnz-external 3.3.1-0.1
+libapache2-mod-fcgid 1:2.3.9-1
+libapache2-mod-php5 5.5.9+dfsg-1ubuntu4.9
+libapparmor1:amd64 2.8.95~2430-0ubuntu5.2
+libapr1:amd64 1.5.0-1
+libapr1-dev 1.5.0-1
+libaprutil1:amd64 1.5.3-1
+libaprutil1-dbd-sqlite3:amd64 1.5.3-1
+libaprutil1-dev 1.5.3-1
+libaprutil1-ldap:amd64 1.5.3-1
+libapt-inst1.5:amd64 1.0.1ubuntu2.8
+libapt-pkg4.12:amd64 1.0.1ubuntu2.8
+libarchive-extract-perl 0.70-1
+libarchive-zip-perl 1.30-7
+libasan0:amd64 4.8.2-19ubuntu1
+libasn1-8-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libasound2:amd64 1.0.27.2-3ubuntu7
+libasound2-data 1.0.27.2-3ubuntu7
+libaspell15 0.60.7~20110707-1ubuntu1
+libasprintf-dev:amd64 0.18.3.1-1ubuntu3
+libasprintf0c2:amd64 0.18.3.1-1ubuntu3
+libassuan0:amd64 2.1.1-1ubuntu1
+libasyncns0:amd64 0.8-4ubuntu2
+libatasmart4:amd64 0.19-3
+libatinject-jsr330-api-java 1.0+ds1-1
+libatk-bridge2.0-0:amd64 2.10.2-2ubuntu1
+libatk-wrapper-java 0.30.4-4
+libatk-wrapper-java-jni:amd64 0.30.4-4
+libatk1.0-0:amd64 2.10.0-2ubuntu2
+libatk1.0-data 2.10.0-2ubuntu2
+libatm1:amd64 1:2.5.1-1.5
+libatomic1:amd64 4.8.2-19ubuntu1
+libatspi2.0-0:amd64 2.10.2.is.2.10.1-0ubuntu1
+libattr1:amd64 1:2.4.47-1ubuntu1
+libaudit-common 1:2.3.2-2ubuntu1
+libaudit1:amd64 1:2.3.2-2ubuntu1
+libauthen-sasl-perl 2.1500-1
+libavahi-client3:amd64 0.6.31-4ubuntu1
+libavahi-common-data:amd64 0.6.31-4ubuntu1
+libavahi-common3:amd64 0.6.31-4ubuntu1
+libavahi-glib1:amd64 0.6.31-4ubuntu1
+libavalon-framework-java 4.2.0-9
+libbcel-java 5.2-9build1
+libberkeleydb-perl 0.54-1
+libbind9-90 1:9.9.5.dfsg-3ubuntu0.2
+libbison-dev:amd64 2:3.0.2.dfsg-2
+libbit-vector-perl 7.3-1build1
+libblkid1:amd64 2.20.1-5.1ubuntu20.4
+libbonobo2-0:amd64 2.32.1-0ubuntu5
+libbonobo2-common 2.32.1-0ubuntu5
+libboost-iostreams1.54.0:amd64 1.54.0-4ubuntu3.1
+libbsd0:amd64 0.6.0-2ubuntu1
+libbz2-1.0:amd64 1.0.6-5
+libc-ares-dev:amd64 1.10.0-2
+libc-ares2:amd64 1.10.0-2
+libc-bin 2.19-0ubuntu6.6
+libc-client2007e 8:2007f~dfsg-2
+libc-dev-bin 2.19-0ubuntu6.6
+libc6:amd64 2.19-0ubuntu6.6
+libc6-dev:amd64 2.19-0ubuntu6.6
+libcairo-gobject2:amd64 1.13.0~20140204-0ubuntu1.1
+libcairo2:amd64 1.13.0~20140204-0ubuntu1.1
+libcanberra0:amd64 0.30-0ubuntu3
+libcap-ng0 0.7.3-1ubuntu2
+libcap2:amd64 1:2.24-0ubuntu2
+libcap2-bin 1:2.24-0ubuntu2
+libcarp-clan-perl 6.04-1
+libcgmanager0:amd64 0.24-0ubuntu7.3
+libck-connector0:amd64 0.4.5-3.1ubuntu2
+libclamav6 0.98.7+dfsg-0ubuntu0.14.04.1
+libclass-accessor-perl 0.34-1
+libclass-isa-perl 0.36-5
+libcloog-isl4:amd64 0.18.2-1
+libcolord1:amd64 1.0.6-1
+libcolorhug1:amd64 1.0.6-1
+libcomerr2:amd64 1.42.9-3ubuntu1.2
+libcommons-beanutils-java 1.9.1-1
+libcommons-codec-java 1.9-1
+libcommons-collections3-java 3.2.1-6
+libcommons-compress-java 1.6-1
+libcommons-daemon-java 1.0.15-5ubuntu2
+libcommons-dbcp-java 1.4-3ubuntu1
+libcommons-digester-java 1.8.1-4
+libcommons-fileupload-java 1.3-3
+libcommons-httpclient-java 3.1-10.2
+libcommons-io-java 2.4-2
+libcommons-lang-java 2.6-3ubuntu2
+libcommons-logging-java 1.1.3-1
+libcommons-parent-java 22-2build1
+libcommons-pool-java 1.6-2
+libcompress-raw-zlib-perl 2.063-1
+libconvert-binhex-perl 1.123-1
+libconvert-tnef-perl 0.18-1
+libconvert-uulib-perl 1:1.4~dfsg-1build3
+libcroco3:amd64 0.6.8-2ubuntu1
+libcrypt-openssl-bignum-perl 0.04-4build1
+libcrypt-openssl-rsa-perl 0.28-1build1
+libcups2:amd64 1.7.2-0ubuntu1.6
+libcupsfilters1:amd64 1.0.52-0ubuntu1.4
+libcupsimage2:amd64 1.7.2-0ubuntu1.6
+libcurl3:amd64 7.35.0-1ubuntu2.5
+libcurl3-gnutls:amd64 7.35.0-1ubuntu2.5
+libcwidget3 0.5.16-3.5ubuntu1
+libdate-calc-perl 6.3-1
+libdate-calc-xs-perl 6.3-1build1
+libdatrie1:amd64 0.2.8-1
+libdb5.1:amd64 5.1.29-7ubuntu1
+libdb5.3:amd64 5.3.28-3ubuntu3
+libdbd-mysql-perl 4.025-1
+libdbi-perl 1.630-1
+libdbus-1-3:amd64 1.6.18-0ubuntu4.3
+libdbus-glib-1-2:amd64 0.100.2-1
+libdconf1:amd64 0.20.0-1
+libdebconfclient0:amd64 0.187ubuntu1
+libdevmapper1.02.1:amd64 2:1.02.77-6ubuntu2
+libdigest-hmac-perl 1.03+dfsg-1
+libdjvulibre-text 3.5.25.4-3
+libdjvulibre21:amd64 3.5.25.4-3
+libdns100 1:9.9.5.dfsg-3ubuntu0.2
+libdpkg-perl 1.17.5ubuntu5.4
+libdrm-intel1:amd64 2.4.60-2~ubuntu14.04.1
+libdrm-nouveau2:amd64 2.4.60-2~ubuntu14.04.1
+libdrm-radeon1:amd64 2.4.60-2~ubuntu14.04.1
+libdrm2:amd64 2.4.60-2~ubuntu14.04.1
+libecj-java 3.9.0-1
+libedit2:amd64 3.1-20130712-2
+libelf1:amd64 0.158-0ubuntu5.2
+libept1.4.12:amd64 1.0.12
+liberror-perl 0.17-1.1
+libestr0 0.1.9-0ubuntu2
+libevent-2.0-5:amd64 2.0.21-stable-1ubuntu1.14.04.1
+libevent-core-2.0-5:amd64 2.0.21-stable-1ubuntu1.14.04.1
+libevent-dev 2.0.21-stable-1ubuntu1.14.04.1
+libevent-extra-2.0-5:amd64 2.0.21-stable-1ubuntu1.14.04.1
+libevent-openssl-2.0-5:amd64 2.0.21-stable-1ubuntu1.14.04.1
+libevent-pthreads-2.0-5:amd64 2.0.21-stable-1ubuntu1.14.04.1
+libexcalibur-logkit-java 2.0-10
+libexif12:amd64 0.6.21-1ubuntu1
+libexpat1:amd64 2.1.0-4ubuntu1
+libexpat1-dev:amd64 2.1.0-4ubuntu1
+libfakeroot:amd64 1.20-3ubuntu2
+libffi-dev:amd64 3.1~rc1+r3.0.13-12
+libffi6:amd64 3.1~rc1+r3.0.13-12
+libfftw3-double3:amd64 3.3.3-7ubuntu3
+libfile-basedir-perl 0.03-1fakesync1
+libfile-copy-recursive-perl 0.38-1
+libfile-desktopentry-perl 0.07-1
+libfile-fcntllock-perl 0.14-2build1
+libfile-mimeinfo-perl 0.22-1
+libfile-next-perl 1.12-1
+libflac8:amd64 1.3.0-2ubuntu0.14.04.1
+libfontconfig1:amd64 2.11.0-0ubuntu4.1
+libfontenc1:amd64 1:1.1.2-1
+libfreetype6:amd64 2.5.2-1ubuntu2.4
+libfribidi0:amd64 0.19.6-1
+libfsplib0 0.11-2
+libfuse2:amd64 2.9.2-4ubuntu4.14.04.1
+libgc1c2:amd64 1:7.2d-5ubuntu2
+libgcc-4.8-dev:amd64 4.8.2-19ubuntu1
+libgcc1:amd64 1:4.9.1-0ubuntu1
+libgck-1-0:amd64 3.10.1-1
+libgconf-2-4:amd64 3.2.6-0ubuntu2
+libgconf2-4:amd64 3.2.6-0ubuntu2
+libgcr-3-common 3.10.1-1
+libgcr-base-3-1:amd64 3.10.1-1
+libgcrypt11:amd64 1.5.3-2ubuntu4.2
+libgd3:amd64 2.1.0-3
+libgdbm-dev 1.8.3-12build1
+libgdbm3:amd64 1.8.3-12build1
+libgdk-pixbuf2.0-0:amd64 2.30.7-0ubuntu1
+libgdk-pixbuf2.0-common 2.30.7-0ubuntu1
+libgeoip1:amd64 1.6.0-1
+libgeronimo-jta-1.1-spec-java 1.1.1-3ubuntu1
+libgeronimo-stax-1.2-spec-java 1.1-1
+libgettextpo-dev:amd64 0.18.3.1-1ubuntu3
+libgettextpo0:amd64 0.18.3.1-1ubuntu3
+libgif4:amd64 4.1.6-11
+libgirepository-1.0-1 1.40.0-1ubuntu0.2
+libgl1-mesa-dri:amd64 10.1.3-0ubuntu0.4
+libgl1-mesa-glx:amd64 10.1.3-0ubuntu0.4
+libglapi-mesa:amd64 10.1.3-0ubuntu0.4
+libglib2.0-0:amd64 2.40.2-0ubuntu1
+libglib2.0-data 2.40.2-0ubuntu1
+libgmp10:amd64 2:5.1.3+dfsg-1ubuntu1
+libgnome2-0:amd64 2.32.1-4ubuntu1
+libgnome2-bin 2.32.1-4ubuntu1
+libgnome2-common 2.32.1-4ubuntu1
+libgnomevfs2-0:amd64 1:2.24.4-1ubuntu6
+libgnomevfs2-common 1:2.24.4-1ubuntu6
+libgnuinet-java 1.1.2-2build1
+libgnujaf-java 1.1.1-8build1
+libgnumail-java 1.1.2-9ubuntu3
+libgnutls-openssl27:amd64 2.12.23-12ubuntu2.2
+libgnutls26:amd64 2.12.23-12ubuntu2.2
+libgomp1:amd64 4.8.2-19ubuntu1
+libgpg-error0:amd64 1.12-0.2ubuntu1
+libgpgme11:amd64 1.4.3-0.1ubuntu5.1
+libgphoto2-6:amd64 2.5.3.1-1ubuntu2.2
+libgphoto2-l10n 2.5.3.1-1ubuntu2.2
+libgphoto2-port10:amd64 2.5.3.1-1ubuntu2.2
+libgpm2:amd64 1.20.4-6.1
+libgraphite2-3:amd64 1.2.4-1ubuntu1
+libgs9 9.10~dfsg-0ubuntu10.2
+libgs9-common 9.10~dfsg-0ubuntu10.2
+libgsasl7 1.8.0-2ubuntu2
+libgssapi-krb5-2:amd64 1.12+dfsg-2ubuntu5.1
+libgssapi3-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libgssrpc4:amd64 1.12+dfsg-2ubuntu5.1
+libgtk-3-0:amd64 3.10.8-0ubuntu1.5
+libgtk-3-bin 3.10.8-0ubuntu1.5
+libgtk-3-common 3.10.8-0ubuntu1.5
+libgtk2.0-0:amd64 2.24.23-0ubuntu1.2
+libgtk2.0-bin 2.24.23-0ubuntu1.2
+libgtk2.0-common 2.24.23-0ubuntu1.2
+libguava-java 15.0-2ubuntu1
+libgudev-1.0-0:amd64 1:204-5ubuntu20.12
+libgusb2:amd64 0.1.6-5
+libharfbuzz0b:amd64 0.9.27-1ubuntu1
+libhcrypto4-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libheimbase1-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libheimntlm0-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libhtml-template-perl 2.95-1
+libhttpclient-java 4.3.3-1
+libhttpcore-java 4.3.2-2
+libhttpmime-java 4.3.3-1
+libhx509-5-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libice-dev:amd64 2:1.0.8-2
+libice6:amd64 2:1.0.8-2
+libicu4j-4.4-java 4.4.2.2-1
+libicu52:amd64 52.1-3ubuntu0.3
+libidl-common 0.8.14-0.2ubuntu4
+libidl0:amd64 0.8.14-0.2ubuntu4
+libidn11:amd64 1.28-1ubuntu2
+libieee1284-3:amd64 0.2.11-12
+libijs-0.35 0.35-8build1
+libilmbase6:amd64 1.0.1-6ubuntu1
+libio-multiplex-perl 1.13-1
+libio-pty-perl 1:1.08-1build4
+libio-socket-inet6-perl 2.71-1
+libio-socket-ssl-perl 1.965-1ubuntu1
+libio-string-perl 1.08-3
+libio-stringy-perl 2.110-5
+libipc-run-perl 0.92-1
+libisc95 1:9.9.5.dfsg-3ubuntu0.2
+libisccc90 1:9.9.5.dfsg-3ubuntu0.2
+libisccfg90 1:9.9.5.dfsg-3ubuntu0.2
+libisl10:amd64 0.12.2-1
+libisorelax-java 20041111-8
+libitm1:amd64 4.8.2-19ubuntu1
+libiw30:amd64 30~pre9-8ubuntu1
+libjasper1:amd64 1.900.1-14ubuntu3.2
+libjaxp1.3-java 1.3.05-2ubuntu3
+libjbig0:amd64 2.0-2ubuntu4.1
+libjbig2dec0 0.11+20120125-1ubuntu1
+libjetty-java 6.1.26-1ubuntu1.1
+libjpeg-turbo8:amd64 1.3.0-0ubuntu2
+libjpeg62:amd64 6b1-4ubuntu1
+libjpeg8:amd64 8c-2ubuntu8
+libjs-jquery 1.7.2+dfsg-2ubuntu1
+libjs-jquery-mousewheel 8-2
+libjs-sphinxdoc 1.2.2+dfsg-1ubuntu1.1
+libjs-underscore 1.4.4-2ubuntu1
+libjson-c2:amd64 0.11-3ubuntu1.2
+libjson0:amd64 0.11-3ubuntu1.2
+libjsr305-java 0.1~+svn49-4
+libk5crypto3:amd64 1.12+dfsg-2ubuntu5.1
+libkadm5clnt-mit9:amd64 1.12+dfsg-2ubuntu5.1
+libkadm5srv-mit8:amd64 1.12+dfsg-2ubuntu5.1
+libkadm5srv-mit9:amd64 1.12+dfsg-2ubuntu5.1
+libkdb5-7:amd64 1.12+dfsg-2ubuntu5.1
+libkeyutils1:amd64 1.5.6-1
+libklibc 2.0.3-0ubuntu1
+libkmod2:amd64 15-0ubuntu6
+libknopflerfish-osgi-framework-java 2.3.3-3
+libkrb5-26-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libkrb5-3:amd64 1.12+dfsg-2ubuntu5.1
+libkrb5-dev 1.12+dfsg-2ubuntu5.1
+libkrb5support0:amd64 1.12+dfsg-2ubuntu5.1
+libkyotocabinet16:amd64 1.2.76-4
+liblcms2-2:amd64 2.5-0ubuntu4
+libldap-2.4-2:amd64 2.4.31-1+nmu2ubuntu8.1
+libldap2-dev:amd64 2.4.31-1+nmu2ubuntu8.1
+libldns1 1.6.17-1
+libllvm3.4:amd64 1:3.4-1ubuntu3
+liblocale-gettext-perl 1.05-7build3
+liblockfile-bin 1.09-6ubuntu1
+liblockfile1:amd64 1.09-6ubuntu1
+liblog-message-simple-perl 0.10-1
+liblog4j1.2-java 1.2.17-4ubuntu3
+liblqr-1-0:amd64 0.4.1-2ubuntu1
+libltdl-dev:amd64 2.4.2-1.7ubuntu1
+libltdl7:amd64 2.4.2-1.7ubuntu1
+liblua5.2-0:amd64 5.2.3-1
+liblucene3-contrib-java 3.6.2+dfsg-2
+liblucene3-java 3.6.2+dfsg-2
+liblwres90 1:9.9.5.dfsg-3ubuntu0.2
+liblzma5:amd64 5.1.1alpha+20120614-2ubuntu2
+liblzo2-2:amd64 2.06-1.2ubuntu1.1
+libmagic1:amd64 1:5.14-2ubuntu3.3
+libmagickcore5:amd64 8:6.7.7.10-6ubuntu3
+libmagickcore5-extra:amd64 8:6.7.7.10-6ubuntu3
+libmagickwand5:amd64 8:6.7.7.10-6ubuntu3
+libmail-dkim-perl 0.40-1
+libmail-sendmail-perl 0.79.16-1
+libmailtools-perl 2.12-1
+libmailutils4 1:2.99.98-1.1
+libmcrypt4 2.5.8-3.1ubuntu1
+libmime-tools-perl 5.505-1
+libmodule-pluggable-perl 5.1-1
+libmount1:amd64 2.20.1-5.1ubuntu20.4
+libmpc3:amd64 1.0.1-1ubuntu1
+libmpdec2:amd64 2.4.0-6
+libmpfr4:amd64 3.1.2-1
+libmsv-java 2009.1+dfsg1-4
+libmx4j-java 3.0.2-13ubuntu1
+libmysqlclient-dev 5.5.43-0ubuntu0.14.04.1
+libmysqlclient18:amd64 5.5.43-0ubuntu0.14.04.1
+libncurses5:amd64 5.9+20140118-1ubuntu1
+libncurses5-dev:amd64 5.9+20140118-1ubuntu1
+libncursesw5:amd64 5.9+20140118-1ubuntu1
+libnet-cidr-perl 0.17-1
+libnet-daemon-perl 0.48-1
+libnet-dns-perl 0.68-1.2build1
+libnet-ip-perl 1.26-1
+libnet-libidn-perl 0.12.ds-1build4
+libnet-rblclient-perl 0.5-2
+libnet-server-perl 2.007-3
+libnet-smtp-ssl-perl 1.01-3
+libnet-ssleay-perl 1.58-1
+libnetpbm10 2:10.0-15ubuntu2
+libnewt0.52:amd64 0.52.15-2ubuntu5
+libnfnetlink0:amd64 1.0.1-2
+libnih-dbus1:amd64 1.0.3-4ubuntu25
+libnih1:amd64 1.0.3-4ubuntu25
+libnl-3-200:amd64 3.2.21-1
+libnl-genl-3-200:amd64 3.2.21-1
+libnspr4:amd64 2:4.10.7-0ubuntu0.14.04.1
+libnss3:amd64 2:3.17.4-0ubuntu0.14.04.1
+libnss3-nssdb 2:3.17.4-0ubuntu0.14.04.1
+libntlm0:amd64 1.4-1
+libnuma1:amd64 2.0.9~rc5-1ubuntu3.14.04.1
+libogg0:amd64 1.3.1-1ubuntu1
+libopenexr6:amd64 1.6.1-7ubuntu1
+liborbit-2-0:amd64 1:2.14.19-0.3
+liborbit2:amd64 1:2.14.19-0.3
+libossp-uuid16 1.6.2-1.3ubuntu1
+libp11-kit0:amd64 0.20.2-2ubuntu2
+libpam-cap:amd64 1:2.24-0ubuntu2
+libpam-modules:amd64 1.1.8-1ubuntu2
+libpam-modules-bin 1.1.8-1ubuntu2
+libpam-runtime 1.1.8-1ubuntu2
+libpam-systemd:amd64 204-5ubuntu20.12
+libpam-tmpdir 0.09
+libpam0g:amd64 1.1.8-1ubuntu2
+libpango-1.0-0:amd64 1.36.3-1ubuntu1.1
+libpangocairo-1.0-0:amd64 1.36.3-1ubuntu1.1
+libpangoft2-1.0-0:amd64 1.36.3-1ubuntu1.1
+libpaper-utils 1.1.24+nmu2ubuntu3
+libpaper1:amd64 1.1.24+nmu2ubuntu3
+libparse-debianchangelog-perl 1.2.0-1ubuntu1
+libparse-syslog-perl 1.10-2ubuntu1
+libparted0debian1:amd64 2.3-19ubuntu1
+libpcap0.8:amd64 1.5.3-2
+libpci3:amd64 1:3.2.1-1ubuntu5
+libpciaccess0:amd64 0.13.2-1
+libpcre3:amd64 1:8.31-2ubuntu2
+libpcre3-dev:amd64 1:8.31-2ubuntu2
+libpcrecpp0:amd64 1:8.31-2ubuntu2
+libpcsclite1:amd64 1.8.10-1ubuntu1
+libperl-dev 5.18.2-2ubuntu1
+libperl5.18 5.18.2-2ubuntu1
+libpipeline1:amd64 1.3.0-1
+libpixman-1-0:amd64 0.30.2-2ubuntu1
+libplrpc-perl 0.2020-2
+libplymouth2:amd64 0.8.8-0ubuntu17.1
+libpng12-0:amd64 1.2.50-1ubuntu2
+libpod-latex-perl 0.61-1
+libpolkit-agent-1-0:amd64 0.105-4ubuntu2.14.04.1
+libpolkit-backend-1-0:amd64 0.105-4ubuntu2.14.04.1
+libpolkit-gobject-1-0:amd64 0.105-4ubuntu2.14.04.1
+libpopt0:amd64 1.16-8ubuntu1
+libpq-dev 9.3.8-0ubuntu0.4.04
+libpq5 9.3.8-0ubuntu0.4.04
+libprocps3:amd64 1:3.3.9-1ubuntu2.2
+libpthread-stubs0-dev:amd64 0.3-4
+libpulse0:amd64 1:4.0-0ubuntu11.1
+libpython-dev:amd64 2.7.5-5ubuntu3
+libpython-stdlib:amd64 2.7.5-5ubuntu3
+libpython2.7:amd64 2.7.6-8
+libpython2.7-dev:amd64 2.7.6-8
+libpython2.7-minimal:amd64 2.7.6-8
+libpython2.7-stdlib:amd64 2.7.6-8
+libpython3-dev:amd64 3.4.0-0ubuntu2
+libpython3-stdlib:amd64 3.4.0-0ubuntu2
+libpython3.4:amd64 3.4.0-2ubuntu1
+libpython3.4-dev:amd64 3.4.0-2ubuntu1
+libpython3.4-minimal:amd64 3.4.0-2ubuntu1
+libpython3.4-stdlib:amd64 3.4.0-2ubuntu1
+libquadmath0:amd64 4.8.2-19ubuntu1
+libreadline-dev:amd64 6.3-4ubuntu2
+libreadline6:amd64 6.3-4ubuntu2
+libreadline6-dev:amd64 6.3-4ubuntu2
+libregexp-java 1.5-3build1
+librelaxng-datatype-java 1.0+ds1-3
+libroken18-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+librsvg2-2:amd64 2.40.2-1
+librsvg2-common:amd64 2.40.2-1
+librtmp0:amd64 2.4+20121230.gitdf6c518-1
+libruby1.9.1 1.9.3.484-2ubuntu1.2
+libsane:amd64 1.0.23-3ubuntu3.1
+libsane-common 1.0.23-3ubuntu3.1
+libsasl2-2:amd64 2.1.25.dfsg1-17build1
+libsasl2-dev 2.1.25.dfsg1-17build1
+libsasl2-modules:amd64 2.1.25.dfsg1-17build1
+libsasl2-modules-db:amd64 2.1.25.dfsg1-17build1
+libsctp-dev 1.0.15+dfsg-1
+libsctp1:amd64 1.0.15+dfsg-1
+libsecret-1-0:amd64 0.16-0ubuntu1
+libsecret-common 0.16-0ubuntu1
+libselinux1:amd64 2.2.2-1ubuntu0.1
+libsemanage-common 2.2-1
+libsemanage1:amd64 2.2-1
+libsensors4:amd64 1:3.3.4-2ubuntu1
+libsepol1:amd64 2.2-1ubuntu0.1
+libserf-1-1:amd64 1.3.3-1ubuntu0.1
+libservlet2.5-java 6.0.39-1
+libservlet3.0-java 7.0.52-1ubuntu0.1
+libsigc++-2.0-0c2a:amd64 2.2.10-0.2ubuntu2
+libsigsegv2:amd64 2.10-2
+libslang2:amd64 2.2.4-15ubuntu1
+libslf4j-java 1.7.5-2
+libsm-dev:amd64 2:1.2.1-2
+libsm6:amd64 2:1.2.1-2
+libsndfile1:amd64 1.0.25-7ubuntu2
+libsocket6-perl 0.25-1
+libsolr-java 3.6.2+dfsg-2
+libsqlite0 2.8.17-10ubuntu2
+libsqlite3-0:amd64 3.8.2-1ubuntu2
+libsqlite3-dev:amd64 3.8.2-1ubuntu2
+libss2:amd64 1.42.9-3ubuntu1.2
+libssl-dev:amd64 1.0.1f-1ubuntu8
+libssl-doc 1.0.1f-1ubuntu8
+libssl0.9.8:amd64 0.9.8o-7ubuntu3.2.14.04.1
+libssl1.0.0:amd64 1.0.1f-1ubuntu8
+libstax-java 1.2.0-3build1
+libstax2-api-java 3.1.1-1
+libstdc++-4.8-dev:amd64 4.8.2-19ubuntu1
+libstdc++6:amd64 4.8.2-19ubuntu1
+libstdc++6-4.4-dev 4.4.7-8ubuntu1
+libstdc++6-4.6-dev 4.6.4-6ubuntu2
+libsub-name-perl 0.05-1build4
+libsvn1:amd64 1.8.8-1ubuntu3.1
+libswitch-perl 2.16-2
+libsys-hostname-long-perl 1.4-3
+libsystemd-daemon0:amd64 204-5ubuntu20.12
+libsystemd-login0:amd64 204-5ubuntu20.12
+libt1-5 5.1.2-3.6ubuntu1
+libtasn1-6:amd64 3.4-3ubuntu0.3
+libtcl8.5:amd64 8.5.15-2ubuntu1
+libtcl8.6:amd64 8.6.1-4ubuntu1
+libtdb1:amd64 1.2.12-1
+libterm-readkey-perl 2.31-1
+libterm-ui-perl 0.42-1
+libtext-charwidth-perl 0.04-7build3
+libtext-iconv-perl 1.7-5build2
+libtext-soundex-perl 3.4-1build1
+libtext-wrapi18n-perl 0.06-7
+libthai-data 0.1.20-3
+libthai0:amd64 0.1.20-3
+libtiff5:amd64 4.0.3-7ubuntu0.3
+libtimedate-perl 2.3000-1
+libtinfo-dev:amd64 5.9+20140118-1ubuntu1
+libtinfo5:amd64 5.9+20140118-1ubuntu1
+libtokyocabinet9:amd64 1.4.48-2
+libtomcat6-java 6.0.39-1
+libtool 2.4.2-1.7ubuntu1
+libtre5:amd64 0.8.0-3ubuntu1
+libtsan0:amd64 4.8.2-19ubuntu1
+libtxc-dxtn-s2tc0:amd64 0~git20131104-1.1
+libudev1:amd64 204-5ubuntu20.12
+libudisks2-0:amd64 2.1.3-1
+libunistring0:amd64 0.9.3-5ubuntu3
+libunix-syslog-perl 1.1-2build5
+libusb-0.1-4:amd64 2:0.1.12-23.3ubuntu1
+libusb-1.0-0:amd64 2:1.0.17-1ubuntu2
+libustr-1.0-1:amd64 1.0.4-3ubuntu2
+libuuid1:amd64 2.20.1-5.1ubuntu20.4
+libv4l-0:amd64 1.0.1-1
+libv4lconvert0:amd64 1.0.1-1
+libv8-3.14.5 3.14.5.8-5ubuntu2
+libv8-dev 3.14.5.8-5ubuntu2
+libvorbis0a:amd64 1.3.2-1.3ubuntu1
+libvorbisenc2:amd64 1.3.2-1.3ubuntu1
+libvorbisfile3:amd64 1.3.2-1.3ubuntu1
+libvpx1:amd64 1.3.0-2
+libwayland-client0:amd64 1.4.0-1ubuntu1
+libwayland-cursor0:amd64 1.4.0-1ubuntu1
+libwind0-heimdal:amd64 1.6~git20131207+dfsg-1ubuntu1.1
+libwmf0.2-7:amd64 0.2.8.4-10.3ubuntu1
+libwoodstox-java 1:4.1.3-1
+libwrap0:amd64 7.6.q-25
+libx11-6:amd64 2:1.6.2-1ubuntu2
+libx11-data 2:1.6.2-1ubuntu2
+libx11-dev:amd64 2:1.6.2-1ubuntu2
+libx11-doc 2:1.6.2-1ubuntu2
+libx11-xcb1:amd64 2:1.6.2-1ubuntu2
+libxapian22 1.2.16-2ubuntu1
+libxau-dev:amd64 1:1.0.8-1
+libxau6:amd64 1:1.0.8-1
+libxaw7:amd64 2:1.0.12-1
+libxcb-dri2-0:amd64 1.10-2ubuntu1
+libxcb-dri3-0:amd64 1.10-2ubuntu1
+libxcb-glx0:amd64 1.10-2ubuntu1
+libxcb-present0:amd64 1.10-2ubuntu1
+libxcb-render0:amd64 1.10-2ubuntu1
+libxcb-shape0:amd64 1.10-2ubuntu1
+libxcb-shm0:amd64 1.10-2ubuntu1
+libxcb-sync1:amd64 1.10-2ubuntu1
+libxcb1:amd64 1.10-2ubuntu1
+libxcb1-dev:amd64 1.10-2ubuntu1
+libxcomposite1:amd64 1:0.4.4-1
+libxcursor1:amd64 1:1.1.14-1
+libxdamage1:amd64 1:1.1.4-1ubuntu1
+libxdmcp-dev:amd64 1:1.1.1-1
+libxdmcp6:amd64 1:1.1.1-1
+libxerces2-java 2.11.0-7
+libxext6:amd64 2:1.3.2-1ubuntu0.0.14.04.1
+libxfixes3:amd64 1:5.0.1-1ubuntu1.1
+libxft2:amd64 2.3.1-2
+libxi6:amd64 2:1.7.1.901-1ubuntu1.1
+libxinerama1:amd64 2:1.1.3-1
+libxkbcommon0:amd64 0.4.1-0ubuntu1
+libxml-commons-external-java 1.4.01-2build1
+libxml-commons-resolver1.1-java 1.2-7build1
+libxml2:amd64 2.9.1+dfsg1-3ubuntu4.4
+libxml2-dev:amd64 2.9.1+dfsg1-3ubuntu4.4
+libxml2-utils 2.9.1+dfsg1-3ubuntu4.4
+libxmu6:amd64 2:1.1.1-1
+libxmuu1:amd64 2:1.1.1-1
+libxpm4:amd64 1:3.5.10-1
+libxrandr2:amd64 2:1.4.2-1
+libxrender1:amd64 1:0.9.8-1build0.14.04.1
+libxshmfence1:amd64 1.1-2
+libxslt1-dev:amd64 1.1.28-2build1
+libxslt1.1:amd64 1.1.28-2build1
+libxt-dev:amd64 1:1.1.4-1
+libxt6:amd64 1:1.1.4-1
+libxtables10 1.4.21-1ubuntu1
+libxtst6:amd64 2:1.2.2-1
+libxv1:amd64 2:1.0.10-1
+libxxf86dga1:amd64 2:1.1.4-1
+libxxf86vm1:amd64 1:1.1.3-1
+libxz-java 1.4-1
+libyaml-0-2:amd64 0.1.4-3ubuntu3.1
+libyaml-dev:amd64 0.1.4-3ubuntu3.1
+linux-firmware 1.127.12
+linux-libc-dev:amd64 3.13.0-55.92
+lksctp-tools 1.0.15+dfsg-1
+locales 2.13+git20120306-12.1
+lockfile-progs 0.1.17
+login 1:4.1.5.1-1ubuntu9
+logrotate 3.8.7-1ubuntu1
+lsb-base 4.1+Debian11ubuntu6
+lsb-release 4.1+Debian11ubuntu6
+lshw 02.16-2ubuntu1.2
+lsof 4.86+dfsg-1ubuntu2
+ltrace 0.7.3-4ubuntu5.1
+lxc-docker 1.6.2
+lxc-docker-1.6.1 1.6.1
+lxc-docker-1.6.2 1.6.2
+m4 1.4.17-2ubuntu1
+mailman 1:2.1.16-2ubuntu0.1
+mailutils 1:2.99.98-1.1
+mailutils-common 1:2.99.98-1.1
+make 3.81-8.2ubuntu3
+makedev 2.3.1-93ubuntu1
+man-db 2.6.7.1-1ubuntu1
+manpages 3.54-1ubuntu1
+manpages-dev 3.54-1ubuntu1
+mawk 1.3.3-17ubuntu2
+mime-support 3.54ubuntu1.1
+mingetty 1.08-2
+mlocate 0.26-1ubuntu1
+mlock 8:2007f~dfsg-2
+module-init-tools 15-0ubuntu6
+moreutils 0.50
+mount 2.20.1-5.1ubuntu20.4
+mountall 2.53
+mtr-tiny 0.85-2
+multiarch-support 2.19-0ubuntu6.6
+mutt 1.5.21-6.4ubuntu2.1
+mysql-client-5.5 5.5.43-0ubuntu0.14.04.1
+mysql-client-core-5.5 5.5.43-0ubuntu0.14.04.1
+mysql-common 5.5.43-0ubuntu0.14.04.1
+mysql-server 5.5.43-0ubuntu0.14.04.1
+mysql-server-5.5 5.5.43-0ubuntu0.14.04.1
+mysql-server-core-5.5 5.5.43-0ubuntu0.14.04.1
+nano 2.2.6-1ubuntu1
+ncurses-base 5.9+20140118-1ubuntu1
+ncurses-bin 5.9+20140118-1ubuntu1
+ncurses-term 5.9+20140118-1ubuntu1
+net-tools 1.60-25ubuntu2.1
+netbase 5.2
+netcat 1.10-40
+netcat-openbsd 1.105-7ubuntu1
+netcat-traditional 1.10-40
+netpbm 2:10.0-15ubuntu2
+nodejs 0.10.25~dfsg2-2ubuntu1
+nomarch 1.4-3
+ntfs-3g 1:2013.1.13AR.1-2ubuntu2
+ntpdate 1:4.2.6.p5+dfsg-3ubuntu2.14.04.3
+offlineimap 6.5.4-2
+openbsd-inetd 0.20091229-2ubuntu3
+openjdk-7-jdk:amd64 7u79-2.5.5-0ubuntu0.14.04.2
+openjdk-7-jre:amd64 7u79-2.5.5-0ubuntu0.14.04.2
+openjdk-7-jre-headless:amd64 7u79-2.5.5-0ubuntu0.14.04.2
+openssh-client 1:6.6p1-2ubuntu2
+openssh-server 1:6.6p1-2ubuntu2
+openssh-sftp-server 1:6.6p1-2ubuntu2
+openssl 1.0.1f-1ubuntu8
+parted 2.3-19ubuntu1
+passwd 1:4.1.5.1-1ubuntu9
+patch 2.7.1-4ubuntu2
+pax 1:20120606-2+deb7u1
+pbzip2 1.1.8-1
+pciutils 1:3.2.1-1ubuntu5
+perl 5.18.2-2ubuntu1
+perl-base 5.18.2-2ubuntu1
+perl-modules 5.18.2-2ubuntu1
+pflogsumm 1.1.5-1
+php-auth 1.6.4-1
+php-auth-sasl 1.0.6-1
+php-db 1.7.14-2
+php-http-request 1.4.4-4
+php-log 1.12.7-1
+php-mail 1.2.0-6
+php-mail-mime 1.8.8-1
+php-mdb2 2.5.0b5-1
+php-net-dime 1.0.2-2
+php-net-sieve 1.3.2-4
+php-net-smtp 1.6.1-1
+php-net-socket 1.0.14-1
+php-net-url 1.0.15-3
+php-pear 5.5.9+dfsg-1ubuntu4.9
+php-soap 0.13.0-1
+php-xml-parser 1.3.4-6
+php5 5.5.9+dfsg-1ubuntu4.9
+php5-cgi 5.5.9+dfsg-1ubuntu4.9
+php5-cli 5.5.9+dfsg-1ubuntu4.9
+php5-common 5.5.9+dfsg-1ubuntu4.9
+php5-curl 5.5.9+dfsg-1ubuntu4.9
+php5-dev 5.5.9+dfsg-1ubuntu4.9
+php5-fpm 5.5.9+dfsg-1ubuntu4.9
+php5-gd 5.5.9+dfsg-1ubuntu4.9
+php5-gmp 5.5.9+dfsg-1ubuntu4.9
+php5-imap 5.4.6-0ubuntu5
+php5-intl 5.5.9+dfsg-1ubuntu4.9
+php5-json 1.3.2-2build1
+php5-mcrypt 5.4.6-0ubuntu5
+php5-mysql 5.5.9+dfsg-1ubuntu4.9
+php5-pspell 5.5.9+dfsg-1ubuntu4.9
+php5-readline 5.5.9+dfsg-1ubuntu4.9
+php5-sqlite 5.5.9+dfsg-1ubuntu4.9
+php5-xmlrpc 5.5.9+dfsg-1ubuntu4.9
+php5-xsl 5.5.9+dfsg-1ubuntu4.9
+pidentd 3.0.19.ds1-7
+pkg-config 0.26-1ubuntu4
+pkg-php-tools 1.11
+plymouth 0.8.8-0ubuntu17.1
+plymouth-theme-ubuntu-text 0.8.8-0ubuntu17.1
+po-debconf 1.0.16+nmu2ubuntu1
+policykit-1 0.105-4ubuntu2.14.04.1
+policykit-1-gnome 0.105-1ubuntu4
+poppler-data 0.4.6-4
+postfix 2.11.0-1ubuntu1
+postfix-doc 2.11.0-1ubuntu1
+postfix-pcre 2.11.0-1ubuntu1
+postfix-policyd-spf-python 1.2-1
+postgrey 1.34-1.2
+powermgmt-base 1.31build1
+ppp 2.4.5-5.1ubuntu2.2
+pppconfig 2.3.19ubuntu1
+procmail 3.22-21ubuntu0.1
+procps 1:3.3.9-1ubuntu2.2
+psmisc 22.20-1ubuntu2
+pwauth 2.3.8-1
+pwgen 2.06-1ubuntu4
+python 2.7.5-5ubuntu3
+python-apport 2.14.1-0ubuntu3.11
+python-apt 0.9.3.5ubuntu1
+python-apt-common 0.9.3.5ubuntu1
+python-authres 0.602-1
+python-chardet 2.0.1-2build2
+python-configobj 4.7.2+ds-5build1
+python-crypto 2.6.1-4build1
+python-dbus 1.2.0-2build2
+python-dbus-dev 1.2.0-2build2
+python-debian 0.1.21+nmu2ubuntu2
+python-dev 2.7.5-5ubuntu3
+python-dns 2.3.6-3
+python-dnspython 1.11.1-1build1
+python-gdbm 2.7.5-1ubuntu1
+python-gi 3.12.0-1ubuntu1
+python-gnupginterface 0.3.2-9.1ubuntu3
+python-httplib2 0.8-2build1
+python-ipaddr 2.1.10-1
+python-ipcalc 0.5.2-0ubuntu1
+python-keyring 3.5-1
+python-launchpadlib 1.10.2+ds-2
+python-lazr.restfulclient 0.13.3-1build1
+python-lazr.uri 1.0.3-1build1
+python-ldns 1.6.17-1
+python-minimal 2.7.5-5ubuntu3
+python-newt 0.52.15-2ubuntu5
+python-oauth 1.0.1-3build2
+python-openssl 0.13-2ubuntu6
+python-pam 0.4.2-13.1ubuntu3
+python-pkg-resources 3.3-1ubuntu1
+python-problem-report 2.14.1-0ubuntu3.11
+python-pycurl 7.19.3-0ubuntu3
+python-requests 2.2.1-1ubuntu0.2
+python-secretstorage 2.0.0-1ubuntu1.1
+python-serial 2.6-1build1
+python-simplejson 3.3.1-1ubuntu6
+python-six 1.5.2-1
+python-software-properties 0.92.37.3
+python-spf 2.0.8-3
+python-sqlite 1.0.1-11
+python-support 1.0.15
+python-twisted-bin 13.2.0-1ubuntu1
+python-twisted-core 13.2.0-1ubuntu1
+python-urllib3 1.7.1-1ubuntu3
+python-wadllib 1.3.2-2build1
+python-xapian 1.2.16-2ubuntu1
+python-zope.interface 4.0.5-1ubuntu4
+python2.7 2.7.6-8
+python2.7-dev 2.7.6-8
+python2.7-minimal 2.7.6-8
+python3 3.4.0-0ubuntu2
+python3-apport 2.14.1-0ubuntu3.11
+python3-apt 0.9.3.5ubuntu1
+python3-authres 0.602-1
+python3-commandnotfound 0.3ubuntu12
+python3-dbus 1.2.0-2build2
+python3-dev 3.4.0-0ubuntu2
+python3-distupgrade 1:0.220.7
+python3-dns 3.0.4-1ubuntu1
+python3-gdbm:amd64 3.4.0-0ubuntu1
+python3-gi 3.12.0-1ubuntu1
+python3-minimal 3.4.0-0ubuntu2
+python3-problem-report 2.14.1-0ubuntu3.11
+python3-pycurl 7.19.3-0ubuntu3
+python3-software-properties 0.92.37.3
+python3-spf 2.0.8-3
+python3-update-manager 1:0.196.13
+python3.4 3.4.0-2ubuntu1
+python3.4-dev 3.4.0-2ubuntu1
+python3.4-minimal 3.4.0-2ubuntu1
+rar 2:4.2.0-1
+rcm 1.2.3-1ubuntu2
+readline-common 6.3-4ubuntu2
+realpath 1.19
+renameutils 0.12.0-3
+resolvconf 1.69ubuntu1.1
+ripole 0.2.0+20081101.0215-1
+roundcube 0.9.5-4
+roundcube-core 0.9.5-4
+roundcube-mysql 0.9.5-4
+roundcube-plugins 0.9.5-4
+roundcube-plugins-extra 0.9.2-20130819
+rsync 3.1.0-2ubuntu0.1
+rsyslog 7.4.4-1ubuntu2.6
+ruby 1:1.9.3.4
+ruby1.9.1 1.9.3.484-2ubuntu1.2
+run-one 1.17-0ubuntu1
+safecat 1.13-2
+sasl2-bin 2.1.25.dfsg1-17build1
+screen 4.1.0~20120320gitdb59704-9
+sed 4.2.2-4ubuntu1
+sensible-utils 0.0.9
+sgml-base 1.26+nmu4ubuntu1
+sgml-data 2.0.9-1
+shared-mime-info 1.2-0ubuntu3
+shtool 2.0.8-6
+software-properties-common 0.92.37.3
+solr-common 3.6.2+dfsg-2
+solr-tomcat 3.6.2+dfsg-2
+sound-theme-freedesktop 0.8-1
+sqlite3 3.8.2-1ubuntu2
+ssh-import-id 3.21-0ubuntu1
+sshfp 1.2.2-4
+ssl-cert 1.0.33
+stow 2.2.0-2
+strace 4.8-1ubuntu5
+subversion 1.8.8-1ubuntu3.1
+sudo 1.8.9p5-1ubuntu1.1
+swig 2.0.11-1ubuntu2
+swig2.0 2.0.11-1ubuntu2
+sysstat 10.2.0-1
+systemd-services 204-5ubuntu20.12
+systemd-shim 6-2bzr1
+sysv-rc 2.88dsf-41ubuntu6.2
+sysvinit-utils 2.88dsf-41ubuntu6.2
+tar 1.27.1-1
+tasksel 2.88ubuntu15
+tasksel-data 2.88ubuntu15
+tcl8.5 8.5.15-2ubuntu1
+tcpd 7.6.q-25
+tcpdump 4.5.1-2ubuntu1.2
+telnet 0.17-36build2
+time 1.7-24
+tinymce 3.4.8+dfsg0-1
+tmux 1.9a-1~ppa1~p
+tomcat6 6.0.39-1
+tomcat6-common 6.0.39-1
+traceroute 1:2.0.20-0ubuntu0.1
+tree 1.6.0-1
+ttf-dejavu-core 2.34-1ubuntu1
+tzdata 2015d-0ubuntu0.14.04
+tzdata-java 2015d-0ubuntu0.14.04
+ubuntu-keyring 2012.05.19
+ubuntu-minimal 1.325
+ubuntu-release-upgrader-core 1:0.220.7
+ucf 3.0027+nmu1
+udev 204-5ubuntu20.12
+udisks2 2.1.3-1
+unattended-upgrades 0.82.1ubuntu2.2
+unison 2.40.102-2ubuntu1
+unrar 1:5.0.10-1ubuntu0.14.04.1
+unzip 6.0-9ubuntu1.3
+update-inetd 4.43
+update-manager-core 1:0.196.13
+update-notifier-common 0.154.1ubuntu1
+upstart 1.12.1-0ubuntu4.2
+ureadahead 0.100.0-16
+usbutils 1:007-2ubuntu1
+util-linux 2.20.1-5.1ubuntu20.4
+uuid 1.6.2-1.3ubuntu1
+uuid-dev 2.20.1-5.1ubuntu20.4
+uuid-runtime 2.20.1-5.1ubuntu20.4
+vim-common 2:7.4.052-1ubuntu3
+vim-nox 2:7.4.052-1ubuntu3
+vim-runtime 2:7.4.052-1ubuntu3
+vim-tiny 2:7.4.052-1ubuntu3
+w3m 0.5.3-15
+wget 1.15-1ubuntu1.14.04.1
+whiptail 0.52.15-2ubuntu5
+whois 5.1.1
+x11-common 1:7.7+1ubuntu8.1
+x11-utils 7.7+1
+x11-xserver-utils 7.7+2ubuntu1
+x11proto-core-dev 7.0.26-1~ubuntu2
+x11proto-input-dev 2.3-1
+x11proto-kb-dev 1.0.6-2
+xauth 1:1.0.7-1ubuntu1
+xdg-utils 1.1.0~rc1-2ubuntu7.1
+xkb-data 2.10.1-1ubuntu1
+xml-core 0.13+nmu2
+xorg-sgml-doctools 1:1.11-1
+xtrans-dev 1.3.5-1~ubuntu14.04.1
+xz-utils 5.1.1alpha+20120614-2ubuntu2
+zip 3.0-8
+zlib1g:amd64 1:1.2.8.dfsg-1ubuntu1
+zlib1g-dev:amd64 1:1.2.8.dfsg-1ubuntu1
+znc 1.6.0-2~ubuntu14.04.2
+znc-dbg 1.6.0-2~ubuntu14.04.2
+znc-dev 1.6.0-2~ubuntu14.04.2
+znc-perl 1.6.0-2~ubuntu14.04.2
+znc-python 1.6.0-2~ubuntu14.04.2
+znc-tcl 1.6.0-2~ubuntu14.04.2
+zoo 2.10-27
+zsh 5.0.2-3ubuntu6
+zsh-beta 5.0.2-3ubuntu6
+zsh-common 5.0.2-3ubuntu6
+zsh-doc 5.0.2-3ubuntu6
diff --git a/spec/data/plugins/lslpp.output b/spec/data/plugins/lslpp.output
new file mode 100644
index 00000000..0175eacf
--- /dev/null
+++ b/spec/data/plugins/lslpp.output
@@ -0,0 +1,49 @@
+bos.sysmgt:bos.sysmgt.smit:7.1.1.15: : :C:F:System Management Interface Tool (SMIT): : : : : : :0:0:/:1216
+bos.sysmgt:bos.sysmgt.sysbr:7.1.1.17: : :C:F:System Backup and BOS Install Utilities: : : : : : :0:0:/:1228
+bos.sysmgt:bos.sysmgt.trace:7.1.1.15: : :C:F:Software Trace Service Aids: : : : : : :0:1:/:1216
+bos.terminfo:bos.terminfo.ansi.data:7.1.0.0: : :C: :Amer National Stds Institute Terminal Defs: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.com.data:7.1.0.0: : :C: :Common Terminal Definitions: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.dec.data:7.1.0.0: : :C: :Digital Equipment Corp. Terminal Definitions: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.ibm.data:7.1.0.0: : :C: :IBM Terminal Definitions: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.pc.data:7.1.0.0: : :C: :Personal Computer Terminal Definitions: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.print.data:7.1.0.0: : :C: :Generic Line Printer Terminal Definitions: : : : : : :0:1:/:1036
+bos.terminfo:bos.terminfo.rte:7.1.0.0: : :C: :Run-time Environment for AIX Terminals: : : : : : :0:0:/:1036
+bos.terminfo:bos.terminfo.svprint.data:7.1.0.0: : :C: :System V Printer Terminal Definitions: : : : : : :0:0:/:1036
+bos.terminfo:bos.terminfo.televideo.data:7.1.0.0: : :C: :Televideo Terminal Definitions: : : : : : :0:0:/:1036
+bos.terminfo:bos.terminfo.wyse.data:7.1.0.0: : :C: :Wyse Terminal Definitions: : : : : : :0:0:/:1036
+bos.txt:bos.txt.hplj.fnt:7.1.0.0: : :C: :Fonts for Hewlett Packard Laser Jet Printers : : : : : : :0:0:/:1115
+bos.txt:bos.txt.ibm3812.fnt:7.1.0.0: : :C: :Fonts for IBM 3812 Printer : : : : : : :0:0:/:1115
+bos.txt:bos.txt.ibm3816.fnt:7.1.0.0: : :C: :Fonts for IBM 3816 Printer : : : : : : :0:0:/:1115
+bos.txt:bos.txt.spell:7.1.0.0: : :C: :Writer's Tools Commands : : : : : : :0:0:/:1115
+bos.txt:bos.txt.spell.data:7.1.0.0: : :C: :Writer's Tools Data: : : : : : :0:0:/:1036
+bos.txt:bos.txt.tfs:7.1.1.15: : :C:F:Text Formatting Services Commands: : : : : : :0:0:/:1216
+bos.txt:bos.txt.tfs.data:7.1.0.0: : :C: :Text Formatting Services Data: : : : : : :0:0:/:1036
+bos.wpars:bos.wpars:7.1.1.15: : :C:F:AIX Workload Partitions: : : : : : :0:0:/:1216
+cdrtools.base:cdrtools.base:1.9.0.9: : :C: :CD/DVD recorder: : : : : : :0:0:/:
+cdrtools.man.en_US:cdrtools.man.en_US:1.9.0.9: : :C: :CD/DVD recorder man page documentation: : : : : : :0:0:/:
+chef:chef:12.5.1.1: : :C: :The full stack of chef: : : : : : :0:0:/:
+clic.rte:clic.rte.kernext:4.7.0.1: : :C: :CryptoLite for C Kernel: : : : : : :0:0:/:
+clic.rte:clic.rte.lib:4.7.0.1: : :C: :CryptoLite for C Library: : : : : : :0:0:/:
+devices.artic960:devices.artic960.diag:7.1.0.0: : :C: :IBM ARTIC960 Adapter Diagnostics : : : : : : :0:0:/:1115
+devices.artic960:devices.artic960.rte:7.1.1.15: : :C:F:IBM ARTIC960 Runtime Support: : : : : : :0:0:/:1216
+devices.artic960:devices.artic960.ucode:7.1.0.0: : :C: :IBM ARTIC960 Adapter Software : : : : : : :0:0:/:1115
+devices.chrp.AT97SC3201_r:devices.chrp.AT97SC3201_r.rte:7.1.0.0: : :C: :Trusted Platform Module Device Software: : : : : : :0:0:/:1036
+devices.chrp.IBM.lhca:devices.chrp.IBM.lhca.rte:7.1.1.16: : :C:F:Infiniband Logical HCA Runtime Environment: : : : : : :0:0:/:1228
+devices.chrp.IBM.lhea:devices.chrp.IBM.lhea.diag:7.1.0.0: : :C: :Host Ethernet Adapter Diagnostics : : : : : : :0:0:/:1115
+devices.chrp.IBM.lhea:devices.chrp.IBM.lhea.rte:7.1.1.16: : :C:F:Host Ethernet Adapter (HEA) Runtime Environment: : : : : : :0:0:/:1228
+devices.chrp.base:devices.chrp.base.ServiceRM:1.5.1.0: : :C:F:RSCT Service Resource Manager: : : : : : :0:0:/:
+devices.chrp.base:devices.chrp.base.diag:7.1.1.15: : :C:F:RISC CHRP Base System Device Diagnostics: : : : : : :0:0:/:1216
+devices.chrp.base:devices.chrp.base.rte:7.1.1.16: : :C:F:RISC PC Base System Device Software (CHRP): : : : : : :0:0:/:1228
+devices.chrp.pci:devices.chrp.pci.rte:7.1.1.16: : :C:F:PCI Bus Software (CHRP): : : : : : :0:0:/:1228
+devices.chrp.pciex:devices.chrp.pciex.rte:7.1.0.0: : :C: :PCI Express Bus Software (CHRP): : : : : : :0:0:/:1036
+devices.chrp.vdevice:devices.chrp.vdevice.rte:7.1.1.16: : :C:F:Virtual I/O Bus Support: : : : : : :0:0:/:1228
+devices.chrp_lpar.base:devices.chrp_lpar.base.ras:7.1.0.15: : :C: :CHRP LPAR RAS Support : : : : : : :0:0:/:1115
+devices.common.IBM.async:devices.common.IBM.async.diag:7.1.0.0: : :C: :Common Serial Adapter Diagnostics: : : : : : :0:0:/:1036
+devices.common.IBM.atm:devices.common.IBM.atm.rte:7.1.1.16: : :C:F:Common ATM Software: : : : : : :0:0:/:1228
+devices.common.IBM.crypt:devices.common.IBM.crypt.rte:7.1.0.0: : :C: :Cryptographic Common Runtime Environment: : : : : : :0:0:/:1036
+devices.common.IBM.cx:devices.common.IBM.cx.rte:7.1.1.15: : :C:F:CX Common Adapter Software: : : : : : :0:0:/:1216
+devices.common.IBM.disk:devices.common.IBM.disk.rte:7.1.1.15: : :C:F:Common IBM Disk Software: : : : : : :0:0:/:1216
+devices.common.IBM.ethernet:devices.common.IBM.ethernet.rte:7.1.1.16: : :C:F:Common Ethernet Software: : : : : : :0:1:/:1228
+devices.common.IBM.fc:devices.common.IBM.fc.hba-api:7.1.1.16: : :C:F:Common HBA API Library: : : : : : :0:0:/:1228
+devices.common.IBM.fc:devices.common.IBM.fc.rte:7.1.1.16: : :C:F:Common IBM FC Software: : : : : : :0:0:/:1228
+devices.common.IBM.fda:devices.common.IBM.fda.diag:7.1.0.0: : :C: :Common Diskette Adapter and Device Diagnostics: : : : : : :0:0:/:1036
diff --git a/spec/data/plugins/pkginfo.output b/spec/data/plugins/pkginfo.output
new file mode 100644
index 00000000..3b5db466
--- /dev/null
+++ b/spec/data/plugins/pkginfo.output
@@ -0,0 +1,50 @@
+ PKGINST: mqm
+ NAME: WebSphere MQ Client for Sun Solaris
+ CATEGORY: application
+ ARCH: sparcv9
+ VERSION: 7.0.1.4
+ BASEDIR: /
+ VENDOR: IBM
+ PSTAMP: src (packaged: January 14, 2011 - 11:44:27 PM)
+ INSTDATE: Dec 22 2015 17:10
+ VSTOCK: 5724-H72
+ STATUS: completely installed
+ FILES: 3303 installed pathnames
+ 88 directories
+ 158 executables
+ 20 setuid/setgid executables
+ 327903 blocks used (approx)
+
+ PKGINST: vasclnt
+ NAME: vasclnt 4.1.0.21853
+ CATEGORY: application
+ ARCH: sparcv9
+ VERSION: 4.1.0.21853
+ BASEDIR: /
+ VENDOR: Quest Software, Inc.
+ DESC: Quest Authentication System (QAS) provides centralized user and
+ PSTAMP: vassol8sparc20150701013812
+ INSTDATE: Dec 22 2015 16:58
+ STATUS: completely installed
+ FILES: 174 installed pathnames
+ 9 shared pathnames
+ 32 directories
+ 101 executables
+ 60402 blocks used (approx)
+
+ PKGINST: vasgp
+ NAME: vasgp 4.1.0.21853
+ CATEGORY: application
+ ARCH: sparcv9
+ VERSION: 4.1.0.21853
+ BASEDIR: /
+ VENDOR: Quest Software, Inc.
+ DESC: Quest Group Policy (QGP) provides Active Directory Group Policy
+ PSTAMP: vassol8sparc20150701013859
+ INSTDATE: Dec 22 2015 17:06
+ STATUS: completely installed
+ FILES: 50 installed pathnames
+ 9 shared pathnames
+ 18 directories
+ 25 executables
+ 11999 blocks used (approx)
diff --git a/spec/data/plugins/pkglist.output b/spec/data/plugins/pkglist.output
new file mode 100644
index 00000000..4e1980f1
--- /dev/null
+++ b/spec/data/plugins/pkglist.output
@@ -0,0 +1,24 @@
+chef 12.5.1 i--
+compatibility/ucb 0.5.11-0.175.2.0.0.42.2 i--
+compress/bzip2 1.0.6-0.175.2.0.0.42.1 i--
+compress/gzip 1.5-0.175.2.4.0.3.0 i--
+compress/p7zip 9.20.1-0.175.2.0.0.42.1 i--
+compress/pbzip2 1.1.6-0.175.2.0.0.42.1 i--
+compress/pixz 1.0-0.175.2.0.0.42.1 i--
+compress/unzip 6.0-0.175.2.3.0.4.0 i--
+compress/xz 5.0.1-0.175.2.0.0.42.1 i--
+compress/zip 3.0-0.175.2.0.0.42.1 i--
+consolidation/SunVTS/SunVTS-incorporation 7.18.2-0.175.2.1.0.5.1 i--
+consolidation/X/X-incorporation 0.5.11-0.175.2.1.0.3.1413 i--
+consolidation/admin/admin-incorporation 0.5.11-0.175.1.0.0.5.0 i--
+consolidation/cacao/cacao-incorporation 0.5.11-0.175.2.0.0.38.0 i--
+consolidation/cde/cde-incorporation 0.5.11-0.175.2.0.0.23.0 i--
+consolidation/cns/cns-incorporation 0.5.11-0.175.2.0.0.39.0 i--
+consolidation/dbtg/dbtg-incorporation 0.5.11-0.175.2.0.0.38.0 i--
+consolidation/ddt/ddt-incorporation 8.10.15.11.23 i--
+consolidation/desktop/desktop-incorporation 0.5.11-0.175.2.4.0.5.0 i--
+consolidation/desktop/gnome-incorporation 0.5.11-0.175.2.0.0.42.0 i--
+consolidation/gfx/gfx-incorporation 0.5.11-0.175.1.0.0.5.0 i--
+consolidation/ips/ips-incorporation 0.5.11-0.175.2.3.0.3.0 i--
+consolidation/java-7/java-7-incorporation 1.7.0.72.14-0 i--
+system/EMCpower (emc.com) 6.0.0.1.0-3 i--
diff --git a/spec/data/plugins/rpmquery.output b/spec/data/plugins/rpmquery.output
new file mode 100644
index 00000000..142fd2fa
--- /dev/null
+++ b/spec/data/plugins/rpmquery.output
@@ -0,0 +1,388 @@
+ntp 4.2.6p5 3.el6_6
+perl-CGI 3.51 136.el6_6.1
+mailx 12.4 8.el6_6
+libattr 2.4.44 7.el6
+perl-ExtUtils-ParseXS 2.2003.0 136.el6_6.1
+redhat-lsb-core 4.0 7.el6
+libsepol 2.0.41 4.el6
+screen 4.0.3 16.el6
+coreutils-libs 8.4 37.el6
+bzip2-libs 1.0.5 7.el6_0
+gpg-pubkey 66fd4949 4803fe57
+libudev 147 2.57.el6
+hal-libs 0.5.14 14.el6
+plymouth-scripts 0.8.3 27.el6_5.1
+libgpg-error 1.7 4.el6
+libselinux-utils 2.0.94 5.8.el6
+sqlite 3.6.20 1.el6
+libxcb 1.9.1 2.el6
+libxml2 2.7.6 17.el6_6.1
+p11-kit-trust 0.18.5 2.el6_5.2
+libgcrypt 1.4.5 11.el6_4
+upstart 0.6.5 13.el6_5.3
+checkpolicy 2.0.22 1.el6
+procps 3.2.8 30.el6
+pth 2.0.7 9.3.el6
+libX11 1.6.0 2.2.el6
+less 436 13.el6
+libXdamage 1.1.3 4.el6
+file 5.04 21.el6
+cryptsetup-luks 1.2.0 11.el6
+libXfont 1.4.5 4.el6_6
+eggdbus 0.6 3.el6
+python-rhsm 1.12.5 2.el6
+hal-info 20090716 3.1.el6
+hwdata 0.233 11.1.el6
+diffutils 2.8.1 28.el6
+mesa-libGL 10.1.2 2.el6
+initscripts 9.03.46 1.el6_6.1
+which 2.19 6.el6
+xorg-x11-drv-vmware 13.0.1 9.el6
+cracklib-dicts 2.8.16 4.el6
+libdrm 2.4.52 4.el6
+logrotate 3.7.8 17.el6
+mingetty 1.08 5.el6
+unzip 6.0 2.el6_6
+e2fsprogs 1.41.12 21.el6
+fipscheck-lib 1.2.0 7.el6
+cyrus-sasl 2.1.23 15.el6_6.2
+dmidecode 2.12 5.el6_5
+libnl 1.1.4 2.el6
+chef 12.2.1 1.el6
+ql2400-firmware 7.03.00 1.el6_5
+gdbm 1.8.0 36.el6
+xorg-x11-server-Xorg 1.15.0 26.el6_6
+python-dateutil 1.4.1 6.el6
+openssh 5.3p1 104.el6_6.1
+dbus 1.2.24 8.el6_6
+perl-version 0.77 136.el6_6.1
+pygpgme 0.1 18.20090824bzr68.el6
+dracut-kernel 004 356.el6_6.2
+perl 5.10.1 136.el6_6.1
+rhnlib 2.5.22 15.el6
+nss-sysinit 3.18.0 5.3.el6_6
+pygobject2 2.20.0 5.el6
+selinux-policy 3.7.19 260.el6_6.3
+openssh-clients 5.3p1 104.el6_6.1
+ca-certificates 2015.2.4 65.0.1.el6_6
+device-mapper-event-libs 1.02.90 2.el6_6.3
+bind-utils 9.8.2 0.30.rc1.el6_6.3
+rpm-python 4.8.0 38.el6_6
+glibc-common 2.12 1.149.el6_6.9
+kernel-firmware 2.6.32 504.23.4.el6
+libssh2 1.4.2 1.el6_6.1
+openssl-devel 1.0.1e 30.el6_6.11
+nss-softokn 3.14.3 22.el6_6
+tree 1.5.3 2.el6
+virt-what 1.11 1.2.el6
+rpcbind 0.2.0 11.el6
+nfs-utils 1.2.3 54.el6
+autoconf 2.63 5.1.el6
+cloog-ppl 0.15.7 1.2.el6
+b43-openfwwf 5.2 4.el6
+iwl1000-firmware 39.31.5.1 1.el6
+libstdc++-devel 4.4.7 11.el6
+xz 4.999.9 0.5.beta.20091007git.el6
+acl 2.2.49 6.el6
+elfutils 0.158 3.2.el6
+ql2100-firmware 1.19.38 3.1.el6
+fakeroot 1.12.2 22.2.el6
+rt61pci-firmware 1.2 7.el6
+perl-IO-Compress-Base 2.021 136.el6_6.1
+ipw2100-firmware 1.3 11.el6
+gpg-pubkey fd431d51 4ae0493b
+libcom_err-devel 1.41.12 21.el6
+kernel 2.6.32 504.12.2.el6
+filesystem 2.4.30 3.el6
+basesystem 10.0 4.el6
+time 1.7 37.1.el6
+cvs 1.11.23 16.el6
+pax 3.4 10.1.el6
+at 3.1.10 44.el6_6.2
+libgcc 4.4.7 11.el6
+libcap 2.16 5.5.el6
+ed 1.1 3.3.el6
+redhat-release-server 6Server 6.6.0.2.el6
+info 4.13a 8.el6
+popt 1.13 7.el6
+perl-Test-Harness 3.17 136.el6_6.1
+bash 4.1.2 29.el6
+libacl 2.2.49 6.el6
+perl-ExtUtils-MakeMaker 6.55 136.el6_6.1
+perl-Test-Simple 0.92 136.el6_6.1
+libcom_err 1.41.12 21.el6
+iotop 0.3.2 7.el6
+audit-libs 2.3.7 5.el6
+wemux 3.2.0 1.el6
+grep 2.6.3 6.el6
+libdnet 1.12 6.el6
+coreutils 8.4 37.el6
+libblkid 2.17.2 12.18.el6
+pcre 7.8 6.el6
+lua 5.1.4 4.1.el6
+mesa-dri-filesystem 10.1.2 2.el6
+cpio 2.10 12.el6_5
+libXau 1.0.6 4.el6
+p11-kit 0.18.5 2.el6_5.2
+glib2 2.28.8 4.el6
+grubby 7.0.15 7.el6
+expat 2.0.1 11.el6_2
+bzip2 1.0.5 7.el6_0
+openldap 2.4.39 8.el6
+libss 1.41.12 21.el6
+psmisc 22.6 19.el6_5
+sysvinit-tools 2.87 5.dsf.el6
+libstdc++ 4.4.7 11.el6
+libX11-common 1.6.0 2.2.el6
+pciutils-libs 3.1.10 4.el6
+libXfixes 5.0.1 2.1.el6
+gzip 1.3.12 22.el6
+libxslt 1.1.26 2.el6_3.1
+libXxf86vm 1.1.3 2.1.el6
+file-libs 5.04 21.el6
+libxkbfile 1.0.6 1.1.el6
+ethtool 3.5 5.el6
+gmp 4.3.1 7.el6_2.2
+cryptsetup-luks-libs 1.2.0 11.el6
+libnih 1.0.1 7.el6
+python-libs 2.6.6 52.el6
+libutempter 1.1.5 4.1.el6
+yum 3.2.29 60.el6
+vim-minimal 7.2.411 1.8.el6
+gnupg2 2.0.14 8.el6
+net-tools 1.60 110.el6_2
+redhat-support-lib-python 0.9.6 1.el6
+tar 1.23 11.el6
+mysql-libs 5.1.73 3.el6_5
+module-init-tools 3.9 24.el6
+pinentry 0.7.6 6.el6
+iptables 1.4.7 14.el6
+util-linux-ng 2.17.2 12.18.el6
+m4 1.4.13 5.el6
+udev 147 2.57.el6
+dash 0.5.5.1 4.el6
+rhn-client-tools 1.0.0.1 18.el6
+groff 1.18.1.4 21.el6
+cracklib 2.8.16 4.el6
+rhn-setup 1.0.0.1 18.el6
+redhat-logos 60.0.14 1.el6
+libpciaccess 0.13.3 0.1.el6
+plymouth 0.8.3 27.el6_5.1
+libcap-ng 0.6.4 3.el6_0.1
+rhn-check 1.0.0.1 18.el6
+bfa-firmware 3.2.23.0 2.el6
+redhat-support-tool 0.9.6 2.el6
+gpgme 1.1.8 3.el6
+authconfig 6.1.12 19.el6
+efibootmgr 0.5.4 12.el6
+sudo 1.8.6p3 15.el6
+fipscheck 1.2.0 7.el6
+cyrus-sasl-lib 2.1.23 15.el6_6.2
+audit 2.3.7 5.el6
+libsemanage 2.0.43 4.2.el6
+elfutils-libelf 0.158 3.2.el6
+gpg-pubkey 83ef826a 4a690bb4
+xorg-x11-drv-ati-firmware 7.3.99 2.el6
+newt 0.52.11 3.el6
+xorg-x11-server-common 1.15.0 26.el6_6
+ql2500-firmware 7.03.00 1.el6_5
+libffi 3.0.5 3.2.el6
+krb5-devel 1.10.3 37.el6_6
+shadow-utils 4.1.4.2 19.el6_6.1
+python-iniparse 0.3.1 2.1.el6
+newt-python 0.52.11 3.el6
+dbus-libs 1.2.24 8.el6_6
+python-lxml 2.2.3 1.1.el6
+python-ethtool 0.6 5.el6
+python-dmidecode 3.10.13 3.el6_4
+perl-Pod-Escapes 1.04 136.el6_6.1
+runit 2.1.2 1.el6
+perl-Module-Pluggable 3.90 136.el6_6.1
+python-pycurl 7.19.0 8.el6
+dracut 004 356.el6_6.2
+perl-Pod-Simple 3.13 136.el6_6.1
+pyOpenSSL 0.10 2.el6
+collectl 4.0.0 2.el6
+pkgconfig 0.23 9.1.el6
+nspr 4.10.8 1.el6_6
+libuser 0.56.13 5.el6
+dbus-python 0.83.0 6.1.el6
+nss 3.18.0 5.3.el6_6
+iproute 2.6.32 33.el6_6
+passwd 0.77 4.el6_2.2
+libedit 2.11 4.20080712cvs.1.el6
+yum-metadata-parser 1.1.2 16.el6
+selinux-policy-targeted 3.7.19 260.el6_6.3
+nss-tools 3.18.0 5.3.el6_6
+yum-rhn-plugin 0.9.1 52.3.el6_6
+kbd-misc 1.15 11.el6
+device-mapper-libs 1.02.90 2.el6_6.3
+rpm 4.8.0 38.el6_6
+device-mapper-event 1.02.90 2.el6_6.3
+bind-libs 9.8.2 0.30.rc1.el6_6.3
+lvm2 2.02.111 2.el6_6.3
+glibc 2.12 1.149.el6_6.9
+rsyslog 5.8.10 10.el6_6
+glibc-headers 2.12 1.149.el6_6.9
+system-config-firewall-base 1.2.27 7.2.el6_6
+usermode 1.102 3.el6
+glibc-static 2.12 1.149.el6_6.9
+nss-softokn-freebl 3.14.3 22.el6_6
+openssl 1.0.1e 30.el6_6.11
+db4-cxx 4.7.25 19.el6_6
+libcurl 7.19.7 40.el6_6.4
+kernel 2.6.32 504.23.4.el6
+dhclient 4.1.1 43.P1.el6_6.1
+db4-utils 4.7.25 19.el6_6
+kernel-devel 2.6.32 504.23.4.el6
+vim-common 7.2.411 1.8.el6
+cronie-anacron 1.4.4 12.el6
+vim-enhanced 7.2.411 1.8.el6
+crontabs 1.10 33.el6
+sysstat 9.0.4 27.el6
+libtirpc 0.2.1 10.el6
+keyutils 1.4 5.el6
+nfs-utils-lib 1.1.5 9.el6
+gnutls 2.8.5 14.el6_5
+rsyslog-relp 5.8.10 10.el6_6
+bison 2.4.1 5.el6
+iwl5150-firmware 8.24.2.2 1.el6
+ppl 0.10.2 11.el6
+iwl6050-firmware 41.28.5.1 2.el6
+libgomp 4.4.7 11.el6
+iwl6000g2a-firmware 17.168.5.3 1.el6
+cpp 4.4.7 11.el6
+iwl6000-firmware 9.221.4.1 1.el6
+gcc 4.4.7 11.el6
+gcc-c++ 4.4.7 11.el6
+patch 2.6 6.el6
+xz-lzma-compat 4.999.9 0.5.beta.20091007git.el6
+attr 2.4.44 7.el6
+elfutils-libs 0.158 3.2.el6
+iwl5000-firmware 8.83.5.1_1 1.el6_1.1
+ivtv-firmware 20080701 20.2
+fakeroot-libs 1.12.2 22.2.el6
+wget 1.12 5.el6_6.1
+atmel-firmware 1.3 7.el6
+rpmdevtools 7.5 2.el6
+iwl4965-firmware 228.61.2.24 2.1.el6
+iwl3945-firmware 15.32.2.9 4.el6
+perl-Compress-Raw-Zlib 2.021 136.el6_6.1
+rt73usb-firmware 1.8 7.el6
+perl-IO-Compress-Zlib 2.021 136.el6_6.1
+ql23xx-firmware 3.03.27 3.1.el6
+perl-Time-HiRes 1.9721 136.el6_6.1
+rootfiles 8.1 6.1.el6
+htop 1.0.1 2.el6
+gpg-pubkey 2fa658e0 45700c69
+zlib-devel 1.2.3 29.el6
+libsepol-devel 2.0.41 4.el6
+keyutils-libs-devel 1.4 5.el6
+ntpdate 4.2.6p5 3.el6_6
+freetype 2.3.11 15.el6_6.1
+libfontenc 1.0.5 2.el6
+xkeyboard-config 2.11 1.el6
+libXdmcp 1.1.1 3.el6
+ConsoleKit 0.4.1 3.el6
+pm-utils 1.2.5 11.el6
+hal 0.5.14 14.el6
+mesa-private-llvm 3.4 3.el6
+mesa-dri1-drivers 7.11 8.el6
+xorg-x11-drv-vmmouse 13.0.0 2.el6
+setup 2.8.14 20.el6_4.1
+kernel-devel 2.6.32 504.12.2.el6
+ncurses-base 5.7 3.20090208.el6
+gettext 0.17 18.el6
+ncurses-libs 5.7 3.20090208.el6
+bc 1.06.95 1.el6
+zlib 1.2.3 29.el6
+gdbm-devel 1.8.0 36.el6
+chkconfig 1.3.49.3 2.el6_4.1
+perl-devel 5.10.1 136.el6_6.1
+libselinux 2.0.94 5.8.el6
+tmux 1.6 3.el6
+sed 4.2.1 10.el6
+libicu 4.2.1 9.1.el6_2
+pam 1.1.1 20.el6
+readline 6.0 4.el6
+libuuid 2.17.2 12.18.el6
+gawk 3.1.7 10.el6
+pixman 0.32.4 4.el6
+libtasn1 2.3 6.el6_5
+libidn 1.18 2.el6
+shared-mime-info 0.70 6.el6
+findutils 4.4.2 6.el6
+e2fsprogs-libs 1.41.12 21.el6
+tcp_wrappers-libs 7.6 57.el6
+ConsoleKit-libs 0.4.1 3.el6
+device-mapper-persistent-data 0.3.2 1.el6
+libXext 1.3.2 2.1.el6
+plymouth-core-libs 0.8.3 27.el6_5.1
+xorg-x11-xkb-utils 7.7 4.el6
+keyutils-libs 1.4 5.el6
+libusb 0.1.12 23.el6
+hdparm 9.43 4.el6
+python 2.6.6 52.el6
+MAKEDEV 3.24 6.el6
+libxml2-python 2.7.6 17.el6_6.1
+polkit 0.96 7.el6
+binutils 2.20.51.0.2 5.42.el6
+system-setup-keyboard 0.7 4.el6
+make 3.81 20.el6
+mesa-dri-drivers 10.1.2 2.el6
+policycoreutils 2.0.83 19.47.el6_6.1
+ncurses 5.7 3.20090208.el6
+iptables-ipv6 1.4.7 14.el6
+postfix 2.6.6 6.el6_5
+grub 0.97 93.el6
+libgudev1 147 2.57.el6
+ustr 1.0.4 9.1.el6
+xz-libs 4.999.9 0.5.beta.20091007git.el6
+slang 2.2.1 1.el6
+krb5-libs 1.10.3 37.el6_6
+m2crypto 0.20.2 9.el6
+python-simplejson 2.0.9 3.1.el6
+kernel 2.6.32 504.16.2.el6
+kernel-devel 2.6.32 504.16.2.el6
+perl-libs 5.10.1 136.el6_6.1
+python-urlgrabber 3.9.1 9.el6
+tzdata 2015d 1.el6
+gamin 0.1.10 9.el6
+nss-util 3.18.0 1.el6_6
+openssh-server 5.3p1 104.el6_6.1
+dbus-glib 0.86 6.el6_4
+python-gudev 147.1 4.el6_0.1
+device-mapper 1.02.90 2.el6_6.3
+rpm-libs 4.8.0 38.el6_6
+lvm2-libs 2.02.111 2.el6_6.3
+iputils 20071127 17.el6_4.2
+python-devel 2.6.6 52.el6
+subscription-manager 1.12.14 9.el6_6
+glibc-devel 2.12 1.149.el6_6.9
+dhcp-common 4.1.1 43.P1.el6_6.1
+rhnsd 4.9.3 2.el6
+db4 4.7.25 19.el6_6
+db4-devel 4.7.25 19.el6_6
+curl 7.19.7 40.el6_6.4
+kbd 1.15 11.el6
+kernel-headers 2.6.32 504.23.4.el6
+gpm-libs 1.20.6 12.el6
+cronie 1.4.4 12.el6
+libgssglue 0.1 11.el6
+libevent 1.4.13 4.el6
+librelp 1.2.7 3.el6
+flex 2.5.35 9.el6
+iwl100-firmware 39.31.5.1 1.el6
+mpfr 2.4.1 6.el6
+aic94xx-firmware 30 2.el6
+gdb 7.2 75.el6
+rpm-build 4.8.0 38.el6_6
+libertas-usb8388-firmware 5.110.22.p23 3.1.el6
+man 1.6f 32.el6
+zd1211-firmware 1.4 4.el6
+gpg-pubkey 0608b895 4bd22942
+ql2200-firmware 2.02.08 3.1.el6
+perl-Compress-Zlib 2.021 136.el6_6.1
+ipw2200-firmware 3.1 4.el6
+nc 1.84 22.el6
+libselinux-devel 2.0.94 5.8.el6
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..80f893d3 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");
@@ -25,7 +25,7 @@ describe Ohai::System, "AIX memory plugin" do
allow(@plugin).to receive(:shell_out).with("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").and_return(mock_shell_out(0, " 513280.00 340034.17 173245.83 62535.17 230400.05 276950.14 70176.00\n", nil))
@swap_s = "allocated = 23887872 blocks used = 288912 blocks free = 23598960 blocks\n"
allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0,@swap_s, nil))
- end
+ end
it "should get total memory" do
@plugin.run
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_output.rb b/spec/unit/plugins/darwin/system_profiler_output.rb
index ffacfde2..e18d3f57 100644
--- a/spec/unit/plugins/darwin/system_profiler_output.rb
+++ b/spec/unit/plugins/darwin/system_profiler_output.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
module SystemProfilerOutput
Mini = <<end_output
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..bae9af29 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");
@@ -26,6 +26,7 @@ describe Ohai::System, "Linux plugin platform" do
let(:have_redhat_release) { false }
let(:have_gentoo_release) { false }
let(:have_exherbo_release) { false }
+ let(:have_alpine_release) { false }
let(:have_suse_release) { false }
let(:have_arch_release) { false }
let(:have_system_release) { false }
@@ -45,6 +46,7 @@ describe Ohai::System, "Linux plugin platform" do
allow(File).to receive(:exist?).with("/etc/redhat-release").and_return(have_redhat_release)
allow(File).to receive(:exist?).with("/etc/gentoo-release").and_return(have_gentoo_release)
allow(File).to receive(:exist?).with("/etc/exherbo-release").and_return(have_exherbo_release)
+ allow(File).to receive(:exist?).with("/etc/alpine-release").and_return(have_alpine_release)
allow(File).to receive(:exist?).with("/etc/SuSE-release").and_return(have_suse_release)
allow(File).to receive(:exist?).with("/etc/arch-release").and_return(have_arch_release)
allow(File).to receive(:exist?).with("/etc/system-release").and_return(have_system_release)
@@ -223,6 +225,23 @@ describe Ohai::System, "Linux plugin platform" do
end
end
+ describe "on alpine" do
+
+ let(:have_alpine_release) { true }
+
+ before(:each) do
+ @plugin.lsb = nil
+ end
+
+ it "should set platform and platform_family to alpine" do
+ expect(File).to receive(:read).with("/etc/alpine-release").and_return("3.2.3")
+ @plugin.run
+ expect(@plugin[:platform]).to eq("alpine")
+ expect(@plugin[:platform_family]).to eq("alpine")
+ expect(@plugin[:platform_version]).to eq('3.2.3')
+ end
+ end
+
describe "on exherbo" do
let(:have_exherbo_release) { true }
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/packages_spec.rb b/spec/unit/plugins/packages_spec.rb
new file mode 100644
index 00000000..7f5e63ab
--- /dev/null
+++ b/spec/unit/plugins/packages_spec.rb
@@ -0,0 +1,241 @@
+# Author:: Christopher M. Luciano (<cmlucian@us.ibm.com>)
+# Author:: Shahul Khajamohideen (<skhajamohid1@bloomberg.net>)
+# Copyright (C) 2015 IBM Corp.
+# Copyright (C) 2015 Bloomberg Finance L.P.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+
+describe Ohai::System, 'plugin packages' do
+ context 'on debian' do
+ let(:plugin) do
+ get_plugin('packages').tap do |plugin|
+ plugin[:platform_family] = 'debian'
+ end
+ end
+
+ let(:stdout) do
+ File.read(File.join(SPEC_PLUGIN_PATH, 'dpkg-query.output'))
+ end
+
+ before(:each) do
+ allow(plugin).to receive(:collect_os).and_return(:linux)
+ allow(plugin).to receive(:shell_out)
+ .with('dpkg-query -W')
+ .and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'calls dpkg query' do
+ expect(plugin).to receive(:shell_out)
+ .with('dpkg-query -W')
+ .and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'gets packages and versions' do
+ expect(plugin[:packages]['vim-common'][:version]).to eq('2:7.4.052-1ubuntu3')
+ end
+ end
+
+ context 'on fedora' do
+ let(:plugin) do
+ get_plugin('packages').tap do |plugin|
+ plugin[:platform_family] = 'fedora'
+ end
+ end
+
+ let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
+
+ let(:stdout) do
+ File.read(File.join(SPEC_PLUGIN_PATH, 'rpmquery.output'))
+ end
+
+ before(:each) do
+ allow(plugin).to receive(:collect_os).and_return(:linux)
+ allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'calls rpm -qa' do
+ expect(plugin).to receive(:shell_out)
+ .with("rpm -qa --queryformat #{format}")
+ .and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'gets packages and versions/release' do
+ expect(plugin[:packages]['vim-common'][:version]).to eq('7.2.411')
+ expect(plugin[:packages]['vim-common'][:release]).to eq('1.8.el6')
+ end
+ end
+
+ context 'on windows', :windows_only do
+ require 'wmi-lite'
+
+ let(:plugin) do
+ get_plugin('packages').tap do |plugin|
+ plugin[:platform_family] = 'windows'
+ end
+ end
+
+ let(:win32_product_output) do
+ [{ 'assignmenttype' => 0,
+ 'caption' => 'NXLOG-CE',
+ 'description' => 'NXLOG-CE',
+ 'helplink' => nil,
+ 'helptelephone' => nil,
+ 'identifyingnumber' => '{22FA28AB-3C1B-438B-A8B5-E23892C8B567}',
+ 'installdate' => '20150511',
+ 'installdate2' => nil,
+ 'installlocation' => nil,
+ 'installsource' => 'C:\\chef\\cache\\',
+ 'installstate' => 5,
+ 'language' => '1033',
+ 'localpackage' => 'C:\\Windows\\Installer\\30884.msi',
+ 'name' => 'NXLOG-CE',
+ 'packagecache' => 'C:\\Windows\\Installer\\30884.msi',
+ 'packagecode' => '{EC3A13C4-4634-47FC-9662-DC293CB96F9F}',
+ 'packagename' => 'nexlog-ce-2.8.1248.msi',
+ 'productid' => nil,
+ 'regcompany' => nil,
+ 'regowner' => nil,
+ 'skunumber' => nil,
+ 'transforms' => nil,
+ 'urlinfoabout' => nil,
+ 'urlupdateinfo' => nil,
+ 'vendor' => 'nxsec.com',
+ 'version' => '2.8.1248',
+ 'wordcount' => 2 },
+ { 'assignmenttype' => 1,
+ 'caption' => 'Chef Development Kit v0.7.0',
+ 'description' => 'Chef Development Kit v0.7.0',
+ 'helplink' => 'http://www.getchef.com/support/',
+ 'helptelephone' => nil,
+ 'identifyingnumber' => '{90754A33-404C-4172-8F3B-7F04CE98011C}',
+ 'installdate' => '20150925', 'installdate2' => nil,
+ 'installlocation' => nil,
+ 'installsource' => 'C:\\Users\\skhajamohid1\\Downloads\\',
+ 'installstate' => 5, 'language' => '1033',
+ 'localpackage' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
+ 'name' => 'Chef Development Kit v0.7.0',
+ 'packagecache' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
+ 'packagecode' => '{9B82FB86-40AE-4CDF-9DE8-97574F9395B9}',
+ 'packagename' => 'chefdk-0.7.0-1 (2).msi',
+ 'productid' => nil,
+ 'regcompany' => nil,
+ 'regowner' => nil,
+ 'skunumber' => nil,
+ 'transforms' => nil,
+ 'urlinfoabout' => nil,
+ 'urlupdateinfo' => nil,
+ 'vendor' => "\"Chef Software, Inc. <maintainers@chef.io>\"",
+ 'version' => '0.7.0.1',
+ 'wordcount' => 2 }]
+ end
+
+ before(:each) do
+ allow(plugin).to receive(:collect_os).and_return(:windows)
+ expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with('Win32_Product').and_return(win32_product_output)
+ plugin.run
+ end
+
+ it 'gets package info' do
+ expect(plugin[:packages]['Chef Development Kit v0.7.0'][:version]).to eq('0.7.0.1')
+ expect(plugin[:packages]['Chef Development Kit v0.7.0'][:vendor]).to eq("\"Chef Software, Inc. <maintainers@chef.io>\"")
+ expect(plugin[:packages]['Chef Development Kit v0.7.0'][:installdate]).to eq('20150925')
+
+ expect(plugin[:packages]['NXLOG-CE'][:version]).to eq('2.8.1248')
+ expect(plugin[:packages]['NXLOG-CE'][:vendor]).to eq('nxsec.com')
+ expect(plugin[:packages]['NXLOG-CE'][:installdate]).to eq('20150511')
+ end
+ end
+
+ context 'on aix' do
+ let(:plugin) { get_plugin('packages') }
+
+ let(:stdout) do
+ File.read(File.join(SPEC_PLUGIN_PATH, 'lslpp.output'))
+ end
+
+ before(:each) do
+ allow(plugin).to receive(:collect_os).and_return(:aix)
+ allow(plugin).to receive(:shell_out).with('lslpp -L -q -c').and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'calls lslpp -L -q -c' do
+ expect(plugin).to receive(:shell_out)
+ .with('lslpp -L -q -c')
+ .and_return(mock_shell_out(0, stdout, ''))
+ plugin.run
+ end
+
+ it 'gets packages with version' do
+ expect(plugin[:packages]['chef'][:version]).to eq('12.5.1.1')
+ end
+ end
+
+ context 'on solaris2' do
+ let(:plugin) { get_plugin('packages') }
+
+ let(:pkglist_output) do
+ File.read(File.join(SPEC_PLUGIN_PATH, 'pkglist.output'))
+ end
+
+ let(:pkginfo_output) do
+ File.read(File.join(SPEC_PLUGIN_PATH, 'pkginfo.output'))
+ end
+
+ before(:each) do
+ allow(plugin).to receive(:collect_os).and_return(:solaris2)
+ allow(plugin).to receive(:shell_out).with('pkg list -H').and_return(mock_shell_out(0, pkglist_output, ''))
+ allow(plugin).to receive(:shell_out).with('pkginfo -l').and_return(mock_shell_out(0, pkginfo_output, ''))
+ plugin.run
+ end
+
+ it 'calls pkg list -H' do
+ expect(plugin).to receive(:shell_out)
+ .with('pkg list -H')
+ .and_return(mock_shell_out(0, pkglist_output, ''))
+ plugin.run
+ end
+
+ it 'calls pkginfo -l' do
+ expect(plugin).to receive(:shell_out)
+ .with('pkginfo -l')
+ .and_return(mock_shell_out(0, pkginfo_output, ''))
+ plugin.run
+ end
+
+ it 'gets ips packages with version' do
+ expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
+ end
+
+ it 'gets ips packages with version and publisher' do
+ expect(plugin[:packages]['system/EMCpower'][:version]).to eq('6.0.0.1.0-3')
+ expect(plugin[:packages]['system/EMCpower'][:publisher]).to eq('emc.com')
+ end
+
+ it 'gets sysv packages with version' do
+ expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
+ end
+
+ it 'gets sysv packages with version' do
+ expect(plugin[:packages]['mqm'][:version]).to eq('7.0.1.4')
+ end
+ end
+end
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..2319432a 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");
@@ -49,7 +49,7 @@ describe Ohai::System, "plugin ruby" do
:host_vendor => ::RbConfig::CONFIG['host_vendor'],
:gems_dir => %x{#{ruby_bin} #{::RbConfig::CONFIG['bindir']}/gem env gemdir}.chomp,
:gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::RbConfig::CONFIG['bindir']}/#{bin}"
- }.find{|bin| ::File.exists? bin},
+ }.find{|bin| ::File.exists? bin},
:ruby_bin => ruby_bin
}.each do |attribute, value|
it "should have #{attribute} set to #{value.inspect}" do
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/cpu_spec.rb b/spec/unit/plugins/solaris2/cpu_spec.rb
index 4983da15..e4b1d891 100644
--- a/spec/unit/plugins/solaris2/cpu_spec.rb
+++ b/spec/unit/plugins/solaris2/cpu_spec.rb
@@ -2888,7 +2888,7 @@ END
expect(@plugin["cpu"]["104"]["core_id"]).to eql("1117")
expect(@plugin["cpu"]["112"]["core_id"]).to eql("1124")
expect(@plugin["cpu"]["120"]["core_id"]).to eql("1131")
- end
+ end
it "should include processor architecture" do
expect(@plugin["cpu"]["0"]["arch"]).to eql("sparcv9")
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
#