aircon 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d51871327109dc3145685c8ff1b808658592ebc527baaab88fc7d54d3a2b5d1
-  data.tar.gz: 60ddec11a21faf68d0c8d43beae7a424d935e82df72c0be5e09ff90a2102829b
+  metadata.gz: d76315d35b51587153fc8df9ef838132d3c3e86a0c3e4c2cd8a0316efae9c69a
+  data.tar.gz: c563bde8c95b8fe48de22520b014a3b98a6b0cd81974b6ced35b1aa600e4c4b2
 SHA512:
-  metadata.gz: 23e48ab217b5c812dffac335ff9dbebb72233379dbf601fe86369e2fa38960b798d1bd325ddbde3164951927a798a60ca9c129aa87b49f2e2333cdafae5a9934
-  data.tar.gz: 8d93936b25ce81e580a5741706cd3e7a6cd4ae1bc46776e6db1a25864a51ca2c08b42f33d8e583b84c05bd040c2e42fa646e3c7d03d486ef7723ca4ecfbae8b8
+  metadata.gz: d951bf39261652772719424735e55cbab79ed819e2fb36347b6e93d61c4c6c534660c64eaa578f68480e46b689e0c37737ff6841dca58e5375dd2af8d492c55f
+  data.tar.gz: 8d331471642fc173bd1f770559e0c8a55a773517089082378918b8144fc1220f2b43cc779f9305da896ebaf3dc5e2abdb76492e15a0e20512616a95d051ff8e7

data/lib/aircon/commands/up.rb

@@ -170,18 +170,32 @@ module Aircon
           system("docker", "exec", container, "git", "config", "--global",
                  "url.#{authed}.insteadOf", "git@github.com:")
         end
-        # 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?
+        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", "-b", branch, "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", "-b", branch, "origin/main")
+          system("docker", "exec", container, "git", "checkout", "-f", "--no-track", "-b", branch, "origin/main")
         end
+        system("docker", "exec", container, "git", "clean", "-fd")
+      end
 
-        # 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/")
+      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)

data/lib/aircon/version.rb

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

metadata

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