vagrant-foodshow 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5c4f943a2b884e12cfd85da7218e0b9217e3f7
-  data.tar.gz: 0a0ebd7b8a5bc21cd2b274b48418a665afadff2b
+  metadata.gz: 366d9a432ef47400bf996eb100457e6d9564d872
+  data.tar.gz: 2baa056556112ec5671495ede167e787b04df2e0
 SHA512:
-  metadata.gz: 8dfeec9abd54db5496c01e4b84f739d54f2e7f60ac3a9ce9189accc49db946f6d9160882dcb73f85a85b377ffe963f3bcd1c1a114ede805bcff31881e502dbea
-  data.tar.gz: 8e2638ec982c58260bb65d5fc7fa384f8bcfa33f7ef767d63577a904153f2828d5e3f3cadf732a816a38be76ded55e4b05debac761583baa3634f91f71347291
+  metadata.gz: 0c70c7750701cbe445a8208a427a246efbb2be1110f0ae4c7770d19cacf61a40d1d99865d61e8f6b751420bd32e4523f289768b33064f40c0e11a780af37651d
+  data.tar.gz: 0a6b52cb46b411a8e84e2cd5d4f0682c21a8a16d424aae75fd950948ba0c7eb7bc416feb522b0865ff75735339b591f80e64a327f446800d480be5aae7cd2b07

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 Vagrantfile
 .vagrant
+.idea

data/README.md

@@ -133,6 +133,8 @@ Read this document if you want to start self-hosted server https://github.com/in
 - Scope *config+tunnel* means that this option can be set via `foodshow.<options>` and can be can be passed to the `foodshow.tunnel` method as options hash.
 - Scope *tunnel* means that this option can be passed to the `foodshow.tunnel` method
 
+Configuration options for **ngrok v1.x**
+
 Option | Default | Scope | Purpose
 -------|---------|---------|--------
 `enabled` | `false` |  config | Enable foodshow plugin
@@ -149,6 +151,16 @@ Option | Default | Scope | Purpose
 `server_addr` | `nil` | config+tunnel | Server address for self-hosted ngrokd, see [Self-hosted tunnels example](#self-hosted-tunnel-example)
 `trust_host_root_certs` | `nil` | config+tunnel | Allow ngrok accept root server certificate. Must be `true` if you using self-hosted ngrokd
 
+Changes in config options for **ngrok v2.x**
+
+v1.x option | | v2.x option
+------------|-|------------
+httpauth | => | auth
+inspect_addr | => | web_addr
+inspect_pbase | => | web_pbase
+
+> If you are using ngrok v2.x authtoken option could be automatically filled from ngrok configuration
+
 # Authors
 
 * Nikita Borzykh (<sample.n@gmail.com>)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/vagrant-foodshow.rb

@@ -1,5 +1,5 @@
-require "vagrant-foodshow/version"
-require "vagrant-foodshow/plugin"
+require 'vagrant-foodshow/version'
+require 'vagrant-foodshow/plugin'
 module Vagrant
   module Foodshow
   end

data/lib/vagrant-foodshow/action/start.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Foodshow
     module Action
       class Start
-        def initialize(app,env)
+        def initialize(app, env)
           @app = app
         end
 
@@ -13,10 +13,10 @@ module VagrantPlugins
 
           if env[:machine].config.foodshow.forward_ssh?
             env[:machine].config.foodshow.tunnel(
-                                                  env[:machine].ssh_info[:port],
-                                                  "tcp",
-                                                  :host => env[:machine].ssh_info[:host]
-                                                )
+                env[:machine].ssh_info[:port],
+                'tcp',
+                :host => env[:machine].ssh_info[:host]
+            )
           end
 
           env[:machine].config.vm.networks.each do |network|
@@ -24,16 +24,16 @@ module VagrantPlugins
             if network[0] == :forwarded_port
               if network[1][:ngrok_proto]
 
-                if network[1][:protocol] != "tcp"
+                if network[1][:protocol] != 'tcp'
                   env[:ui].error "Can't tunnel port #{network[1][:host]}, only tcp protocol supported. Skipping."
                   next
                 end
 
                 env[:machine].config.foodshow.tunnel(
-                                                     network[1][:host],
-                                                     network[1][:ngrok_proto],
-                                                     :host  => network[1][:host_ip] || "127.0.0.1",
-                                                    )
+                    network[1][:host],
+                    network[1][:ngrok_proto],
+                    :host => network[1][:host_ip] || '127.0.0.1',
+                )
               end
             end
           end
