vagrant-linode 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e79120502b6fda82a12f08ad42c6b9ca167711f
-  data.tar.gz: 13e80103279fbae0a7e521e3f81426b7a539c2ba
+  metadata.gz: e8ce03d21b5be2ac13a6492b31874c435dced26f
+  data.tar.gz: 4662545d18c8e288c37bb3f085306239865b8a09
 SHA512:
-  metadata.gz: 63661d58fb59497f8017b370781ed289f2da809328d68475b79f55acb8b788a86299a9e2cc4622d794adf02fdebd33210f9c326cda10bc5930da321e947d57b7
-  data.tar.gz: ffd6a184e1f2f60dd0120d76568b4d699c5a8143c79d491fc7da62989175d79b809379a0d853356f00a5c3efa3ab5fe7a881b8b914ea86fad736f6a26d89239a
+  metadata.gz: fbee5ac73c4c72a2f8518a775e895c64e420901ff3eb9e2d5dec78d3a0eb65d1cd66dc7b31dd05c754f63f2942aed694bedda10cc62e5e9ed33dad391e3b6969
+  data.tar.gz: 5f31d483d567d7bbdbb9a8548288f56748adf2172c00062a6e74c62f851e5ddf5f36723c76fb9bf4f1ef8fe2e90a1e04c2a4908980a366403a3c23ffc919c84e

data/.gitignore

@@ -12,8 +12,10 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+Vagrantfile
+.vagrant
+!test/Vagrantfile
 test/tmp
 test/version_tmp
 test/.vagrant
 tmp
-.vagrant

data/README.md

@@ -87,8 +87,8 @@ Please note the following:
 **Supported Configuration Attributes**
 
 The following attributes are available to further configure the provider:
-- `provider.image` - A string representing the image to use when creating a
-   new linode (e.g. `Debian 7.5`). The available options may
+- `provider.distribution` - A string representing the distribution to use when
+   creating a new linode (e.g. `Debian 7.5`). The available options may
    be found on Linode's new linode [form](https://www.linode.com/distributions).
    It defaults to `Ubuntu 14.04 LTS`.
 - `provider.datacenter` - A string representing the region to create the new
