vagrant-phpstorm-tunnel 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30108c2f50668f943fbd9ca9ae7030d23195fcd
-  data.tar.gz: 30eca830b89620109440391b186ac553dcb122da
+  metadata.gz: 2f69fa584205c2640712c910f852c97525fdc184
+  data.tar.gz: 0df7cb13f6c5636e824ffeaa68a7deca3e2ec058
 SHA512:
-  metadata.gz: 5f31049e7fec59a76d69cc44482f30c74892629bb503fd0cef671051ac89c2add55eede65fb9f85b2c274b72e76eacc5f418e6a5617641c3b9d59da6d6d4f001
-  data.tar.gz: ba2661a2b0bbe8912cd6e890823f71f851af68814224f0627b8454db4866aeef0f3ed49fc5b165a9790d0124ee7ca0903bce2adf1a2acb7b658fd5622dc65dcf
+  metadata.gz: ced344ff58500fdb3cd10d5772ab70bf662ae53d6cca742e047ca4723bfeba69197ccfb1357165fa2b7464695a8f7c57b011416cb33c57f73490e94e96f46d72
+  data.tar.gz: 2823e224a09a59a4a06d9f2e73d66bdf4f29b3245ef95b7552a457cc2dce21da9874346e38cae4758e665d23a74f892d419172ce00aba3e36682141995629082

data/README.md

@@ -11,6 +11,16 @@ Installation
 vagrant plugin install vagrant-phpstorm-tunnel
 ```
 
+Vagrantfile
+-----------
+You can configure your `project_home` path within `vagrant` machine. This is needed for proper paths mapping from `PhpStorm` during debugging (please have a look also section below).
+```ruby
+Vagrant.configure('2') do |config|
+  (...)
+  config.phpstorm_tunnel.project_home = '/home/vagrant/fuboo'
+end
+```
+
 PhpStorm
 --------
 `vagrant-phpstorm-tunnel` will create a file `.idea/vagrant/php` in your vagrant-project.

data/data/php

@@ -20,6 +20,11 @@ if (!filter_var($hostIp, FILTER_VALIDATE_IP)) {
 	throw new Exception('Cannot detect host IP, got value `' . $hostIp . '`.');
 }
 
+// Detect Project Dir on Guest
+$projectDirGuestFile = $homeDirHost . '/vm_project_dir';
+if (file_exists($projectDirGuestFile)) {
+  $projectDirGuest = trim(file_get_contents($projectDirGuestFile));
+}
 
 $arguments = $argv;
 array_shift($arguments);

data/lib/vagrant-phpstorm-tunnel/config.rb

@@ -0,0 +1,16 @@
+module VagrantPhpstormTunnel
+  class Config < Vagrant.plugin(2, :config)
+
+    attr_accessor :project_home
+
+    def project_home=(path)
+      @project_home = path
+    end
+
+    def to_hash
+      {
+          :project_home => project_home
+      }
+    end
+  end
+end

data/lib/vagrant-phpstorm-tunnel/configurator.rb

@@ -5,6 +5,7 @@ module VagrantPhpstormTunnel
     def initialize(app, env)
       @app = app
       @env = env
+      @vm = nil
 
       @root_path = @env[:root_path].to_s
       @home_path = '.idea/vagrant'
@@ -18,17 +19,31 @@ module VagrantPhpstormTunnel
       destination_path = File.join(@root_path, @home_path, 'php')
       source_path = File.expand_path('../../../data/php', __FILE__)
 
-      FileUtils.rm_rf(@home_path)
-      FileUtils.mkdir_p(@home_path)
       File.link(source_path, destination_path)
       File.chmod(0755, destination_path)
     end
 
+    def setup_environment
+      FileUtils.rm_rf(@home_path)
+      FileUtils.mkdir_p(@home_path)
+
+      if tunnel_options[:project_home]
+        destination_path = File.join(@root_path, @home_path, 'vm_project_dir')
+        File.write(destination_path, tunnel_options[:project_home].to_s, mode: 'a')
+      end
+    end
+
+    def tunnel_options
+      !@vm.nil? ? @vm.config.phpstorm_tunnel.to_hash : {}
+    end
+
     def call(env)
       @env = env
       @app.call(env)
+      @vm = env[:machine]
 
       if is_intellij
+        setup_environment
         link_php_to_intellij
       end
     end

data/lib/vagrant-phpstorm-tunnel.rb

@@ -1,10 +1,15 @@
 require 'vagrant-phpstorm-tunnel/configurator'
+require 'vagrant-phpstorm-tunnel/config'
 
 module VagrantPhpstormTunnel
   class Plugin < Vagrant.plugin('2')
 
     name 'vagrant-phpstorm-tunnel'
 
+    config 'phpstorm_tunnel' do
+      Config
+    end
+
     %w{up provision reload}.each do |action|
       action_hook(:install_tunnel, "machine_action_#{action}".to_sym) do |hook|
         hook.append VagrantPhpstormTunnel::Configurator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-phpstorm-tunnel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cargo Media
@@ -37,6 +37,7 @@ files:
 - README.md
 - data/php
 - lib/vagrant-phpstorm-tunnel.rb
+- lib/vagrant-phpstorm-tunnel/config.rb
 - lib/vagrant-phpstorm-tunnel/configurator.rb
 homepage: https://github.com/cargomedia/vagrant-phpstorm-tunnel
 licenses: