devbox_launcher 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2b9f957cb18b171f3d4acc9d802576b1bd768eb6afa6036ae23143b9403ab1
-  data.tar.gz: f0dc90ba120f6d34f42b0432b53728bd9caf40468262091dd2c88e15bdc16fcf
+  metadata.gz: 51aeda9106ca067ea8ceb40899eeced91677bebb5de13b036280190d22980e16
+  data.tar.gz: b2852f7051db8ec6c4ce7e071aa256cab13b64af69455a774d4d18e9b949db75
 SHA512:
-  metadata.gz: ba367cf32efeef9ac13b46c9c3af638b1998ff7c335a458c4c4421e0c849a043e44fb97d904b69428936393fdc1754adef71ead9197c46d96beacb25e6bee909
-  data.tar.gz: 5b7b7216addc48d9982e9706069a7ecf293e5543f3d11c4aff7997882b2f274ab0fe3bbf6b98b1833008cc9354b8753c9e3591756e9df7ad82c949bd353e1cb4
+  metadata.gz: c84b3cb6f48286ea756546429c3e2d6bf6121b0f4632207bf37779e1f0a4611eb4126b6d24645a81b34738cb178c3cc06ec3046c606fa92a8bc65a71665474b0
+  data.tar.gz: 2585520ba4fb389c731b9f8fcca88b453ac6dbb91e82b9a466341d32e68ee773a42b481f106a400d1d5f5ea31b12358db098fb53f7ae6e6312cd7ec117a6b500

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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).
 
+## [0.5.2] - 2021-05-31
+### Added
+- Ignore VCS as recommended by mutagen
+
+### Fixed
+- Retry on `Errno::ECONNREFUSED`
+
 ## [0.5.1] - 2021-04-08
 ### Fixed
 - Use configured `zone` for describe as well

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (0.5.1)
+    devbox_launcher (0.5.2)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -26,7 +26,7 @@ GEM
     concurrent-ruby (1.1.8)
     diff-lcs (1.3)
     ed25519 (1.2.4)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     minitest (5.14.4)

data/lib/devbox_launcher/models/box.rb

@@ -6,9 +6,10 @@ module DevboxLauncher
       Net::SSH::Disconnect,
       Errno::ECONNRESET,
       Errno::ETIMEDOUT,
+      Errno::ECONNREFUSED,
     ]
     WAIT_BOOT_IN_SECONDS = 10.freeze
-    MAX_BOOT_RETRIES = 10
+    MAX_BOOT_RETRIES = 20
     DEFAULT_IDENTIFY_FILE_PATH = "~/.ssh/google_compute_engine".freeze
     SSH_CONFIG_PATH = File.expand_path("~/.ssh/config").freeze
     CONFIG_PATH = File.expand_path("~/.devbox_launcher.yml").freeze
@@ -68,8 +69,6 @@ module DevboxLauncher
     def description(reload: false)
       return @description if !reload && @description
 
-      puts "Fetching box's description..."
-
       describe_stdout, describe_stderr, describe_status =
         Open3.capture3(describe_cmd)
 

data/lib/devbox_launcher/version.rb

@@ -1,3 +1,3 @@
 module DevboxLauncher
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,6 @@ files:
 - bin/setup
 - devbox_launcher.gemspec
 - lib/devbox_launcher.rb
-- lib/devbox_launcher/box.rb
 - lib/devbox_launcher/cli.rb
 - lib/devbox_launcher/models/box.rb
 - lib/devbox_launcher/models/description.rb

data/lib/devbox_launcher/box.rb

