vagrant-ohai2 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea985e2ede58fe7c113fe6a34d6edca8279c493
-  data.tar.gz: df0404fd9b1a5b84a1781e883710beb48432a069
+  metadata.gz: fc5d75b7e1d544c8c335c948b517858d6cc22b4a
+  data.tar.gz: 9b4f0c3b779fdca3c7012fea95043c3a5a92ec24
 SHA512:
-  metadata.gz: cc22f0bc06bc9f6be01f6bd92f2e93dc33c27c23826fe767ab030d75f7678566ee8ff13e07420e431f7039caeafede456e3c26f6f102f336a44ea581c86aa361
-  data.tar.gz: 34c9bbd6be275cd8d93734bdbb64c79edde2e01ebe2329d2bf9968df4fdccbd76e1d46f9595e43e349d4c9a674e47d5eabd9274a0e5b23272c0dbf70768ccfe4
+  metadata.gz: b62ff9fcb55e9d1f9024165be29c1a44c3a9ae857064eb69865746dd9f8254ae4c798501f87767040ebae8213b3a14193533afc5c022500bec96add136c0c263
+  data.tar.gz: b671867178b94ce31f2faa90b23f8b3306a80fe74310d9e492e18f8a77cfc7d387646303299b1d40a125792c8517c8c2b4479b5c04c25e61d425d88e18473ecc

data/README.md

@@ -1,24 +1,24 @@
-# Vagrant::Ohai
+# Vagrant::Ohai2
 
