fsevents_to_vm 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124e6037bd036859c7d514b92ed5b8ab0dab59be
-  data.tar.gz: 43d4d7cf2e483c0ee9b6c28d16a0d29c499c3b59
+  metadata.gz: 4c593568f83e0c594792bedcd1d1edee22bdb16c
+  data.tar.gz: 0d96d92e28e2f189e9d77daa34d719f086360307
 SHA512:
-  metadata.gz: bc9bc260fb294da69de46fc69792e5eec6d763c74fdcc49b5e06bf9337430cbf87f06aec2ebc3f15bb9265f01ab094a1df7661051da63f75b806e225ab118186
-  data.tar.gz: cdba2d66334200bc349b2232f8b7f741b558d8201118b173ea37bf2d8589a60b64c3b42dfc2988d73111a6280e6a9d90b814f4e0dad0d657d10edcec4200bcb2
+  metadata.gz: bb2f79df416d0290884a7631f1db311d1677a5c5475f89d11dc79515d755fca82e217eedd4e492a191137e5129a8d7b7d682e58209c962528b932f805795e417
+  data.tar.gz: c32a880014f839db86d30f9536ad5bc2b4e6ceb016b76e36b764b019506e95ba4271539a7b2c32f52bd17eae57a0df74dc0061d96063794ce6671967ec0053ca

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.1.0 - 2016-01-07
+
+### Changed
+- Switch to direct ip and identity_file params, rather than reading a SSH config file
+
 ## 1.0.0 - 2015-08-05
 
 ### Changed

data/README.md

@@ -27,3 +27,19 @@ You can specify a specific directory to watch. This directory must be already mo
 * Delete events are not forwarded.
 * Multiple events for the same file within the same 1/100th of a second may cause events to be missed.
 * Some directories that you are unlikely to care about are ignored, for example `~/Library`.
+
+## Testing
+
+First, make sure that `fsevents` isn't already running due to `dinghy start`, kill it if necessary.
+
+Then run manually:
+
+    be ruby exe/fsevents_to_vm start --debug --ssh-identity-file ~/.docker/machine/machines/dinghy/id_rsa --ssh-ip $(dinghy ip) ~
+
+You can use inotifywait in the VM to watch for events:
+
+    docker run --rm -it -v $HOME:/fstest ubuntu:trusty
+    apt-get update && apt-get install -y inotify-tools
+    inotifywait /fstest/some/dir
+
+Then modify a file in `~/some/dir` and watch for inotifywait to catch the change.

data/lib/fsevents_to_vm.rb

@@ -4,7 +4,6 @@ require 'fsevents_to_vm/event'
 require 'fsevents_to_vm/watch'
 require 'fsevents_to_vm/path_filter'
 require 'fsevents_to_vm/recursion_filter'
-require 'fsevents_to_vm/ssh_config'
 require 'fsevents_to_vm/ssh_emit'
 
 module FseventsToVm

data/lib/fsevents_to_vm/cli.rb

@@ -4,7 +4,8 @@ require 'fsevents_to_vm'
 module FseventsToVm
   class Cli < Thor
     option :debug, type: :boolean, default: false
-    option :ssh_config_file, type: :string
+    option :ssh_identity_file, type: :string
+    option :ssh_ip, type: :string
     desc "start PATH",
       "Watch PATH and forward filesystem touch events to the Dinghy VM."
     def start(listen_dir = ENV['HOME'])
@@ -13,8 +14,7 @@ module FseventsToVm
       watcher = FseventsToVm::Watch.new(listen_dir)
       path_filter = FseventsToVm::PathFilter.new
       recursion_filter = FseventsToVm::RecursionFilter.new
-      ssh_config = FseventsToVm::SshConfig.fetch(options[:ssh_config_file])
-      forwarder = FseventsToVm::SshEmit.new(ssh_config)
+      forwarder = FseventsToVm::SshEmit.new(options[:ssh_identity_file], options[:ssh_ip])
 
       if debug
         puts "Watching #{listen_dir} and forwarding events to Dinghy VM..."

data/lib/fsevents_to_vm/ssh_emit.rb

@@ -4,8 +4,9 @@ require 'tempfile'
 
 module FseventsToVm
   class SshEmit
-    def initialize(ssh_config_file)
-      @config_path = ssh_config_file.path
+    def initialize(identity_file, ip)
+      @identity_file = identity_file
+      @ip = ip
     end
 
     def event(event)
@@ -19,7 +20,7 @@ module FseventsToVm
     protected
 
     def ssh
-      @ssh ||= Net::SSH.start('dinghy', 'docker', config: @config_path)
+      @ssh ||= Net::SSH.start(@ip, 'docker', config: false, keys: [@identity_file])
     end
 
     def disconnect!

data/lib/fsevents_to_vm/version.rb

@@ -1,3 +1,3 @@
 module FseventsToVm
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fsevents_to_vm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Palmer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
@@ -104,7 +104,6 @@ files:
 - lib/fsevents_to_vm/event.rb
 - lib/fsevents_to_vm/path_filter.rb
 - lib/fsevents_to_vm/recursion_filter.rb
-- lib/fsevents_to_vm/ssh_config.rb
 - lib/fsevents_to_vm/ssh_emit.rb
 - lib/fsevents_to_vm/version.rb
 - lib/fsevents_to_vm/watch.rb
@@ -128,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: forward OS X file system events to a VM, designed for use with Dinghy
 test_files: []
-has_rdoc: 

data/lib/fsevents_to_vm/ssh_config.rb

@@ -1,16 +0,0 @@
-module FseventsToVm
-  module SshConfig
-    def self.fetch(ssh_config_file)
-      if ssh_config_file
-        File.open(ssh_config_file, 'rb')
-      else
-        ssh_config = `dinghy ssh-config`
-        raise("Could not read Vagrant VM ssh config") unless $?.success?
-        file = Tempfile.new('fsevents-ssh-config')
-        file.write(ssh_config)
-        file.flush
-        file
-      end
-    end
-  end
-end