vagrant-junos 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f72d17a04c64856719508d00372f21a3c0aab8fa
-  data.tar.gz: c94681cd514bcdbacecf4d9ede3f64bd673864fa
+  metadata.gz: 16a8b9343dcfd9927b32a4c24af87437c4ba52a3
+  data.tar.gz: e6daa5c8ee7634d102249d042e9c5a6e3213aee3
 SHA512:
-  metadata.gz: 9569b8b166cc1873ee64cb6b237f92fd84f671c61de68f11d7db99cb1f1ce9dee7044f0c1ae0ec17ccd0ce9cea82d5f84e7fb4e3134590dcf188d2f9e2a2a785
-  data.tar.gz: a7e99c05261a0c9aa12a5ef93c809302722558cac2bc0e53ce8488472a25e90a111e55e23e477434b6e84d6a1a52d2bdd8d2b6843c533537b16ac91f4d293db5
+  metadata.gz: 88809822a9710f05a892d1707cde9032263ee8ceee108b194596484502033cc5d82d75710571ce818784e17424a0dc9b99563d156626795c56088039c5f2548a
+  data.tar.gz: 91eb44a22182c370a35f4f2c3ec81fe32a44749215e5b9d6314071d007fa5068d0fd9f49d67b98a74646e758767b9364a65bceffc933e365e9c0eb7de5cc9e76

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p576
+2.1.5

data/Gemfile

@@ -11,8 +11,6 @@ end
 
 group 'test' do
   gem 'rake'
-  gem 'chefspec'
-  gem 'foodcritic'
   gem 'rubocop'
 end
 

data/README.md

@@ -4,20 +4,18 @@
 
 
 
-This is a [Vagrant](http://www.vagrantup.com) 1.6+ plugin that adds a Junos guest to Vagrant, allowing for OS detection and initial configuration
+This is a [Vagrant](http://www.vagrantup.com) 1.7+ plugin that adds a Junos guest to Vagrant, allowing for OS detection and initial configuration
 
-> **NOTE:** This plugin requires Vagrant 1.6.3+,
+> **NOTE:** This plugin requires Vagrant 1.7+,
 
 ## Features
 
-* Detect [Firefly Perimeter](http://www.juniper.net/us/en/products-services/security/firefly-perimeter/) guest instances automatically, or via [Vagrantfile](https://docs.vagrantup.com/v2/vagrantfile/machine_settings.html).  The default boxes on [Juniper's Vagrant Cloud site](https://vagrantcloud.com/Juniper) have `config.vm.guest` explicitly set to Junos.
+* Detect [vSRX](http://www.juniper.net/us/en/products-services/security/srx-series/vsrx/) guest instances automatically, or via [Vagrantfile](https://docs.vagrantup.com/v2/vagrantfile/machine_settings.html).  The default boxes on [Juniper's Atlas site](http://atlas.hashicorp.com/Juniper) have `config.vm.guest` explicitly set to Junos.
 * Set the hostname via [Vagrantfile](https://docs.vagrantup.com/v2/vagrantfile/machine_settings.html) - `config.vm.hostname`
-* Change the default SSH key via the [Vagrantfile SSH settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html) -  `config.ssh.private_key_path`
-* TBD: network configuration of ge-0/0/0.0 through ge-0/0/9.0
-* TBD: mounting of NFS folders for sharing data, if this is valuable to anyone
-* TBD: a switch to NETCONF-based configuration, if it adds any functionality
+* Support [Vagrantfile SSH settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html) -  `config.ssh.private_key_path`, etc.
+* Network configuration of ge-0/0/1.0 through ge-0/0/9.0
+* __TBD__: anything you request via [issues](https://github.com/JNPRAutomate/vagrant-junos/issues)
 
-> **NOTE:** post-bootstrap configuration in Vagrant will be carried out through the [vagrant-netconf](https://github.com/JNPRAutomate/vagrant-netconf) communicator plugin and [vagrant-jprovision](https://github.com/JNPRAutomate/vagrant-jprovision) provisioner plugin.  These may or may not be required in the premade boxes in the future.
 
 ## Usage
 
@@ -65,3 +63,7 @@ Use bundler to execute Vagrant:
 ```
 $ bundle exec vagrant up juniper/ffp-12.1X46-D20.5
 ```
+
+## Notes
+
+> **NOTE:** post-bootstrap configuration in Vagrant will be carried out through the [vagrant-netconf](https://github.com/JNPRAutomate/vagrant-netconf) communicator plugin and [vagrant-jprovision](https://github.com/JNPRAutomate/vagrant-jprovision) provisioner plugin.  These may or may not be required in the premade boxes in the future.

data/lib/vagrant-junos/cap/configure_networks.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
             network[:prefix_length] = (network[:netmask] && netmask_to_cidr(network[:netmask]))
           end
 
-          # render template, based on Vagrantfile, and upload
+          # render template based on Vagrantfile, and upload
           network_module = TemplateRenderer.render('guest/junos/network',
                                                    options: networks,
                                                    template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
@@ -38,7 +38,7 @@ module VagrantPlugins
         def self.deploy(machine)
           machine.communicate.tap do |comm|
             comm.execute('cli -f /mfs/tmp/network')
-            # comm.execute('rm /mfs/tmp/network')
+            comm.execute('rm /mfs/tmp/network')
           end
         end
 

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

@@ -0,0 +1,25 @@
+require 'tempfile'
+require 'vagrant-junos/version'
+require 'vagrant/util/shell_quote'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module GuestJunos
+    module Cap
+      # Completely dumb check for now - only one key per user
+      class RemovePublicKey
+        include Vagrant::Util
+
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            comm.test("test -f ~/.ssh/authorized_keys")
+            comm.execute("cat #{contents}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-junos/plugin.rb

@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < '1.6.0'
-  fail 'The vagrant-junos plugin is only compatible with Vagrant 1.6+'
+if Vagrant::VERSION < '1.7.0'
+  fail 'The vagrant-junos plugin is only compatible with Vagrant 1.7+'
 end
 
 module VagrantPlugins
@@ -44,6 +44,11 @@ module VagrantPlugins
         require_relative 'cap/insert_public_key'
         Cap::InsertPublicKey
       end
+
+      guest_capability('junos', 'remove_public_key') do
+        require_relative 'cap/remove_public_key'
+        Cap::RemovePublicKey
+      end
     end
   end
 end

data/lib/vagrant-junos/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Junos guest gem + plugin version
   module GuestJunos
-    VERSION = '0.0.4'
+    VERSION = '0.1.0'
   end
 end

data/vagrant-junos.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.6.9'
+  spec.add_development_dependency 'rake', '~> 10.4.2'
   spec.add_development_dependency 'rspec-core', '~> 2.14'
   spec.add_development_dependency 'rspec-expectations', '~> 2.14'
   spec.add_development_dependency 'rspec-mocks', '~> 2.14'

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - John Deatherage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.6.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.6.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: A Vagrant plugin for Junos guests, e.g. Firefly Perimeter
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,6 +100,7 @@ files:
 - lib/vagrant-junos/cap/configure_networks.rb
 - lib/vagrant-junos/cap/halt.rb
 - lib/vagrant-junos/cap/insert_public_key.rb
+- lib/vagrant-junos/cap/remove_public_key.rb
 - lib/vagrant-junos/guest.rb
 - lib/vagrant-junos/plugin.rb
 - lib/vagrant-junos/version.rb
@@ -117,17 +118,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: A Vagrant plugin for Junos guests, e.g. Firefly Perimeter