vagrant-pristine 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1eba2103a27b3adfff2db14e001cb3c9f341ea
-  data.tar.gz: eba0c58d58cbb435742eb0fa60dc4e62d11fecb9
+  metadata.gz: e333755710294665bae18486f2efe8d3df32a9a1
+  data.tar.gz: 749f1b5e9c0a4f95fec7bf813005b0eacdc79acb
 SHA512:
-  metadata.gz: cd76399d91d0cbcc8375d883ba99c454c5bb9f5b8de080aceab55e6931aa33a009466aac26ee0a03838986e9784940e7a9387c34a593afc7e79059c9cd89857d
-  data.tar.gz: 3641c7b8fec81cff51de84d4f1ec0927d835bf99ba39bca66c4e1f2b9b0644f74fa024f99bc5253cebd65c5eae8fc749fb1dfd6699d2f08b213f5958fe73a949
+  metadata.gz: d653ba0da79230d421b375ee401ac7d24971465ab4a137a955dcc09c5323c0653a1fdff763e6e4590b63cbde7e42e9b9a0d50987d1227af6c90daa975c2d01ae
+  data.tar.gz: 9178803e4c36777c4fd492f3bb31b6dff3092bf24a37b15bdcbcb4533c0ff002e97907b00e41ab643ff5ec7a384b646c088687accbbe86c67253c81c5b7fb1a1

data/Gemfile

@@ -5,6 +5,4 @@ gemspec
 
 group :development do
   gem 'vagrant',         github: 'mitchellh/vagrant'
-  gem 'vagrant-lxc',     github: 'fgrehm/vagrant-lxc'
-  gem 'vagrant-cachier', github: 'fgrehm/vagrant-cachier'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fabio Rehm
+Copyright (c) 2013-2014 Fabio Rehm
 
 MIT License
 

data/README.md

@@ -3,6 +3,11 @@
 Restore your vagrant machines to a pristine state with a single command. Basically
 the same as runnning a `vagrant destroy && vagrant up`.
 
+Similar functionality may be provided by a future Vagrant release, see the issues below for more information:
+- https://github.com/mitchellh/vagrant/issues/5378
+- https://github.com/mitchellh/vagrant/pull/5410
+- https://github.com/mitchellh/vagrant/pull/5613
+
 ## Installation
 
 Make sure you have Vagrant 1.2+ and run:
@@ -21,6 +26,7 @@ Usage: vagrant pristine [vm-name]
     -f, --force                      Destroy without confirmation.
         --[no-]parallel              Enable or disable parallelism if provider supports it.
         --provider provider          Back the machine with a specific provider.
+        --[no-]update                Enable or disable box update.
     -h, --help                       Print this help
 ```
 
@@ -31,3 +37,4 @@ Usage: vagrant pristine [vm-name]
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/vagrant-pristine/plugin.rb

@@ -1,6 +1,7 @@
 require_relative 'version'
 require 'vagrant'
 require Vagrant.source_root.join('plugins/commands/up/start_mixins')
+require Vagrant.source_root.join('plugins/commands/box/command/download_mixins')
 
 module VagrantPlugins
   module Pristine
@@ -14,11 +15,13 @@ module VagrantPlugins
 
     class Command < Vagrant.plugin(2, :command)
       include VagrantPlugins::CommandUp::StartMixins
+      include VagrantPlugins::CommandBox::DownloadMixins
 
       def execute
         options = {
           force:    false,
-          parallel: true
+          parallel: true,
+          update:   true
         }
 
         opts = OptionParser.new do |o|
@@ -40,6 +43,10 @@ module VagrantPlugins
                "Back the machine with a specific provider.") do |provider|
             options[:provider] = provider
           end
+
+          o.on("--[no-]update", "Enable or disable box update.") do |update|
+            options[:update] = update
+          end
         end
 
         # Parse the options
@@ -59,14 +66,54 @@ module VagrantPlugins
         # Success if no confirms were declined
         return 1 if declined
 
-        # Build up the batch job of what we'll do
-        @env.batch(options[:parallel]) do |batch|
-          with_target_vms(argv, :provider => options[:provider]) do |machine|
-            FileUtils.mkdir_p machine.data_dir.to_s
-            @env.ui.info(I18n.t(
-              "vagrant.commands.up.upping",
-              :name => machine.name,
-              :provider => machine.provider_name))
+          # Build up the batch job of what we'll do
+          @env.batch(options[:parallel]) do |batch|
+            with_target_vms(argv, :provider => options[:provider]) do |machine|
+              if options[:update]
+                begin
+                  box = machine.box
+                  if box
+                    @env.ui.output(I18n.t("vagrant.box_update_checking", name: machine.name))
+
+                    update = box.has_update?
+                    if !update
+                      @env.ui.success(I18n.t(
+                        "vagrant.box_up_to_date_single",
+                        name: box.name, version: box.version))
+                    else
+                      @env.ui.output(I18n.t(
+                        "vagrant.box_updating",
+                        name: update[0].name,
+                        provider: update[2].name,
+                        old: box.version,
+                        new: update[1].version))
+                      @env.action_runner.run(Vagrant::Action.action_box_add, {
+                        box_url: box.metadata_url,
+                        box_provider: update[2].name,
+                        box_version: update[1].version,
+                        ui: @env.ui
+                      })
+
+                      machine.box = @env.boxes.find(update[0].name, update[2].name, update[1].version)
+                    end
+                  end
+                rescue Exception => e
+                  # exception will be logged to ui but not thrown, box update failure is not fatal
+                  @env.ui.warn e
+                end
+              else
+                @env.ui.output(I18n.t("vagrant.box_update_checking", name: machine.name)+" skipped")
+              end
+
+              # turn off default update check
+              machine.config.instance_variable_get(:@keys)[:vm].instance_variable_set(:@box_check_update, false)
+
+              FileUtils.mkdir_p machine.data_dir.to_s
+
+              @env.ui.info(I18n.t(
+                "vagrant.commands.up.upping",
+                :name => machine.name,
+                :provider => machine.provider_name))
 
               batch.action(machine, :up, options)
           end

data/lib/vagrant-pristine/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Pristine
-    VERSION = "0.3.0"
+    VERSION = "0.4.2"
   end
 end

data/vagrant-pristine.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["fgrehm@gmail.com"]
   spec.description   = %q{Vagrant destroy && up made simple}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/fgrehm/vagrant-recreate"
+  spec.homepage      = "https://github.com/fgrehm/vagrant-pristine"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pristine
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: Vagrant destroy && up made simple
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -54,7 +54,7 @@ files:
 - lib/vagrant-pristine/plugin.rb
 - lib/vagrant-pristine/version.rb
 - vagrant-pristine.gemspec
-homepage: https://github.com/fgrehm/vagrant-recreate
+homepage: https://github.com/fgrehm/vagrant-pristine
 licenses:
 - MIT
 metadata: {}
@@ -64,17 +64,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.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Vagrant destroy && up made simple