vagrant-foodshow 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f146d0ff605189d2e409ede395779c9be1d9f282
-  data.tar.gz: 455533e5892334c78b3b900b276f2b53ab502f17
+  metadata.gz: 70bb757fb91620373f0ff8ed75fc4a6a9f491f10
+  data.tar.gz: bb922e878f3e8e9ce9f50afa0d1055bb216f6251
 SHA512:
-  metadata.gz: 0c8cc0f7499bf6aeda07a578a1ccb03881ca9c268f2aa2f84983f561602c4d2e03e6672ef3435d26ed5474e60e85275f06ba1e7ee347670af3c628064a53b8c0
-  data.tar.gz: 99d663cea9e2df4bc40e453b8c9a3f8612f64091b00759518f4fb00cf0a9c839124fe1b7fe0b720f347e21dde9f6c8ae7121514ed55e6ded60993b6218256834
+  metadata.gz: d3e07cc7476493280b46f45631913d475c93c9b3793e7424c8b491e9d5854517d56c7cbff07dd4c926a87e847e5cabff62b1e57e3c63e84529b4555c71982678
+  data.tar.gz: 290de7d390ffed5d5aab9de8b70e61268680bbaec105cd9f6f48adb5fd902799e05176c3994442f3317f94b08bb54dcaaa971d4202aa38ca4a929847209e443a

data/Gemfile

@@ -3,9 +3,10 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :development do
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.5.1"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.6.3"
 end
 
 group :plugins do
+  gem "vagrant-parallels", :git => "https://github.com/Parallels/vagrant-parallels"
   gemspec
 end

data/README.md

@@ -13,7 +13,7 @@ Ngrok tunnel can operate in TCP and HTTP modes. In HTTP tunnel mode `ngrok` prov
 
 ### Ngrok installation
 
-You should go to [ngrok.com](http://ngrok.com) and download ngrok binary for your system. By default vagrant-foodshow will search ngrok binary at `~/bin/ngrok`. You must place binary into *bin* directory in your home folder. To change default location you must set `foodshow.ngrok_bin` option (See [Advanced tunnel example](#advanced-tunnel-example)).
+You should go to [ngrok.com](http://ngrok.com) and download ngrok binary for your system. Vagrant-foodshow will search ngrok binary in PATH. `~/bin/ngrok` will be used if no ngrok binary in PATH. To disable search you may set `foodshow.ngrok_bin` option (See [Advanced tunnel example](#advanced-tunnel-example)).
 
 ### Plugin installation
 
@@ -132,7 +132,7 @@ Read this document if you want to start self-hosted server https://github.com/in
 Option | Default | Scope | Purpose
 -------|---------|---------|--------
 `enabled` | `false` |  config | Enable foodshow plugin
-`ngrok_bin` | `~/bin/ngrok` | config+tunnel |  Ngrok binary location (you should put a binary file at this location)
+`ngrok_bin` | `nil` | config+tunnel |  By default vagrant-foodshow will search ngrok binary in PATH, then at ~/bin/ngrok. You may override this behavior by setting this option
 `forward_ssh` | `false` | config | Automatically search and forward vagrant ssh guest port (authtoken required)
 `timeout` | `10` | config | Max waiting time for establishing tunnel
 `authtoken` | `nil` | config+tunnel | Auth token. Required for TCP tunnels and some functions (Go to [ngrok.com](http://ngrok.com) to get authkey)

data/lib/vagrant-foodshow/config.rb

@@ -58,13 +58,14 @@ module VagrantPlugins
 
       def validate(machine)
         errors = _detected_errors
-        unless ::File.executable? @ngrok_bin
-          errors << "You must put ngrok binary to #{@ngrok_bin}.\n"\
-                    "  Go to http://ngrok.com and download ngrok binary.\n"\
-                    "  You can change binary location by changing option foodshow.ngrok_bin.\n\n"\
-                    "  EXAMPLE. Download and unpack ngrok to ~/bin on Mac OS x86_64:\n"\
-                    "  curl -O https://dl.ngrok.com/darwin_amd64/ngrok.zip && unzip ngrok.zip && mkdir -p ~/bin && mv ngrok ~/bin\n\n"\
-                    "  You can read docs at http://github.com/express42/vagrant-foodshow\n"
+        if @ngrok_bin == UNSET_VALUE
+          errors << "Ngrok binary not found!\n"\
+                    "  Make sure you have downloaded ngrok binary from http://ngrok.com\n"\
+                    "  You can do this:\n"\
+                    "  1) Add directory with ngrok binary your PATH\n"\
+                    "  2) Aut ngrok binary in ~/bin/ngrok\n"\
+                    "  3) Set ngrok binary location with option foodshow.ngrok_bin in your vagrant file\n\n"\
+                    "  You can read docs at http://github.com/express42/vagrant-foodshow"
         end
 
         unless @authtoken
@@ -87,7 +88,7 @@ module VagrantPlugins
       end
 
       def finalize!
-        @ngrok_bin = ::File.expand_path('~/bin/ngrok') if @ngrok_bin == UNSET_VALUE
+        @ngrok_bin = VagrantPlugins::Foodshow::Util::NgrokConfig.where_ngrok if @ngrok_bin == UNSET_VALUE
 
         @trust_host_root_certs = nil if @trust_host_root_certs == UNSET_VALUE
         @server_addr           = nil if @server_addr           == UNSET_VALUE

data/lib/vagrant-foodshow/util/ngrok_config.rb

@@ -4,6 +4,19 @@ module VagrantPlugins
       class NgrokConfig
         NGROK_ALLOWED_OPTIONS = %w(authtoken hostname httpauth proto subdomain host port server_addr trust_host_root_certs)
 
+        def self.where_ngrok
+          cmd = 'ngrok'
+          exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+          ENV['PATH'].split(::File::PATH_SEPARATOR).each do |path|
+            exts.each { |ext|
+              exe = ::File.join(path, "#{cmd}#{ext}")
+              return exe if ::File.executable?(exe) && !File.directory?(exe)
+            }
+          end
+          return ::File.expand_path('~/bin/ngrok') if ::File.executable?(::File.expand_path('~/bin/ngrok'))
+          return VagrantPlugins::Foodshow::Config::UNSET_VALUE
+        end
+
         def self.build_cmd(config)
           cmd  = config.delete(:ngrok_bin) + " -log=stdout"
           host = config.delete(:host)

data/lib/vagrant-foodshow/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Foodshow
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-foodshow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nikita Borzykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-09-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.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: You can share your vagrant vm with your colleagues easily by using vagrant-foodshow
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -55,17 +55,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: vagrant-foodshow
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: You can share your vagrant vm with your colleagues easily by using vagrant-foodshow