[DRE-commits] [ohai] 01/12: Merge tag 'upstream/7.0.4'
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Jun 13 18:36:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ohai.
commit c09615a554eab08f1ed23104329ad216b7a09e12
Merge: d9efdf4 8994f0d
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Jun 12 23:16:12 2015 -0300
Merge tag 'upstream/7.0.4'
Upstream version 7.0.4
Rakefile | 4 +-
checksums.yaml.gz | Bin 0 -> 267 bytes
docs/man/man1/ohai.1 | 110 +-
lib/ohai.rb | 2 +-
lib/ohai/application.rb | 17 +-
lib/ohai/common/dmi.rb | 126 +
lib/ohai/config.rb | 18 +-
lib/ohai/{plugins/aix/hostname.rb => dsl.rb} | 11 +-
lib/ohai/dsl/plugin.rb | 191 +
lib/ohai/dsl/plugin/versionvi.rb | 62 +
lib/ohai/dsl/plugin/versionvii.rb | 106 +
lib/ohai/exception.rb | 13 +-
lib/ohai/hints.rb | 48 +
lib/ohai/loader.rb | 205 +
lib/ohai/mixin/command.rb | 43 +-
lib/ohai/mixin/constant_helper.rb | 53 +
lib/ohai/mixin/ec2_metadata.rb | 126 +-
lib/ohai/mixin/from_file.rb | 36 -
.../mixin/{ec2_metadata.rb => gce_metadata.rb} | 68 +-
.../uptime.rb => mixin/network_constants.rb} | 27 +-
lib/ohai/mixin/os.rb | 59 +
lib/ohai/mixin/seconds_to_human.rb | 48 +
lib/ohai/plugins/aix/cpu.rb | 40 +-
lib/ohai/plugins/aix/filesystem.rb | 61 +-
.../plugins/{openbsd/uptime.rb => aix/kernel.rb} | 23 +-
lib/ohai/plugins/aix/memory.rb | 15 +-
lib/ohai/plugins/aix/network.rb | 133 +-
lib/ohai/plugins/aix/platform.rb | 15 +-
lib/ohai/plugins/aix/ps.rb | 23 -
lib/ohai/plugins/aix/ssh_host_key.rb | 26 -
lib/ohai/plugins/aix/uptime.rb | 23 +-
lib/ohai/plugins/azure.rb | 35 +
lib/ohai/plugins/c.rb | 181 +-
lib/ohai/plugins/chef.rb | 28 +-
lib/ohai/plugins/cloud.rb | 315 +-
lib/ohai/plugins/cloud_v2.rb | 289 +
lib/ohai/plugins/command.rb | 8 +-
lib/ohai/plugins/darwin/cpu.rb | 44 +
lib/ohai/plugins/darwin/filesystem.rb | 64 +-
lib/ohai/plugins/darwin/hostname.rb | 22 -
lib/ohai/plugins/darwin/kernel.rb | 37 -
lib/ohai/plugins/darwin/network.rb | 311 +-
lib/ohai/plugins/darwin/platform.rb | 34 +-
lib/ohai/plugins/darwin/ps.rb | 23 -
lib/ohai/plugins/darwin/ssh_host_key.rb | 25 -
lib/ohai/plugins/darwin/system_profiler.rb | 62 +-
lib/ohai/plugins/darwin/uptime.rb | 32 -
lib/ohai/plugins/dmi.rb | 204 +-
lib/ohai/plugins/dmi_common.rb | 121 -
lib/ohai/plugins/ec2.rb | 58 +-
lib/ohai/plugins/erlang.rb | 35 +-
lib/ohai/plugins/eucalyptus.rb | 73 +-
lib/ohai/plugins/freebsd/cpu.rb | 63 +-
lib/ohai/plugins/freebsd/filesystem.rb | 64 +-
lib/ohai/plugins/freebsd/hostname.rb | 22 -
lib/ohai/plugins/freebsd/kernel.rb | 37 -
lib/ohai/plugins/freebsd/memory.rb | 60 +-
lib/ohai/plugins/freebsd/network.rb | 183 +-
.../{solaris2/hostname.rb => freebsd/os.rb} | 25 +-
lib/ohai/plugins/freebsd/platform.rb | 14 +-
lib/ohai/plugins/freebsd/ps.rb | 24 -
lib/ohai/plugins/freebsd/ssh_host_key.rb | 26 -
lib/ohai/plugins/freebsd/virtualization.rb | 113 +-
lib/ohai/plugins/gce.rb | 52 +
lib/ohai/plugins/groovy.rb | 25 +-
lib/ohai/plugins/hostname.rb | 158 +-
lib/ohai/plugins/hpux/cpu.rb | 19 -
lib/ohai/plugins/hpux/filesystem.rb | 19 -
lib/ohai/plugins/hpux/hostname.rb | 19 -
lib/ohai/plugins/hpux/memory.rb | 19 -
lib/ohai/plugins/hpux/network.rb | 19 -
lib/ohai/plugins/hpux/platform.rb | 19 -
lib/ohai/plugins/hpux/ps.rb | 23 -
lib/ohai/plugins/hpux/ssh_host_key.rb | 26 -
lib/ohai/plugins/hpux/uptime.rb | 19 -
.../plugins/{windows/uptime.rb => init_package.rb} | 18 +-
lib/ohai/plugins/ip_scopes.rb | 47 +-
lib/ohai/plugins/java.rb | 70 +-
lib/ohai/plugins/kernel.rb | 200 +-
lib/ohai/plugins/keys.rb | 8 +-
lib/ohai/plugins/languages.rb | 8 +-
lib/ohai/plugins/linode.rb | 61 +
lib/ohai/plugins/linux/block_device.rb | 34 +-
lib/ohai/plugins/linux/cpu.rb | 80 +-
lib/ohai/plugins/linux/filesystem.rb | 142 +-
lib/ohai/plugins/linux/hostname.rb | 26 -
lib/ohai/plugins/linux/lsb.rb | 70 +-
lib/ohai/plugins/linux/memory.rb | 126 +-
lib/ohai/plugins/linux/network.rb | 698 +-
lib/ohai/plugins/linux/platform.rb | 174 +-
lib/ohai/plugins/linux/ps.rb | 23 -
lib/ohai/plugins/linux/ssh_host_key.rb | 26 -
lib/ohai/plugins/linux/uptime.rb | 28 -
lib/ohai/plugins/linux/virtualization.rb | 213 +-
lib/ohai/plugins/lua.rb | 24 +-
lib/ohai/plugins/mono.rb | 30 +-
lib/ohai/plugins/netbsd/cpu.rb | 48 +-
lib/ohai/plugins/netbsd/filesystem.rb | 64 +-
lib/ohai/plugins/netbsd/hostname.rb | 22 -
lib/ohai/plugins/netbsd/kernel.rb | 35 -
lib/ohai/plugins/netbsd/memory.rb | 118 +-
lib/ohai/plugins/netbsd/network.rb | 180 +-
lib/ohai/plugins/netbsd/platform.rb | 13 +-
lib/ohai/plugins/netbsd/ps.rb | 24 -
lib/ohai/plugins/netbsd/ssh_host_key.rb | 26 -
lib/ohai/plugins/netbsd/virtualization.rb | 79 +-
lib/ohai/plugins/network.rb | 195 +-
lib/ohai/plugins/network_listeners.rb | 48 +-
lib/ohai/plugins/{freebsd/uptime.rb => nodejs.rb} | 28 +-
lib/ohai/plugins/ohai.rb | 17 +-
lib/ohai/plugins/ohai_time.rb | 8 +-
lib/ohai/plugins/openbsd/cpu.rb | 35 +-
lib/ohai/plugins/openbsd/filesystem.rb | 64 +-
lib/ohai/plugins/openbsd/hostname.rb | 22 -
lib/ohai/plugins/openbsd/kernel.rb | 35 -
lib/ohai/plugins/openbsd/memory.rb | 118 +-
lib/ohai/plugins/openbsd/network.rb | 180 +-
lib/ohai/plugins/openbsd/platform.rb | 14 +-
lib/ohai/plugins/openbsd/ps.rb | 24 -
lib/ohai/plugins/openbsd/ssh_host_key.rb | 26 -
lib/ohai/plugins/openbsd/virtualization.rb | 80 +-
lib/ohai/plugins/openstack.rb | 48 +
lib/ohai/plugins/os.rb | 40 +-
lib/ohai/plugins/passwd.rb | 49 +-
lib/ohai/plugins/perl.rb | 37 +-
lib/ohai/plugins/php.rb | 27 +-
lib/ohai/plugins/platform.rb | 18 +-
lib/ohai/plugins/{linux/kernel.rb => ps.rb} | 25 +-
lib/ohai/plugins/python.rb | 28 +-
lib/ohai/plugins/rackspace.rb | 162 +-
lib/ohai/plugins/root_group.rb | 32 +
lib/ohai/plugins/ruby.rb | 98 +-
lib/ohai/plugins/sigar/cpu.rb | 38 +-
lib/ohai/plugins/sigar/filesystem.rb | 49 +-
lib/ohai/plugins/sigar/hostname.rb | 28 -
lib/ohai/plugins/sigar/memory.rb | 31 +-
lib/ohai/plugins/sigar/network.rb | 200 +-
lib/ohai/plugins/sigar/network_route.rb | 61 +-
lib/ohai/plugins/sigar/platform.rb | 16 +-
lib/ohai/plugins/sigar/uptime.rb | 27 -
lib/ohai/plugins/solaris2/cpu.rb | 74 +-
lib/ohai/plugins/solaris2/dmi.rb | 292 +-
lib/ohai/plugins/solaris2/filesystem.rb | 151 +-
lib/ohai/plugins/solaris2/kernel.rb | 40 -
lib/ohai/plugins/solaris2/{ps.rb => memory.rb} | 13 +-
lib/ohai/plugins/solaris2/network.rb | 176 +-
lib/ohai/plugins/solaris2/platform.rb | 76 +-
lib/ohai/plugins/solaris2/ssh_host_key.rb | 26 -
lib/ohai/plugins/solaris2/uptime.rb | 36 -
lib/ohai/plugins/solaris2/virtualization.rb | 113 +-
lib/ohai/plugins/solaris2/zpools.rb | 76 +-
lib/ohai/plugins/ssh_host_key.rb | 77 +
lib/ohai/plugins/uptime.rb | 112 +-
lib/ohai/plugins/virtualization.rb | 114 +-
lib/ohai/plugins/windows/cpu.rb | 71 +-
lib/ohai/plugins/windows/filesystem.rb | 50 +-
lib/ohai/plugins/windows/hostname.rb | 33 -
lib/ohai/plugins/windows/kernel.rb | 77 -
lib/ohai/plugins/windows/network.rb | 167 +-
lib/ohai/plugins/windows/platform.rb | 13 +-
lib/ohai/provides_map.rb | 184 +
lib/ohai/runner.rb | 104 +
lib/ohai/system.rb | 297 +-
lib/ohai/version.rb | 7 +-
metadata.yml | 722 +-
spec/data/plugins/___lib64___libc.so.6.output | 135 +
spec/data/plugins/___lib___libc.so.6.output | 135 +
spec/data/plugins/cc.output | 135 +
spec/data/plugins/cl.output | 135 +
spec/data/plugins/devenv.com.output | 135 +
spec/data/plugins/env.output | 71 +
spec/data/plugins/erl.output | 144 +
spec/data/plugins/gcc.output | 135 +
spec/data/plugins/groovy.output | 159 +
spec/data/plugins/java.output | 143 +
spec/data/plugins/lua.output | 143 +
spec/data/plugins/messages.rb | 8 +
spec/data/plugins/node.output | 143 +
spec/data/plugins/perl.output | 143 +
spec/data/plugins/php.output | 143 +
spec/data/plugins/python.output | 143 +
spec/data/plugins/uname.output | 71 +
spec/data/plugins/v6message.rb | 2 +
spec/data/plugins/v7message.rb | 7 +
spec/data/plugins/what.output | 135 +
spec/data/plugins/xlc.output | 135 +
spec/ohai/mixin/command_spec.rb | 47 -
spec/ohai/mixin/from_file_spec.rb | 53 -
spec/ohai/plugins/cloud_spec.rb | 113 -
spec/ohai/plugins/darwin/kernel_spec.rb | 46 -
spec/ohai/plugins/darwin/network_spec.rb | 851 -
spec/ohai/plugins/darwin/platform_spec.rb | 99 -
spec/ohai/plugins/ec2_spec.rb | 120 -
spec/ohai/plugins/eucalyptus_spec.rb | 119 -
spec/ohai/plugins/fail_spec.rb | 62 -
spec/ohai/plugins/hostname_spec.rb | 39 -
spec/ohai/plugins/java_spec.rb | 123 -
spec/ohai/plugins/kernel_spec.rb | 43 -
spec/ohai/plugins/linux/filesystem_spec.rb | 289 -
spec/ohai/plugins/linux/lsb_spec.rb | 150 -
spec/ohai/plugins/linux/platform_spec.rb | 440 -
spec/ohai/plugins/linux/virtualization_spec.rb | 249 -
spec/ohai/plugins/perl_spec.rb | 82 -
spec/ohai/plugins/rackspace_spec.rb | 146 -
spec/ohai/system_spec.rb | 138 -
spec/spec_helper.rb | 79 +-
spec/support/integration_helper.rb | 44 +
spec/support/platform_helpers.rb | 31 +
spec/unit/dsl/plugin_spec.rb | 335 +
spec/unit/hints_spec.rb | 65 +
spec/unit/loader_spec.rb | 226 +
spec/unit/mixin/command_spec.rb | 89 +
spec/unit/mixin/ec2_metadata_spec.rb | 82 +
spec/unit/plugins/aix/cpu_spec.rb | 80 +
spec/unit/plugins/aix/filesystem_spec.rb | 113 +
.../netbsd => unit/plugins/aix}/hostname_spec.rb | 24 +-
spec/unit/plugins/aix/kernel_spec.rb | 52 +
spec/unit/plugins/aix/network_spec.rb | 279 +
.../netbsd => unit/plugins/aix}/platform_spec.rb | 35 +-
spec/unit/plugins/aix/uptime_spec.rb | 39 +
spec/unit/plugins/azure_spec.rb | 72 +
spec/{ohai => unit}/plugins/c_spec.rb | 175 +-
spec/{ohai => unit}/plugins/chef_spec.rb | 29 +-
spec/unit/plugins/cloud_spec.rb | 208 +
spec/unit/plugins/cloud_v2_spec.rb | 292 +
spec/unit/plugins/darwin/cpu_spec.rb | 73 +
.../{ohai => unit}/plugins/darwin/hostname_spec.rb | 34 +-
spec/unit/plugins/darwin/kernel_spec.rb | 69 +
spec/unit/plugins/darwin/network_spec.rb | 850 +
spec/unit/plugins/darwin/platform_spec.rb | 72 +
spec/unit/plugins/darwin/system_profiler_output.rb | 79525 +++++++++++++++++++
spec/unit/plugins/darwin/system_profiler_spec.rb | 47 +
spec/{ohai => unit}/plugins/dmi_spec.rb | 19 +-
spec/unit/plugins/ec2_spec.rb | 213 +
spec/{ohai => unit}/plugins/erlang_spec.rb | 38 +-
spec/unit/plugins/eucalyptus_spec.rb | 126 +
spec/unit/plugins/fail_spec.rb | 315 +
.../plugins/freebsd/hostname_spec.rb | 20 +-
spec/{ohai => unit}/plugins/freebsd/kernel_spec.rb | 16 +-
.../plugins/freebsd/os_spec.rb} | 25 +-
.../plugins/freebsd/platform_spec.rb | 19 +-
spec/unit/plugins/freebsd/virtualization_spec.rb | 99 +
spec/unit/plugins/gce_spec.rb | 84 +
spec/{ohai => unit}/plugins/groovy_spec.rb | 26 +-
spec/unit/plugins/hostname_spec.rb | 104 +
spec/unit/plugins/init_package_spec.rb | 50 +
spec/unit/plugins/ip_scopes_spec.rb | 97 +
spec/unit/plugins/java_spec.rb | 169 +
spec/unit/plugins/kernel_spec.rb | 79 +
spec/unit/plugins/linode_spec.rb | 158 +
spec/{ohai => unit}/plugins/linux/cpu_spec.rb | 85 +-
spec/unit/plugins/linux/filesystem_spec.rb | 256 +
spec/{ohai => unit}/plugins/linux/hostname_spec.rb | 30 +-
spec/{ohai => unit}/plugins/linux/kernel_spec.rb | 30 +-
spec/unit/plugins/linux/lsb_spec.rb | 148 +
spec/{ohai => unit}/plugins/linux/network_spec.rb | 488 +-
spec/unit/plugins/linux/platform_spec.rb | 450 +
spec/{ohai => unit}/plugins/linux/uptime_spec.rb | 38 +-
spec/unit/plugins/linux/virtualization_spec.rb | 369 +
spec/{ohai => unit}/plugins/lua_spec.rb | 27 +-
spec/{ohai => unit}/plugins/mono_spec.rb | 25 +-
.../{ohai => unit}/plugins/netbsd/hostname_spec.rb | 24 +-
spec/{ohai => unit}/plugins/netbsd/kernel_spec.rb | 16 +-
.../{ohai => unit}/plugins/netbsd/platform_spec.rb | 18 +-
spec/unit/plugins/network_spec.rb | 987 +
spec/unit/plugins/nodejs_spec.rb | 49 +
spec/{ohai => unit}/plugins/ohai_spec.rb | 7 +-
spec/{ohai => unit}/plugins/ohai_time_spec.rb | 17 +-
.../plugins/openbsd/hostname_spec.rb | 32 +-
spec/{ohai => unit}/plugins/openbsd/kernel_spec.rb | 16 +-
.../plugins/openbsd/platform_spec.rb | 18 +-
spec/unit/plugins/openstack_spec.rb | 214 +
spec/{ohai => unit}/plugins/os_spec.rb | 29 +-
spec/{ohai => unit}/plugins/passwd_spec.rb | 25 +-
spec/unit/plugins/perl_spec.rb | 58 +
spec/{ohai => unit}/plugins/php_spec.rb | 35 +-
spec/{ohai => unit}/plugins/platform_spec.rb | 53 +-
spec/{ohai => unit}/plugins/python_spec.rb | 30 +-
spec/unit/plugins/rackspace_spec.rb | 266 +
spec/unit/plugins/root_group_spec.rb | 88 +
spec/{ohai => unit}/plugins/ruby_spec.rb | 16 +-
.../plugins/sigar/network_route_spec.rb | 24 +-
spec/unit/plugins/solaris2/cpu_spec.rb | 82 +
.../plugins/solaris2/hostname_spec.rb | 25 +-
.../{ohai => unit}/plugins/solaris2/kernel_spec.rb | 26 +-
.../plugins/solaris2/memory_spec.rb} | 23 +-
.../plugins/solaris2/network_spec.rb | 69 +-
.../plugins/solaris2/platform_spec.rb | 35 +-
.../plugins/solaris2/virtualization_spec.rb | 82 +-
spec/unit/plugins/ssh_host_keys_spec.rb | 102 +
spec/unit/provides_map_spec.rb | 208 +
spec/unit/runner_spec.rb | 461 +
spec/unit/system_spec.rb | 714 +
293 files changed, 99240 insertions(+), 9345 deletions(-)
diff --cc spec/unit/plugins/ruby_spec.rb
index 634cbb0,6c3a3de..e215c09
--- a/spec/unit/plugins/ruby_spec.rb
+++ b/spec/unit/plugins/ruby_spec.rb
@@@ -16,9 -16,10 +16,10 @@@
# limitations under the License.
#
-
+require 'rubygems'
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
- require 'tempfile'
+
+ ruby_bin = File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
describe Ohai::System, "plugin ruby" do
@@@ -51,20 -47,11 +51,20 @@@
:host_cpu => ::RbConfig::CONFIG['host_cpu'],
:host_os => ::RbConfig::CONFIG['host_os'],
: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}"
+ :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},
:ruby_bin => ruby_bin
- }.each do |attribute, value|
+ }
+ puts data.inspect
+ EOS
+ program = Tempfile.new('ruby')
+ program.write(code)
+ program.close
+ data = eval(`ruby #{program.path}`)
+ program.unlink
+
+ data.each do |attribute, value|
it "should have #{attribute} set" do
@ruby_ohai_data[attribute].should eql(value)
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ohai.git
More information about the Pkg-ruby-extras-commits
mailing list