vagrant-linode 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c0b56e45b965f16f865dbd480b823f1c568eca1
-  data.tar.gz: cb62e7ce8e9482621d273e3f28e9b76678b2c365
+  metadata.gz: e16e4d4758bf63cfd92415d81520f83db8f353c3
+  data.tar.gz: 6bc13afd6403044f06b2b8cb1d1e2be04d5d2e56
 SHA512:
-  metadata.gz: ac6a357b79d595d347ecf7a022f220b38ea9b4e9a5f9fadf219fa31a959c7899b33c6e0c8b06c988345dbefad8247ae6ac6f3ec15f9d2f68ad556421a0360001
-  data.tar.gz: 69ef3bddf8194c4369d533e7c05ae74feaa207f251f4390e108933bafd6100831b357253c420834e542a023cd0a4964fb5b34402590fe76338a129a5f25c7dc5
+  metadata.gz: 4b996b315d58e433ae27434d50b2e8974f15a6fe751ad5f8e6598774673c042ef76aac85b9392e530134d5917a2006e86c76b0a5afe35656c1a5a98217538fd0
+  data.tar.gz: d7a18739c9a870e5f4e5affa6c1b1be7da1b67cc819768d4e82f9546ca4c7c20a2f2679c5f027916fa33a5e22651e7484523f140c3ae6e5da32e9fa7d9955e95

data/README.md

@@ -19,26 +19,10 @@ Debian 7.5+ guest operating systems.
 
 Install
 -------
-Installation of the provider requires two steps:
-
-1. Install the provider plugin using the Vagrant command-line interface:
-
-        $ vagrant plugin install vagrant-linode
-
-
-**NOTE:** If you are using a Mac, and this plugin would not work caused by SSL certificate problem,
-You may need to specify certificate path explicitly.
-You can verify actual certificate path by running:
-
-```bash
-ruby -ropenssl -e "p OpenSSL::X509::DEFAULT_CERT_FILE"
-```
-
-Then, add the following environment variable to your
-`.bash_profile` script and `source` it:
+Installation of the provider couldn't be easier:
 
 ```bash
-export SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem
+vagrant plugin install vagrant-linode
 ```
 
 Configure
@@ -208,7 +192,7 @@ The provider supports the following Vagrant sub-commands:
   account.
 - `vagrant halt` - Powers off the linode instance.
 - `vagrant provision` - Runs the configured provisioners and rsyncs any
