dorian-commit 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b83c8fffda78584363b2d97d26a5da277b13fb640f5eb0a9e935446848f4d0
-  data.tar.gz: 2a8ee8d66bbdc09844a2a8850549b8e74a32dd93527c4623c48dcb63e1f4e4fb
+  metadata.gz: 8277450427f579a722a664da512e6cee4b3a31fa00699c6506a6b5ec53271115
+  data.tar.gz: '08f33e3dd2936e5c881e5cb21ffcf7699104b5a68cbbce8b1c9940a251bba861'
 SHA512:
-  metadata.gz: b6ec2f80ae82311479444e59b6ad51c66bb731cf59979ef14756840c03fc4f675aa413a6223bfaef11811e5855cc0181e94c02cfe59c436d31186b747079ecf1
-  data.tar.gz: 9504f8ffae772c26fe24c3de06755a6c71b140b1a6a9255d4052f014e5276c3a3a9482fccca22d26a27c85da1e59a6640c35898669ff9f7f80b6609d7b5fdf4e
+  metadata.gz: f30d67a1bb421eab3e523d8bc58dba9691ec53cbcf0420b470acf28dc17cc05b2edef192e45510cf96ae524fd830c67833aa3530f521371f28c1f734ce3c55aa
+  data.tar.gz: c84cf08482ef6e85183f1063933f9a4c2c38a98678bde8b736f8185dd9bde4494d28c2a3776f9789846aa94006b49b9b983a57d1ebd9c35a11b1f6830e63b59d

data/bin/commit

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require "dorian/arguments"
+require "git"
 require "json"
 require "net/http"
 require "uri"
-require "git"
-
-abort "USAGE: commit" if ARGV.any?
 
 TOKEN_FILE = File.join(Dir.home, ".commit")
-PROMPT =
-  "simple, clear, short, lowercase commit message for the following diff:"
 
 if File.exist?(TOKEN_FILE)
   TOKEN = File.read(TOKEN_FILE).strip
@@ -21,11 +18,35 @@ else
   puts "token written to #{TOKEN_FILE}"
 end
 
-STAGED = `git diff --staged`
+PROMPT_1 = "simple, clear, short, lowercase commit message"
+PROMPT_2 = "for the following diff:"
+PROMPT_3 = "for the following git status:"
+PROMPT_4 = "for the following comment:"
 
-abort "no staged files" if STAGED.strip.empty?
+parsed = Dorian::Arguments.parse(version: { alias: :v }, help: { alias: :h })
+
+abort parsed.help if parsed.options.help
+
+if parsed.options.version
+  abort File.read(File.expand_path("../../VERSION", __FILE__))
+end
+
+content_2 = `git diff --staged`
+content_3 = `git status`
+content_4 = parsed.arguments.join(" ")
+content_4 += parsed.files.map { |file| File.read(file) }.join("\n")
+
+if content_4.empty?
+  messages_4 = []
+else
+  messages_4 = [
+    { role: :system, content: PROMPT_4 },
+    { role: :user, content: content_4 }
+  ]
+end
+
+uri = URI.parse("https://api.openai.com/v1/chat/completions")
 
-uri = URI("https://api.openai.com/v1/chat/completions")
 http = Net::HTTP.new(uri.host, uri.port)
 http.use_ssl = true
 
@@ -41,13 +62,24 @@ request =
 request.body = {
   model: "gpt-4o",
   messages: [
-    { role: "system", content: PROMPT },
-    { role: "user", content: STAGED }
+    { role: :system, content: PROMPT_1 },
+    { role: :system, content: PROMPT_2 },
+    { role: :user, content: content_2 },
+    { role: :system, content: PROMPT_3 },
+    { role: :user, content: content_3 },
+    *messages_4
   ]
 }.to_json
 
 response = http.request(request)
+
 json = JSON.parse(response.body)
-message = json.dig("choices", 0, "message", "content").strip
-Git.open(".").commit(message)
-puts message
+
+message = json.dig("choices", 0, "message", "content")
+
+if message
+  Git.open(".").commit(message)
+  puts message
+else
+  puts JSON.pretty_generate(json)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian-commit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dorian-arguments
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: commit with ai
 email: dorian@dorianmarie.com
 executables: