vagrant-omnibus 1.0.2 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQxYmJiN2Q2YzI1NGYyMTg4Njk5NmEyNzMwNmZiOTlmMGMyY2QzNw==
+    MzNiOTFhOWM4OGRiODViMjA2Zjc5NzY0ZjFiMTIyZGFmMWFmOWJlYg==
   data.tar.gz: !binary |-
-    NzVlNTBhMmI0ZGI0ODkyYzc0MjA3YzA2NDdiNGQ2NWJjZjAzMTUyYg==
+    N2Y5NTYwODVmODc0YmQwMjRjYjM4YmQ0YjE2Y2JhMGJlOTcwYTc1NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDEyMTRjZDlmMzQ4YWQ5MGZiMzliMjk4Mzk5NzQ0NzhhNGI3Yzc3YmU1ZDZi
-    MmQ2MWIxNDM2NjI0M2Q0YjcxZjE3NDNlMGY5N2Q5ZDE1NTRmNTQwNjIzNTEy
-    MWU3ZDA5MjdhODEzMjQwNTcxMTFjN2VlZGM1ZTA4ZDE2NGVmOWM=
+    ODYyNjY0ZDZmM2YxMmMzZTdlYjQyOTk4YzhiY2VmNWNjNzg3ZTAxYmVkZmZh
+    MzdjZDRiNjI3ZGMzMThhODhmNDMyNjNlZjliZTk2NjJjNGU5NGIzYzY5ZDEy
+    ODU0Y2ViMzU1ZWZjMTkxOWVkY2ZhMDU5YzlkMWViNjRjZmNhNGQ=
   data.tar.gz: !binary |-
-    YjQ4NWI5NTQwMzc2MmE4YjA0ZTQ5NjI0OTg0ZDBlYzNmZjViMmI1NGJhZGU1
-    ZTM2OGE2MzMzZGQ1ZDc5YzI1YjgxMjFjZTljZTI4NGU2NjM0NjUxY2Y3YTZm
-    MGU3OThiMWY1MjFhNzY0ZDk4YjNmOTA3Zjg5NGY2OWJmNTkwMDk=
+    MGYzYmJjY2IwNDYyNjNlMDVkOWFlOThlNTVhYWI3NjAyODk4NDczMDM0Y2Ux
+    YzBmODQ4YTc5NDJjNjdhYTcyMjVkMTAyZjAzYWVjMjM0YzQxNGExZjIxMzkw
+    ZjU0ZTE1OGQ4YjM3YmM2M2ZlZjM2NzllZDE4MjI2ZTU5NzE4YmI=

data/CHANGELOG.md

