aircon 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a82194933fb47bffb6daacf310c4f244ab1d9a25db2f9b32ec25edd578c4a06
-  data.tar.gz: 0222cec49d295996c4066d56518ee84fff8747c8189713f4581a17e103ac8c61
+  metadata.gz: 9d51871327109dc3145685c8ff1b808658592ebc527baaab88fc7d54d3a2b5d1
+  data.tar.gz: 60ddec11a21faf68d0c8d43beae7a424d935e82df72c0be5e09ff90a2102829b
 SHA512:
-  metadata.gz: 937ab4b996d225743372ed6d5c25fe319c2305dfd84bca24b95671465ae1846ab20043f2ad7e442096e09cb060840e2a2bd948b5b723932469bb99f744c85dd4
-  data.tar.gz: 7623f3fd28dd5adffbd85908447c1d5e640a952a9eb2c27d0c31f8de7f2407d76a22762f34f50b0f3f4aab3fe750b5e34e33cc69fdb29575804bee222aa02629
+  metadata.gz: 23e48ab217b5c812dffac335ff9dbebb72233379dbf601fe86369e2fa38960b798d1bd325ddbde3164951927a798a60ca9c129aa87b49f2e2333cdafae5a9934
+  data.tar.gz: 8d93936b25ce81e580a5741706cd3e7a6cd4ae1bc46776e6db1a25864a51ca2c08b42f33d8e583b84c05bd040c2e42fa646e3c7d03d486ef7723ca4ecfbae8b8

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 |
@@ -233,12 +238,7 @@ init_script: .aircon/aircon_init.sh
 ## Releasing to RubyGems
 
 1. Bump the version in `lib/aircon/version.rb`.
-2. Build and push:
-
-```bash
-gem build aircon.gemspec
-gem push aircon-<version>.gem
-```
+2. run `bundle exec rake release`.
 
 You'll be prompted for your RubyGems credentials on first push. Subsequent pushes use the stored API key at `~/.gem/credentials`.
 

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
@@ -185,6 +189,7 @@ module Aircon
     COMPOSE_TEMPLATE = <<~'YAML'
       services:
         app:
+          image: ${AIRCON_APP_NAME:-aircon}-app:latest
           build:
             context: ..
             dockerfile: .aircon/Dockerfile

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

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.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aircon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Philip Nguyen
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement