shippy 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5655cddec8ec27d9507202159d17e8501b7a8d4119857adf2b7b73d2e569fb3c
-  data.tar.gz: 6bba258479efe8243d089b28da0a4b775d1ecbacd6b733f60548f07c99644fa2
+  metadata.gz: 2c8514e699c44724105cd11bc6b9034e7fe36c992403642bba781a16e7c74aac
+  data.tar.gz: 5356c87f5316dff2637f5f78a0271a8fdcce4a41bfbd6fb128e3aca654087452
 SHA512:
-  metadata.gz: cf0825967db41d98a1ecff981892b39881434f21aa8cd0ed1e9f40d6ee4f056251ed960f53729f235d4794fd165d2df4835692a1159a8cd7fa0d48461187d0ff
-  data.tar.gz: d586a76ec8f0653dae0a95b5c054b6980388921a244d81f0c496eb8e5212a81d0097fcf391ca2bee50807ef4335b4c6434763063cdfc449712c0df03651aadaf
+  metadata.gz: e25771e02e107140eebaf7f8f0f90c66974040d3ebdb0258e819da8a508060d9e297d37e2e2b2e9a4d355f2f4f5491963aa7bd5440c45ca6751170d241fafc72
+  data.tar.gz: ea3feb9af3d644ef5e82149d09da0479cb46f010e07cdb1422dd73a58d90afac106c0db47f3b7e59b5732dc310b8876491848263c0b228fdbb4b1866d71689f2

data/lib/shippy/cli/main.rb

@@ -55,4 +55,7 @@ class Shippy::Cli::Main < Shippy::Cli::Base
 
   desc "prune", "Prune old application images and containers"
   subcommand "prune", Shippy::Cli::Prune
+
+  desc "secrets", "Manage secrets"
+  subcommand "secrets", Shippy::Cli::Secrets
 end

data/lib/shippy/cli/secrets.rb

@@ -0,0 +1,11 @@
+class Shippy::Cli::Secrets < Shippy::Cli::Base
+  desc "edit", "Edit secrets"
+  def edit
+    Shippy::SecretsManager.new.edit
+  end
+
+  desc "view", "View secrets"
+  def view
+    puts JSON.pretty_generate(Shippy::SecretsManager.new.read)
+  end
+end

data/lib/shippy/cli/templates/config/shippy.yml

@@ -4,4 +4,4 @@ ssh:
 wildcard_domain: 'local.homelab.com'
 local_domain: local
 deploy_to: '/var/lib/homelab'
-secrets_file: 'config/secrets.yml'
+secrets_file: 'config/secrets.yml.enc'

data/lib/shippy/cli.rb

@@ -3,6 +3,7 @@ require_relative "cli/init"
 require_relative "cli/server"
 require_relative "cli/app"
 require_relative "cli/prune"
+require_relative "cli/secrets"
 require_relative "cli/main"
 
 module Shippy::Cli

data/lib/shippy/config.rb

@@ -4,7 +4,7 @@ module Shippy
 
     def initialize(file)
       @data = YAML.load_file(file).deep_symbolize_keys
-      @secrets = Secrets.new(@data.fetch(:secrets_file))
+      @secrets = Secrets.new(@data.fetch(:secrets_file) { "config/secrets.yml.enc" })
     end
 
     def secrets(app, name)

data/lib/shippy/secrets.rb

@@ -3,7 +3,7 @@ module Shippy
     attr_reader :data
 
     def initialize(file)
-      @data = YAML.load_file(file).deep_symbolize_keys
+      @data = Shippy::SecretsManager.new(content_path: file).read.deep_symbolize_keys
     end
 
     def fetch(app, name)

data/lib/shippy/secrets_manager.rb

@@ -0,0 +1,74 @@
+require "active_support"
+require "active_support/encrypted_configuration"
+require "tempfile"
+require "fileutils"
+
+module Shippy
+  class SecretsManager
+    attr_reader :content_path, :key_path, :output
+
+    def initialize(
+      content_path: "config/secrets.yml.enc",
+      key_path: "config/master.key",
+      env_key: "SHIPPY_MASTER_KEY",
+      output: $stdout
+    )
+      @content_path = content_path
+      @key_path = key_path
+      @env_key = env_key
+      @output = output
+
+      @config = ActiveSupport::EncryptedConfiguration.new(
+        config_path: @content_path,
+        key_path: @key_path,
+        env_key: @env_key,
+        raise_if_missing_key: true
+      )
+    end
+
+    def edit
+      ensure_key_exists!
+
+      original_content = if File.exist?(content_path)
+        @config.read
+      else
+        "# Add your secrets here. They will be encrypted on save.\n" \
+        "# keys: values\n"
+      end
+
+      Tempfile.create(["secrets", ".yml"]) do |tmp_file|
+        tmp_file.write(original_content)
+        tmp_file.close
+
+        editor = ENV["EDITOR"] || "vim"
+        system("#{editor} #{tmp_file.path}")
+
+        new_content = File.read(tmp_file.path)
+
+        if new_content != original_content
+          @config.write(new_content)
+          output.puts "✅ Secrets updated and encrypted to #{content_path}"
+        else
+          output.puts "⚠️ No changes detected."
+        end
+      end
+    rescue ActiveSupport::EncryptedFile::MissingKeyError
+      output.puts "❌ Error: Missing '#{key_path}'. Run 'setup' first to generate a key."
+    end
+
+    def read
+      YAML.safe_load(@config.read, symbolize_names: true).to_h
+    rescue Errno::ENOENT
+      {}
+    end
+
+    def ensure_key_exists!
+      return if File.exist?(key_path)
+
+      output.puts "Generating new master key at #{key_path}..."
+      FileUtils.mkdir_p(File.dirname(key_path))
+      File.write(key_path, ActiveSupport::EncryptedConfiguration.generate_key)
+      output.puts "⚠️ IMPORTANT: Add #{key_path} to your .gitignore!"
+    end
+  end
+end

data/lib/shippy/version.rb

@@ -1,3 +1,3 @@
 module Shippy
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/shippy.rb

@@ -10,6 +10,7 @@ require "zlib"
 
 require_relative "shippy/version"
 require_relative "shippy/secrets"
+require_relative "shippy/secrets_manager"
 require_relative "shippy/config"
 require_relative "shippy/commander"
 require_relative "shippy/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shippy
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Marius Bobin
@@ -164,11 +164,12 @@ files:
 - lib/shippy/cli/init.rb
 - lib/shippy/cli/main.rb
 - lib/shippy/cli/prune.rb
+- lib/shippy/cli/secrets.rb
 - lib/shippy/cli/server.rb
 - lib/shippy/cli/templates/apps/proxy/docker-compose.rb
 - lib/shippy/cli/templates/apps/proxy/traefik/config.yml.erb
 - lib/shippy/cli/templates/apps/proxy/traefik/dynamic_config.yml
-- lib/shippy/cli/templates/config/secrets.yml
+- lib/shippy/cli/templates/config/secrets.yml.enc
 - lib/shippy/cli/templates/config/shippy.yml
 - lib/shippy/commander.rb
 - lib/shippy/compiler.rb
@@ -176,6 +177,7 @@ files:
 - lib/shippy/config.rb
 - lib/shippy/repo.rb
 - lib/shippy/secrets.rb
+- lib/shippy/secrets_manager.rb
 - lib/shippy/service.rb
 - lib/shippy/version.rb
 homepage: https://mbobin.me/shippy

data/lib/shippy/cli/templates/config/secrets.yml

@@ -1,3 +0,0 @@
-proxy:
-  cloudflare_email: me@example.org
-  cloudflare_token: token