@@ -1,38 +1,58 @@
+## 1.1.0 (June 21, 2013)
+
+FEATURES:
+
+* PR [#23][], Issues [#17][], [#19][], [#21][], [#23][]: Support for all Vagrant providers that hook into `Vagrant::Action::Builtin::Provision` for provisioning. ([@smdahlen][], [@michfield][], [@rjocoleman][])
+* Issue [#15][]: Multi-VM Vagrantfiles are now fully supported. A global `omnibus.chef_version` will install the same version of Chef on all VMs OR declare a separate Chef version in the config block for each individual VM! ([@smdahlen][], [@schisamo][])
+* PR [#10][]: Optionally change the location of `install.sh` via the `OMNIBUS_INSTALL_URL` environment variable. Default is still https://www.opscode.com/chef/install.sh. , ([@petecheslock][])
+
 ## 1.0.2 (April 20, 2013)
 
 IMPROVEMENTS:
 
-* unit test coverage for `VagrantPlugins::Omnibus::Config`
-* Add Rackspace provider acceptance test.
-* Parameterize the acceptance test Rake task, this allows you test run
-  acceptance tests against a single provider.
+* Unit test coverage for `VagrantPlugins::Omnibus::Config` ([@schisamo][])
+* Add Rackspace provider acceptance test. ([@schisamo][])
+* Parameterize the acceptance test Rake task, this allows you test run acceptance tests against a single provider. ([@schisamo][])
 
 BUG FIXES:
 
-* convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a
-  string. fixes [GH-2] for realz.
-* RubyGems 2.0 compat: use #empty? to check for results. fixes [GH-6]
-* Ensure 'vagrant-rackspace/action' is loaded. fixes [GH-7]
-* Trigger plugin if machine state is `:active`. fixes [GH-8]
+* Fixes [#2][]: Convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a string. ([@schisamo][])
+* Fixes [#6][]: RubyGems 2.0 compat: use #empty? to check for results. ([@schisamo][])
+* Fixes [#7][]: Ensure 'vagrant-rackspace/action' is loaded. ([@schisamo][])
+* Fixes [#8][]: Trigger plugin if machine state is `:active`. ([@schisamo][])
 
 ## 1.0.1 (April 17, 2013)
 
 IMPROVEMENTS:
 
-* Resolve `latest` to a real Chef version. This ensures the plugin does not
-  attempt to re-install Chef on subsequent provisions. [GH-2]
-* Validate user provided value for omnibus.chef_version is in fact a real Chef
-  version. [GH-4]
-* Retrieve omnibus.chef_version directly from global config.
-* Update development depdendencies to vagrant (1.2.1) and vagrant-aws
-  (0.2.1).
+* Issue [#2][]: Resolve `latest` to a real Chef version. This ensures the plugin does not attempt to re-install Chef on subsequent provisions. ([@schisamo][])
+* Issue [#4][]: Validate user provided value for omnibus.chef_version is in fact a real Chef version. ([@schisamo][])
+* Retrieve omnibus.chef_version directly from global config. ([@schisamo][])
+* Update development dependencies to vagrant (1.2.1) and vagrant-aws (0.2.1). ([@schisamo][])
 
 BUG FIXES:
 
-* Plugin now correctly operates in "no-op" node if now "omnibus.chef_version"
-  is not present in the Vagrantfile. [GH-3]
-* Use Ubuntu 12.04 release AMI for acceptance testing.
+* Issue [#3][]: Plugin now correctly operates in "no-op" node if now `omnibus.chef_version` is not present in the Vagrantfile. ([@schisamo][])
+* Use Ubuntu 12.04 release AMI for acceptance testing. ([@schisamo][])
 
 ## 1.0.0 (April 1, 2013)
 
 * The initial release.
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#2]: https://github.com/schisamo/vagrant/issues/2
+[#3]: https://github.com/schisamo/vagrant/issues/3
+[#4]: https://github.com/schisamo/vagrant/issues/4
+[#6]: https://github.com/schisamo/vagrant/issues/6
+[#7]: https://github.com/schisamo/vagrant/issues/7
+[#8]: https://github.com/schisamo/vagrant/issues/8
+[#10]: https://github.com/schisamo/vagrant/issues/10
+[#15]: https://github.com/schisamo/vagrant/issues/15
+[#17]: https://github.com/schisamo/vagrant/issues/17
+[#19]: https://github.com/schisamo/vagrant/issues/19
+[#21]: https://github.com/schisamo/vagrant/issues/21
+[#23]: https://github.com/schisamo/vagrant/issues/23
+[@michfield]: https://github.com/michfield
+[@petecheslock]: https://github.com/petecheslock
+[@rjocoleman]: https://github.com/rjocoleman
+[@schisamo]: https://github.com/schisamo
+[@smdahlen]: https://github.com/smdahlen

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
 end
 
 group :test do
+  gem "vagrant-digitalocean", "~> 0.2.0"
   gem "vagrant-aws", "~> 0.2.2"
   gem "vagrant-rackspace", "~> 0.1.1"
 end

data/README.md

@@ -9,15 +9,17 @@ A Vagrant plugin that ensures the desired version of Chef is installed via the
 platform-specific Omnibus packages. This proves very useful when using Vagrant
 with provisioner-less baseboxes OR cloud images.
 
-This plugin has been verified to work with the following
+The plugin should work correctly with most all providers that hook into 
+`Vagrant::Action::Builtin::Provision` for provisioning and is 
+known to work with the following 
 [Vagrant providers](http://docs.vagrantup.com/v2/providers/index.html):
 
 * VirtualBox (part of core)
 * AWS (ships in [vagrant-aws](https://github.com/mitchellh/vagrant-aws) plugin)
 * Rackspace (ships in [vagrant-rackspace](https://github.com/mitchellh/vagrant-rackspace)
   plugin)
-
-It may work with other Vagrant providers but is not guaranteed to!
+* VMWare Fusion (can be [purchased from Hashicorp](http://www.vagrantup.com/vmware))
+* LXC (ships in [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc))
 
 ## Installation
 
@@ -61,6 +63,35 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+This plugin is also multi-vm aware so it would possible to say install a 
+different version of Chef on each VM:
+
+```ruby
+Vagrant.configure("2") do |config|
+
+  config.vm.define :new_chef do |new_chef_config|
+
+    ...
+
+    new_chef_config.omnibus.chef_version = :latest
+
+    ...
+
+  end
+
+  config.vm.define :old_chef do |old_chef_config|
+
+    ...
+
+    old_chef_config.omnibus.chef_version = "10.24.0"
+
+    ...
+
+  end
+end
+
+```
+
 ## Tests
 
 ### Unit

data/Rakefile

@@ -21,6 +21,10 @@ namespace :test do
       end
     end
 
+    unless system("vagrant box list | grep 'digital_ocean' &>/dev/null")
+      system("vagrant box add digital_ocean https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box")
+    end
+
     all_providers = Dir["test/acceptance/*"].map{|dir| File.basename(File.expand_path(dir))}
 
     # If a provider wasn't passed to the task run acceptance tests against

data/lib/vagrant-omnibus.rb

@@ -14,12 +14,17 @@
 # limitations under the License.
 #
 
-require "pathname"
-require "vagrant-omnibus/plugin"
+require 'vagrant'
+require 'vagrant-omnibus/plugin'
+require 'vagrant-omnibus/config'
 
 module VagrantPlugins
   module Omnibus
-    autoload :Action, 'vagrant-omnibus/action'
-    autoload :Config, 'vagrant-omnibus/config'
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+
+    I18n.load_path << File.expand_path('locales/en.yml', source_root)
+    I18n.reload!
   end
 end

data/lib/vagrant-omnibus/action.rb

@@ -14,30 +14,15 @@
 # limitations under the License.
 #
 
-require "vagrant/action/builder"
+require "vagrant-omnibus/action/install_chef"
 
 module VagrantPlugins
   module Omnibus
     module Action
-      autoload :InstallChef, File.expand_path("../action/install_chef", __FILE__)
-      autoload :IsRunningOrActive, File.expand_path("../action/is_running_or_active", __FILE__)
-      autoload :ReadChefVersion, File.expand_path("../action/read_chef_version", __FILE__)
-
-      # Include the built-in modules so that we can use them as top-level
-      # things.
-      include Vagrant::Action::Builtin
-
-      # @return [::Vagrant::Action::Builder]
       def self.install_chef
         @install_chef ||= ::Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsRunningOrActive do |env1, b2|
-            if env1[:result]
-              b2.use ReadChefVersion
-              b2.use InstallChef
-              b2.use SSHRun
-            end
-          end
+          b.use ::Vagrant::Action::Builtin::ConfigValidate
+          b.use InstallChef
         end
       end
     end

data/lib/vagrant-omnibus/action/install_chef.rb

@@ -22,43 +22,58 @@ module VagrantPlugins
       # This action installs Chef Omnibus packages at the desired version.
       class InstallChef
 
-        INSTALL_SH = "https://www.opscode.com/chef/install.sh".freeze
+        INSTALL_SH = "#{ENV['OMNIBUS_INSTALL_URL'] || 'https://www.opscode.com/chef/install.sh'}"
 
         def initialize(app, env)
           @app = app
+          @machine = env[:machine]
           # Config#finalize! SHOULD be called automatically
-          env[:global_config].omnibus.finalize!
+          @machine.config.omnibus.finalize!
         end
 
         def call(env)
-          desired_chef_version = env[:global_config].omnibus.chef_version
+          @app.call(env)
+
+          return unless @machine.communicate.ready?
 
-          unless desired_chef_version.nil?
-            env[:ui].info("Ensuring Chef is installed at requested version of #{desired_chef_version}.")
-            if env[:installed_chef_version] == desired_chef_version
-              env[:ui].info("Chef #{desired_chef_version} Omnibus package is already installed...skipping installation.")
+          desired_version = @machine.config.omnibus.chef_version
+          unless desired_version.nil?
+            if installed_version == desired_version
+              env[:ui].info I18n.t('vagrant-omnibus.action.installed', {
+                :version => desired_version
+              })
             else
-              env[:ui].info("Chef #{desired_chef_version} Omnibus package is not installed...installing now.")
-              env[:ssh_run_command] = install_chef_command(desired_chef_version)
+              env[:ui].info I18n.t('vagrant-omnibus.action.installing', {
+                :version => desired_version
+              })
+              install(desired_version)
             end
           end
-
-          @app.call(env)
         end
 
         private
 
-        def install_chef_command(version=latest)
-          <<-INSTALL_OMNIBUS
-if command -v wget &>/dev/null; then
-  wget -qO- #{INSTALL_SH} | sudo bash -s -- -v #{version}
-elif command -v curl &>/dev/null; then
-  curl -L #{INSTALL_SH} -v #{version} | sudo bash
-else
-  echo "Neither wget nor curl found. Please install one and try again." >&2
-  exit 1
-fi
-INSTALL_OMNIBUS
+        def installed_version
+          version = nil
+          command = 'echo $(chef-solo --v | awk "{print \\$2}" || "")'
+          @machine.communicate.sudo(command) do |type, data|
+            version = data.chomp if [:stderr, :stdout].include?(type)
+          end
+          version
+        end
+
+        def install(version)
+          command = <<-INSTALL_OMNIBUS
+            if command -v wget &>/dev/null; then
+              wget -qO- #{INSTALL_SH} | sudo bash -s -- -v #{version}
+            elif command -v curl &>/dev/null; then
+              curl -L #{INSTALL_SH} -v #{version} | sudo bash
+            else
+              echo "Neither wget nor curl found. Please install one." >&2
+              exit 1
+            fi
+          INSTALL_OMNIBUS
+          @machine.communicate.sudo(command)
         end
       end
     end

data/lib/vagrant-omnibus/plugin.rb

@@ -14,12 +14,6 @@
 # limitations under the License.
 #
 
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The Vagrant Omnibus plugin must be run within Vagrant."
-end
-
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < "1.1.0"
@@ -36,37 +30,20 @@ module VagrantPlugins
       via the platform-specific Omnibus packages.
       DESC
 
-      def self.provision(hook)
-
+      action_hook(:install_chef, Plugin::ALL_ACTIONS) do |hook|
+        require_relative "action"
         hook.after(Vagrant::Action::Builtin::Provision, Action.install_chef)
 
-        # BEGIN workaround
+        # The AWS provider uses a non-standard Provision action on initial
+        # creation:
+        #
+        # https://github.com/mitchellh/vagrant-aws/blob/master/lib/vagrant-aws/action.rb#L105
         #
-        # Currently hooks attached to {Vagrant::Action::Builtin::Provision} are
-        # not wired into the middleware return path. My current workaround is to
-        # fire after anything boot related which wedges in right before the
-        # actual real run of the provisioner.
-
-        hook.after(VagrantPlugins::ProviderVirtualBox::Action::Boot, Action.install_chef)
-
         if VagrantPlugins.const_defined?("AWS")
-          hook.after(VagrantPlugins::AWS::Action::RunInstance, Action.install_chef)
-        end
-
-        if VagrantPlugins.const_defined?("Rackspace")
-          # The `VagrantPlugins::Rackspace` module is missing the autoload for
-          # `VagrantPlugins::Rackspace::Action` so we need to ensure it is
-          # loaded before accessing the module in the after hook below.
-          require 'vagrant-rackspace/action'
-          hook.after(VagrantPlugins::Rackspace::Action::CreateServer, Action.install_chef)
+          hook.after(VagrantPlugins::AWS::Action::TimedProvision, Action.install_chef)
         end
-
-        # END workaround
       end
 
-      action_hook(:install_chef, :machine_action_up, &method(:provision))
-      action_hook(:install_chef, :machine_action_provision, &method(:provision))
-
       config(:omnibus) do
         require_relative "config"
         Config

data/lib/vagrant-omnibus/version.rb

@@ -16,6 +16,6 @@
 
 module VagrantPlugins
   module Omnibus
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  vagrant-omnibus:
+    action:
+      installed: "Chef %{version} Omnibus package is already installed."
+      installing: "Installing Chef %{version} Omnibus package..."

data/test/acceptance/digital_ocean/Vagrantfile

@@ -0,0 +1,23 @@
+Vagrant.require_plugin('vagrant-omnibus')
+Vagrant.require_plugin('vagrant-digitalocean')
+
+Vagrant.configure('2') do |config|
+  config.omnibus.chef_version = :latest
+
+  config.vm.box = 'digital_ocean'
+  config.vm.synced_folder '.', '/vagrant', :disabled => true
+
+  config.vm.provider :digital_ocean do |provider, override|
+    provider.client_id = ENV['DO_CLIENT_ID']
+    provider.api_key = ENV['DO_API_KEY']
+    provider.region = 'New York 1'
+    provider.size = '512MB'
+    provider.image = 'Ubuntu 12.04 x64 Server'
+    override.ssh.private_key_path = '~/.ssh/id_rsa'
+  end
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+    chef.add_recipe "chef-inator"
+  end
+end

data/test/acceptance/virtualbox/Vagrantfile

@@ -5,13 +5,28 @@
 require 'vagrant-omnibus'
 
 Vagrant.configure("2") do |config|
-  config.omnibus.chef_version = :latest
 
-  config.vm.box = "canonical-ubuntu-12.04"
-  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.define :new_chef do |new_chef_config|
+    new_chef_config.vm.box = "canonical-ubuntu-12.04"
+    new_chef_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
 
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
-    chef.add_recipe "chef-inator"
+    new_chef_config.omnibus.chef_version = :latest
+
+    new_chef_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
+
+  config.vm.define :old_chef do |old_chef_config|
+    old_chef_config.vm.box = "opscode-centos-6.4"
+    old_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box"
+
+    old_chef_config.omnibus.chef_version = "10.24.0"
+
+    old_chef_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,12 +73,12 @@ files:
 - lib/vagrant-omnibus.rb
 - lib/vagrant-omnibus/action.rb
 - lib/vagrant-omnibus/action/install_chef.rb
-- lib/vagrant-omnibus/action/is_running_or_active.rb
-- lib/vagrant-omnibus/action/read_chef_version.rb
 - lib/vagrant-omnibus/config.rb
 - lib/vagrant-omnibus/plugin.rb
 - lib/vagrant-omnibus/version.rb
+- locales/en.yml
 - test/acceptance/aws/Vagrantfile
+- test/acceptance/digital_ocean/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md
@@ -114,6 +114,7 @@ summary: A Vagrant plugin that ensures the desired version of Chef is installed
   the platform-specific Omnibus packages.
 test_files:
 - test/acceptance/aws/Vagrantfile
+- test/acceptance/digital_ocean/Vagrantfile
 - test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md

data/lib/vagrant-omnibus/action/is_running_or_active.rb

@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# 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.
-#
-
-module VagrantPlugins
-  module Omnibus
-    module Action
-      # @author Seth Chisamore <schisamo@opscode.com>
-      #
-      # This action checks if the machine is running (virtualbox) or active
-      # (aws, rackspace).
-      #
-      class IsRunningOrActive
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          # Set the result to be true if the machine is :running or :active.
-          if (env[:machine].state.id == :running) ||
-             (env[:machine].state.id == :active)
-
-            env[:result] = true
-          else
-            env[:result] = false
-          end
-
-          # Call the next if we have one (but we shouldn't, since this
-          # middleware is built to run with the Call-type middlewares)
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-omnibus/action/read_chef_version.rb

@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# 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.
-#
-
-module VagrantPlugins
-  module Omnibus
-    module Action
-      # @author Seth Chisamore <schisamo@opscode.com>
-      #
-      # This action will extract the installed version of Chef installed on the
-      # guest. The resulting version will exist in the `:installed_chef_version`
-      # key in the environment.
-      class ReadChefVersion
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:installed_chef_version] = nil
-          env[:machine].communicate.tap do |comm|
-            # Execute it with sudo
-            comm.sudo(chef_version_command) do |type, data|
-              if [:stderr, :stdout].include?(type)
-                env[:installed_chef_version] = data.chomp
-              end
-            end
-          end
-          @app.call(env)
-        end
-
-        private
-
-        def chef_version_command
-          <<-CHEF_VERSION
-echo $(chef-solo --v | awk "{print \\$2}" || "")
-          CHEF_VERSION
-        end
-      end
-    end
-  end
-end