vagrant-digitalocean 0.0.4 → 0.1.0

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = "0.0.4"
+    VERSION = '0.1.0'
   end
 end

data/locales/en.yml

@@ -1,13 +1,35 @@
 en:
   vagrant_digital_ocean:
+    info:
+      off: "Droplet is off"
+      not_created: "Droplet has not been created"
+      already_active: "Droplet is already active"
+      already_off: "Droplet is already off"
+      creating: "Creating a new droplet..."
+      droplet_ip: "Assigned IP address: %{ip}"
+      destroying: "Destroying the droplet..."
+      powering_off: "Powering off the droplet..."
+      powering_on: "Powering on the droplet..."
+      rebuilding: "Rebuilding the droplet..."
+      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}..."
     config:
-      client_id_required: "Client ID required"
-      api_key_required: "API key required"
-      private_key_required: "SSH private key path required"
-      private_key_missing: "SSH private key is missing: %{key}"
-      public_key_missing: "SSH public key is missing: %{key}.pub"
+      client_id: "Client ID is required"
+      api_key: "API key is required"
+      private_key: "SSH private key path is required"
+      public_key: "SSH public key not found: %{key}"
     errors:
-      public_key: "Failed to read public key: %{path}"
+      public_key: |-
+        There was an issue reading the public key at:
+
+        Path: %{path}
+
+        Please check the file's permissions.
       api_status: |-
         There was an issue with the request made to the Digital Ocean
         API at:
@@ -19,7 +41,6 @@ en:
 
         Status: %{status}
         Response: %{response}
-
       rsync: |-
         There was an error when attemping to rsync a share folder.
         Please inspect the error message below for more info.
@@ -27,8 +48,7 @@ en:
         Host path: %{hostpath}
         Guest path: %{guestpath}
         Error: %{stderr}
-
-      :json: |-
+      json: |-
         There was an issue with the JSON response from the Digital Ocean
         API at:
 
@@ -38,7 +58,7 @@ en:
         The response JSON from the API was:
 
         Response: %{response}
-      :result_match: |-
+      result_match: |-
         The result collection for %{collection_name}:
 
         %{sub_obj}
@@ -47,7 +67,7 @@ en:
         key "%{key}".
 
         Please ensure that the configured value exists in the collection.
-      :certificate: |-
+      certificate: |-
         The secure connection to the Digital Ocean API has failed. Please
         ensure that your local certificates directory is defined in the
         provider config.
@@ -59,33 +79,5 @@ en:
         This is generally caused by the OpenSSL configuration associated
         with the Ruby install being unaware of the system specific ca
         certs.
-      :local_ip: |-
+      local_ip: |-
         The Digital Ocean provider was unable to determine the host's IP.
-
-    actions:
-      create:
-        create_droplet: "Creating the droplet"
-        wait_active: "Waiting for the droplet to become active (>= 1 min)"
-      rebuild:
-        rebuild: "Rebuilding the droplet"
-        wait: "Waiting for the droplet to rebuild (>= 1 min)"
-      destroy:
-        destroying: "Destroying droplet"
-        wait_off: "Waiting for the droplet to be destroyed"
-      setup_sudo:
-        exec: "Making alterations to the sudoers file where necessary"
-      setup_provisioner:
-        install: "Installing provisioner: %{provisioner} (>= 2 min)"
-      sync_folders:
-        rsync_folder: "Rsyncing folder: %{hostpath} => %{guestpath}"
-      setup_ssh_key:
-        existing_key: "Using existing SSH key: %{name}"
-        insecure_key: "Using default insecure vagrant SSH key"
-        new_key: "Creating new SSH key: %{name} (%{path})"
-      message_is_active:
-        active: "Droplet is already active"
-        not_active: "Droplet is not active"
-      check_ssh_user:
-        fallback: "Failed to authenticate with '%{user}', falling back to 'root'"
-      modify_provision_path:
-        modify: "Modifying provisioning path to '/home/%{user}/tmp'"

data/test/Vagrantfile

