vagrant-digitalocean 0.1.2 → 0.2.0

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.1'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2'
+gem 'vagrant-omnibus'
 gemspec

data/README.md

@@ -4,6 +4,13 @@ Digital Ocean Vagrant Provider
 management of [Digital Ocean](https://www.digitalocean.com/) droplets
 (instances).
 
+**NOTE:** The Chef provisioner is no longer supported by default (as of 0.2.0).
+Please use the `vagrant-omnibus` plugin to install Chef on Vagrant-managed
+machines. This plugin provides control over the specific version of Chef
+to install. The custom `rebuild` command will not work until a pull request
+is accepted within the `vagrant-omnibus` project. I will update the README
+when this is completed.
+
 Current features include:
 - create and destroy droplets
 - power on and off droplets
@@ -65,6 +72,9 @@ Please note the following:
   extension.
 - You *must* specify your Digital Ocean Client and API keys. These may be
   found on the control panel within the *My Settings > API Access* section.
+- The Chef provisioner is installed via the
+  [`vagrant-omnibus` plugin](https://github.com/schisamo/vagrant-omnibus).
+  Please see its documentation for details. 
 
 **Supported Configuration Attributes**
 
@@ -89,8 +99,7 @@ set.
 
 *NOTE:* For those using a 0.0.x version of the provider,
 `provider.ssh_username` and `provider.ssh_private_key_path` have been removed
-in favor of the configuration options above. This approach better aligns the
-provider with upcoming changes in Vagrant 1.2.
+in favor of the configuration options above.
 
 Run
 ---

data/lib/vagrant-digitalocean/actions.rb

@@ -7,7 +7,6 @@ require 'vagrant-digitalocean/actions/rebuild'
 require 'vagrant-digitalocean/actions/reload'
 require 'vagrant-digitalocean/actions/setup_user'
 require 'vagrant-digitalocean/actions/setup_sudo'
-require 'vagrant-digitalocean/actions/setup_provisioner'
 require 'vagrant-digitalocean/actions/setup_key'
 require 'vagrant-digitalocean/actions/sync_folders'
 require 'vagrant-digitalocean/actions/modify_provision_path'
@@ -70,7 +69,6 @@ module VagrantPlugins
             case env[:machine_state]
             when :active
               b.use Provision
-              b.use SetupProvisioner
               b.use ModifyProvisionPath
               b.use SyncFolders
             when :off

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/locales/en.yml

@@ -14,7 +14,6 @@ en:
       reloading: "Rebooting the droplet..."
       creating_user: "Creating user account: %{user}..."
       modifying_sudo: "Modifying sudoers file to remove tty requirement..."
-      installing_provisioner: "Installing provisioner: %{provisioner}..."
       using_key: "Using existing SSH key: %{name}"
       creating_key: "Creating new SSH key: %{name}..."
       rsyncing: "Rsyncing folder: %{hostpath} => %{guestpath}..."

data/test/Vagrantfile

@@ -1,12 +1,15 @@
 Vagrant.require_plugin('vagrant-digitalocean')
+Vagrant.require_plugin('vagrant-omnibus')
 
 Vagrant.configure('2') do |config|
+  config.omnibus.chef_version = :latest
+
   config.vm.box = 'digital_ocean'
 
   config.ssh.username = 'tester'
   config.ssh.private_key_path = 'test_id_rsa'
 
-  config.vm.synced_folder '/vagrant', '.', :id => 'vagrant-root', :disabled => true
+  config.vm.synced_folder '.', '/vagrant', :disabled => true
 
   config.vm.provider :digital_ocean do |provider|
     provider.client_id = ENV['DO_CLIENT_ID']
@@ -31,7 +34,7 @@ Vagrant.configure('2') do |config|
 
   config.vm.define :centos do |centos|
     centos.vm.provider :digital_ocean do |provider|
-      provider.image = 'CentOS 6.3 x64'
+      provider.image = 'CentOS 6.4 x64'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -84,7 +84,6 @@ files:
 - lib/vagrant-digitalocean/actions/rebuild.rb
 - lib/vagrant-digitalocean/actions/reload.rb
 - lib/vagrant-digitalocean/actions/setup_key.rb
-- lib/vagrant-digitalocean/actions/setup_provisioner.rb
 - lib/vagrant-digitalocean/actions/setup_sudo.rb
 - lib/vagrant-digitalocean/actions/setup_user.rb
 - lib/vagrant-digitalocean/actions/sync_folders.rb

data/lib/vagrant-digitalocean/actions/setup_provisioner.rb

@@ -1,41 +0,0 @@
-module VagrantPlugins
-  module DigitalOcean
-    module Actions
-      class SetupProvisioner
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger = 
-            Log4r::Logger.new('vagrant::digitalocean::setup_provisioner')
-        end
-
-        def call(env)
-          # check if provisioning is enabled
-          enabled = true
-          enabled = env[:provision_enabled] if env.has_key?(:provision_enabled)
-          return @app.call(env) if !enabled
-
-          # check if a chef provisioner is configured
-          provisioners = @machine.config.vm.provisioners
-          configured = provisioners.reduce(false) do |c, provisioner|
-            provisioner.name =~ /chef/
-          end
-          return @app.call(env) if !configured
-
-          # check if chef is already installed
-          command = 'which chef-solo'
-          code = @machine.communicate.execute(command, :error_check => false)
-          return @app.call(env) if code == 0
-
-          # install chef
-          key = 'vagrant_digital_ocean.info.installing_provisioner'
-          env[:ui].info I18n.t(key, { :provisioner => 'chef' })
-          command = 'wget -O - http://www.opscode.com/chef/install.sh | bash'
-          @machine.communicate.sudo(command)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end