@@ -41,12 +41,12 @@ module VagrantPlugins
             status, message, debug_output = VagrantPlugins::Foodshow::Util::Ngrok.start(env, tunnel)
 
             if status == 0
-              env[:ui].success "Tunnel from " + message + " to " + tunnel[:host] + ":" + tunnel[:port].to_s
+              env[:ui].success 'Tunnel from ' + message + ' to ' + tunnel[:host] + ':' + tunnel[:port].to_s
             elsif status == 1
-              env[:ui].error "Ngrok failed: " + message
+              env[:ui].error 'Ngrok failed: ' + message
             elsif status == -1
               env[:ui].error message
-              env[:ui].error "Ngrok output: " + debug_output.join()
+              env[:ui].error 'Ngrok output: ' + debug_output.join
             end
           end
         end

data/lib/vagrant-foodshow/action/stop.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Foodshow
     module Action
       class Stop
-        def initialize(app,env)
+        def initialize(app, env)
           @app = app
         end
 
@@ -10,15 +10,15 @@ module VagrantPlugins
 
           machine_id = VagrantPlugins::Foodshow::Util::NgrokConfig.get_machine_id(env)
           Dir.glob("#{env[:tmp_path] || '/tmp'}/ngrok-#{machine_id}-*.pid") do |pid_file|
-            ::File.open(pid_file, "r") do |f|
+            ::File.open(pid_file, 'r') do |f|
               begin
                 pid = f.readline().to_i
-                ::Process.kill("TERM",pid)
+                ::Process.kill('TERM', pid)
                 ::File.delete(pid_file)
               rescue Errno::ESRCH
                 ::File.delete(pid_file)
               ensure
-                env[:ui].info("ngrok terminated")
+                env[:ui].info('ngrok terminated')
               end
             end
           end

data/lib/vagrant-foodshow/config.rb

@@ -9,39 +9,59 @@ module VagrantPlugins
       attr_accessor :enabled
       attr_accessor :forward_ssh
 
+      # ngrok common options
       attr_accessor :authtoken
       attr_accessor :hostname
-      attr_accessor :httpauth
       attr_accessor :subdomain
+
+      # ngrok v1.x options
+      attr_accessor :httpauth
       attr_accessor :inspect_addr
       attr_accessor :inspect_pbase
 
-      attr_reader   :tunnels
-      attr_reader   :ngrok_bin
+      # ngrok v2.x options
+      attr_accessor :auth
+      attr_accessor :web_addr
+      attr_accessor :web_pbase
+
+      attr_reader :tunnels
+      attr_reader :ngrok_bin
 
       def initialize
-        @forward_ssh  = UNSET_VALUE
-        @enabled      = UNSET_VALUE
-        @timeout      = UNSET_VALUE
-        @ngrok_bin    = UNSET_VALUE
+        @forward_ssh = UNSET_VALUE
+        @enabled = UNSET_VALUE
+        @timeout = UNSET_VALUE
+        @ngrok_bin = UNSET_VALUE
+        @tunnels = []
+
+        # ngrok common params
+        @authtoken = UNSET_VALUE
+        @hostname = UNSET_VALUE
+        @subdomain = UNSET_VALUE
+
+        # ngrok v1.x params
+        @httpauth = UNSET_VALUE
         @inspect_addr = UNSET_VALUE
         @inspect_port = UNSET_VALUE
-        @tunnels      = []
 
-        #ngrok params
-        @authtoken    = UNSET_VALUE
-        @hostname     = UNSET_VALUE
-        @httpauth     = UNSET_VALUE
-        @subdomain    = UNSET_VALUE
+        # ngrok v2.x params
+        @auth = UNSET_VALUE
+        @web_addr = UNSET_VALUE
+        @web_port = UNSET_VALUE
 
         # Options for self-hosted ngrokd
-        @server_addr           = UNSET_VALUE
+        @server_addr = UNSET_VALUE
         @trust_host_root_certs = UNSET_VALUE
+
+        file = ENV['HOME'] + '/.ngrok2/ngrok.yml'
+        if File.exist?(file)
+          @authtoken = YAML.load_file(file)['authtoken']
+        end
       end
 
