vagrant-wrapper 1.2.1.1 → 2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 501d5a1c6d888a816d5d52c6cf6ab3ddad9c60f4
+  data.tar.gz: a610dd50af7805c8d6ef27af0c734afc0b5761b4
+SHA512:
+  metadata.gz: 8b525222282ff19adbc416305d48c330d07a54bb471c7b9689e5587c29ada8e1cf7a4e26f8c394284f04f6ac34a9f9601bd10cd3aeeb443363c40a7953eaeb9b
+  data.tar.gz: 7b1c76b4c488077e38f2c1550ca9cc08925ad264969bd2fc1fe826424eeee10bc5c01f2f93be9bf565903bd3cbf0972df8fe250dacda03f96a0d1773a9e5d6e1

data/README.md

@@ -8,15 +8,23 @@ A gem providing access and bundling to the newer packaged versions of Vagrant. (
 
 **Please note:** this Gem does not install any version of Vagrant, it provides a compatibility layer over the newer packaged version. However, functions are included which may be used to guide the installation of Vagrant, when necessary.
 
-**[More information on why this Gem exists can be seen in the Background section below.](#background---aka-the-vagrant-gem-enigma)**
+### Background - AKA the Vagrant Gem Enigma
+
+Examples of the problem this gem solves, and the history behind it, have been moved to the [ENIGMA.md](ENIGMA.md) file.
+
+## Version 2.0 Now Available
+
+- Now supporting Windows!
+- Testing cleaned up and updated to RSpec3
+
+Big thank you to @btm for writing these updates, and @tknerr for helping to test.
+
 
 
 # Installation and Usage
 
 Require the Vagrant Wrapper via your Gemfile, then run `bundle install`.
 
-    source 'https://rubygems.org'
-
     gem 'vagrant-wrapper'
 
 Shell calls to 'vagrant' in your project will now always use the packaged version of Vagrant if available,
@@ -28,54 +36,6 @@ and use the older Gem version, even if they are shelling out as well.
 **Please note:** The wrapper searches for a packaged installation of Vagrant first, and then falls back to any version it can find in the PATH. Therefore it will link to the 1.0.x gem version if that's all that is installed, so you should always enforce a minimum Vagrant version, see below.
 
 
-## Gemfile examples
-
-**Let's assume you have both Vagrant 1.0.7 installed via a Gem, and Vagrant 1.2 installed via the official package.**
-
-### A... Older 'vagrant' gemfiles
-
-This older Gemfile will still launch Vagrant 1.0.7, as expected:
-
-**Gemfile**
-
-    source 'https://rubygems.org'
-    gem 'vagrant'
-
-**Output**
-
-    puts %x{vagrant -v}
-    => "Vagrant version 1.0.7"
-
-_Notes below on [VAGRANT_HOME](#vagrant_home) with older versions._
-
-### B... Simply Leaving out 'vagrant'
-
-This is the key problem the Vagrant Wrapper seeks to solve, because otherwise (without uninstalling the vagrant gem), your shell calls will still be routed to 1.0.7.
-
-**Gemfile**
-
-    source 'https://rubygems.org'
-
-**Output**
-
-    puts %x{vagrant -v}
-    => "Vagrant version 1.0.7"
-
-### C... Including 'vagrant-wrapper'
-
-Calls to vagrant now route to the newer packaged version.
-
-**Gemfile**
-
-    source 'https://rubygems.org'
-    gem 'vagrant-wrapper'
-
-**Output**
-
-    puts %x{vagrant -v}
-    => "Vagrant version 1.2.0"
-
-
 ## Shell interaction
 
 By requiring 'vagrant-wrapper' in your Gemfile, all calls to vagrant (inside and outside of Ruby), will use the packaged Vagrant install if available.
@@ -171,34 +131,7 @@ Major differences in Vagrant will refuse to use the same existing shared data di
 
     $ export VAGRANT_HOME=~/.vagrant.old
 
-----------
-
-# Background - AKA the Vagrant Gem enigma
-
-Per the creator's discretion, Vagrant 1.1+ no longer ships in Gem form,
-[see here](https://groups.google.com/d/msg/vagrant-up/kX_wvn7wcds/luwNur4kgDEJ),
-in favor of packaged installers.
-
-There are many ways in which this is a strong move for the project, and in theory Vagrant's ability to use
-its own bundled Ruby allows it to operate in a vacuum. So why does this wrapper exist?
-
-The problem is that Gems do (and will always) exist for the older versions. If they are installed they tend
-to override the system installed version of Vagrant if shell calls are made from within Ruby projects.
-
-As an example, if you have any bundled project that requires the 'vagrant' gem via its Gemfile, and a newer
-project that does not require this Gem (hoping to rely on the system packaged version), you'll find that
-the Gem version of Vagrant will always be called when your program attempts to access Vagrant via a shell
-or subprocess.
-
-This is because the Rubygems bin directory is higher in your PATH, and using "bundle exec" will not help.
-Even though Bundler will attempt to broker between multiple versions of Gems, it cannot handle the choice
-between the Gem version and the system version.
-
-Your only option would be to remove the old vagrant gem between projects, which is cumbersome. Also the problem will recur if you run a "bundle install" on a project which still includes the older Gem. This wrapper
-solves the problem by giving your newer projects something to include and override the older Gem versions
-of Vagrant.
 
-----------
 
 # Development and Maintenance
 

data/bin/vagrant

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'vagrant-wrapper'
+begin
+  require 'vagrant-wrapper'
+rescue LoadError
+  # This ensures the integration tests pass if the gem is not installed
+  $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+  retry
+end
 
 min_ver = nil
 

data/lib/vagrant-wrapper.rb

@@ -22,11 +22,13 @@ require 'shellwords'
 # if the vagrant-wrapper Gem is required in your bundle.
 class VagrantWrapper
 
+  # The string used to detect ourselves and a gem wrapper of ourselves
+  WRAPPER_MARK = "vagrant-wrapper"
+
   def initialize(*args)
-    @vagrant_name = "vagrant"
+    @vagrant_name = windows? ? "vagrant.exe" : "vagrant"
     @vagrant_path = nil
     @search_paths = default_paths + env_paths
-    @wrapper_mark = "END VAGRANT WRAPPER"
 
     # Optional first parameter sets required version.
     unless args.length < 1 or args[0].nil?
@@ -79,7 +81,7 @@ class VagrantWrapper
   def vagrant_version
     ver = call_vagrant "-v"
     unless ver.nil?
-      ver = ver[/(\.?[0-9]+)+/]
+      ver = ver[/Vagrant( version)? ([0-9]+(\.[0-9]+)+)/, 2]
     end
     ver
   end
@@ -90,19 +92,31 @@ class VagrantWrapper
   #   /usr/bin
   #   /bin
   def default_paths
-    %w{
-      /opt/vagrant/bin
-      /usr/local/bin
-      /usr/bin
-      /bin
-    }
+    if windows?
+      %w{
+        C:\HashiCorp\Vagrant\bin
+        /c/HashiCorp/Vagrant/bin
+      }
+    else
+      %w{
+        /opt/vagrant/bin
+        /usr/local/bin
+        /usr/bin
+        /bin
+      }
+    end
   end
 
   # Environment search paths to be used as low priority search.
   def env_paths
     path = ENV['PATH'].to_s.strip
     return [] if path.empty?
-    path.split(':')
+    separator = if windows?
+                  ';'
+                else
+                  ':'
+                end
+    path.split(separator)
   end
 
   def self.install_instructions
@@ -129,9 +143,9 @@ class VagrantWrapper
   def find_vagrant
     unless @vagrant_path
       @search_paths.each do |path|
-        test_bin = "#{path}/#{@vagrant_name}"
+        test_bin = "#{path}#{path_separator}#{@vagrant_name}"
         next unless ::File.executable?(test_bin)
-        next if (%x{tail -n1 #{test_bin}}.match(@wrapper_mark) != nil)
+        next if is_wrapper?(test_bin)
         @vagrant_path = test_bin
         break
       end
@@ -152,10 +166,26 @@ class VagrantWrapper
   def exec_vagrant(*args)
     unless vagrant = find_vagrant
       $stderr.puts "Vagrant is not installed."
-      $stderr.print install_instructions
+      $stderr.print VagrantWrapper.install_instructions
       exit(1)
     end
     args.unshift(vagrant)
     exec(Shellwords.join(args))
   end
+
+  def windows?
+    !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+  end
+
+  def is_wrapper?(file)
+    File.readlines(file).grep(/#{WRAPPER_MARK}/).any?
+  end
+
+  def path_separator
+    if windows?
+      File::ALT_SEPARATOR || '\\'.freeze
+    else
+      File::SEPARATOR
+    end
+  end
 end

data/lib/vagrant-wrapper/version.rb

@@ -13,6 +13,6 @@
 #
 
 class VagrantWrapper
-  VERSION = '1.2.1.1'
-  RELEASE_DATE = '2013-05-20'
+  VERSION = '2.0'
+  RELEASE_DATE = '2014-12-16'
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.2.1.1
-  prerelease: 
+  version: '2.0'
 platform: ruby
 authors:
 - BinaryBabel OSS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: vagrant
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,22 +48,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.7
-description: ! 'Since Vagrant 1.1+ is no longer distributed via Gems, vagrant-wrapper
-  allows you to require and interact
-
-  with the newer package versions via your Gemfile, shell, or Ruby code. It allows
-  the newer packaged
-
+description: |
+  Since Vagrant 1.1+ is no longer distributed via Gems, vagrant-wrapper allows you to require and interact
+  with the newer package versions via your Gemfile, shell, or Ruby code. It allows the newer packaged
   version to take precedence even if the older Vagrant gem remains installed.
-
   See https://github.com/org-binbab/gem-vagrant-wrapper for more details.
-
-'
 email:
 - projects@binarybabel.org
 executables:
@@ -79,39 +66,32 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/vagrant
+- lib/vagrant-wrapper.rb
 - lib/vagrant-wrapper/exceptions.rb
 - lib/vagrant-wrapper/version.rb
-- lib/vagrant-wrapper.rb
-- bin/vagrant
 homepage: http://code.binbab.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1894894601892164128
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1894894601892164128
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper/binstub for os packaged version of Vagrant.
 test_files: []