vagrant-junos_cli 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7290a4051b7190108477a6cc4c9ac17579bfccb
-  data.tar.gz: 4f65b37b7f98530114626587b485b5f0a2b65ad3
+SHA256:
+  metadata.gz: aca9764e93360463155bba981befd2b2c18198230a91966e8ae42126703e4dff
+  data.tar.gz: c955429abb917749bdf870bad3d2cdcab1a694b4da63c61289310746c7d0ccca
 SHA512:
-  metadata.gz: b7faa8159b988739028958475901d3211bcf44bf0c1bc9ffccc047ded4497de83a86849da6df86283021d1b765fb54ff1cf47f2b2085e3f27e344b491084e1b5
-  data.tar.gz: 436510b8b418e016238fbeedf7fc76a67438cb3fcf91b5e4f556da6cf7d998e090ed2816b0c79e7a7b0efeae5bfde36865b7a3e44087239df07505e7d6aef450
+  metadata.gz: 3008aa7da9fccac6f3f83f98b0720309e698288b24d9dcece1261beb0905a6ca77f115a5f95f3222e0f8c4638a3da44070543b75ec87b6a5cff516916b0563fe
+  data.tar.gz: a68b44d83b667168a0cae7d50a9c0d88d3c75aa416eec8a032d2b2ba2d682e4bd95f8c9480b40f71f38af079e888422651071cec5ced2ddc508c49936a61769e

data/.gitignore

@@ -1,7 +1,8 @@
-/Gemfile.lock
+*.swp
 /.bundle/
 /.vagrant/
 /.yardoc
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.1.0
+
+- Add `skip_cleanup` option
+- Add `skip_prepare` option
+
+## 1.0.2
+
+- Update vulnerable Rake dependency
+- Pin Vagrant version (Ruby <2.4)
+
 ## 1.0.1
 
 - Usage of quotes in the provisioning script has been fixed

data/Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', ref: 'v2.2.4'
+  gem 'rake', '~> 13.0'
+  gem 'pry', '~> 0.13'
 end
 
 group :plugins do

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Original work Copyright (c) 2010-2018 Mitchell Hashimoto
+Modified work Copyright 2018 Mate Farkas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -60,6 +60,10 @@ Run `vagrant up` and the new box is getting created with the address configured.
 
 ## Configuration
 
-Junos CLI provisioner accepts most parameters available for the [Shell provisioner](https://www.vagrantup.com/docs/provisioning/shell.html).
+Junos CLI provisioner accepts most options available for the [Shell provisioner](https://www.vagrantup.com/docs/provisioning/shell.html).
 Do not pass `args` or `env`.
 
+### Extra options
+
+- `skip_cleanup` (boolean) - Do not clean up script uploaded to `upload_path` after execution.
+- `skip_prepare` (boolean) - Do not try to fix `print` and `export` commands in the box. Provisioning output might get omitted.

data/example/Vagrantfile

@@ -14,10 +14,8 @@ Vagrant.configure('2') do |config|
     vqfx.vm.network 'private_network', auto_config: false, nic_type: '82540EM', intnet: 'reserved-bridge'
 
     # (em3  em4)
-    (1..2).each do |_seg_id|
-      vqfx.vm.network 'private_network', auto_config: false, nic_type: '82540EM', intnet: 'segment'
-    end
+    2.times { vqfx.vm.network 'private_network', auto_config: false, nic_type: '82540EM', intnet: 'segment' }
 
-    config.vm.provision 'junos_cli', path: 'provision.cmd'
+    config.vm.provision 'junos_cli', path: 'provision.cmd', skip_prepare: false
   end
 end

data/lib/vagrant/junos_cli/config.rb

@@ -4,6 +4,8 @@ require File.expand_path('../config.rb', VagrantPlugins::Shell::Plugin.provision
 module Vagrant
   module JunosCli
     class Config < VagrantPlugins::Shell::Config
+      attr_accessor :skip_cleanup
+      attr_accessor :skip_prepare
     end
   end
 end

data/lib/vagrant/junos_cli/provisioner.rb

@@ -53,7 +53,12 @@ fi'"
 
             clean_up = "/bin/rm #{config.upload_path}"
 
-            [prepare, cli_oneliner, clean_up].each do |command|
+            stages = []
+            stages << prepare unless config.skip_prepare
+            stages << cli_oneliner
+            stages << clean_up unless config.skip_cleanup
+
+            stages.each do |command|
               comm.execute(
                 command,
                 sudo: false,

data/lib/vagrant/junos_cli/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module JunosCli
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/vagrant-junos_cli.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.16.a'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mate Farkas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: 
 email:
 - mate.farkas@sch.hu
@@ -49,6 +49,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - example/Vagrantfile
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Provision Junos OS boxes using CLI commands.