vagrant_box_version 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448b6eb663ff3e362c5e8953ffc7491ee52d7e6b
-  data.tar.gz: 30b6be9f3f652ccebdbdb21622d7efa138c578ce
+  metadata.gz: 1c4b0d5d746a99637d2596722b2a59aebb985667
+  data.tar.gz: c4c5f3eadf68083ccf183600e2c4aa98b9df0409
 SHA512:
-  metadata.gz: bcda7ad27f8749a59a5c128c53b2dbe8a79fadda2ee9034ecd3586263e3d9a6ed23e92f4e83199f9661c2dc24702ede3e046cec512211a0ef5fb31533979c302
-  data.tar.gz: 33674f0b3bd51c28536219b64f86308ce46c42ac271e3aa72c1b05bc358f69727cea832bfd1786f0e87a704643d7dc98225ccbc3c3092aaececc663e9db770b6
+  metadata.gz: b214f97ca82d4d70bc62dee594217a9fa952351d346fcf75992fbf4ee1d2af53486c26df7d1a1f340132d2e77086ece3e95be34c8aef2e5779137f23f13951b9
+  data.tar.gz: a8da378649a5679befef71168400ce690c24e0a560bbf47db8ab90f5de0f5e3774e7b938395456285703ca2bf5b8da3a7c293ee9bc24256ca61f4f1627199eae

data/lib/vagrant_box_version/action.rb

@@ -0,0 +1,18 @@
+require_relative "version-checking"
+
+module VagrantBoxVersion
+  module Action
+    class Check
+      include VersionChecking
+
+      def initialize(app, env)
+        @app = app
+      end
+
+      def call(env)
+        check(env[:machine], env[:ui])
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/vagrant_box_version/command.rb

@@ -1,68 +1,15 @@
 require "vagrant"
+require_relative "version-checking"
 
 module VagrantBoxVersion
-  require "open-uri"
-
-  class VersionString
-    attr_reader :build, :hash
-    include Comparable
-
-    def initialize(string)
-      @build = string.strip[/[^-]*/].to_i
-      @hash = if string.include? "-" then string.strip.split("-")[1] else "" end
-    end
-
-    def to_s
-      "#@build-#@hash"
-    end
-
-    def <=>(other)
-      build <=> other.build
-    end
-  end
-
   class Command < Vagrant.plugin(2, :command)
+    include VersionChecking
 
     def execute
       ui = @env.ui
 
       with_target_vms() do |machine|
-        box = machine.box
-        unless box.nil?
-          version = local_version(box.directory)
-          remote = remote_version(machine.config.version.url, box.name)
-
-          ui.info("Local version is #{version || "unknown"}")
-
-          if (version || VersionString.new("0")) < (remote || VersionString.new("0"))
-            ui.warn("Version #{remote} is available!")
-            ui.info("To update, run:")
-            ui.info("  vagrant destroy && vagrant box remove #{box.name} #{box.provider.to_s}")
-          elsif version.nil?
-            ui.warn("Local version couldn't be determined. You should probably upgrade your box.")
-          elsif remote.nil?
-            ui.warn("Remote version couldn't be determined. Try again later.")
-          else
-            ui.success("You are up to date!")
-          end
-        else
-          ui.success("There is no local box yet. Nothing to do.")
-        end
-      end
-    end
-
-    private
-
-    def local_version(boxdir)
-      versionfile = File.join(boxdir, "include", "version")
-      if File.exists? versionfile then VersionString.new(File.read(versionfile)) else nil end
-    end
-
-    def remote_version(server, name)
-      begin
-        VersionString.new(open("#{server}/#{name}.box.version").read)
-      rescue
-        nil
+        check(machine, ui)
       end
     end
   end

data/lib/vagrant_box_version/plugin.rb

@@ -23,5 +23,17 @@ module VagrantBoxVersion
       require_relative "config"
       Config
     end
+
+    # thanks to
+    # https://github.com/tknerr/vagrant-plugin-bundler/blob/master/lib/vagrant-plugin-bundler/plugin.rb
+
+    check_version_hook = lambda do |hook|
+      require_relative "action"
+      hook.before Vagrant::Action::Builtin::Provision, VagrantBoxVersion::Action::Check
+    end
+
+    action_hook 'check-box-version-on-machine-up', :machine_action_up, &check_version_hook
+    action_hook 'check-box-version-on-machine-reload', :machine_action_reload, &check_version_hook
+    action_hook 'check-box-version-on-machine-provision', :machine_action_provision, &check_version_hook
   end
 end

data/lib/vagrant_box_version/version-checking.rb

@@ -0,0 +1,66 @@
+##
+# Mix-in to do actual version checking
+#
+
+module VagrantBoxVersion
+  require "open-uri"
+
+
+  class VersionString
+    attr_reader :build, :hash
+    include Comparable
+
+    def initialize(string)
+      @build = string.strip[/[^-]*/].to_i
+      @hash = if string.include? "-" then string.strip.split("-")[1] else "" end
+    end
+
+    def to_s
+      "#@build-#@hash"
+    end
+
+    def <=>(other)
+      build <=> other.build
+    end
+  end
+
+
+  module VersionChecking
+    def check(machine, ui)
+      box = machine.box
+      unless box.nil?
+        version = local_version(box.directory)
+        remote = remote_version(machine.config.version.url, box.name)
+
+        ui.info("Local version is #{version || "unknown"}")
+
+        if (version || VersionString.new("0")) < (remote || VersionString.new("0"))
+          ui.warn("Version #{remote} is available!")
+          ui.info("To update, run:")
+          ui.info("  vagrant destroy && vagrant box remove #{box.name} #{box.provider.to_s}")
+        elsif version.nil?
+          ui.warn("Local version couldn't be determined. You should probably upgrade your box.")
+        elsif remote.nil?
+          ui.warn("Remote version couldn't be determined. Try again later.")
+        else
+          ui.success("You are up to date!")
+        end
+      else
+        ui.success("There is no local box yet. Nothing to do.")
+      end
+    end
+
+    def local_version(boxdir)
+      versionfile = File.join(boxdir, "include", "version")
+      if File.exists? versionfile then VersionString.new(File.read(versionfile)) else nil end
+    end
+
+    def remote_version(server, name)
+      begin
+        VersionString.new(open("#{server}/#{name}.box.version").read)
+      rescue
+        nil
+      end
+    end
+  end
+end

data/lib/vagrant_box_version/version.rb

@@ -1,3 +1,3 @@
 module VagrantBoxVersion
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/vagrant_box_version.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `find lib -type f`.split($/) +
+    ["Gemfile", "LICENSE.txt", "README.md", "Rakefile", "vagrant_box_version.gemspec"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_box_version
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Edd Steel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,16 +45,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/vagrant_box_version.rb
+- lib/vagrant_box_version/action.rb
 - lib/vagrant_box_version/command.rb
 - lib/vagrant_box_version/config.rb
 - lib/vagrant_box_version/plugin.rb
+- lib/vagrant_box_version/version-checking.rb
 - lib/vagrant_box_version/version.rb
+- lib/vagrant_box_version.rb
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
 - vagrant_box_version.gemspec
 homepage: ''
 licenses:

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp