devbox_launcher 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3edb043751826ec3d3dfec5c5cbfe867cecd1da4938f5f5b7fee2401903387
-  data.tar.gz: 51d6d27541b6933ab9f7e2eca6a3c1d74bcf455fd6a447dabb9dcfe09852abb7
+  metadata.gz: 452b640a1f3b25789f24d33da5c41b46e974fa88ab0a4078eea5c4880cac1a00
+  data.tar.gz: 59a2965f4f0f1ca5a9758f30c4de941319b29bc5b8e9fbd9d0ea227fd6cab13e
 SHA512:
-  metadata.gz: b213b9982c3c7ffbc16db6b2555e4ef1ed4ab7ff59a0a3e10bbd6a7c800ce60006615dedb2caae32353ea27331a9c89b97fc30b973b6e73bf85ba34d2c86bbae
-  data.tar.gz: 0f6a627362ff12fb49e7f1f508ee374adaaff932ca248c8d88cfb3209ea28ec94521e1443b7144a66ea270fe896b53aeb740c042dea1134de2aa28ee568b70bb
+  metadata.gz: e5db95617c9d43d952acc269794bdde185eb6fb2dbd143e91e5715ae90596eda82813fc0b8f37716d1dec5689c1e19398052b396e42fa879b5cde6d54d06e3ef
+  data.tar.gz: '009f47d05871bfdae83c23736a21dfb2b9b617edba29acc7741a43d499b8c2927716561c6f9533c15c237c26f6edefe644f20f8714ded7ee980508752203ee9a'

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.3.1]
+### Fixed
+- Recover when the devbox is in a shutdown cycle
+
 ## [0.3.0]
 ### Changed
 - Label sessions with devbox

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devbox_launcher (0.3.0)
+    devbox_launcher (0.3.1)
       activesupport (~> 6.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -14,24 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     bcrypt_pbkdf (1.0.1)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     ed25519 (1.2.4)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.0)
+    minitest (5.14.1)
     net-ssh (5.2.0)
-    os (1.0.1)
+    os (1.1.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -56,9 +56,9 @@ GEM
     ssh-config (0.1.3)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/lib/devbox_launcher.rb

@@ -16,3 +16,4 @@ end
 
 require "devbox_launcher/cli"
 require "devbox_launcher/watchman"
+require "devbox_launcher/models/description"

data/lib/devbox_launcher/cli.rb

@@ -17,9 +17,12 @@ module DevboxLauncher
       end
 
       config = CONFIG[account].with_indifferent_access
+      name = config[:box]
 
       username = account.gsub(/\W/, "_")
 
+      puts "Starting #{name}..."
+
       set_account_command = %Q(gcloud config set account #{account})
       set_account_stdout, set_account_stderr, set_account_status =
         Open3.capture3(set_account_command)
@@ -28,39 +31,11 @@ module DevboxLauncher
       set_project_stdout, set_project_stderr, set_project_status =
         Open3.capture3(set_project_command)
 
-      name = config[:box]
-
-      start_command = %Q(gcloud compute instances start #{name})
-      start_stdout, start_stderr, start_status = Open3.capture3(start_command)
-
-      puts "Fetching IP..."
-      describe_command = %Q(gcloud compute instances describe #{name})
-      describe_stdout, describe_stderr, describe_status =
-        Open3.capture3(describe_command)
-
-      if !describe_status.success?
-        msg = "Problem fetching the IP address. "
-        msg += "Please ensure you can call `#{describe_command}`.\n"
-        msg += "Error:\n"
-        msg += describe_stderr
-        fail msg
-      end
-
-      description = YAML.load(describe_stdout)
+      start_box name, username
 
-      ip = description["networkInterfaces"].first["accessConfigs"].
-        find { |config| config["kind"] == "compute#accessConfig" }["natIP"]
+      wait_boot(name, username)
 
-      puts "IP: #{ip}"
-
-      hostname = "#{name}-devbox"
-
-      set_ssh_config!(hostname, {
-        username: username,
-        ip: ip,
-       })
-
-      wait_boot(hostname, username)
+      hostname = hostname_for(name)
 
       reset_mutagen_session(
         mutagen_config: config[:mutagen],
@@ -74,13 +49,25 @@ module DevboxLauncher
     end
 
     no_commands do
-      def wait_boot(hostname, username)
+      def wait_boot(name, username, tries: 1)
+        hostname = hostname_for(name)
+
         Net::SSH.start(hostname, username, timeout: WAIT_BOOT_IN_SECONDS) do |ssh|
           puts "[#{ssh.exec!('date').chomp}] Machine booted"
         end
       rescue Net::SSH::ConnectionTimeout, Net::SSH::Disconnect, Errno::ECONNRESET
         puts "Not booted. Waiting #{WAIT_BOOT_IN_SECONDS} seconds before trying again..."
-        wait_boot hostname, username
+
+        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 set_ssh_config!(hostname, username:, ip:)
@@ -164,6 +151,41 @@ module DevboxLauncher
         watchman = Watchman.new(dir: alpha_dir)
         watchman.trigger("mutagen sync flush --label-selector=#{LABEL}")
       end
+
+      def start_box(name, username)
+        start_command = %Q(gcloud compute instances start #{name})
+        start_stdout, start_stderr, start_status = Open3.capture3(start_command)
+
+        desc = describe(name)
+        ip = desc.ip
+
+        set_ssh_config!(hostname_for(name), {
+          username: username,
+          ip: ip,
+        })
+      end
+
+      def describe(name)
+        puts "Fetching box's description..."
+
+        describe_command = %Q(gcloud compute instances describe #{name})
+        describe_stdout, describe_stderr, describe_status =
+          Open3.capture3(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.new(describe_stdout)
+      end
+
+      def hostname_for(name)
+        [name, "devbox"].join("-")
+      end
     end
 
   end

data/lib/devbox_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devbox_launcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Conveniently launch your devbox