vagrant-linode 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjE5MThiZTU0ODg3ZGVmZjA2OTI4MWEzZWIxYTc2YWRkNTYxZDllZA==
-  data.tar.gz: !binary |-
-    NTRmMjI5MzdkNDg5YjBkNzI5NjhjZTA0ODdlN2RkMGNmMDBlNTQ3OA==
+SHA1:
+  metadata.gz: 9e79120502b6fda82a12f08ad42c6b9ca167711f
+  data.tar.gz: 13e80103279fbae0a7e521e3f81426b7a539c2ba
 SHA512:
-  metadata.gz: !binary |-
-    YzBlMjc0ZGEyMDJmZTMwMDYzY2FlYTc4N2E0ZTBjMGVhOGFhNWJhMjhkZmYw
-    YzQ4NWYwZWNlY2FhYjBiMGU2YzUxNjQxYWI1OTM1ODk5NjEyMmVkMjgyNTQw
-    ZTU4OTIxODcwYzZjNzA1YjFhMTE3ODE4ODQxNjZmOGFiODBhNWE=
-  data.tar.gz: !binary |-
-    NjQwNmRjOTc3N2ZhZGI3MTcxM2RjM2YxYjExMmRhNGU3YzM4OWRjOTA2MTFm
-    NjM4Mzk3N2E0YmIyMjdhOWNjZTJiNTczZDU1MDI2ZDc2OWVjZjdmZDU1MzBi
-    NTQ5MGQ0ZjdhYWQ4YzNmMTdkM2E2ZGE4NTA5ODMwNDc2MDgxNTA=
+  metadata.gz: 63661d58fb59497f8017b370781ed289f2da809328d68475b79f55acb8b788a86299a9e2cc4622d794adf02fdebd33210f9c326cda10bc5930da321e947d57b7
+  data.tar.gz: ffd6a184e1f2f60dd0120d76568b4d699c5a8143c79d491fc7da62989175d79b809379a0d853356f00a5c3efa3ab5fe7a881b8b914ea86fad736f6a26d89239a

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.3'
+gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
 gem 'vagrant-omnibus'
 gem 'rake'
 

data/README.md

@@ -1,5 +1,6 @@
 Linode Vagrant Provider
 ==============================
