vagrant-linode 0.1.3 → 0.2.0

data/test/Vagrantfile

@@ -1,12 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.require_plugin('vagrant-linode')
-Vagrant.require_plugin('vagrant-omnibus')
-
 Vagrant.configure('2') do |config|
-  config.omnibus.chef_version = :latest
-
   config.ssh.username = 'tester'
   config.ssh.private_key_path = './test_id_rsa'
 
@@ -15,9 +10,9 @@ Vagrant.configure('2') do |config|
   config.vm.provider :linode do |provider, override|
     override.vm.box = 'linode'
     override.vm.box_url = 'https://github.com/displague/vagrant-linode/raw/master/box/linode.box'
-    provider.token = ENV['LINODE_TOKEN']
+    provider.api_key = ENV['LINODE_API_KEY']
     provider.ssh_key_name = 'Test Key'
-    provider.distribution = 'Ubuntu 14.04 LTS'
+    provider.distribution = 'Debian 8'
     provider.datacenter = 'newark'
     provider.plan = '1024'
     provider.label = 'vagrant-'+Time.new.strftime("%F%T").gsub(/[^0-9]/,'')
@@ -26,7 +21,7 @@ Vagrant.configure('2') do |config|
 
     # Main Disk Image Size
     # [str] ( Full Allocation - Swap ) if nil
-    provider.xvda_size = '1024'
+    provider.xvda_size = '2048'
 
     # Swap Image Size
     # [str] 256 if nil
@@ -41,7 +36,7 @@ Vagrant.configure('2') do |config|
 
     # Enable private networking
     # [boolean] disabled if nil
-    #provider.private_networking = true
+    # provider.private_networking = true
   end
 
   config.vm.provision :shell, path: 'scripts/provision.sh'

data/vagrant-linode.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   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.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']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-14 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !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
   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
@@ -103,39 +103,79 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .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
+- box/metadata-debian-7.5.json
 - box/metadata.json
+- features/provision.feature
+- features/steps/sdk_steps.rb
+- features/steps/server_steps.rb
+- features/support/env.rb
+- features/support/fog_mock.rb
+- features/vagrant-linode.feature
 - lib/vagrant-linode.rb
 - lib/vagrant-linode/actions.rb
-- lib/vagrant-linode/actions/check_state.rb
+- lib/vagrant-linode/actions/connect_linode.rb
 - lib/vagrant-linode/actions/create.rb
+- lib/vagrant-linode/actions/create_image.rb
 - lib/vagrant-linode/actions/destroy.rb
+- lib/vagrant-linode/actions/halt.rb
+- lib/vagrant-linode/actions/is_created.rb
+- lib/vagrant-linode/actions/is_stopped.rb
+- 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_plans.rb
+- lib/vagrant-linode/actions/list_servers.rb
+- lib/vagrant-linode/actions/message_already_active.rb
+- lib/vagrant-linode/actions/message_already_off.rb
+- lib/vagrant-linode/actions/message_not_created.rb
+- lib/vagrant-linode/actions/message_off.rb
 - lib/vagrant-linode/actions/modify_provision_path.rb
 - lib/vagrant-linode/actions/power_off.rb
 - lib/vagrant-linode/actions/power_on.rb
+- lib/vagrant-linode/actions/read_ssh_info.rb
+- lib/vagrant-linode/actions/read_state.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
 - 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/list_images.rb
+- lib/vagrant-linode/commands/networks.rb
+- lib/vagrant-linode/commands/plans.rb
 - lib/vagrant-linode/commands/rebuild.rb
+- lib/vagrant-linode/commands/root.rb
+- lib/vagrant-linode/commands/servers.rb
 - lib/vagrant-linode/config.rb
 - lib/vagrant-linode/errors.rb
 - lib/vagrant-linode/helpers/client.rb
 - lib/vagrant-linode/helpers/result.rb
+- lib/vagrant-linode/helpers/waiter.rb
 - lib/vagrant-linode/plugin.rb
 - lib/vagrant-linode/provider.rb
 - lib/vagrant-linode/version.rb
 - locales/en.yml
+- spec/spec_helper.rb
+- spec/vagrant-linode/actions/list_distributions_spec.rb
+- spec/vagrant-linode/actions/list_plans_spec.rb
+- spec/vagrant-linode/config_spec.rb
 - test/Vagrantfile
 - test/cookbooks/test/recipes/default.rb
 - test/scripts/provision.sh
@@ -153,21 +193,31 @@ 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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Linode linodes
 test_files:
+- features/provision.feature
+- features/steps/sdk_steps.rb
+- features/steps/server_steps.rb
+- features/support/env.rb
+- features/support/fog_mock.rb
+- features/vagrant-linode.feature
+- spec/spec_helper.rb
+- spec/vagrant-linode/actions/list_distributions_spec.rb
+- spec/vagrant-linode/actions/list_plans_spec.rb
+- spec/vagrant-linode/config_spec.rb
 - test/Vagrantfile
 - test/cookbooks/test/recipes/default.rb
 - test/scripts/provision.sh

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

@@ -1,19 +0,0 @@
-module VagrantPlugins
-  module Linode
-    module Actions
-      class CheckState
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger = Log4r::Logger.new('vagrant::linode::check_state')
-        end
-
-        def call(env)
-          env[:machine_state] = @machine.state.id
-          @logger.info "Machine state is '#{@machine.state.id}'"
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-require 'vagrant-linode/helpers/client'
-
-module VagrantPlugins
-  module Linode
-    module Actions
-      class SetupKey
-        include Helpers::Client
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::linode::setup_key')
-        end
-
-        # TODO check the content of the key to see if it has changed
-        def call(env)
-          ssh_key_name = @machine.provider_config.ssh_key_name
-
-          begin
-            # assigns existing ssh key id to env for use by other commands
-            env[:ssh_key_id] = @client
-              .request('/v2/account/keys')
-              .find_id(:ssh_keys, name: ssh_key_name)
-
-            env[:ui].info I18n.t('vagrant_linode.info.using_key', name: ssh_key_name)
-          rescue Errors::ResultMatchError
-            env[:ssh_key_id] = create_ssh_key(ssh_key_name, env)
-          end
-
-          @app.call(env)
-        end
-
-        private
-
-        def create_ssh_key(name, env)
-          # assumes public key exists on the same path as private key with .pub ext
-          path = @machine.config.ssh.private_key_path
-          path = path[0] if path.is_a?(Array)
-          path = File.expand_path(path, @machine.env.root_path)
-          pub_key = Linode.public_key(path)
-
-          env[:ui].info I18n.t('vagrant_linode.info.creating_key', name: name)
-
-          result = @client.post('/v2/account/keys', name: name,
-                                                    public_key: pub_key)
-          result['ssh_key']['id']
-        end
-      end
-    end
-  end
-end