@@ -1,214 +0,0 @@
-module DevboxLauncher
-  class Box
-
-    WAIT_BOOT_RESCUED_EXCEPTIONS = [
-      Net::SSH::ConnectionTimeout,
-      Net::SSH::Disconnect,
-      Errno::ECONNRESET,
-      Errno::ETIMEDOUT,
-      Errno::ECONNREFUSED,
-    ]
-    WAIT_BOOT_IN_SECONDS = 10.freeze
-    DEFAULT_IDENTIFY_FILE_PATH = "~/.ssh/google_compute_engine".freeze
-    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
-
-    attr_reader :account
-
-    def initialize(account)
-      @account = account
-    end
-
-    def start
-      start_stdout, start_stderr, start_status =
-        run_command(start_cmd)
-
-      set_ssh_config!(hostname, {
-        username: username,
-        ip: description.ip,
-      })
-
-      wait_boot
-
-      reset_mutagen_session(
-        mutagen_config: config[:mutagen],
-        hostname: hostname,
-      )
-    end
-
-    def start_cmd
-      args = {
-        project: config[:project],
-        account: account,
-      }.map do |(key, val)|
-        ["--#{key}", val].join("=")
-      end.join(" ")
-
-      [
-        "gcloud",
-        "compute",
-        "instances",
-        "start",
-        name,
-        args
-      ].join(" ")
-    end
-
-    def wait_boot(tries: 1)
-      Net::SSH.start(hostname, username, timeout: WAIT_BOOT_IN_SECONDS) do |ssh|
-        puts "[#{ssh.exec!('date').chomp}] Machine booted"
-      end
-    rescue *WAIT_BOOT_RESCUED_EXCEPTIONS
-      puts "Not booted. Waiting #{WAIT_BOOT_IN_SECONDS} seconds before trying again..."
-
-      sleep WAIT_BOOT_IN_SECONDS
-
-      description = describe(name)
-      if !description.running?
-        puts "Detected that the machine is not running " \
-          "(status is #{description.status}). Booting it..."
-        start_box name, username
-      end
-
-      wait_boot name, username, tries: tries+1
-    end
-
-    def description(reload: false)
-      return @description if !reload && @description
-
-      puts "Fetching box's description..."
-
-      describe_command = %Q(gcloud compute instances describe #{name})
-      describe_stdout, describe_stderr, describe_status =
-        run_command(describe_command)
-
-      if !describe_status.success?
-        msg = "Problem fetching the description of #{name}. "
-        msg += "Please ensure you can call `#{describe_command}`.\n"
-        msg += "Error:\n"
-        msg += describe_stderr
-        fail msg
-      end
-
-      @description = Description.new(describe_stdout)
-    end
-
-    def set_ssh_config!(hostname, username:, ip:)
-      FileUtils.touch(SSH_CONFIG_PATH)
-      config = ConfigFile.new
-      args = {
-        "HostName" => ip,
-        "User" => username,
-        "IdentityFile" => DEFAULT_IDENTIFY_FILE_PATH,
-      }
-      args.each do |key, value|
-        config.set(hostname, key, value)
-      end
-      config.save
-    end
-
-    def reset_mutagen_session
-      mutagen_config = config[:mutagen]
-      return if mutagen_config.nil?
-
-      alpha_dir = mutagen_config[:alpha]
-      beta_dir = mutagen_config[:beta]
-
-      return if alpha_dir.nil? || beta_dir.nil?
-
-      terminate_mutagen_session
-
-      create_mutagen_session(
-        alpha_dir: alpha_dir,
-        beta_dir: beta_dir,
-        hostname: hostname,
-        username: username,
-      )
-
-      if OS.linux?
-        watch_alpha(alpha_dir: alpha_dir, hostname: hostname)
-      end
-    end
-
-    def terminate_mutagen_session(username)
-      puts "Terminating mutagen session..."
-      terminate_mutagen_command =
-        %Q(mutagen terminate --label-selector=#{username})
-      terminate_mutagen_stdout,
-        terminate_mutagen_stderr,
-        terminate_mutagen_status =
-        run_command(terminate_mutagen_command)
-
-      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 create_mutagen_session(alpha_dir:, beta_dir:, hostname:, username:)
-      puts "Create mutagen session syncing local #{alpha_dir} " \
-        "with #{hostname} #{beta_dir}"
-
-      create_mutagen_command = [
-        "mutagen sync create",
-        alpha_dir,
-        "#{hostname}:#{beta_dir}",
-        "--label=#{username}",
-        "--sync-mode=two-way-resolved",
-      ]
-      create_mutagen_command << "--watch-mode-alpha=no-watch" if OS.linux?
-
-      create_mutagen_stdout,
-        create_mutagen_stderr,
-        create_mutagen_status =
-        run_command(create_mutagen_command.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(alpha_dir:, hostname:)
-      watchman = Watchman.new(dir: alpha_dir)
-      watchman.trigger("mutagen sync flush --label-selector=#{hostname}")
-    end
-
-    def name
-      @name ||= config[:box]
-    end
-
-    def hostname
-      [name, username, "devbox"].join("-")
-    end
-
-    def username
-      @username ||= account.gsub(/\W/, "_")
-    end
-
-    def config
-      return @config if @config
-
-      if not CONFIG.has_key?(account)
-        fail "No config in #{CONFIG_PATH} found for #{account}"
-      end
-
-      @config = CONFIG[account].with_indifferent_access
-    end
-
-    def run_command(command, tries: 0)
-      Open3.capture3(command)
-    rescue *WAIT_BOOT_RESCUED_EXCEPTIONS
-      sleep WAIT_BOOT_IN_SECONDS
-      run_command(command, tries+1)
-    end
-
-  end
-end