aircon 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d377d72c782742b8754582b70b34c4abffaf3e7f6393a008ab10ca6b3ab128
-  data.tar.gz: 1aacdca2fb4d077f9493035ed806b88f5702b8d9f149c9fd1c70769366c2baba
+  metadata.gz: b5b3b124b494117995209a018929128c6f19659813c182d8cf204a29b695bc97
+  data.tar.gz: ffd8e8323e460a77a007abe18f43cee07080b78156da9759fd3f22773310860c
 SHA512:
-  metadata.gz: f62d5dc54c8ba3f739856d7a90c314e473d2673b716d1fa84f133794009f07940f866db25f8a13201035d41c3c3ca27af64de9a535b959662ceab0771df207f9
-  data.tar.gz: d482db64c49245cfa74a5da5adb4e438da1c9468db72baea3050bbec5b1b2e28e4ebb5c4b47e72c198b57876e11818ab7ad0e409a9c61248e3787f9cd4a00936
+  metadata.gz: 749d093f93485cbbc99b3280be49d8921049b5ad107ccc17170f6522d47eefe358bde6ba17afa74c270d289133feb47673486a4dc28e39f8f42fa614e9f9f5b4
+  data.tar.gz: '091c7ce2565eea7113f4c3d8263a0c31a72349e5c05ff681f373bd0c9e40b82feda3f031f507a5ec74304e40161891d98034f1a6b8167616f2dc031a03b41676'

data/README.md

@@ -97,7 +97,7 @@ aircon up my-feature -d            # start detached (no interactive shell)
 5. Installs Claude Code inside the container if not already present (`curl -fsSL https://claude.ai/install.sh | bash`).
 6. Adds `~/.local/bin` to `PATH` in `/etc/bash.bashrc` so `claude` is available in all sessions.
 7. Writes `GH_TOKEN` and `GITHUB_PERSONAL_ACCESS_TOKEN` to `/etc/bash.bashrc` (if `gh_token` is set).
-8. Writes `CLAUDE_CODE_OAUTH_TOKEN` to `/etc/bash.bashrc` (if configured).
+8. Injects Claude Code credentials based on `credentials_source`: copies from macOS Keychain (`keychain`), from `~/.claude/.credentials.json` (`file`), or sets `CLAUDE_CODE_OAUTH_TOKEN` in `/etc/bash.bashrc` (`oauth_token`).
 9. Sets `git config user.email` and `git config user.name` globally inside the container.
 10. Configures `git` to authenticate GitHub URLs with your token (covers both `https://github.com/` and `git@github.com:`).
 11. Checks out the branch:
@@ -177,7 +177,11 @@ app_name: my-app
 # GitHub personal access token — authenticates git and gh inside the container
 gh_token: <%= ENV['GITHUB_TOKEN'] %>
 
-# Claude Code OAuth token — set as CLAUDE_CODE_OAUTH_TOKEN inside the container
+# How to obtain Claude Code credentials: "keychain" (macOS), "file", or "oauth_token"
+credentials_source: keychain
+
+# Claude Code OAuth token — used when credentials_source is "oauth_token"
+# Falls back to CLAUDE_CODE_OAUTH_TOKEN env var if not set here.
 claude_code_oauth_token: <%= ENV['CLAUDE_CODE_OAUTH_TOKEN'] %>
 
 # Workspace folder path inside the container
@@ -210,7 +214,8 @@ init_script: .aircon/aircon_init.sh
 | `compose_file` | `.aircon/docker-compose.yml` | Docker Compose file to use |
 | `app_name` | basename of cwd | App name passed to Compose as `AIRCON_APP_NAME` |
 | `gh_token` | `nil` | GitHub token; sets `GH_TOKEN` and `GITHUB_PERSONAL_ACCESS_TOKEN` in the container |
-| `claude_code_oauth_token` | `nil` | Claude Code OAuth token; sets `CLAUDE_CODE_OAUTH_TOKEN` in the container |
+| `credentials_source` | `keychain` | `keychain` (macOS), `file` (~/.claude/.credentials.json), or `oauth_token` |
+| `claude_code_oauth_token` | `nil` | OAuth token for `oauth_token` mode; falls back to `CLAUDE_CODE_OAUTH_TOKEN` env var |
 | `workspace_path` | `/workspace` | Workspace folder path inside the container |
 | `claude_config_path` | `~/.claude.json` | Host path to `claude.json` |
 | `claude_dir_path` | `~/.claude` | Host path to `.claude/` directory |

data/lib/aircon/cli.rb

@@ -70,7 +70,11 @@ module Aircon
       # GitHub personal access token (supports ERB)
       # gh_token: <%= ENV['GITHUB_TOKEN'] %>
 
-      # Claude Code OAuth token (supports ERB)
+      # How to obtain Claude Code credentials: "keychain" (macOS), "file", or "oauth_token"
+      # credentials_source: keychain
+
+      # Claude Code OAuth token — used when credentials_source is "oauth_token" (supports ERB)
+      # Falls back to CLAUDE_CODE_OAUTH_TOKEN env var if not set here.
       # claude_code_oauth_token: <%= ENV['CLAUDE_CODE_OAUTH_TOKEN'] %>
 
       # Workspace folder path inside the container

data/lib/aircon/commands/up.rb

