devbox_launcher 0.7.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bbdd9915f666e004ef152b8749e333face998265474ecddbf5d01f55a30f01
-  data.tar.gz: af3b044ffff0318f3fdf622ef688685c7eba44068976703e32255038d79f26ea
+  metadata.gz: 7dba24702fd7a8544853fb57f70e2eacefde9baaad77c89395e02386a7cb8f8e
+  data.tar.gz: c1429492e09d53cb713aff3350dc9f9bb1493cfde9f3ab5b13661e55a0ae9cfd
 SHA512:
-  metadata.gz: fb0e7f1d59c4a81faa72586cb618d24f3dc75f1a04711427a74846e34ab2fda3df2dac8098211d7734b3d3b5f4c010c6683a5f12efb36c8e13c30ace73291e70
-  data.tar.gz: 5d558bf0456db555941e8e5b6bf498af28280420f86dd0d2e3b438819a878528889cda7155a8e5050116a783a6f16dec3d47b2704238bbdd5a19230902a130e3
+  metadata.gz: 1a2575b81a0874f3feeae362f34629ac12dc911a10724304ad7a02ce9e682c030f0c1be9219c4f54a59dcd84a289163e040c256cc56c85c84ca54894d6058b5b
+  data.tar.gz: b4de4abcd93eef4da20fa422ddc1f19613cb8d3d9faa6415ddfd32eabf68fd5a10c3bb0f1df0e1191bb64491e3ba6b4256c0218ac9a75631023c91bf7d014fe0

data/CHANGELOG.md

@@ -4,6 +4,19 @@ 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).
 
+## [1.1.1] - 2022-04-25
+### Fixed
+- Conflicts between beta and alpha
+
+## [1.1.0] - 2022-04-18
+### Changed
+- Ignore version control system directories like `.git`. You will be unable to use git in the remote machine.
+- Ignore `.DS_Store` files
+
+## [1.0.0] - 2021-12-20
+### Changed
+- Update compatibility with mutagen 0.12.0. Drops support for previous versions
+
 ## [0.7.1] - 2021-10-14
 ### Fixed
 - Explicitly require fileutils for Ruby 3.0 compatibility

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (0.7.1)
+    devbox_launcher (1.1.1)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,15 +23,15 @@ GEM
     bcrypt_pbkdf (1.1.0)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.3)
