diff options
| author | adamedx <adamed@getchef.com> | 2014-06-19 22:08:21 -0700 |
|---|---|---|
| committer | adamedx <adamed@getchef.com> | 2014-06-19 22:09:01 -0700 |
| commit | 84b6ee436aa5c7f74e7299f27a91f28ed2ad15b9 (patch) | |
| tree | 0177f657fb9c295b4200133cbec3265b971ab048 | |
| parent | 846bf3be736044f048f97d13e0667394466d04c1 (diff) | |
| download | ohai-84b6ee436aa5c7f74e7299f27a91f28ed2ad15b9.tar.gz | |
Back to one gemspec since FFI will be needed on all platforms soon anyway
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/ohai/util/win32.rb | 2 | ||||
| -rw-r--r-- | ohai-x86-mingw32.gemspec | 8 | ||||
| -rw-r--r-- | ohai.gemspec | 1 |
4 files changed, 3 insertions, 10 deletions
@@ -1,6 +1,6 @@ source "https://rubygems.org" -gemspec :name => "ohai" +gemspec # https://github.com/sj26/rspec_junit_formatter/pull/14 # rspec_junit_formatter isn't compatible with RSpec3 yet, but is fixed in diff --git a/lib/ohai/util/win32.rb b/lib/ohai/util/win32.rb index f77622a5..a475979f 100644 --- a/lib/ohai/util/win32.rb +++ b/lib/ohai/util/win32.rb @@ -24,6 +24,7 @@ module Ohai require 'ffi' extend FFI::Library + ffi_lib 'advapi32' attach_function :lookup_account_sid, @@ -32,7 +33,6 @@ module Ohai attach_function :convert_string_sid_to_sid, :ConvertStringSidToSidA,[ :pointer, :pointer ], :long - extend FFI::Library ffi_lib 'kernel32' attach_function :local_free, diff --git a/ohai-x86-mingw32.gemspec b/ohai-x86-mingw32.gemspec deleted file mode 100644 index 3a6625b5..00000000 --- a/ohai-x86-mingw32.gemspec +++ /dev/null @@ -1,8 +0,0 @@ -# x86-mingw32 Gemspec # -gemspec = eval(IO.read(File.expand_path("../ohai.gemspec", __FILE__))) - -gemspec.platform = "x86-mingw32" - -gemspec.add_dependency "ffi", "1.5.0" - -gemspec diff --git a/ohai.gemspec b/ohai.gemspec index dbc0eae0..ee152e45 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -21,6 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", "~> 1.2" s.add_dependency "ipaddress" s.add_dependency "wmi-lite", "~> 1.0" + s.add_dependency "ffi", "1.5.0" # Rake 10.2 drops Ruby 1.8 support, so stick to 10.1.x until chef also drops # 1.8. |