vagrant-vyos 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWRmN2MwZjNjMzc0YTgzZDViMGYwZDMwOGY0ZmFlZTgxMjI2ZTE3Mg==
-  data.tar.gz: !binary |-
-    ZTYxZGIxMWVlMjQwMGJlYThmZDAwZTNmNDVhZTBmYTkzYzQxZjMzZQ==
+SHA1:
+  metadata.gz: 0ec20c7345a53d7c0d64239cd907ee06486a9c38
+  data.tar.gz: 1a3788b74897f5bce5656f576911ca0d262ad365
 SHA512:
-  metadata.gz: !binary |-
-    NzM0Y2MyZTg3ZWI5YzljNzRkNTc5MDFkNWE4Y2E2MjFhYzc2MjhmZjI2MzVl
-    MjMwMzhlZDUxY2VkMjQ2ODAyZjI5OTU2Y2YxMWE1MzkxMzI5MWIwMWFhMDkx
-    M2UyNDc5NjcwNzE3ZDI4MTVjOTc3MDY1OTU2NTNiZTJkMzk3OTU=
-  data.tar.gz: !binary |-
-    YTM4MmJlZDUxYWU1NWYwYWI4ZDBhYzk2OTE4ZGQ0YWQwMGM4NmUwMTI4ZjU5
-    ZDFkY2JlMDcwZTBkZjZlNWRmZjA1N2JmOWYwNTg4YjMwNmM4NzFiZjBlNWEz
-    YzQ4YmZjOWVkMTM4YmZjN2JiY2M0ZjZlZDZkOGJhODZhNzhlYTQ=
+  metadata.gz: 65ac78573b8fb8674423181232b229c0b7647b4bf2d53f5bb8b81017d4a4d3b6230b31470ed8cff5d1e9158d9458997e9eed45351bde6180e6cebf96ff26de56
+  data.tar.gz: 18767b486113c17e5bb391485bfe7de3068fb2154b7cde76d8351b572b4feac4bf558c03a9e88a80ca04b191be9641b5fb6b5cb3bbd6e141144b4f92b4fb1bf3

data/README.md

@@ -1,6 +1,6 @@
 # vagrant-vyos
 [![Build Status](https://travis-ci.org/higebu/vagrant-vyos.png)](https://travis-ci.org/higebu/vagrant-vyos)
-[![Code Climate](https://codeclimate.com/repos/5302538e69568020f60027b2/badges/c5b01915845941764536/gpa.png)](https://codeclimate.com/repos/5302538e69568020f60027b2/feed)
+[![Code Climate](https://codeclimate.com/github/higebu/vagrant-vyos/badges/gpa.svg)](https://codeclimate.com/github/higebu/vagrant-vyos)
 [![Gem Version](https://badge.fury.io/rb/vagrant-vyos.png)](http://badge.fury.io/rb/vagrant-vyos)
 [![Dependency Status](https://gemnasium.com/higebu/vagrant-vyos.png)](https://gemnasium.com/higebu/vagrant-vyos)
 
@@ -11,6 +11,7 @@ This plugin fixes following features.
 * `vagrant halt`.
 * `config.vm.hostname`.
 * `config.vm.network`.
+* `config.ssh.insert_key`.
 
 ## Installation
 
@@ -21,7 +22,7 @@ $ vagrant plugin install vagrant-vyos
 ## Usage
 
 ```
-$ vagrant init higebu/vyos-1.1.4
+$ vagrant init higebu/vyos-1.1.4-amd64
 $ vagrant up
 ```
 

data/lib/vagrant-vyos/cap/insert_public_key.rb

@@ -0,0 +1,35 @@
+module VagrantPlugins
+  module GuestVyOS
+    module Cap
+      class InsertPublicKey
+        def self.insert_public_key(machine, contents)
+          contents = contents.chomp
+
+          key_type, key_value, key_name = contents.split()
+
+          commands = <<-EOS
+source /opt/vyatta/etc/functions/script-template
+set system login user vagrant authentication public-keys #{key_name} type #{key_type}
+set system login user vagrant authentication public-keys #{key_name} key #{key_value}
+commit
+save
+          EOS
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(commands)
+          temp.close
+
+          machine.communicate.tap do |comm|
+            comm.upload(temp.path, "/tmp/vagrant-insert-public-key")
+            comm.execute("bash /tmp/vagrant-insert-public-key")
+            comm.execute("rm -f /tmp/vagrant-insert-public-key")
+          end
+
+          temp.unlink
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vyos/cap/remove_public_key.rb

@@ -0,0 +1,35 @@
+module VagrantPlugins
+  module GuestVyOS
+    module Cap
+      class RemovePublicKey
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+
+          key_type, key_value, key_name = contents.split()
+
+          commands = <<-EOS
+source /opt/vyatta/etc/functions/script-template
+show system login user vagrant authentication public-keys #{key_name} key | grep #{key_value} || exit 0
+delete system login user vagrant authentication public-keys #{key_name}
+commit
+save
+          EOS
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(commands)
+          temp.close
+
+          machine.communicate.tap do |comm|
+            comm.upload(temp.path, "/tmp/vagrant-remove-public-key")
+            comm.execute("bash /tmp/vagrant-remove-public-key")
+            comm.execute("rm -f /tmp/vagrant-remove-public-key")
+          end
+
+          temp.unlink
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vyos/plugin.rb

@@ -25,6 +25,16 @@ module VagrantPlugins
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
+
+      guest_capability("vyos", "insert_public_key") do
+        require_relative "cap/insert_public_key"
+        Cap::InsertPublicKey
+      end
+
+      guest_capability("vyos", "remove_public_key") do
+        require_relative "cap/remove_public_key"
+        Cap::RemovePublicKey
+      end
     end
   end
 end

data/lib/vagrant-vyos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GuestVyOS
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vyos
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - KUSAKABE Yuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.8.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'
 description: VyOS Guest Support for Vagrant
@@ -51,8 +51,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -61,6 +61,8 @@ files:
 - lib/vagrant-vyos/cap/change_host_name.rb
 - lib/vagrant-vyos/cap/configure_networks.rb
 - lib/vagrant-vyos/cap/halt.rb
+- lib/vagrant-vyos/cap/insert_public_key.rb
+- lib/vagrant-vyos/cap/remove_public_key.rb
 - lib/vagrant-vyos/guest.rb
 - lib/vagrant-vyos/plugin.rb
 - lib/vagrant-vyos/version.rb
@@ -75,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-vyos
-rubygems_version: 2.4.6
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A small gem that adds vyos guest support to vagrant.