-    ed25519 (1.2.4)
-    i18n (1.8.10)
+    ed25519 (1.3.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     net-ssh (5.2.0)
-    os (1.1.1)
+    os (1.1.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -54,10 +54,10 @@ GEM
     rspec-support (3.9.0)
     ruby-watchman (0.0.2)
     ssh-config (0.1.3)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -70,4 +70,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.27
+   2.2.28

data/lib/devbox_launcher/models/box.rb

@@ -33,7 +33,7 @@ module DevboxLauncher
 
       wait_boot
 
-      reset_mutagen_session
+      mutagen_session.reset
 
       connect_mosh || connect_ssh
     end
@@ -111,68 +111,10 @@ module DevboxLauncher
       ssh_config.save
     end
 
-    def reset_mutagen_session
-      return if !mutagen_config.configured?
-
-      terminate_mutagen_session
-      create_mutagen_session
-      watch_alpha if OS.linux?
-    end
-
-    def terminate_mutagen_session
-      puts "Terminating mutagen session..."
-      terminate_mutagen_cmd =
-        %Q(mutagen terminate --label-selector=#{label})
-      terminate_mutagen_stdout,
-        terminate_mutagen_stderr,
-        terminate_mutagen_status =
-        Open3.capture3(terminate_mutagen_cmd)
-
-      if not terminate_mutagen_status.success?
-        # mutagen prints to stdout and stderr
-        msg = "Failed to terminate mutagen sessions: " \
-          "#{terminate_mutagen_stdout} -" \
-          "#{terminate_mutagen_stderr}"
-        fail msg
-      end
-    end
-
     def label
       "#{username}=#{name}"
     end
 
-    def create_mutagen_session
-      puts "Create mutagen session syncing local " \
-        "#{mutagen_config.alpha_dir} with " \
-        "#{hostname} #{mutagen_config.beta_dir}"
-
-      create_mutagen_cmd = [
-        "mutagen sync create",
-        mutagen_config.alpha_dir,
-        "#{hostname}:#{mutagen_config.beta_dir}",
-        "--label=#{label}",
-      ]
-      create_mutagen_cmd << "--watch-mode-alpha=no-watch" if OS.linux?
-
-      create_mutagen_stdout,
-        create_mutagen_stderr,
-        create_mutagen_status =
-        Open3.capture3(create_mutagen_cmd.join(" "))
-
-      if not create_mutagen_status.success?
-        # mutagen prints to stdout and stderr
-        msg = "Failed to create mutagen sessions: " \
-          "#{create_mutagen_stdout} -" \
-          "#{create_mutagen_stderr}"
-        fail msg
-      end
-    end
-
-    def watch_alpha
-      watchman = Watchman.new(dir: mutagen_config.alpha_dir)
-      watchman.trigger("mutagen sync flush --label-selector=#{label}")
-    end
-
     def box_name_from_config
       passed_in_box_name = @account_and_box_name.split("/")[1]
 
@@ -246,6 +188,13 @@ module DevboxLauncher
       ].join(" ")
     end
 
+    def mutagen_session
+      @mutagen_session ||= MutagenSession.new(
+        label: label,
+        config: mutagen_config,
+        hostname: hostname,
+      )
+    end
 
   end
 end

data/lib/devbox_launcher/models/box_config.rb

@@ -10,7 +10,7 @@ module DevboxLauncher
     end
 
     def mutagen_config
-      Mutagen.new(config[:mutagen])
+      MutagenConfig.new(config[:mutagen])
     end
 
     def project

data/lib/devbox_launcher/models/mutagen_config.rb

@@ -0,0 +1,24 @@
+module DevboxLauncher
+  class MutagenConfig
+
+    attr_reader :config
+
+    def initialize(config)
+      @config = config
+    end
+
+    def configured?
+      return false if config.nil?
+      [alpha_dir, beta_dir].all?(&:present?)
+    end
+
+    def alpha_dir
+      config[:alpha]
+    end
+
+    def beta_dir
+      config[:beta]
+    end
+
+  end
+end

data/lib/devbox_launcher/models/mutagen_session.rb

@@ -0,0 +1,86 @@
+module DevboxLauncher
+  class MutagenSession
+
+    attr_reader :label, :config, :hostname
+
+    def initialize(label:, config:, hostname:)
+      @label = label
+      @config = config
+      @hostname = hostname
+    end
+
+    def create
+      puts "Create mutagen session syncing local " \
+        "#{config.alpha_dir} with " \
+        "#{hostname} #{config.beta_dir}"
+
+      create_stdout,
+        create_stderr,
+        create_status =
+        Open3.capture3(create_cmd)
+
+      if not create_status.success?
+        # mutagen prints to stdout and stderr
+        msg = "Failed to create mutagen sessions: " \
+          "#{create_stdout} -" \
+          "#{create_stderr}"
+        fail msg
+      end
+    end
+
+    def linux?
+      OS.linux?
+    end
+
+    def create_cmd
+      str = [
+        "mutagen sync create",
+        config.alpha_dir,
+        "#{hostname}:#{config.beta_dir}",
+        "--label=#{label}",
+        "--sync-mode=two-way-resolved",
+        "--ignore-vcs",
+        "--ignore=.DS_Store"
+      ]
+      str << "--watch-mode-alpha=no-watch" if linux?
+      str.join(" ")
+    end
+
+    def terminate_cmd
+      %Q(mutagen sync terminate --label-selector=#{label})
+    end
+
+    def terminate
+      puts "Terminating mutagen session..."
+      terminate_stdout,
+        terminate_stderr,
+        terminate_status =
+        Open3.capture3(terminate_cmd)
+
+      if not terminate_status.success?
+        # mutagen prints to stdout and stderr
+        msg = "Failed to terminate mutagen sessions: " \
+          "#{terminate_stdout} -" \
+          "#{terminate_stderr}"
+        fail msg
+      end
+    end
+
+    def watch_alpha
+      watchman.trigger("mutagen sync flush --label-selector=#{label}")
+    end
+
+    def watchman
+      @watchman ||= Watchman.new(dir: config.alpha_dir)
+    end
+
+    def reset
+      return if !config.configured?
+
+      terminate
+      create
+      watch_alpha if linux?
+    end
+
+  end
+end

data/lib/devbox_launcher/version.rb

@@ -1,3 +1,3 @@
 module DevboxLauncher
-  VERSION = "0.7.1"
+  VERSION = "1.1.1"
 end

data/lib/devbox_launcher.rb

@@ -19,7 +19,8 @@ end
 require "devbox_launcher/cli"
 require "devbox_launcher/watchman"
 require "devbox_launcher/models/description"
-require "devbox_launcher/models/mutagen"
+require "devbox_launcher/models/mutagen_config"
+require "devbox_launcher/models/mutagen_session"
 require "devbox_launcher/models/box"
 require "devbox_launcher/models/account_config"
 require "devbox_launcher/models/box_config"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,6 +195,8 @@ files:
 - lib/devbox_launcher/models/box_config.rb
 - lib/devbox_launcher/models/description.rb
 - lib/devbox_launcher/models/mutagen.rb
+- lib/devbox_launcher/models/mutagen_config.rb
+- lib/devbox_launcher/models/mutagen_session.rb
 - lib/devbox_launcher/version.rb
 - lib/devbox_launcher/watchman.rb
 homepage: https://github.com/bloom-solutions/devbox_launcher