@@ -104,6 +104,10 @@ The following attributes are available to further configure the provider:
   account and modify sudo to disable tty requirement. It defaults to `true`.
   If you are using a tool like [packer](https://packer.io) to create
   reusable snapshots with user accounts already provisioned, set to `false`.
+- `provider.label` - A string representing the Linode label to assign when
+  creating a new linode
+- `provider.group` - A string representing the Linode's Display group to assign
+  when creating a new linode
 
 The provider will create a new user account with the specified SSH key for
 authorization if `config.ssh.username` is set and the `provider.setup`
@@ -147,6 +151,7 @@ Current Region-ID table is:
 |   7          | london     | London, England, UK |
 |   6          | newark     | Newark, NJ, USA     |
 |   8          | tokyo      | Tokyo, JP           |
+|   9          | singapore  | Singapore, SGP      |
 
 You can find latest datacenter ID number using Linode API call.
 
@@ -171,6 +176,8 @@ command:
 This command will create a new linode, setup your SSH key for authentication,
 create a new user account, and run the provisioners you have configured.
 
+The  environment variable `VAGRANT_DEFAULT_PROVIDER` can be set to `linode` to avoid sending `--provider=linode` on each `vagrant up`. 
+
 **Supported Commands**
 
 The provider supports the following Vagrant sub-commands:
@@ -201,8 +208,10 @@ You can now make modifications. Running `vagrant` within the Bundler
 environment will ensure that plugins installed in your Vagrant
 environment are not loaded.
 
+[![Join the chat at https://gitter.im/displague/vagrant-linode](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/displague/vagrant-linode?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Code Climate](https://codeclimate.com/github/displague/vagrant-linode/badges/gpa.svg)](https://codeclimate.com/github/displague/vagrant-linode)
 [![Test Coverage](https://codeclimate.com/github/displague/vagrant-linode/badges/coverage.svg)](https://codeclimate.com/github/displague/vagrant-linode)
 [![Gem Version](https://badge.fury.io/rb/vagrant-linode.svg)](http://badge.fury.io/rb/vagrant-linode)
+[![Dependency Status](https://gemnasium.com/displague/vagrant-linode.svg)](https://gemnasium.com/displague/vagrant-linode)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
 

data/lib/vagrant-linode/actions/create.rb

@@ -98,16 +98,16 @@ module VagrantPlugins
               label: 'Vagrant Disk Distribution ' + distribution_id.to_s + ' Linode ' + result['linodeid'].to_s,
               type: 'ext4',
               size: xvda_size,
-              rootSSHKey: pubkey,
-              rootPass: root_pass
+              rootsshkey: pubkey,
+              rootpass: root_pass
             )
           elsif image_id
             disk = @client.linode.disk.createfromimage(
               linodeid: result['linodeid'],
               imageid: image_id,
               size: xvda_size,
-              rootSSHKey: pubkey,
-              rootPass: root_pass
+              rootsshkey: pubkey,
+              rootpass: root_pass
             )
 
             swap = @client.linode.disk.create(
@@ -137,9 +137,13 @@ module VagrantPlugins
           label = label || @machine.name if @machine.name != 'default'
           label = label || get_server_name
 
+          group = @machine.provider_config.group
+          group = "" if @machine.provider_config.group == false
+
           result = @client.linode.update(
             linodeid: result['linodeid'],
-            label: label
+            label: label,
+            lpm_displaygroup: group
           )
 
           env[:ui].info I18n.t('vagrant_linode.info.booting', linodeid: result['linodeid'])

data/lib/vagrant-linode/actions/setup_hostname.rb

@@ -0,0 +1,32 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+module VagrantPlugins
+	module Linode
+		module Actions
+			class SetupHostname
+
+				def initialize(app, env)
+					@app 	 = app
+					@machine = env[:machine]
+					@logger	 = Log4r::Logger.new('vagrant::linode::setup_hostname')
+				end
+
+				def call(env)
+					# Check if setup is enabled
+					return @app.call(env) unless @machine.provider_config.setup?
+
+					# Set Hostname
+					if @machine.config.vm.hostname
+						env[:ui].info I18n.t('vagrant_linode.info.modifying_host', name: @machine.config.vm.hostname)
+
+						@machine.communicate.execute(<<-BASH)
+							sudo echo -n #{@machine.config.vm.hostname} > /etc/hostname;
+							sudo hostname -F /etc/hostname
+						BASH
+					end
+				end
+			end
+		end
+	end
+end

data/lib/vagrant-linode/actions.rb

@@ -5,6 +5,7 @@ require 'vagrant-linode/actions/power_off'
 require 'vagrant-linode/actions/power_on'
 require 'vagrant-linode/actions/rebuild'
 require 'vagrant-linode/actions/reload'
+require 'vagrant-linode/actions/setup_hostname'
 require 'vagrant-linode/actions/setup_user'
 require 'vagrant-linode/actions/setup_sudo'
 require 'vagrant-linode/actions/setup_key'
@@ -100,6 +101,7 @@ module VagrantPlugins
               b.use Create
               b.use SetupSudo
               b.use SetupUser
+              b.use SetupHostname
               b.use provision
             end
           end
@@ -148,6 +150,7 @@ module VagrantPlugins
               b.use Rebuild
               b.use SetupSudo
               b.use SetupUser
+              b.use SetupHostname
               b.use provision
             when :not_created
               env[:ui].info I18n.t('vagrant_linode.info.not_created')

data/lib/vagrant-linode/config.rb

@@ -15,6 +15,7 @@ module VagrantPlugins
       attr_accessor :swap_size
       attr_accessor :kernel_id
       attr_accessor :label
+      attr_accessor :group
 
       alias_method :setup?, :setup
 
@@ -33,6 +34,7 @@ module VagrantPlugins
         @swap_size          = UNSET_VALUE
         @kernel_id          = UNSET_VALUE
         @label              = UNSET_VALUE
+        @group              = UNSET_VALUE
       end
 
       def finalize!
@@ -50,6 +52,7 @@ module VagrantPlugins
         @swap_size          = '256' if @swap_size == UNSET_VALUE
         @kernel_id          = '138' if @kernel_id == UNSET_VALUE
         @label              = false if @label == UNSET_VALUE
+        @group              = false if @group == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-linode/helpers/client.rb

@@ -1,8 +1,10 @@
 require 'vagrant-linode/helpers/result'
-require 'linode'
+require 'linodeapi'
 require 'json'
 require 'vagrant/util/retryable'
 
+include Vagrant::Util::Retryable
+
 module VagrantPlugins
   module Linode
     module Helpers
@@ -20,8 +22,8 @@ module VagrantPlugins
               fail 'not ready' if result['host_finish_dt'] > ''
             end
           end
-          linodeapi = ::Linode.new(api_key: @machine.provider_config.token,
-                                   api_url: @machine.provider_config.api_url || nil)
+          linodeapi = ::LinodeAPI::Raw.new(apikey: @machine.provider_config.token,
+				      endpoint: @machine.provider_config.api_url || nil)
           # linodeapi.wait_for_event = wait_for_event
           # linodeapi.extend wait_for_event
         end
@@ -33,7 +35,7 @@ module VagrantPlugins
         def initialize(machine)
           @logger = Log4r::Logger.new('vagrant::linode::apiclient')
           @config = machine.provider_config
-          @client = ::Linode.new(api_key: @config.token)
+	  @client = ::LinodeAPI::Raw.new(apikey: @config.token, endpoint: @config.api_url || nil)
         end
 
         attr_reader :client

data/lib/vagrant-linode/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Linode
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/locales/en.yml

@@ -17,6 +17,7 @@ en:
       reloading: "Rebooting the linode..."
       creating_user: "Creating user account: %{user}..."
       modifying_sudo: "Modifying sudoers file to remove tty requirement..."
+      modifying_host: "Modifying hostname: %{name}..."
       using_key: "Using existing SSH key: %{name}"
       creating_key: "Creating new SSH key: %{name}..."
       trying_rsync_install: "Rsync not found, attempting to install with yum..."

data/test/Vagrantfile

@@ -20,6 +20,7 @@ Vagrant.configure('2') do |config|
     provider.distribution = 'Ubuntu 14.04 LTS'
     provider.datacenter = 'newark'
     provider.plan = '1024'
+    provider.label = 'vagrant-'+Time.new.strftime("%F%T").gsub(/[^0-9]/,'')
 
     # Disk Image Sizes (Optional configuration)
 

data/vagrant-linode.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.github.com/displague/vagrant-linode'
   gem.summary       = gem.description
 
-  gem.add_runtime_dependency 'linode'
+  gem.add_runtime_dependency 'linodeapi'
   gem.add_runtime_dependency 'json'
   gem.add_runtime_dependency 'log4r'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: linode
+  name: linodeapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +122,7 @@ files:
 - lib/vagrant-linode/actions/power_on.rb
 - lib/vagrant-linode/actions/rebuild.rb
 - lib/vagrant-linode/actions/reload.rb
+- lib/vagrant-linode/actions/setup_hostname.rb
 - lib/vagrant-linode/actions/setup_key.rb
 - lib/vagrant-linode/actions/setup_sudo.rb
 - lib/vagrant-linode/actions/setup_user.rb