@@ -80,6 +80,8 @@ module Aircon
             FileUtils.mkdir_p(File.join(staging, ".claude"))
           end
 
+          write_credentials(File.join(staging, ".claude", ".credentials.json"))
+
           home = @config.container_home
           rewrite_paths(staging, home)
           user = @config.container_user
@@ -106,6 +108,29 @@ module Aircon
         end
       end
 
+      def write_credentials(dest)
+        case @config.credentials_source
+        when "keychain"
+          out, status = Open3.capture2(
+            "security", "find-generic-password",
+            "-a", ENV.fetch("USER", "unknown"),
+            "-w", "-s", "Claude Code-credentials"
+          )
+          if status.success?
+            File.write(dest, out)
+          else
+            warn "Warning: Could not read credentials from keychain."
+          end
+        when "file"
+          src = File.expand_path("~/.claude/.credentials.json")
+          if File.exist?(src)
+            FileUtils.cp(src, dest)
+          else
+            warn "Warning: Credentials file not found at #{src}"
+          end
+        end
+      end
+
       def setup_container(container, branch)
         home = @config.container_home
 
@@ -125,10 +150,13 @@ module Aircon
                  "echo 'export GITHUB_PERSONAL_ACCESS_TOKEN=\"#{@config.gh_token}\"' >> /etc/bash.bashrc")
         end
 
-        if @config.claude_code_oauth_token && !@config.claude_code_oauth_token.to_s.empty?
-          system("docker", "exec", "-u", "root", container, "bash", "-c",
-                 "grep -qF 'export CLAUDE_CODE_OAUTH_TOKEN=' /etc/bash.bashrc 2>/dev/null || " \
-                 "echo 'export CLAUDE_CODE_OAUTH_TOKEN=\"#{@config.claude_code_oauth_token}\"' >> /etc/bash.bashrc")
+        if @config.credentials_source == "oauth_token"
+          token = @config.claude_code_oauth_token || ENV["CLAUDE_CODE_OAUTH_TOKEN"]
+          if token && !token.to_s.empty?
+            system("docker", "exec", "-u", "root", container, "bash", "-c",
+                   "grep -qF 'export CLAUDE_CODE_OAUTH_TOKEN=' /etc/bash.bashrc 2>/dev/null || " \
+                   "echo 'export CLAUDE_CODE_OAUTH_TOKEN=\"#{token}\"' >> /etc/bash.bashrc")
+          end
         end
 
         # Configure git and create branch
@@ -142,14 +170,20 @@ 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?
-          system("docker", "exec", container, "git", "fetch", "origin", branch)
-          system("docker", "exec", container, "git", "checkout", "-b", branch, "origin/#{branch}")
-        else
-          system("docker", "exec", container, "git", "fetch", "origin", "main")
-          system("docker", "exec", container, "git", "checkout", "-b", branch, "origin/main")
+        # 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
 
         # 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.

data/lib/aircon/configuration.rb

@@ -6,11 +6,13 @@ require "erb"
 module Aircon
   class Configuration
     CONFIG_FILE = ".aircon/aircon.yml"
+    VALID_CREDENTIALS_SOURCES = %w[keychain file oauth_token].freeze
 
     DEFAULTS = {
       "compose_file" => ".aircon/docker-compose.yml",
       "app_name" => nil,
       "gh_token" => nil,
+      "credentials_source" => "keychain",
       "claude_code_oauth_token" => nil,
       "workspace_path" => nil,
       "claude_config_path" => "~/.claude.json",
@@ -22,9 +24,9 @@ module Aircon
       "init_script" => ".aircon/aircon_init.sh"
     }.freeze
 
-    attr_reader :compose_file, :app_name, :gh_token, :claude_code_oauth_token, :workspace_path,
-                :claude_config_path, :claude_dir_path, :service, :git_email, :git_name,
-                :container_user, :init_script
+    attr_reader :compose_file, :app_name, :gh_token, :credentials_source, :claude_code_oauth_token,
+                :workspace_path, :claude_config_path, :claude_dir_path, :service, :git_email,
+                :git_name, :container_user, :init_script
 
     def initialize(dir: Dir.pwd)
       attrs = DEFAULTS.dup
@@ -40,6 +42,7 @@ module Aircon
       @compose_file = attrs["compose_file"]
       @app_name = attrs["app_name"] || File.basename(dir)
       @gh_token = attrs["gh_token"]
+      @credentials_source = attrs["credentials_source"]
       @claude_code_oauth_token = attrs["claude_code_oauth_token"]
       @workspace_path = attrs["workspace_path"] || "/workspace"
       @claude_config_path = attrs["claude_config_path"]
@@ -49,10 +52,22 @@ module Aircon
       @git_name = attrs["git_name"]
       @container_user = attrs["container_user"]
       @init_script = attrs["init_script"]
+
+      validate!
     end
 
     def container_home
       @container_user == "root" ? "/root" : "/home/#{@container_user}"
     end
+
+    private
+
+    def validate!
+      return if VALID_CREDENTIALS_SOURCES.include?(@credentials_source)
+
+      raise ArgumentError,
+            "Invalid credentials_source: #{@credentials_source.inspect}. " \
+            "Must be one of: #{VALID_CREDENTIALS_SOURCES.join(', ')}"
+    end
   end
 end

data/lib/aircon/version.rb

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

metadata

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