-  specified `config.vm.synced_folder`.
+  specified `config.vm.synced_folder`. (see https://docs.vagrantup.com/v2/synced-folders/rsync.html)
 - `vagrant reload` - Reboots the linode instance.
 - `vagrant rebuild` - Destroys the linode instance and recreates it with the
   same IP address which was previously assigned.

data/lib/vagrant-linode/actions.rb

@@ -94,7 +94,7 @@ module VagrantPlugins
                 else
                   b2.use Provision
                   b2.use ModifyProvisionPath
-                  b2.use SyncFolders
+                  b2.use SyncedFolders
                 end
               end
             else
@@ -244,6 +244,14 @@ module VagrantPlugins
         end
       end
 
+      def self.action_list_kernels
+        Vagrant::Action::Builder.new.tap do |b|
+          # b.use ConfigValidate # is this per machine?
+          b.use ConnectLinode
+          b.use ListKernels
+        end
+      end
+
       action_root = Pathname.new(File.expand_path('../actions', __FILE__))
       autoload :ConnectLinode, action_root.join('connect_linode')
       autoload :ReadState, action_root.join('read_state')
@@ -265,12 +273,12 @@ module VagrantPlugins
       autoload :SetupUser, action_root.join('setup_user')
       autoload :SetupSudo, action_root.join('setup_sudo')
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
-      autoload :SyncFolders, action_root.join('sync_folders')
       autoload :ListServers, action_root.join('list_servers')
       autoload :CreateImage, action_root.join('create_image')
       autoload :ListImages, action_root.join('list_images')
       autoload :ListPlans, action_root.join('list_plans')
       autoload :ListDistributions, action_root.join('list_distributions')
+      autoload :ListKernels, action_root.join('list_kernels')
       autoload :ListDatacenters, action_root.join('list_datacenters')
     end
   end

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

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Linode
+    module Actions
+      class ListKernels
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          linode_api = env[:linode_api]
+          env[:ui].info ('%-4s %-6s %-6s %s' % ['ID', 'IsXen', 'IsKVM', 'Kernel Name'])
+          linode_api.avail.kernels.sort_by(&:kernelid).each do |kernel|
+            env[:ui].info ('%-4s %-6s %-6s %s' % [kernel.kernelid, kernel.isxen, kernel.iskvm, kernel.label])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-linode/commands/kernels.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Linode
+    module Commands
+      class Kernels < Vagrant.plugin('2', :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant linode kernels [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          with_target_vms(argv, provider: :linode) do |machine|
+            machine.action('list_kernels')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-linode/commands/root.rb

@@ -24,6 +24,10 @@ module VagrantPlugins
             require File.expand_path('../distributions', __FILE__)
             Distributions
           end
+          @subcommands.register(:kernels) do
+            require File.expand_path('../kernels', __FILE__)
+            Kernels
+          end
           @subcommands.register(:datacenters) do
             require File.expand_path('../datacenters', __FILE__)
             Datacenters

data/lib/vagrant-linode/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Linode
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/vagrant-linode.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.github.com/displague/vagrant-linode'
   gem.summary       = gem.description
 
-  gem.add_runtime_dependency 'linodeapi', '~> 0.1.1'
+  gem.add_runtime_dependency 'linodeapi', '~> 0.2.2'
   gem.add_runtime_dependency 'json', '~> 1.8.3'
   gem.add_runtime_dependency 'log4r', '~> 1.1.10'
 
   gem.add_development_dependency 'rake', '~> 10.4.2'
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
-  gem.add_development_dependency 'aruba', '~> 0.5.4'
+  gem.add_development_dependency 'rspec', '~> 3.3.0'
+  gem.add_development_dependency 'aruba', '~> 0.9.0'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,92 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.9.0
 description: Enables Vagrant to manage Linode linodes
 email:
 - marques@linode.com
@@ -103,16 +103,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile.multi
 - box/README.md
 - box/linode-debian-7.5.box
 - box/linode.box
@@ -136,6 +135,7 @@ files:
 - lib/vagrant-linode/actions/list_datacenters.rb
 - lib/vagrant-linode/actions/list_distributions.rb
 - lib/vagrant-linode/actions/list_images.rb
+- lib/vagrant-linode/actions/list_kernels.rb
 - lib/vagrant-linode/actions/list_plans.rb
 - lib/vagrant-linode/actions/list_servers.rb
 - lib/vagrant-linode/actions/message_already_active.rb
@@ -152,11 +152,11 @@ files:
 - lib/vagrant-linode/actions/setup_hostname.rb
 - lib/vagrant-linode/actions/setup_sudo.rb
 - lib/vagrant-linode/actions/setup_user.rb
-- lib/vagrant-linode/actions/sync_folders.rb
 - lib/vagrant-linode/commands/create_image.rb
 - lib/vagrant-linode/commands/datacenters.rb
 - lib/vagrant-linode/commands/distributions.rb
 - lib/vagrant-linode/commands/images.rb
+- lib/vagrant-linode/commands/kernels.rb
 - lib/vagrant-linode/commands/list_images.rb
 - lib/vagrant-linode/commands/networks.rb
 - lib/vagrant-linode/commands/plans.rb
@@ -193,17 +193,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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Linode linodes

data/Vagrantfile.multi

@@ -1,18 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-DATACENTERS = [:newark, :dallas, :atlanta]
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  Vagrant.require_plugin "vagrant-linode"
-
-  DATACENTERS.each do |datacenter|
-    config.vm.define datacenter do |machine|
-      machine.vm.provider :linode do |provider|
-        provider.api_key  = ENV['LINODE_API_KEY']
-      end
-    end
-  end
-end

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

@@ -1,80 +0,0 @@
-require 'vagrant/util/subprocess'
-require 'vagrant/util/which'
-
-module VagrantPlugins
-  module Linode
-    module Actions
-      class SyncFolders
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger = Log4r::Logger.new('vagrant::linode::sync_folders')
-        end
-
-        def call(env)
-          ssh_info = @machine.ssh_info
-
-          @machine.config.vm.synced_folders.each do |_id, data|
-            next if data[:disabled]
-
-            if @machine.guest.capability?(:rsync_installed)
-              installed = @machine.guest.capability(:rsync_installed)
-              unless installed
-                can_install = @machine.guest.capability?(:rsync_install)
-                fail Vagrant::Errors::RSyncNotInstalledInGuest unless can_install
-                @machine.ui.info I18n.t('vagrant.rsync_installing')
-                @machine.guest.capability(:rsync_install)
-              end
-            end
-
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{Regexp.last_match[1]}" }
-            end
-
-            env[:ui].info I18n.t('vagrant_linode.info.rsyncing', hostpath: hostpath,
-                                                                 guestpath: guestpath)
-
-            # create the guest path
-            @machine.communicate.sudo("mkdir -p #{guestpath}")
-            @machine.communicate.sudo(
-              "chown -R #{ssh_info[:username]} #{guestpath}")
-
-            key = ssh_info[:private_key_path]
-            key = key[0] if key.is_a?(Array)
-
-            # rsync over to the guest path using the ssh info
-            command = [
-              'rsync', '--verbose', '--archive', '-z', '--delete',
-              '-e', "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{key}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
-
-            # we need to fix permissions when using rsync.exe on windows, see
-            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
-            if Vagrant::Util::Platform.windows?
-              command.insert(1, '--chmod', 'ugo=rwX')
-            end
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              fail Errors::RsyncError,
-                   guestpath: guestpath,
-                   hostpath: hostpath,
-                   stderr: r.stderr
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end