vagrant-remove-old-box-versions 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1fe3a3664ab41b568684fcd58923d8a0406674
-  data.tar.gz: ec2bdcba66bf7cb4d28fc4c425a358f6ae26e546
+  metadata.gz: 38d557df95662f148d0aa48bb4e2c59e49d5a6e2
+  data.tar.gz: 42066707f08dfe2818f59782b09e2d0b0131327d
 SHA512:
-  metadata.gz: 487247b89a8f651d0fd93d4b25a41bc627faacd6ee9ae0a816dd5aff25580c64da6fe57604d8e963f44708388e70b968385a90dfc93436ccd146592e01724d02
-  data.tar.gz: 1aa6a2ba045d60e0f599ed31fa95fe9b8fbb1448ddb9de3542733af8d98058d3d6df079af52b0f8b6050743c5afe51f72b90a40aefe0c64b319b89accd1497f3
+  metadata.gz: 8d48150cabceb04b58f736e6a33bfa5b24a2449efce85d8c1d1d8eed230188786f48b6b25c0893387ce4c7744f8902e0d97e2f9a0a2fb713d238d55b20c81331
+  data.tar.gz: 9fd7a3746c9aef86d8c3a5970864f3b2f6b1ae1a9382e53947f4ec7a243393c051d1a0486280395304cf82a0473ae42fefda3abfcb4e31fe94f88a069e099378

data/README.md