-This is a [vagrant](http://vagrantup.com) plugin which installs an Ohai plugin providing network information to Chef.
+This is a [vagrant](http://vagrantup.com) plugin which installs an Ohai2 plugin providing network information to Chef.
 In particular, the ipaddress is set to the private network defined in vagrant, if one is present.
 
-This is a fork of [Avishai Ish-Shalom](https://github.com/avishai-ish-shalom/vagrant-ohai).
+This is a fork of [Avishai Ish-Shalom](https://github.com/avishai-ish-shalom/vagrant-ohai2).
 
 ## Installation
 
-    vagrant plugin install vagrant-ohai
+    vagrant plugin install vagrant-ohai2
 
 ## Usage
 
-The plugin will automatically activate when using the `:chef_solo`, `:chef_zero`, `:chef_apply`, `:chef_client` or `:shell` provisioners. If you want to disable it, put `config.ohai.enable = false` in your Vagrantfile.
+The plugin will automatically activate when using the `:chef_solo`, `:chef_zero`, `:chef_apply`, `:chef_client` or `:shell` provisioners. If you want to disable it, put `config.ohai2.enable = false` in your Vagrantfile.
 If you wish to use a primary nic which is not a private network, e.g. when using a bridge, set the `primary_nic` option:
 
-    config.ohai.primary_nic = "eth1"
+    config.ohai2.primary_nic = "eth1"
 
-To activate custom plugin support put `config.ohai.plugins_dir = <full_path_to_plugins_dir>` in your Vagrantfile
+To activate custom plugin support put `config.ohai2.plugins_dir = <full_path_to_plugins_dir>` in your Vagrantfile
 
-    config.ohai.plugins_dir = "/var/ohai/custom_plugins"
+    config.ohai2.plugins_dir = "/var/ohai2/custom_plugins"
 
 ## Compatibility
 

data/lib/{ohai → ohai2}/vagrant.rb

@@ -39,9 +39,9 @@ Ohai.plugin(:VboxIpaddress) do
   depends 'etc/passwd'
 
   collect_data(:default) do
-  # Ohai hint
+  # Ohai2 hint
     unless File.exist?('/etc/chef/ohai_plugins/vagrant.json')
-      Ohai::Log.fail('Ohai has not set :ipaddress (Missing vagrant.json)')
+      Ohai2::Log.fail('Ohai2 has not set :ipaddress (Missing vagrant.json)')
     else
       vagrant = read_json('/etc/chef/ohai_plugins/vagrant.json')
 
@@ -53,10 +53,10 @@ Ohai.plugin(:VboxIpaddress) do
         nic, addr = lookup_address_by_ipaddress(network, vagrant['private_ipv4'])
       else
         nic, addr = nil, nil
-        Ohai::Log.info("Neither nic nor private_ipv4 are set, skipping")
+        Ohai2::Log.info("Neither nic nor private_ipv4 are set, skipping")
       end
       if addr
-        Ohai::Log.info("Ohai override :ipaddress to #{addr} from #{nic}")
+        Ohai2::Log.info("Ohai2 override :ipaddress to #{addr} from #{nic}")
         ipaddress addr
       end
     end

data/lib/vagrant-ohai2.rb

@@ -0,0 +1 @@
+require 'vagrant-ohai2/vagrant-ohai2.rb'

data/lib/{vagrant-ohai → vagrant-ohai2}/action_configure_chef.rb

@@ -1,9 +1,9 @@
-require 'vagrant-ohai/helpers'
+require 'vagrant-ohai2/helpers'
 
 module VagrantPlugins
-  module Ohai
+  module Ohai2
     class ActionConfigureChef
-      include VagrantPlugins::Ohai::Helpers
+      include VagrantPlugins::Ohai2::Helpers
 
       def initialize(app, env)
         @app = app
@@ -17,23 +17,23 @@ module VagrantPlugins
       end
 
       private
-      def ohai_custom_config(current_conf)
+      def ohai2_custom_config(current_conf)
         tmp = Tempfile.new(["chef-custom-config", ".rb"])
-        tmp.puts 'Ohai::config[:plugin_path] << "/etc/chef/ohai_plugins"'
+        tmp.puts 'ohai.plugin_path << "/etc/chef/ohai_plugins"'
         tmp.write(File.read(current_conf)) if current_conf
         tmp.close
         tmp
       end
 
       def register_custom_chef_config
-        return unless @machine.config.ohai.enable or @machine.config.ohai.plugins_dir
+        return unless @machine.config.ohai2.enable or @machine.config.ohai2.plugins_dir
         chef_provisioners.each do |provisioner|
           if provisioner.config.respond_to? :custom_config_path and not provisioner.config.custom_config_path == Plugin::UNSET_VALUE
             current_custom_config_path = provisioner.config.custom_config_path
           else
             current_custom_config_path = nil
           end
-          custom_config = ohai_custom_config(current_custom_config_path)
+          custom_config = ohai2_custom_config(current_custom_config_path)
           provisioner.config.instance_variable_set("@custom_config_path", custom_config.path)
           # retain a reference to prevent tempfile from being auto cleaned up
           provisioner.config.instance_variable_set("@__custom_config_tempfile__", custom_config)

data/lib/{vagrant-ohai/action_install_ohai_plugin.rb → vagrant-ohai2/action_install_ohai2_plugin.rb}

@@ -1,11 +1,11 @@
-require 'vagrant-ohai/helpers'
+require 'vagrant-Ohai2/helpers'
 
 module VagrantPlugins
-  module Ohai
+  module Ohai2
     class ActionInstallOhaiPlugin
-      OHAI_PLUGIN_PATH = File.expand_path("../../ohai/vagrant.rb", __FILE__)
+      OHAI_PLUGIN_PATH = File.expand_path("../../Ohai2/vagrant.rb", __FILE__)
 
-      include VagrantPlugins::Ohai::Helpers
+      include VagrantPlugins::Ohai2::Helpers
 
       def initialize(app, env)
         @app = app
@@ -18,13 +18,13 @@ module VagrantPlugins
         @app.call(env)
         return unless @machine.communicate.ready?
 
-        if is_chef_used && @machine.config.ohai.enable
-          @machine.ui.info("Installing Ohai plugin")
+        if is_chef_used && @machine.config.ohai2.enable
+          @machine.ui.info("Installing Ohai2 plugin")
           create_ohai_folders
           copy_ohai_plugin
         end
-        if is_chef_used && @machine.config.ohai.plugins_dir
-          @machine.ui.info("Installing Custom Ohai plugin")
+        if is_chef_used && @machine.config.ohai2.plugins_dir
+          @machine.ui.info("Installing Custom Ohai2 plugin")
           create_ohai_folders
           copy_ohai_custom_plugins
         end
@@ -48,14 +48,14 @@ module VagrantPlugins
       def vagrant_info
         info = {}
         info[:box] = @machine.config.vm.box
-        info[:primary_nic] = @machine.config.ohai.primary_nic
+        info[:primary_nic] = @machine.config.Ohai2.primary_nic
         info[:private_ipv4] = private_ipv4
         info
       end
 
       def copy_ohai_plugin
 
-        hint_file = Tempfile.new(["vagrant-ohai", ".json"])
+        hint_file = Tempfile.new(["vagrant-Ohai2", ".json"])
         hint_file.write(vagrant_info.to_json)
         hint_file.close
         @machine.communicate.upload(hint_file.path, "/etc/chef/ohai_plugins/vagrant.json")
@@ -65,10 +65,10 @@ module VagrantPlugins
 
       def copy_ohai_custom_plugins
 
-        files = Dir.entries(@machine.config.ohai.plugins_dir).select { |e| e =~ /^[a-z]+\.rb/ }
+        files = Dir.entries(@machine.config.ohai2.plugins_dir).select { |e| e =~ /^[a-z]+\.rb/ }
         files.each do |file|
-          custom_ohai_plugin_path = File.expand_path("#{@machine.config.ohai.plugins_dir}/#{file}", __FILE__)
-          @machine.communicate.upload(custom_ohai_plugin_path, "/etc/chef/ohai_plugins/#{file}")
+          custom_ohai2_plugin_path = File.expand_path("#{@machine.config.ohai2.plugins_dir}/#{file}", __FILE__)
+          @machine.communicate.upload(custom_ohai2_plugin_path, "/etc/chef/ohai_plugins/#{file}")
         end
       end
 

data/lib/{vagrant-ohai → vagrant-ohai2}/config.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Ohai
+  module Ohai2
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :enable
       attr_accessor :primary_nic

data/lib/{vagrant-ohai → vagrant-ohai2}/helpers.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Ohai
+  module Ohai2
     #
     module Helpers
       def chef_provisioners

data/lib/{vagrant-ohai/ohai → vagrant-ohai2/ohai2}/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  module Ohai
+  module Ohai2
     VERSION = "0.0.1"
   end
 end

data/lib/{vagrant-ohai/vagrant-ohai.rb → vagrant-ohai2/vagrant-ohai2.rb}

@@ -1,25 +1,25 @@
-require "vagrant-ohai/version"
+require "vagrant-ohai2/version"
 require "vagrant/plugin"
 
-raise RuntimeError, "vagrant-ohai will only work with Vagrant 1.2.3 and above!" if Vagrant::VERSION <= "1.2.3"
+raise RuntimeError, "vagrant-Ohai2 will only work with Vagrant 1.2.3 and above!" if Vagrant::VERSION <= "1.2.3"
 
 module VagrantPlugins
-  module Ohai
+  module Ohai2
     class Plugin < Vagrant.plugin("2")
-      name "vagrant-ohai"
+      name "vagrant-ohai2"
       description <<-DESC
       This plugin ensures ipaddress and cloud attributes in Chef
       correspond to Vagrant's private network
       DESC
 
-      action_hook(:install_ohai_plugin, Plugin::ALL_ACTIONS) do |hook|
-        require_relative 'action_install_ohai_plugin'
+      action_hook(:install_ohai2_plugin, Plugin::ALL_ACTIONS) do |hook|
+        require_relative 'action_install_ohai2_plugin'
         require_relative 'action_configure_chef'
         hook.after(Vagrant::Action::Builtin::Provision, ActionInstallOhaiPlugin)
         hook.before(Vagrant::Action::Builtin::ConfigValidate, ActionConfigureChef)
       end
 
-      config(:ohai) do
+      config(:ohai2) do
         require_relative "config"
         Config
       end

data/lib/vagrant-ohai2/version.rb

@@ -0,0 +1,5 @@
+module VagrantPlugins
+  module Ohai2
+    VERSION = "0.1.15"
+  end
+end

data/{vagrant-ohai.gemspec → vagrant-ohai2.gemspec}

@@ -1,15 +1,15 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-ohai/version'
+require 'vagrant-Ohai2/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "vagrant-ohai2"
-  spec.version       = VagrantPlugins::Ohai::VERSION
+  spec.version       = VagrantPlugins::Ohai2::VERSION
   spec.authors       = ["Jeremy Miller"]
   spec.email         = ["jmiller3346@gmail.com"]
-  spec.description   = %q{Vagrant plugin which installs an Ohai plugn to properly detect private ipaddress}
-  spec.summary       = %q{Vagrant plugin which installs an Ohai plugn to properly detect private ipaddress}
+  spec.description   = %q{Vagrant plugin which installs an Ohai2 plugn to properly detect private ipaddress}
+  spec.summary       = %q{Vagrant plugin which installs an Ohai2 plugn to properly detect private ipaddress}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ohai2
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Jeremy Miller
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Vagrant plugin which installs an Ohai plugn to properly detect private
+description: Vagrant plugin which installs an Ohai2 plugn to properly detect private
   ipaddress
 email:
 - jmiller3346@gmail.com
@@ -51,16 +51,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/ohai/vagrant.rb
-- lib/vagrant-ohai.rb
-- lib/vagrant-ohai/action_configure_chef.rb
-- lib/vagrant-ohai/action_install_ohai_plugin.rb
-- lib/vagrant-ohai/config.rb
-- lib/vagrant-ohai/helpers.rb
-- lib/vagrant-ohai/ohai/version.rb
-- lib/vagrant-ohai/vagrant-ohai.rb
-- lib/vagrant-ohai/version.rb
-- vagrant-ohai.gemspec
+- lib/ohai2/vagrant.rb
+- lib/vagrant-ohai2.rb
+- lib/vagrant-ohai2/action_configure_chef.rb
+- lib/vagrant-ohai2/action_install_ohai2_plugin.rb
+- lib/vagrant-ohai2/config.rb
+- lib/vagrant-ohai2/helpers.rb
+- lib/vagrant-ohai2/ohai2/version.rb
+- lib/vagrant-ohai2/vagrant-ohai2.rb
+- lib/vagrant-ohai2/version.rb
+- vagrant-ohai2.gemspec
 homepage: ''
 licenses:
 - MIT
@@ -84,5 +84,5 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Vagrant plugin which installs an Ohai plugn to properly detect private ipaddress
+summary: Vagrant plugin which installs an Ohai2 plugn to properly detect private ipaddress
 test_files: []

data/lib/vagrant-ohai.rb

@@ -1 +0,0 @@
-require 'vagrant-ohai/vagrant-ohai.rb'

data/lib/vagrant-ohai/version.rb

@@ -1,5 +0,0 @@
-module VagrantPlugins
-  module Ohai
-    VERSION = "0.1.14"
-  end
-end