-      def tunnel(port, proto = "http+https", options={})
-        host_hash = {:host => options[:host] || "127.0.0.1"}
-        @tunnels << options.merge(:port => port).merge( :proto => proto).merge(host_hash)
+      def tunnel(port, proto = 'http+https', options={})
+        host_hash = {:host => options[:host] || '127.0.0.1'}
+        @tunnels << options.merge(:port => port).merge(:proto => proto).merge(host_hash)
       end
 
       def forward_ssh?
@@ -59,49 +79,57 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
         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) Add 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"
+          errors << <<MSG
+Ngrok binary not found!
+  Make sure you have downloaded ngrok binary from http://ngrok.com
+  You can do this:
+  1) Add directory with ngrok binary your PATH
+  2) Add ngrok binary in ~/bin/ngrok
+  3) Set ngrok binary location with option foodshow.ngrok_bin in your vagrant file
+
+  You can read docs at http://github.com/express42/vagrant-foodshow
+MSG
         end
 
         unless @authtoken || @server_addr
           if @subdomain || @forward_ssh || @hostname
-            errors << "You should set authtoken if you use subdomain/forward_ssh/hostname options"
+            errors << 'You should set authtoken if you use subdomain/forward_ssh/hostname options'
           end
-          
-          @tunnels.each do |tunnel|
 
+          @tunnels.each do |tunnel|
             unless tunnel[:authtoken]
-              if tunnel[:hostname] || tunnel[:subdomain] || tunnel[:proto] == "tcp"
-                errors << "You should set authtoken if you call foodshow.tunnel with subdomain/hostname/proto=tcp options"
+              if tunnel[:hostname] || tunnel[:subdomain] || tunnel[:proto] == 'tcp'
+                errors << 'You should set authtoken if you call foodshow.tunnel with subdomain/hostname/proto=tcp options'
               end
             end
           end
 
         end
-        
-        { "foodshow" => errors }
+
+        {foodshow: errors}
       end
 
       def finalize!
         @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
-
-        @enabled       = false            if @enabled      == UNSET_VALUE
-        @forward_ssh   = false            if @forward_ssh  == UNSET_VALUE
-        @timeout       = 10               if @timeout      == UNSET_VALUE
-        @authtoken     = nil              if @authtoken    == UNSET_VALUE
-        @hostname      = nil              if @hostname     == UNSET_VALUE
-        @httpauth      = nil              if @httpauth     == UNSET_VALUE
-        @subdomain     = nil              if @subdomain    == UNSET_VALUE
-        @inspect_addr  = "127.0.0.1"      if @inspect_addr == UNSET_VALUE
-        @inspect_pbase = 4040             if @inspect_port == UNSET_VALUE
+        @server_addr = nil if @server_addr == UNSET_VALUE
+
+        @enabled = false if @enabled == UNSET_VALUE
+        @forward_ssh = false if @forward_ssh == UNSET_VALUE
+        @timeout = 10 if @timeout == UNSET_VALUE
+
+        @authtoken = nil if @authtoken == UNSET_VALUE
+        @hostname = nil if @hostname == UNSET_VALUE
+        @httpauth = nil if @httpauth == UNSET_VALUE
+
+        @subdomain = nil if @subdomain == UNSET_VALUE
+        @inspect_addr = '127.0.0.1' if @inspect_addr == UNSET_VALUE
+        @inspect_pbase = 4040 if @inspect_port == UNSET_VALUE
+
+        @auth = nil if @auth == UNSET_VALUE
+        @web_addr = '127.0.0.1' if @web_addr == UNSET_VALUE
+        @web_pbase = 4040 if @web_port == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-foodshow/plugin.rb

@@ -1,13 +1,13 @@
-require "vagrant-foodshow/action/start.rb"
-require "vagrant-foodshow/action/stop.rb"
-require "vagrant-foodshow/util/ngrok.rb"
+require 'vagrant-foodshow/action/start.rb'
+require 'vagrant-foodshow/action/stop.rb'
+require 'vagrant-foodshow/util/ngrok.rb'
 
 module VagrantPlugins
   module Foodshow
-    class Plugin < Vagrant.plugin("2")
-      name "foodshow"
+    class Plugin < Vagrant.plugin('2')
+      name 'foodshow'
       config 'foodshow' do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
       action_hook :ngrok_start_handler, :machine_action_up do |hook|

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