@@ -1,46 +1,52 @@
-# Vagrant remove old box versions plugin
-
-This plugin enables you to automatically remove old vagrant boxes from you host. Just run ``vagrant remove-old-versions`` and it will check your downloaded boxes and remove every box that is not the lastest downloaded version.
-
-Internally it uses ```vagrant box list``` to get a list of boxes, and ```vagrant box remove --box-version  xxx --provider xxx``` so it still has all safeguards you expect from vagrant.
-
-[![Gem Version](https://badge.fury.io/rb/vagrant-remove-old-box-versions.svg)](https://badge.fury.io/rb/vagrant-remove-old-box-versions)
-
-## Installation
-
-```
-vagrant plugin install vagrant-remove-old-box-versions
-```
-
-## Usage
-
-```
-Usage: vagrant remove-old-versions [options]
-
-Options:
-
-    -p, --provider PROVIDER          The specific provider type for the boxes to destroy.
-    -n, --dry-run                    Only print the boxes that would be removed.
-        --name NAME                  The specific box name to destroy.
-    -f, --force                      Destroy without confirmation even when box is in use.
-```
-
-## Contributing
-
-This plugin is built and maintained by [Björn Brala](https://www.swis.nl/over-ons/bjorn-brala)
-Bug reports and pull requests are welcome on GitHub at [swisnl/vagrant-remove-old-box-versions](https://github.com/swisnl/vagrant-remove-old-box-versions).
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
-## Changelog
-
-### [1.1.0] 2016-03-16
-
-* `---dry-run` and `--name` option added by @danielpanteleit
-
-### [1.0.0] 2016-01-13
-
-* Initial release.
+**The code for this plugin has been merged into Vagrant and is released in `1.9.0`. The command is ``vagrant box prune``. See the [pull request](https://github.com/mitchellh/vagrant/pull/7978).**
+
+# Vagrant remove old box versions plugin
+
+This plugin enables you to automatically remove old vagrant boxes from you host. Just run ``vagrant remove-old-versions`` and it will check your downloaded boxes and remove every box that is not the lastest downloaded version.
+
+Internally it uses ```vagrant box list``` to get a list of boxes, and ```vagrant box remove --box-version  xxx --provider xxx``` so it still has all safeguards you expect from vagrant.
+
+[![Gem Version](https://badge.fury.io/rb/vagrant-remove-old-box-versions.svg)](https://badge.fury.io/rb/vagrant-remove-old-box-versions) [![Gem](https://img.shields.io/gem/dv/vagrant-remove-old-box-versions/1.1.0.svg?maxAge=43200)](https://rubygems.org/gems/vagrant-remove-old-box-versions)
+
+## Installation
+
+```
+vagrant plugin install vagrant-remove-old-box-versions
+```
+
+## Usage
+
+```
+Usage: vagrant remove-old-versions [options]
+
+Options:
+
+    -p, --provider PROVIDER          The specific provider type for the boxes to destroy.
+    -n, --dry-run                    Only print the boxes that would be removed.
+        --name NAME                  The specific box name to destroy.
+    -f, --force                      Destroy without confirmation even when box is in use.
+```
+
+## Contributing
+
+This plugin is built and maintained by [Björn Brala](https://www.swis.nl/over-ons/bjorn-brala)
+Bug reports and pull requests are welcome on GitHub at [swisnl/vagrant-remove-old-box-versions](https://github.com/swisnl/vagrant-remove-old-box-versions).
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## Changelog
+
+### [1.2.0] 2016-12-09
+
+* This plugin was merged into Vagrant. Added deprecation message.
+
+### [1.1.0] 2016-03-16
+
+* `---dry-run` and `--name` option added by @danielpanteleit
+
+### [1.0.0] 2016-01-13
+
+* Initial release.

data/lib/vagrant-remove-old-box-versions/command.rb

@@ -1,130 +1,152 @@
-require 'optparse'
-
-module VagrantPlugins
-  module RemoveOldVersions
-    class Command < Vagrant.plugin("2", :command)
-      def self.synopsis
-        "remove all but the latest installed boxes"
-      end
-
-      def execute
-        options = {}
-        options[:force] = false
-        options[:dry_run] = false
-
-        opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant remove-old-versions [options]"
-          o.separator ""
-          o.separator "Options:"
-          o.separator ""
-
-          o.on("-p PROVIDER", "--provider PROVIDER", String, "The specific provider type for the boxes to destroy.") do |p|
-            options[:provider] = p
-          end
-
-          o.on("-n", "--dry-run", "Only print the boxes that would be removed.") do |f|
-            options[:dry_run] = f
-          end
-
-          o.on("--name NAME", String, "The specific box name to destroy.") do |name|
-            options[:name] = name
-          end
-
-          o.on("-f", "--force", "Destroy without confirmation even when box is in use.") do |f|
-            options[:force] = f
-          end
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        boxes = @env.boxes.all.sort
-        if boxes.empty?
-          return @env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), prefix: false)
-        end
-
-        delete_oldest_boxes(boxes, options[:provider], options[:force], options[:name], options[:dry_run])
-
-        # Success, exit status 0
-        0
-      end
-
-      private
-
-      def delete_oldest_boxes(boxes, only_provider, skip_confirm, only_name, dry_run)
-        # Find the longest box name
-        longest_box = boxes.max_by { |x| x[0].length }
-        longest_box_length = longest_box[0].length
-
-        # Hash map to keep track of newest versions
-        newest_boxes = Hash.new
-
-        # First find the newest version for every installed box
-        boxes.each do |name, version, provider|
-          next if only_provider and only_provider != provider.to_s
-          next if only_name and only_name != name
-
-          # Nested to make sure it works for boxes with different providers
-          if newest_boxes.has_key?(name)
-            if newest_boxes[name].has_key?(provider)
-              saved = Gem::Version.new(newest_boxes[name][provider])
-              current = Gem::Version.new(version)
-              if current > saved
-                newest_boxes[name][provider] = version
-              end
-            else
-              newest_boxes[name][provider] = version
-            end
-          else
-            newest_boxes[name] = Hash.new
-            newest_boxes[name][provider] = version
-          end
-        end
-
-        @env.ui.info("The following boxes will be kept...");
-        newest_boxes.each do |name, providers|
-          providers.each do |provider, version|
-            @env.ui.info("#{name.ljust(longest_box_length)} (#{provider}, #{version})")
-
-            @env.ui.machine("box-name", name)
-            @env.ui.machine("box-provider", provider)
-            @env.ui.machine("box-version", version)
-          end
-        end
-
-        @env.ui.info("", prefix: false)
-        @env.ui.info("Checking for older boxes...");
-
-        # Track if we removed anything so the user can be informed
-        removed_any_box = false
-        boxes.each do |name, version, provider|
-          next if !newest_boxes.has_key?(name) or !newest_boxes[name].has_key?(provider)
-
-          current = Gem::Version.new(version)
-          saved = Gem::Version.new(newest_boxes[name][provider])
-          if current < saved
-            removed_any_box = true
-
-            # Use the remove box action
-            if dry_run
-              @env.ui.info("would remove #{name} #{provider} #{version}")
-            else
-              @env.action_runner.run(Vagrant::Action.action_box_remove, {
-                  box_name: name,
-                  box_provider: provider,
-                  box_version: version,
-                  force_confirm_box_remove: skip_confirm,
-                  box_remove_all_versions: false,
-              })
-            end
-          end
-        end
-
-        if !removed_any_box
-          @env.ui.info("No old versions of boxes to remove...");
-        end
-      end
-    end
-  end
-end
+require 'optparse'
+
+
+module VagrantPlugins
+  module RemoveOldVersions
+    class Command < Vagrant.plugin("2", :command)
+      def self.synopsis
+        'remove all but the latest installed boxes'
+      end
+
+      def execute
+
+        vagrant_version = Gem::Version.new(Vagrant::VERSION)
+        unless Gem::Requirement.new('< 1.9.0').satisfied_by?(vagrant_version)
+          @env.ui.warn('This plugin has been merged into Vagrant 1.9.0, please use the command: ');
+          puts
+          @env.ui.warn("'vagrant box prune'");
+          puts
+
+          # Ask the user if we should do this
+          stack = Vagrant::Action::Builder.new.tap do |b|
+            b.use Vagrant::Action::Builtin::Confirm, 'Are you sure you want to use this deprecated method? [yN] ', false
+          end
+
+          result = @env.action_runner.run(stack)
+          if !result[:result]
+            @env.ui.info('Command aborted.');
+            return
+          end
+        end
+
+
+        options = {}
+        options[:force] = false
+        options[:dry_run] = false
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant remove-old-versions [options]"
+          o.separator ""
+          o.separator "Options:"
+          o.separator ""
+
+          o.on("-p PROVIDER", "--provider PROVIDER", String, "The specific provider type for the boxes to destroy.") do |p|
+            options[:provider] = p
+          end
+
+          o.on("-n", "--dry-run", "Only print the boxes that would be removed.") do |f|
+            options[:dry_run] = f
+          end
+
+          o.on("--name NAME", String, "The specific box name to destroy.") do |name|
+            options[:name] = name
+          end
+
+          o.on("-f", "--force", "Destroy without confirmation even when box is in use.") do |f|
+            options[:force] = f
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxes = @env.boxes.all.sort
+        if boxes.empty?
+          return @env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), prefix: false)
+        end
+
+        delete_oldest_boxes(boxes, options[:provider], options[:force], options[:name], options[:dry_run])
+
+        # Success, exit status 0
+        0
+      end
+
+      private
+
+      def delete_oldest_boxes(boxes, only_provider, skip_confirm, only_name, dry_run)
+        # Find the longest box name
+        longest_box = boxes.max_by { |x| x[0].length }
+        longest_box_length = longest_box[0].length
+
+        # Hash map to keep track of newest versions
+        newest_boxes = Hash.new
+
+        # First find the newest version for every installed box
+        boxes.each do |name, version, provider|
+          next if only_provider and only_provider != provider.to_s
+          next if only_name and only_name != name
+
+          # Nested to make sure it works for boxes with different providers
+          if newest_boxes.has_key?(name)
+            if newest_boxes[name].has_key?(provider)
+              saved = Gem::Version.new(newest_boxes[name][provider])
+              current = Gem::Version.new(version)
+              if current > saved
+                newest_boxes[name][provider] = version
+              end
+            else
+              newest_boxes[name][provider] = version
+            end
+          else
+            newest_boxes[name] = Hash.new
+            newest_boxes[name][provider] = version
+          end
+        end
+
+        @env.ui.info("The following boxes will be kept...");
+        newest_boxes.each do |name, providers|
+          providers.each do |provider, version|
+            @env.ui.info("#{name.ljust(longest_box_length)} (#{provider}, #{version})")
+
+            @env.ui.machine("box-name", name)
+            @env.ui.machine("box-provider", provider)
+            @env.ui.machine("box-version", version)
+          end
+        end
+
+        @env.ui.info("", prefix: false)
+        @env.ui.info("Checking for older boxes...");
+
+        # Track if we removed anything so the user can be informed
+        removed_any_box = false
+        boxes.each do |name, version, provider|
+          next if !newest_boxes.has_key?(name) or !newest_boxes[name].has_key?(provider)
+
+          current = Gem::Version.new(version)
+          saved = Gem::Version.new(newest_boxes[name][provider])
+          if current < saved
+            removed_any_box = true
+
+            # Use the remove box action
+            if dry_run
+              @env.ui.info("would remove #{name} #{provider} #{version}")
+            else
+              @env.action_runner.run(Vagrant::Action.action_box_remove, {
+                  box_name: name,
+                  box_provider: provider,
+                  box_version: version,
+                  force_confirm_box_remove: skip_confirm,
+                  box_remove_all_versions: false,
+              })
+            end
+          end
+        end
+
+        if !removed_any_box
+          @env.ui.info("No old versions of boxes to remove...");
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-remove-old-box-versions/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module RemoveOldVersions
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-remove-old-box-versions
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bjorn Brala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,9 +61,7 @@ files:
 - lib/vagrant-remove-old-box-versions/command.rb
 - lib/vagrant-remove-old-box-versions/plugin.rb
 - lib/vagrant-remove-old-box-versions/version.rb
-- pkg/vagrant-remove-old-box-versions-0.0.1.gem
-- pkg/vagrant-remove-old-box-versions-0.0.2.gem
-- pkg/vagrant-remove-old-box-versions-1.0.0.gem
+- pkg/vagrant-remove-old-box-versions-1.2.0.gem
 - vagrant-remove-old-box-versions.gemspec
 homepage: https://github.com/swisnl/vagrant-remove-old-box-versions
 licenses:
@@ -85,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: This plugin enables you to remove all but the latest installed boxes.