devbox_launcher 0.3.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed54fc2716507cd48b6e65acb08d38f1399c7d2a626a898ea0bdbeb70317f9d
-  data.tar.gz: 13b0d4ba4c3b9ae2515040bddff831b746de65c1296d57be20df82bc7f99f722
+  metadata.gz: 0d2b9f957cb18b171f3d4acc9d802576b1bd768eb6afa6036ae23143b9403ab1
+  data.tar.gz: f0dc90ba120f6d34f42b0432b53728bd9caf40468262091dd2c88e15bdc16fcf
 SHA512:
-  metadata.gz: 0c9720ff3bc730ad33b4d225a24796eca616615534d23f5d01c57be8c8291f0b37a0fc2d13092b2f84799c66ea513d6cc3b00bef3fd3e3559fe8d6ea107596e2
-  data.tar.gz: a040326a3fe949841970a3d5fd26535dc2cbf06bec09bd30098f63744ff87ac7fd1184b3a79d4848571681b7cad7c91c6ebe89753781f6126c8b5372619790de
+  metadata.gz: ba367cf32efeef9ac13b46c9c3af638b1998ff7c335a458c4c4421e0c849a043e44fb97d904b69428936393fdc1754adef71ead9197c46d96beacb25e6bee909
+  data.tar.gz: 5b7b7216addc48d9982e9706069a7ecf293e5543f3d11c4aff7997882b2f274ab0fe3bbf6b98b1833008cc9354b8753c9e3591756e9df7ad82c949bd353e1cb4

data/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.1] - 2021-04-08
+### Fixed
+- Use configured `zone` for describe as well
+
+## [0.5.0] - 2021-04-06
+### Added
+- Ability to specify `zone` in config
+
+## [0.4.0]
+### Added
+- Sync mutagen with two-way-resolved
+
+## [0.3.5]
+### Fixed
+- When running commands, also rescue from whitelist of exceptions, and retry
+
+## [0.3.4]
+### Added
+- Rescue from `Errno::ECONNREFUSED` and retry
+
 ## [0.3.3]
 ### Fixed
 - Support launching multiple boxes at the same time

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (0.3.3)
+    devbox_launcher (0.5.1)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -14,31 +14,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    bcrypt_pbkdf (1.0.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    bcrypt_pbkdf (1.1.0)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
     ed25519 (1.2.4)
-    i18n (1.8.2)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.1)
+    minitest (5.14.4)
     net-ssh (5.2.0)
-    os (1.1.0)
+    os (1.1.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -54,11 +54,10 @@ GEM
     rspec-support (3.9.0)
     ruby-watchman (0.0.2)
     ssh-config (0.1.3)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -67,7 +66,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   devbox_launcher!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -4,13 +4,9 @@ Start devboxes quickly
 
 ## Installation
 
-Install the gem:
-
-```sh
-gem install devbox_launcher
-```
-
-Setup gcloud init with the project that contains your VM.
+- Install the gem: `gem install devbox_launcher`
+- Setup `gcloud init` with the project that contains your VM
+- Install [mutagen](https://mutagen.io)
 
 ## Usage
 
@@ -21,6 +17,9 @@ Create the config file at `~/.devbox_launcher.yml` so you type less. This is an
 ```yml
 ramon@email.com:
   project: general-192303
+  # zone not necessarily required, but sometimes starting the box
+  # fails without this:
+  zone: us-central1-a
   box: your-instance-name
   mutagen:
     alpha: /mnt/c/Users/me/src # local machine
@@ -36,7 +35,7 @@ To start and create the mutagen session:
 devbox start your-username
 ```
 
-If you want to mosh in immediately, add the `--mosh` switch.
+If you want to mosh in immediately, add the `--mosh` switch. Yes, mosh needs to be [installed](https://mosh.org/) in your development machine.
 
 Note: Linux users that sync mutagen sessions need to install [Watchman](https://facebook.github.io/watchman/).
 

data/devbox_launcher.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "thor", "~> 1.0"

data/lib/devbox_launcher.rb

@@ -1,4 +1,5 @@
 require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/object/blank"
 require "ssh-config"
 require "open3"
 require "thor"

data/lib/devbox_launcher/box.rb

@@ -6,6 +6,7 @@ module DevboxLauncher
       Net::SSH::Disconnect,
       Errno::ECONNRESET,
       Errno::ETIMEDOUT,
+      Errno::ECONNREFUSED,
     ]
     WAIT_BOOT_IN_SECONDS = 10.freeze
     DEFAULT_IDENTIFY_FILE_PATH = "~/.ssh/google_compute_engine".freeze
@@ -21,7 +22,7 @@ module DevboxLauncher
 
     def start
       start_stdout, start_stderr, start_status =
-        Open3.capture3(start_cmd)
+        run_command(start_cmd)
 
       set_ssh_config!(hostname, {
         username: username,
@@ -80,7 +81,7 @@ module DevboxLauncher
 
       describe_command = %Q(gcloud compute instances describe #{name})
       describe_stdout, describe_stderr, describe_status =
-        Open3.capture3(describe_command)
+        run_command(describe_command)
 
       if !describe_status.success?
         msg = "Problem fetching the description of #{name}. "
@@ -137,7 +138,7 @@ module DevboxLauncher
       terminate_mutagen_stdout,
         terminate_mutagen_stderr,
         terminate_mutagen_status =
-        Open3.capture3(terminate_mutagen_command)
+        run_command(terminate_mutagen_command)
 
       if not terminate_mutagen_status.success?
         # mutagen prints to stdout and stderr
@@ -157,13 +158,14 @@ module DevboxLauncher
         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 =
-        Open3.capture3(create_mutagen_command.join(" "))
+        run_command(create_mutagen_command.join(" "))
 
       if not create_mutagen_status.success?
         # mutagen prints to stdout and stderr
@@ -201,5 +203,12 @@ module DevboxLauncher
       @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

data/lib/devbox_launcher/models/box.rb

@@ -35,21 +35,7 @@ module DevboxLauncher
     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(" ")
+      cmd_args_for('start')
     end
 
     def connect_mosh
@@ -99,21 +85,7 @@ module DevboxLauncher
     end
 
     def describe_cmd
-      args = {
-        project: config[:project],
-        account: account,
-      }.map do |(key, val)|
-        ["--#{key}", val].join("=")
-      end.join(" ")
-
-      [
-        "gcloud",
-        "compute",
-        "instances",
-        "describe",
-        name,
-        args
-      ].join(" ")
+      cmd_args_for('describe')
     end
 
     def set_ssh_config!
@@ -218,5 +190,26 @@ module DevboxLauncher
       @mutagen_config ||= Mutagen.new(config[:mutagen])
     end
 
+    def cmd_args_for(method)
+      args = {
+        project: config[:project],
+        account: account,
+        zone: config[:zone],
+      }.each_with_object([]) do |(key, val), arr|
+        next if val.blank?
+        arr << ["--#{key}", val].join("=")
+      end.join(" ")
+
+      [
+        "gcloud",
+        "compute",
+        "instances",
+        method,
+        name,
+        args
+      ].join(" ")
+    end
+
+
   end
 end

data/lib/devbox_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Ramon Tayag
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
-description: 
+description:
 email:
 - ramon.tayag@gmail.com
 executables:
@@ -204,7 +204,7 @@ metadata:
   homepage_uri: https://github.com/bloom-solutions/devbox_launcher
   source_code_uri: https://github.com/bloom-solutions/devbox_launcher
   changelog_uri: https://github.com/bloom-solutions/devbox_launcher/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Conveniently launch your devbox
 test_files: []