@@ -1,12 +1,18 @@
+require 'json'
 require 'open3'
 require 'timeout'
-require "vagrant-foodshow/util/ngrok_config.rb"
+require 'vagrant-foodshow/util/ngrok_config.rb'
 
 module VagrantPlugins
   module Foodshow
     module Util
       class Ngrok
+
+        def initialize
+        end
+
         def self.start(env, tunnel)
+          @ngrok_version_deprecated = VagrantPlugins::Foodshow::Util::NgrokConfig.ngrok_version_deprecated?
           if defined?(@@counter)
             @@counter += 1
           else
@@ -16,57 +22,72 @@ module VagrantPlugins
           config = VagrantPlugins::Foodshow::Util::NgrokConfig.merge_config(env, tunnel)
 
           trust_host_root_certs = config.delete(:trust_host_root_certs)
-          server_addr           = config.delete(:server_addr)
+          server_addr = config.delete(:server_addr)
+
+          timeout = config.delete(:timeout)
+          log_file = config.delete(:log_file)
+          pid_file = config.delete(:pid_file)
+          authtoken = config.delete(:authtoken)
 
-          timeout       = config.delete(:timeout)
-          log_file      = config.delete(:log_file)
-          pid_file      = config.delete(:pid_file)
-          inspect_addr  = config.delete(:inspect_addr)
-          authtoken     = config.delete(:authtoken)
+          inspect_addr = config.delete(:inspect_addr)
           inspect_pbase = config.delete(:inspect_pbase)
-          config_file   = config[:config]
-          
-          cmd           = VagrantPlugins::Foodshow::Util::NgrokConfig.build_cmd(config)
+
+          web_addr = config.delete(:web_addr)
+          web_pbase = config.delete(:web_pbase)
+
+          config_file = config[:config]
+
+          cmd = VagrantPlugins::Foodshow::Util::NgrokConfig.build_cmd(config)
 
           begin
-            current_pid=-1
+            current_pid = -1
             ::File.open(pid_file) { |pid| current_pid = pid.readline(); }
             Process.getpgid(current_pid.to_i)
-            return 0, "Ngrok already running at pid #{current_pid}. Skipping tunnel", ""
+            return 0, "Ngrok already running at pid #{current_pid}. Skipping tunnel", ''
           rescue
+            # ignored
           end
 
-          ::File.open(config_file, "w") do |conf_h|
+          ::File.open(config_file, 'w') do |conf_h|
 
-            conf_h.write("inspect_addr: #{inspect_addr.to_s}:#{inspect_pbase.to_i + @@counter}\n")
+            if @ngrok_version_deprecated
+              conf_h.write("inspect_addr: #{inspect_addr.to_s}:#{inspect_pbase.to_i + @@counter}\n")
+            else
+              conf_h.write("web_addr: #{web_addr.to_s}:#{web_pbase.to_i + @@counter}\n")
+            end
 
             if server_addr
               conf_h.write("server_addr: #{server_addr}\n")
             end
 
-            if trust_host_root_certs == true
+            if trust_host_root_certs
               conf_h.write("trust_host_root_certs: true\n")
             end
 
             if authtoken
-              conf_h.write("auth_token: #{authtoken}\n")
+              if @ngrok_version_deprecated
+                conf_h.write("auth_token: #{authtoken}\n")
+              else
+                conf_h.write("authtoken: #{authtoken}\n")
+              end
             end
 
           end
 
           pid = spawn(cmd, :out => log_file.to_s)
 
-          ::File.open(pid_file, "w") { |pid_h| pid_h.write(pid) }
+          ::File.open(pid_file, 'w') { |pid_h| pid_h.write(pid) }
 
-          log_h = ::File.open(log_file, "r")
+          log_h = ::File.open(log_file, 'r')
           status, message, debug_output = parse_log(log_h, timeout)
           log_h.close
 
           unless status == 0
             begin
               ::File.delete(pid_file)
-              ::Process.kill("TERM", pid)
+              ::Process.kill('TERM', pid)
             rescue
+              # ignored
             end
           end
 
@@ -76,6 +97,7 @@ module VagrantPlugins
         private
 
         def self.parse_log(log_h, timeout)
+          @ngrok_version_deprecated = VagrantPlugins::Foodshow::Util::NgrokConfig.ngrok_version_deprecated?
           debug_output = []
           begin
             timeout(timeout.to_i) do
@@ -86,22 +108,32 @@ module VagrantPlugins
                   next
                 end
                 debug_output << stdout_str
-
-                if stdout_str.include? "[INFO] [client] Tunnel established at"
-                  return 0, stdout_str[/(http\:\/\/|https\:\/\/|tcp\:\/\/).+/], debug_output
-                end
-
-                if stdout_str.include? "[EROR]"
-                  if stdout_str.include? "Error while checking for update"
-                    next
-                  else
-                    return 1, stdout_str, debug_output
+                if @ngrok_version_deprecated
+                  if stdout_str.include? '[INFO] [client] Tunnel established at'
+                    return 0, stdout_str[/(http\:\/\/|https\:\/\/|tcp\:\/\/).+/], debug_output
+                  end
+                  if stdout_str.include? '[EROR]'
+                    if stdout_str.include? 'Error while checking for update'
+                      next
+                    else
+                      return 1, stdout_str, debug_output
+                    end
+                  end
+                else
+                  stdout_json = JSON.parse(stdout_str)
+                  if stdout_json.include?('err') && stdout_json['err'] != '<nil>'
+                    return 1, stdout_json['err'], debug_output
+                  end
+                  if stdout_json.include?('msg') && stdout_json['msg'] == 'decoded response'
+                    if stdout_json['resp'].match(/URL:/)
+                      return 0, stdout_json['resp'][/\sURL:(.+?)\s/, 1], debug_output
+                    end
                   end
                 end
               end
             end
           rescue ::Timeout::Error
-            return -1, "Ngrok wait timeout. See ngrok output:", debug_output
+            return -1, 'Ngrok wait timeout. See ngrok output:', debug_output
           end
         end
       end

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

@@ -1,8 +1,10 @@
+require 'yaml'
+
 module VagrantPlugins
   module Foodshow
     module Util
       class NgrokConfig
-        NGROK_ALLOWED_OPTIONS = %w(authtoken hostname httpauth proto subdomain host port server_addr trust_host_root_certs)
+        NGROK_ALLOWED_OPTIONS = %w(authtoken hostname httpauth auth proto subdomain host port server_addr trust_host_root_certs)
 
         def self.where_ngrok
           cmd = 'ngrok'
@@ -17,20 +19,49 @@ module VagrantPlugins
           return VagrantPlugins::Foodshow::Config::UNSET_VALUE
         end
 
+        def self.ngrok_version
+          return @ngrok_version unless @ngrok_version.nil?
+          cmd = where_ngrok
+          @ngrok_version = `#{cmd} version`.gsub!(/[^\d\.]/, '')
+        end
+
+        def self.ngrok_version_deprecated?
+          ngrok_version < '2.'
+        end
+
         def self.build_cmd(config)
-          cmd  = config.delete(:ngrok_bin) + " -log=stdout"
+          cmd = config.delete(:ngrok_bin)
           host = config.delete(:host)
           port = config.delete(:port)
 
+          if ngrok_version_deprecated?
+            cmd += ' -log=stdout'
+          else
+            proto = config.delete(:proto)
+            case proto
+              when 'http'
+                config['bind-tls'] = 'false'
+              when 'https'
+                config['bind-tls'] = 'true'
+                proto = 'http'
+              when 'http+https', 'https+http'
+                config['bind-tls'] = 'both'
+                proto = 'http'
+              else
+                # ignored
+            end
+            cmd += ' ' + proto + ' -log=stdout -log-level=debug -log-format=json'
+          end
+
           config.each_pair do |opt, val|
-            cmd = cmd + " -" + opt.to_s + "=" + val.to_s
+            cmd += ' -' + opt.to_s + '=' + val.to_s
           end
 
-          cmd = cmd + " " + host + ":" + port.to_s
+          cmd += ' ' + host + ':' + port.to_s
         end
 
         def self.get_machine_id(env)
-          if env[:machine].provider_name.to_s().start_with?('vmware')
+          if env[:machine].provider_name.to_s.start_with?('vmware')
             machine_id = env[:machine].id.match(/\h+\-\h+\-\h+\-\h+\-\h+/)[0]
           else
             machine_id = env[:machine].id
@@ -42,17 +73,28 @@ module VagrantPlugins
           foodshow_config = env[:machine].config.foodshow
 
           config[:trust_host_root_certs] = foodshow_config.trust_host_root_certs if foodshow_config.trust_host_root_certs
