aircon 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b3b124b494117995209a018929128c6f19659813c182d8cf204a29b695bc97
-  data.tar.gz: ffd8e8323e460a77a007abe18f43cee07080b78156da9759fd3f22773310860c
+  metadata.gz: d76315d35b51587153fc8df9ef838132d3c3e86a0c3e4c2cd8a0316efae9c69a
+  data.tar.gz: c563bde8c95b8fe48de22520b014a3b98a6b0cd81974b6ced35b1aa600e4c4b2
 SHA512:
-  metadata.gz: 749d093f93485cbbc99b3280be49d8921049b5ad107ccc17170f6522d47eefe358bde6ba17afa74c270d289133feb47673486a4dc28e39f8f42fa614e9f9f5b4
-  data.tar.gz: '091c7ce2565eea7113f4c3d8263a0c31a72349e5c05ff681f373bd0c9e40b82feda3f031f507a5ec74304e40161891d98034f1a6b8167616f2dc031a03b41676'
+  metadata.gz: d951bf39261652772719424735e55cbab79ed819e2fb36347b6e93d61c4c6c534660c64eaa578f68480e46b689e0c37737ff6841dca58e5375dd2af8d492c55f
+  data.tar.gz: 8d331471642fc173bd1f770559e0c8a55a773517089082378918b8144fc1220f2b43cc779f9305da896ebaf3dc5e2abdb76492e15a0e20512616a95d051ff8e7

data/lib/aircon/commands/up.rb

@@ -170,26 +170,34 @@ module Aircon
           system("docker", "exec", container, "git", "config", "--global",
                  "url.#{authed}.insteadOf", "git@github.com:")
         end
-        # Skip checkout if already on the target branch (host was on this branch)
-        current_branch, = Open3.capture2("docker", "exec", container, "git", "rev-parse", "--abbrev-ref", "HEAD")
-        if current_branch.strip != branch
-          # Check if branch exists on remote; if so, check it out, otherwise create new
-          _, status = Open3.capture2("docker", "exec", container, "git", "ls-remote", "--heads", "origin", branch)
-          if status.success? && !_.strip.empty?
-            system("docker", "exec", container, "git", "fetch", "origin", branch)
-            system("docker", "exec", container, "git", "checkout", "-f", "-b", branch, "origin/#{branch}")
-            system("docker", "exec", container, "git", "clean", "-fd")
-          else
-            system("docker", "exec", container, "git", "fetch", "origin", "main")
-            system("docker", "exec", container, "git", "checkout", "-f", "--no-track", "-b", branch, "origin/main")
-            system("docker", "exec", container, "git", "clean", "-fd")
-          end
-        end
+        checkout_branch(container, branch)
 
         # If you have the official anthropic marketplace plugin installed, it will always make a call to the anthropic github repo on claude startup. It uses SSH, but it should be https for universal compatibility since its a public repository.
         system("docker", "exec", container, "git", "config", "--global", "url.\"https://github.com/anthropics/\".insteadOf", "ssh://git@github.com/anthropics/")
       end
 
+      def checkout_branch(container, branch)
+        current_branch, = Open3.capture2("docker", "exec", container, "git", "rev-parse", "--abbrev-ref", "HEAD")
+        return if current_branch.strip == branch
+
+        _, local_status = Open3.capture2("docker", "exec", container, "git", "rev-parse", "--verify", branch)
+        if local_status.success?
+          system("docker", "exec", container, "git", "checkout", "-f", branch)
+        elsif branch_exists_on_remote?(container, branch)
+          system("docker", "exec", container, "git", "fetch", "origin", branch)
+          system("docker", "exec", container, "git", "checkout", "-f", "-b", branch, "origin/#{branch}")
+        else
+          system("docker", "exec", container, "git", "fetch", "origin", "main")
+          system("docker", "exec", container, "git", "checkout", "-f", "--no-track", "-b", branch, "origin/main")
+        end
+        system("docker", "exec", container, "git", "clean", "-fd")
+      end
+
+      def branch_exists_on_remote?(container, branch)
+        output, status = Open3.capture2("docker", "exec", container, "git", "ls-remote", "--heads", "origin", branch)
+        status.success? && !output.strip.empty?
+      end
+
       def run_init_script(container)
         return unless @config.init_script && !@config.init_script.to_s.empty?
 

data/lib/aircon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aircon
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aircon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Philip Nguyen