vagrant-foodshow 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59b96661564dbad9346832b58123e12b4577010
-  data.tar.gz: 3407de4dc6a45f73d362091f36fffd0c7ae58431
+  metadata.gz: d2c18e133d54680de1cff45b980bcec79a66bb11
+  data.tar.gz: b87f5cd17a303d0cd5e1f4839bf8c6a1f4e4bb1d
 SHA512:
-  metadata.gz: 0c4d813475f020b8a65a8570569b5b28aff190bf9b9fb16661f13a3247eed93adea472f73344aa063387ab0c78b2927116a7d4d853eea387a4c07d77ed7584e0
-  data.tar.gz: 7601a43d090138b304ec27fed6e0538cfeeb6c3b62f13de844bfa34b5b5ad499ed94fe5215014913098c3e7e14db9338dae3ccf0a39d393baad790019ef64412
+  metadata.gz: d278adae5aa813ebb71938f38695de830be8477506d2d22056a8bf016bfd7a0dac98e6c7e26fc786bd69005d1597af7d9cd9cc94a03627258eaf2922691c24c5
+  data.tar.gz: e47a40018a2de86eacd1d0a0066fc5f4381674ec10857668438db91b8040d7e4e6748a4ae890e2eb7cafaab432f4f9e3953e3c6fa6c6e8821cccfa163a396271

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

@@ -8,7 +8,8 @@ module VagrantPlugins
 
         def call(env)
 
-          Dir.glob("#{env[:tmp_path] || '/tmp'}/ngrok-#{env[:machine].id}-*.pid") do |pid_file|
+          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|
               begin
                 pid = f.readline().to_i

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

@@ -16,6 +16,14 @@ module VagrantPlugins
           cmd = cmd + " " + host + ":" + port.to_s
         end
 
+        def self.get_machine_id(env)
+          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
+          end
+        end
+
         def self.merge_config(env, tunnel)
           config = {}
           foodshow_config = env[:machine].config.foodshow
@@ -35,9 +43,11 @@ module VagrantPlugins
           end
           config.merge!(tunnel)
 
-          config[:config]   = (env[:tmp_path] || "/tmp") + ("ngrok-" + env[:machine].id + "-" + config[:port].to_s + ".cfg")
-          config[:log_file] = (env[:tmp_path] || "/tmp") + ("ngrok-" + env[:machine].id + "-" + config[:port].to_s + ".log")
-          config[:pid_file] = (env[:tmp_path] || "/tmp") + ("ngrok-" + env[:machine].id + "-" + config[:port].to_s + ".pid")
+          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
         end
       end

data/lib/vagrant-foodshow/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Foodshow
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-foodshow
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Nikita Borzykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-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.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: You can share your vagrant vm with your colleagues easily by using vagrant-foodshow