vagrant-vbguest 0.6.0.pre5 → 0.6.0.pre6

data/CHANGELOG.md

@@ -7,6 +7,7 @@
  - Installers no longer are shell scripts, but ruby classes
  - Users may pass in their own installer classes
    (yes! plugins in plugins)
+ - New `sprintf` style `%{version}` placeholder for iso download path
  - Revisited command arguments to not just mirror config values:
    - New `--do` argument: force-run one of those commands:
      * `start`   : Try to start the GuestAdditions Service

data/lib/vagrant-vbguest.rb

@@ -1,3 +1,5 @@
+require 'vagrant-vbguest/core_ext/string/interpolate'
+
 require 'vagrant'
 require "vagrant-vbguest/errors"
 require 'vagrant-vbguest/helpers'

data/lib/vagrant-vbguest/core_ext/string/interpolate.rb

@@ -0,0 +1,110 @@
+# This backports the Ruby 1.9 String interpolation syntax to Ruby 1.8.
+#
+# This file is a copy from I18n
+# https://github.com/mattetti/i18n/blob/master/lib/i18n/core_ext/string/interpolate.rb
+# Copyright (c) 2008 The Ruby I18n team
+# It's copied here for the resons given below:
+#
+# This backport has been shipped with I18n for a number of versions. Meanwhile
+# Rails has started to rely on it and we are going to move it to ActiveSupport.
+# See https://rails.lighthouseapp.com/projects/8994/tickets/6013-move-19-string-interpolation-syntax-backport-from-i18n-to-activesupport
+#
+# Once the above patch has been applied to Rails the following code will be
+# removed from I18n.
+
+=begin
+  heavily based on Masao Mutoh's gettext String interpolation extension
+  http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
+  Copyright (C) 2005-2009 Masao Mutoh
+  You may redistribute it and/or modify it under the same license terms as Ruby.
+=end
+
+begin
+  raise ArgumentError if ("a %{x}" % {:x=>'b'}) != 'a b'
+rescue ArgumentError
+  # KeyError is raised by String#% when the string contains a named placeholder
+  # that is not contained in the given arguments hash. Ruby 1.9 includes and
+  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
+  # in Ruby 1.8.x
+  class KeyError < IndexError
+    def initialize(message = nil)
+      super(message || "key not found")
+    end
+  end unless defined?(KeyError)
+
+  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
+  #
+  # String#% method which accept "named argument". The translator can know
+  # the meaning of the msgids using "named argument" instead of %s/%d style.
+  class String
+    # For older ruby versions, such as ruby-1.8.5
+    alias :bytesize :size unless instance_methods.find {|m| m.to_s == 'bytesize'}
+    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
+
+    INTERPOLATION_PATTERN = Regexp.union(
+      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
+      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
+    )
+
+    INTERPOLATION_PATTERN_WITH_ESCAPE = Regexp.union(
+      /%%/,
+      INTERPOLATION_PATTERN
+    )
+
+    # % uses self (i.e. the String) as a format specification and returns the
+    # result of applying it to the given arguments. In other words it interpolates
+    # the given arguments to the string according to the formats the string
+    # defines.
+    #
+    # There are three ways to use it:
+    #
+    # * Using a single argument or Array of arguments.
+    #
+    #   This is the default behaviour of the String class. See Kernel#sprintf for
+    #   more details about the format string.
+    #
+    #   Example:
+    #
+    #     "%d %s" % [1, "message"]
+    #     # => "1 message"
+    #
+    # * Using a Hash as an argument and unformatted, named placeholders.
+    #
+    #   When you pass a Hash as an argument and specify placeholders with %{foo}
+    #   it will interpret the hash values as named arguments.
+    #
+    #   Example:
+    #
+    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
+    #     # => "Masao Mutoh"
+    #
+    # * Using a Hash as an argument and formatted, named placeholders.
+    #
+    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
+    #   it will interpret the hash values as named arguments and format the value
+    #   according to the formatting instruction appended to the closing >.
+    #
+    #   Example:
+    #
+    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
+    #     # => "10, 43.3"
+    def %(args)
+      if args.kind_of?(Hash)
+        dup.gsub(INTERPOLATION_PATTERN_WITH_ESCAPE) do |match|
+          if match == '%%'
+            '%'
+          else
+            key = ($1 || $2).to_sym
+            raise KeyError unless args.has_key?(key)
+            $3 ? sprintf("%#{$3}", args[key]) : args[key]
+          end
+        end
+      elsif self =~ INTERPOLATION_PATTERN
+        raise ArgumentError.new('one hash required')
+      else
+        result = gsub(/%([{<])/, '%%\1')
+        result.send :'interpolate_without_ruby_19_syntax', args
+      end
+    end
+  end
+end

data/lib/vagrant-vbguest/installers/base.rb

@@ -153,10 +153,10 @@ module VagrantVbguest
 
       def iso_file
         @iso_file ||= begin
-          iso_path = options[:iso_path] || local_iso_path
-
-          if !iso_path || iso_path.empty? && !options[:no_remote]
-            iso_path = VagrantVbguest::Helpers.web_iso_path_for vm, options
+          iso_path = options[:iso_path]
+          if !iso_path || iso_path.empty? || iso_path == :auto
+            iso_path = local_iso_path
+            iso_path = web_iso_path if !iso_path || iso_path.empty? && !options[:no_remote]
           end
           raise VagrantVbguest::IsoPathAutodetectionError if !iso_path || iso_path.empty?
 
@@ -166,13 +166,13 @@ module VagrantVbguest
             iso_path
           else
             # :TODO: This will also raise, if the iso_url points to an invalid local path
-            raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_url) if options[:no_remote]
+            raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_path) if options[:no_remote]
             env = {
               :ui => vm.ui,
               :tmp_path => vm.env.tmp_path,
-              :iso_url => iso_url
+              :iso_url => iso_path
             }
-            @download = VagrantVbguest::Download.new(@env)
+            @download = VagrantVbguest::Download.new(env)
             @download.download
             @download.temp_path
           end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.6.0.pre5"
+  VERSION = "0.6.0.pre6"
 end

data/locales/en.yml

@@ -35,7 +35,7 @@ en:
 
           downloading_disabled: |-
             Could not locate a local Virtualbox Guest Additions iso file.
-            However, the no_remote option was set and thus I will downlownload it from 
+            However, the no_remote option was set and thus I will not downlownload it from 
             %{from}
             Please configure a local path to the iso using `config.vbguest.iso_path` 
             in your Vagrantfile or the `--iso` command line option.

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: -4156320040
+  prerelease: 6
   segments: 
   - 0
   - 6
   - 0
-  - pre5
-  version: 0.6.0.pre5
+  - pre
+  - 6
+  version: 0.6.0.pre6
 platform: ruby
 authors: 
 - Robert Schulze
@@ -15,16 +17,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 +01:00
-default_executable: 
+date: 2013-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: micromachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -50,9 +55,11 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 1
@@ -64,9 +71,11 @@ dependencies:
   name: bundler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -93,6 +102,7 @@ files:
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
 - lib/vagrant-vbguest/config.rb
+- lib/vagrant-vbguest/core_ext/string/interpolate.rb
 - lib/vagrant-vbguest/download.rb
 - lib/vagrant-vbguest/errors.rb
 - lib/vagrant-vbguest/helpers.rb
@@ -107,7 +117,6 @@ files:
 - lib/vagrant_init.rb
 - locales/en.yml
 - vagrant-vbguest.gemspec
-has_rdoc: true
 homepage: https://github.com/dotless-de/vagrant-vbguest
 licenses: 
 - MIT
@@ -117,16 +126,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -135,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM