devbox_launcher 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb15ad0ea9b993eb803001449bff9970a345d12f872ae973a551e5899b3f3401
-  data.tar.gz: c4586ec0d2658d7eba82d88550afc849342a5675d7dde501ff1cdf9aae838119
+  metadata.gz: 2b3edb043751826ec3d3dfec5c5cbfe867cecd1da4938f5f5b7fee2401903387
+  data.tar.gz: 51d6d27541b6933ab9f7e2eca6a3c1d74bcf455fd6a447dabb9dcfe09852abb7
 SHA512:
-  metadata.gz: 0f244644671795da723b0eca23a9546fceabe1c98897362767070b2582c95b58fa94ad27ea57161cd0c2dbfd2a76518c8c0c5f693a724e732289c7a6dfbb8ee8
-  data.tar.gz: 3f49c7aff85f9a3500e9da5139cfddd178734a9413cd5f0e03cb3d95b6b684864b3983a8242de5041ac744b34b490cb605902a1c7256bed3c9629f8d28ed6a6e
+  metadata.gz: b213b9982c3c7ffbc16db6b2555e4ef1ed4ab7ff59a0a3e10bbd6a7c800ce60006615dedb2caae32353ea27331a9c89b97fc30b973b6e73bf85ba34d2c86bbae
+  data.tar.gz: 0f6a627362ff12fb49e7f1f508ee374adaaff932ca248c8d88cfb3209ea28ec94521e1443b7144a66ea270fe896b53aeb740c042dea1134de2aa28ee568b70bb

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.3.0]
+### Changed
+- Label sessions with devbox
+- On linux, mutagen relies on watchman to detect changes
+
+### Fixed
+- In Linux, mutagen no longer burns CPU every 10 seconds
+
+## [0.2.0]
 ### Added
-- Initial release
+- Initial release

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (0.2.0)
+    devbox_launcher (0.3.0)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       net-ssh (~> 5.2)
+      os (~> 1.0)
+      ruby-watchman (= 0.0.2)
       ssh-config (= 0.1.3)
       thor (~> 1.0)
 
@@ -22,7 +24,6 @@ GEM
     byebug (11.0.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    deep_fetch (0.0.5)
     diff-lcs (1.3)
     ed25519 (1.2.4)
     i18n (1.8.2)
@@ -30,6 +31,7 @@ GEM
     method_source (0.9.2)
     minitest (5.14.0)
     net-ssh (5.2.0)
+    os (1.0.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -50,6 +52,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
+    ruby-watchman (0.0.2)
     ssh-config (0.1.3)
     thor (1.0.1)
     thread_safe (0.3.6)
@@ -68,4 +71,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -38,6 +38,8 @@ devbox start your-username
 
 If you want to mosh in immediately, add the `--mosh` switch.
 
+Note: Linux users that sync mutagen sessions need to install [Watchman](https://facebook.github.io/watchman/).
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/devbox_launcher.gemspec

@@ -39,4 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bcrypt_pbkdf", "~> 1.0"
   spec.add_runtime_dependency "ssh-config", "0.1.3"
   spec.add_runtime_dependency "activesupport", "~> 6.0"
+  spec.add_runtime_dependency "os", "~> 1.0"
+  spec.add_runtime_dependency "ruby-watchman", "0.0.2"
 end

data/lib/devbox_launcher.rb

@@ -3,6 +3,10 @@ require "ssh-config"
 require "open3"
 require "thor"
 require "net/ssh"
+require "os"
+require "ruby-watchman"
+require 'socket'
+require 'pathname'
 require "yaml"
 require "devbox_launcher/version"
 
@@ -11,3 +15,4 @@ module DevboxLauncher
 end
 
 require "devbox_launcher/cli"
+require "devbox_launcher/watchman"

data/lib/devbox_launcher/cli.rb

@@ -6,6 +6,7 @@ module DevboxLauncher
     SSH_CONFIG_PATH = File.expand_path("~/.ssh/config").freeze
     CONFIG_PATH = File.expand_path("~/.devbox_launcher.yml").freeze
     CONFIG = YAML.load_file(CONFIG_PATH).freeze
+    LABEL = "devbox".freeze
 
     desc "start configured box for account", "Start a devbox by account"
     option :mosh, type: :boolean, desc: "Mosh in"
@@ -103,8 +104,22 @@ module DevboxLauncher
 
         return if alpha_dir.nil? || beta_dir.nil?
 
-        puts "Terminating all mutagen sessions..."
-        terminate_mutagen_command = %Q(mutagen terminate --all)
+        terminate_mutagen_session
+        create_mutagen_session(
+          alpha_dir: alpha_dir,
+          beta_dir: beta_dir,
+          hostname: hostname,
+        )
+
+        if OS.linux?
+          watch_alpha(alpha_dir: alpha_dir)
+        end
+      end
+
+      def terminate_mutagen_session
+        puts "Terminating mutagen session..."
+        terminate_mutagen_command =
+          %Q(mutagen terminate --label-selector=#{LABEL})
         terminate_mutagen_stdout,
           terminate_mutagen_stderr,
           terminate_mutagen_status =
@@ -117,18 +132,24 @@ module DevboxLauncher
             "#{terminate_mutagen_stderr}"
           fail msg
         end
+      end
 
+      def create_mutagen_session(alpha_dir:, beta_dir:, hostname:)
         puts "Create mutagen session syncing local #{alpha_dir} " \
           "with #{hostname} #{beta_dir}"
+
         create_mutagen_command = [
           "mutagen sync create",
           alpha_dir,
           "#{hostname}:#{beta_dir}",
-        ].join(" ")
+          "--label=#{LABEL}",
+        ]
+        create_mutagen_command << "--watch-mode-alpha=no-watch" if OS.linux?
+
         create_mutagen_stdout,
           create_mutagen_stderr,
           create_mutagen_status =
-          Open3.capture3(create_mutagen_command)
+          Open3.capture3(create_mutagen_command.join(" "))
 
         if not create_mutagen_status.success?
           # mutagen prints to stdout and stderr
@@ -138,6 +159,11 @@ module DevboxLauncher
           fail msg
         end
       end
+
+      def watch_alpha(alpha_dir:)
+        watchman = Watchman.new(dir: alpha_dir)
+        watchman.trigger("mutagen sync flush --label-selector=#{LABEL}")
+      end
     end
 
   end

data/lib/devbox_launcher/version.rb

@@ -1,3 +1,3 @@
 module DevboxLauncher
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/devbox_launcher/watchman.rb

@@ -0,0 +1,50 @@
+module DevboxLauncher
+  class Watchman
+
+    attr_reader :dir
+
+    def initialize(dir:)
+      @dir = dir
+    end
+
+    def trigger(command)
+      UNIXSocket.open(sockname) do |socket|
+        root = Pathname.new(dir).expand_path.to_s
+        result = RubyWatchman.query(['watch-list'], socket)
+        roots = result['roots']
+        if !roots.include?(root)
+          # this path isn't being watched yet; try to set up watch
+          result = RubyWatchman.query(['watch-project', root], socket)
+
+          # root_restrict_files setting may prevent Watchman from working
+          raise "Unable to watch #{dir}" if result.has_key?('error')
+        end
+
+        query = ['trigger', root, {
+          'name' => 'mutagen-sync',
+          'expression' => ['match', '**/*', 'wholename'],
+          'command' => command.split(" "),
+        }]
+        paths = RubyWatchman.query(query, socket)
+
+        # could return error if watch is removed
+        if paths.has_key?('error')
+          raise "Unable to set trigger. Error: #{paths['error']}"
+        end
+      end
+    end
+
+    def sockname
+      sockname = RubyWatchman.load(
+        %x{watchman --output-encoding=bser get-sockname}
+      )['sockname']
+
+      if !$?.exitstatus.zero?
+        raise "Failed to connect to watchman. Is it running?"
+      end
+
+      sockname
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-watchman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: 
 email:
 - ramon.tayag@gmail.com
@@ -163,6 +191,7 @@ files:
 - lib/devbox_launcher.rb
 - lib/devbox_launcher/cli.rb
 - lib/devbox_launcher/version.rb
+- lib/devbox_launcher/watchman.rb
 homepage: https://github.com/bloom-solutions/devbox_launcher
 licenses:
 - MIT