@@ -0,0 +1,37 @@
+Vagrant.require_plugin('vagrant-digitalocean')
+
+Vagrant.configure('2') do |config|
+  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.provider :digital_ocean do |provider|
+    provider.client_id = ENV['DO_CLIENT_ID']
+    provider.api_key = ENV['DO_API_KEY']
+    provider.region = 'New York 1'
+    provider.size = '512MB'
+    provider.ssh_key_name = 'Test Key'
+  end
+
+  config.vm.provision :shell, :path => 'scripts/provision.sh'
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = 'cookbooks'
+    chef.add_recipe 'test'
+  end
+
+  config.vm.define :ubuntu do |ubuntu|
+    ubuntu.vm.provider :digital_ocean do |provider|
+      provider.image = 'Ubuntu 12.04 x64 Server'
+    end
+  end
+
+  config.vm.define :centos do |centos|
+    centos.vm.provider :digital_ocean do |provider|
+      provider.image = 'CentOS 6.3 x64'
+    end
+  end
+end

data/test/cookbooks/test/recipes/default.rb

@@ -1 +1 @@
-log "Testing 1 2 3!"
+log 'Testing 1 2 3!'

data/test/scripts/provision.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 'Testing 1 2 3!'

data/test/test.sh

@@ -0,0 +1,14 @@
+if ! vagrant box list | grep digital_ocean 1>/dev/null; then
+    vagrant box add digital_ocean box/digital_ocean.box
+fi
+
+cd test
+
+vagrant up --provider=digital_ocean
+vagrant up
+vagrant provision
+vagrant rebuild
+vagrant halt
+vagrant destroy
+
+cd ..

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -71,24 +71,20 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/build.sh
-- bin/test_run.sh
-- box/Vagrantfile
-- box/cookbooks/foo/recipes/default.rb
 - box/digital_ocean.box
 - box/metadata.json
 - lib/vagrant-digitalocean.rb
-- lib/vagrant-digitalocean/action.rb
-- lib/vagrant-digitalocean/actions/check_ssh_user.rb
+- lib/vagrant-digitalocean/actions.rb
+- lib/vagrant-digitalocean/actions/check_state.rb
 - lib/vagrant-digitalocean/actions/create.rb
 - lib/vagrant-digitalocean/actions/destroy.rb
-- lib/vagrant-digitalocean/actions/is_active.rb
-- lib/vagrant-digitalocean/actions/message_is_active.rb
 - lib/vagrant-digitalocean/actions/modify_provision_path.rb
-- lib/vagrant-digitalocean/actions/read_state.rb
+- lib/vagrant-digitalocean/actions/power_off.rb
+- lib/vagrant-digitalocean/actions/power_on.rb
 - 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_ssh_key.rb
 - lib/vagrant-digitalocean/actions/setup_sudo.rb
 - lib/vagrant-digitalocean/actions/setup_user.rb
 - lib/vagrant-digitalocean/actions/sync_folders.rb
@@ -96,23 +92,15 @@ files:
 - lib/vagrant-digitalocean/config.rb
 - lib/vagrant-digitalocean/errors.rb
 - lib/vagrant-digitalocean/helpers/client.rb
-- lib/vagrant-digitalocean/helpers/file.rb
 - lib/vagrant-digitalocean/helpers/result.rb
-- lib/vagrant-digitalocean/helpers/translator.rb
 - lib/vagrant-digitalocean/plugin.rb
 - lib/vagrant-digitalocean/provider.rb
 - lib/vagrant-digitalocean/version.rb
 - locales/en.yml
-- scripts/chef/debian.sh
-- scripts/chef/redhat.sh
-- scripts/nfs/debian.sh
-- scripts/nfs/redhat.sh
-- scripts/sudo/redhat.sh
-- test/Vagrantfile.centos
-- test/Vagrantfile.ubuntu
+- test/Vagrantfile
 - test/cookbooks/test/recipes/default.rb
-- test/provision.sh
-- test/scripts/setup_user.sh
+- test/scripts/provision.sh
+- test/test.sh
 - test/test_id_rsa
 - test/test_id_rsa.pub
 - vagrant-digitalocean.gemspec
@@ -141,10 +129,10 @@ signing_key:
 specification_version: 3
 summary: Enables Vagrant to manage Digital Ocean droplets
 test_files:
-- test/Vagrantfile.centos
-- test/Vagrantfile.ubuntu
+- test/Vagrantfile
 - test/cookbooks/test/recipes/default.rb
-- test/provision.sh
-- test/scripts/setup_user.sh
+- test/scripts/provision.sh
+- test/test.sh
 - test/test_id_rsa
 - test/test_id_rsa.pub
+has_rdoc: 