+
 `vagrant-linode` is a provider plugin for Vagrant that supports the
 management of [Linode](https://www.linode.com/) linodes
 (instances).
@@ -17,7 +18,7 @@ Current features include:
 - setup a SSH public key for authentication
 - create a new user account during linode creation
 
-The provider has been tested with Vagrant 1.1.5+ using Ubuntu 14.04 LTS and
+The provider has been tested with Vagrant 1.6.3+ using Ubuntu 14.04 LTS and
 Debian 7.5 guest operating systems.
 
 Install
@@ -199,3 +200,9 @@ To run the provider's tests:
 You can now make modifications. Running `vagrant` within the Bundler
 environment will ensure that plugins installed in your Vagrant
 environment are not loaded.
+
+[![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)
+[![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
+

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

@@ -118,11 +118,14 @@ module VagrantPlugins
             )
           end
 
+	  # kernel id
+	  kernel_id = @machine.provider_config.kernel_id
+
           config = @client.linode.config.create(
             linodeid: result['linodeid'],
             label: 'Vagrant Config',
             disklist: "#{disk['diskid']},#{swap['diskid']}",
-            kernelid: 138 # default - newest @todo make this part of config..
+            kernelid: kernel_id
           )
 
           # @todo: allow provisioning to set static configuration for networking
@@ -130,9 +133,13 @@ module VagrantPlugins
             private_network = @client.linode.ip.addprivate linodeid: result['linodeid']
           end
 
+          label = @machine.provider_config.label
+          label = label || @machine.name if @machine.name != 'default'
+          label = label || get_server_name
+
           result = @client.linode.update(
             linodeid: result['linodeid'],
-            label: @machine.config.vm.hostname || @machine.name
+            label: label
           )
 
           env[:ui].info I18n.t('vagrant_linode.info.booting', linodeid: result['linodeid'])
@@ -178,6 +185,11 @@ module VagrantPlugins
         #  end
         # end
 
+        # generate a random name if server name is empty
+        def get_server_name
+          server_name = "vagrant_linode-#{rand.to_s.split('.')[1]}"
+        end
+
         def terminate(env)
           destroy_env = env.dup
           destroy_env.delete(:interrupted)

data/lib/vagrant-linode/config.rb

@@ -13,6 +13,8 @@ module VagrantPlugins
       attr_accessor :setup
       attr_accessor :xvda_size
       attr_accessor :swap_size
+      attr_accessor :kernel_id
+      attr_accessor :label
 
       alias_method :setup?, :setup
 
@@ -29,6 +31,8 @@ module VagrantPlugins
         @setup              = UNSET_VALUE
         @xvda_size          = UNSET_VALUE
         @swap_size          = UNSET_VALUE
+        @kernel_id          = UNSET_VALUE
+        @label              = UNSET_VALUE
       end
 
       def finalize!
@@ -44,6 +48,8 @@ module VagrantPlugins
         @setup              = true if @setup == UNSET_VALUE
         @xvda_size          = true if @xvda_size == UNSET_VALUE
         @swap_size          = '256' if @swap_size == UNSET_VALUE
+        @kernel_id          = '138' if @kernel_id == UNSET_VALUE
+        @label              = false if @label == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-linode/version.rb

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

data/test/Vagrantfile

@@ -23,19 +23,23 @@ Vagrant.configure('2') do |config|
 
     # Disk Image Sizes (Optional configuration)
 
-      # Main Disk Image Size
-      # [str] ( Full Allocation - Swap ) if nil
-      provider.xvda_size = '1024'
+    # Main Disk Image Size
+    # [str] ( Full Allocation - Swap ) if nil
+    provider.xvda_size = '1024'
 
-      # Swap Image Size
-      # [str] 256 if nil
-      provider.swap_size = '256'
+    # Swap Image Size
+    # [str] 256 if nil
+    provider.swap_size = '256'
+
+    # Kernel Image ID
+    # [str] 138 if nil
+    provider.kernel_id = '138'
 
     # Networking (Optional Configuration)
 
-      # Enable private networking
-      # [boolean] disabled if nil
-      #provider.private_networking = true
+    # Enable private networking
+    # [boolean] disabled if nil
+    #provider.private_networking = true
   end
 
   config.vm.provision :shell, path: 'scripts/provision.sh'
@@ -49,6 +53,9 @@ Vagrant.configure('2') do |config|
   config.vm.define :ubuntu do |ubuntu|
     ubuntu.vm.provider :linode do |provider|
       provider.distribution = 'Ubuntu 14.04 LTS'
+
+      # Optional Settings
+      provider.label = 'Vagrant-Ubuntu'
     end
   end
 

data/vagrant-linode.gemspec

@@ -6,16 +6,23 @@ require 'vagrant-linode/version'
 Gem::Specification.new do |gem|
   gem.name          = 'vagrant-linode'
   gem.version       = VagrantPlugins::Linode::VERSION
+  gem.licenses      = ['MIT']
   gem.authors       = ['Marques Johansson', 'Jonathan Leal']
   gem.email         = ['marques@linode.com', 'jleal@linode.com']
   gem.description   = 'Enables Vagrant to manage Linode linodes'
+  gem.homepage      = 'https://www.github.com/displague/vagrant-linode'
   gem.summary       = gem.description
 
+  gem.add_runtime_dependency 'linode'
+  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'log4r'
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", "~> 2.14.0"
+  gem.add_development_dependency "aruba", "~> 0.5.4"
+
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-
-  gem.add_dependency 'linode'
-  gem.add_dependency 'json'
-  gem.add_dependency 'log4r'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,50 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: Enables Vagrant to manage Linode linodes
 email:
 - marques@linode.com
@@ -61,7 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -100,8 +142,9 @@ files:
 - test/test_id_rsa
 - test/test_id_rsa.pub
 - vagrant-linode.gemspec
-homepage: 
-licenses: []
+homepage: https://www.github.com/displague/vagrant-linode
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -109,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Linode linodes