-          config[:server_addr]           = foodshow_config.server_addr           if foodshow_config.server_addr
+          config[:server_addr] = foodshow_config.server_addr if foodshow_config.server_addr
+
+          config[:ngrok_bin] = foodshow_config.ngrok_bin if foodshow_config.ngrok_bin
+          config[:timeout] = foodshow_config.timeout if foodshow_config.timeout
 
-          config[:ngrok_bin]     = foodshow_config.ngrok_bin     if foodshow_config.ngrok_bin
-          config[:timeout]       = foodshow_config.timeout       if foodshow_config.timeout
+          config[:authtoken] = foodshow_config.authtoken if foodshow_config.authtoken
+          config[:hostname] = foodshow_config.hostname if foodshow_config.hostname
+          config[:subdomain] = foodshow_config.subdomain if foodshow_config.subdomain
 
-          config[:authtoken]     = foodshow_config.authtoken     if foodshow_config.authtoken
-          config[:hostname]      = foodshow_config.hostname      if foodshow_config.hostname
-          config[:httpauth]      = foodshow_config.httpauth      if foodshow_config.httpauth
-          config[:subdomain]     = foodshow_config.subdomain     if foodshow_config.subdomain
-          config[:inspect_addr]  = foodshow_config.inspect_addr  if foodshow_config.inspect_addr
-          config[:inspect_pbase] = foodshow_config.inspect_pbase if foodshow_config.inspect_pbase
+          auth = foodshow_config.auth || foodshow_config.httpauth
+          web_addr = foodshow_config.web_addr || foodshow_config.inspect_addr
+          web_pbase = foodshow_config.web_pbase || foodshow_config.inspect_pbase
+
+          if ngrok_version_deprecated?
+            config[:httpauth] = auth
+            config[:inspect_addr] = web_addr
+            config[:inspect_pbase] = web_pbase
+          else
+            config[:auth] = auth
+            config[:web_addr] = web_addr
+            config[:web_pbase] = web_pbase
+          end
 
           tunnel.keys.each do |key|
             raise unless NGROK_ALLOWED_OPTIONS.include? key.to_s
@@ -61,9 +103,9 @@ module VagrantPlugins
 
           machine_id = get_machine_id(env)
 
-          config[:config]   = (env[:tmp_path] || "/tmp") + ("ngrok-" + machine_id + "-" + config[:port].to_s + ".cfg")
-          config[:log_file] = (env[:tmp_path] || "/tmp") + ("ngrok-" + machine_id + "-" + config[:port].to_s + ".log")
-          config[:pid_file] = (env[:tmp_path] || "/tmp") + ("ngrok-" + machine_id + "-" + config[:port].to_s + ".pid")
+          config[:config] = (env[:tmp_path] || '/tmp') + ('ngrok-' + machine_id + '-' + config[:port].to_s + '.cfg')
+          config[:log_file] = (env[:tmp_path] || '/tmp') + ('ngrok-' + machine_id + '-' + config[:port].to_s + '.log')
+          config[:pid_file] = (env[:tmp_path] || '/tmp') + ('ngrok-' + machine_id + '-' + config[:port].to_s + '.pid')
           config
         end
       end

data/lib/vagrant-foodshow/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Foodshow
-    VERSION = "1.0.3"
+    VERSION = '1.1.0'
   end
 end

data/vagrant-foodshow.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-foodshow/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vagrant-foodshow"
+  spec.name          = 'vagrant-foodshow'
   spec.version       = Vagrant::Foodshow::VERSION
-  spec.authors       = ["Nikita Borzykh"]
-  spec.email         = ["sample.n@gmail.com"]
+  spec.authors       = ['Nikita Borzykh']
+  spec.email         = ['sample.n@gmail.com']
   spec.summary       = %q{You can share your vagrant vm with your colleagues easily by using vagrant-foodshow}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/express42/vagrant-foodshow"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/express42/vagrant-foodshow'
+  spec.license       = 'MIT'
 
-  spec.rubyforge_project = "vagrant-foodshow"
+  spec.rubyforge_project = 'vagrant-foodshow'
 
   spec.files         = `git ls-files -z`.split("\x0")
   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"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency 'bundler', '~> 1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-foodshow
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Nikita Borzykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: vagrant-foodshow
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: You can share your vagrant vm with your colleagues easily by using vagrant-foodshow