data/bin/build.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# uninstall existing versions
-gem uninstall -a vagrant-digitalocean
-
-# clean old gem builds
-rm *.gem
-
-# build the gem
-gem build *.gemspec
-
-# make the gem available for installation as a vagrant plugin
-gem install *.gem
-
-# make sure bsdtar is installed
-if ! `which bsdtar > /dev/null`; then
-  echo "!! Install bsdtar"
-  exit 1
-fi
-
-# install the plugin
-vagrant plugin install vagrant-digitalocean
-
-# move into the dummy box dir
-cd box
-
-# create the dummy box
-tar cvzf digital_ocean.box ./metadata.json
-
-# remove an old version of the dummy box
-if `vagrant box list | grep -q digital_ocean`; then
-  vagrant box remove digital_ocean digital_ocean
-fi
-
-# add the new version of the dummy box
-vagrant box add digital_ocean digital_ocean.box
-
-# back out of the box dir
-cd -

data/bin/test_run.sh

@@ -1,15 +0,0 @@
-function run_test_for {
-  cp Vagrantfile.$1 Vagrantfile
-  vagrant up --provider=digital_ocean
-  vagrant up
-  vagrant provision
-  vagrant rebuild
-  vagrant destroy
-  vagrant destroy
-}
-
-set -e
-
-cd test
-run_test_for centos
-run_test_for ubuntu

data/box/Vagrantfile

@@ -1,20 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "digital_ocean"
-  config.ssh.private_key_path = "../test/test_id_rsa"
-
-  config.vm.provider :digital_ocean do |vm|
-    vm.client_id = ENV["DO_CLIENT_ID"]
-    vm.api_key = ENV["DO_API_KEY"]
-    vm.image = "Ubuntu 12.04 x32 Server"
-    vm.region = "New York 1"
-    vm.size = "512MB"
-  end
-
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = "cookbooks"
-    chef.add_recipe "foo"
-  end
-end

data/box/cookbooks/foo/recipes/default.rb

@@ -1 +0,0 @@
-log "Foo!"

data/lib/vagrant-digitalocean/action.rb

@@ -1,105 +0,0 @@
-require "vagrant-digitalocean/actions/destroy"
-require "vagrant-digitalocean/actions/read_state"
-require "vagrant-digitalocean/actions/setup_provisioner"
-require "vagrant-digitalocean/actions/setup_sudo"
-require "vagrant-digitalocean/actions/create"
-require "vagrant-digitalocean/actions/setup_ssh_key"
-require "vagrant-digitalocean/actions/sync_folders"
-require "vagrant-digitalocean/actions/rebuild"
-require "vagrant-digitalocean/actions/is_active"
-require "vagrant-digitalocean/actions/message_is_active"
-require "vagrant-digitalocean/actions/check_ssh_user"
-require "vagrant-digitalocean/actions/modify_provision_path"
-
-module VagrantPlugins
-  module DigitalOcean
-    class Action
-      include Vagrant::Action::Builtin
-
-      def action(name)
-        send(name)
-      end
-
-      def destroy
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, Actions::IsActive do |env, b|
-            if !env[:is_active]
-              b.use Actions::MessageIsActive
-              next
-            end
-            b.use Actions::Destroy
-          end
-        end
-      end
-
-      def read_state
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Actions::ReadState
-        end
-      end
-
-      def ssh
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, Actions::IsActive do |env, b|
-            if !env[:is_active]
-              b.use Actions::MessageIsActive
-              next
-            end
-            b.use Actions::CheckSSHUser
-            b.use SSHExec
-          end
-        end
-      end
-
-      def provision
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, Actions::IsActive do |env, b|
-            if !env[:is_active]
-              b.use Actions::MessageIsActive
-              next
-            end
-            b.use Actions::CheckSSHUser
-            b.use Actions::ModifyProvisionPath
-            b.use Provision
-            b.use Actions::SetupSudo
-            b.use Actions::SetupProvisioner
-            b.use Actions::SyncFolders
-          end
-        end
-      end
-
-      def up
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, Actions::IsActive do |env, b|
-            if env[:is_active]
-              b.use Actions::MessageIsActive
-              next
-            end
-            b.use Actions::SetupSSHKey
-            b.use Actions::Create
-            b.use provision
-          end
-        end
-      end
-
-      def rebuild
-        return Vagrant::Action::Builder.new.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, Actions::IsActive do |env, b|
-            if !env[:is_active]
-              b.use Actions::MessageIsActive
-              next
-            end
-            b.use Actions::Rebuild
-            b.use provision
-          end
-        end
-      end
-    end
-  end
-end