dorian-commit 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1755970ac251ca93f075f8377be124343de1bd927127e8dd98739527d0dec435
-  data.tar.gz: 55f49464c33b2e61c9c81e5f30c3a1354fa34a0168f4edb050d1aa4d07a04e54
+  metadata.gz: 8277450427f579a722a664da512e6cee4b3a31fa00699c6506a6b5ec53271115
+  data.tar.gz: '08f33e3dd2936e5c881e5cb21ffcf7699104b5a68cbbce8b1c9940a251bba861'
 SHA512:
-  metadata.gz: caec97a14207833cc2bb3958a8c3d96a58ea8428b933da382f807d64db15d46b11a26374597a94370082d6125428c86a4e980b5161d419c6484e5d7708c2d52e
-  data.tar.gz: 4d151d4dc995c2affd1c7cef5b755815d3d88c751334c14037555e71835685eb699cb4d68cb586195b1871c9b65486c7922a4e4ad602aafbd8f855d3e721fdc7
+  metadata.gz: f30d67a1bb421eab3e523d8bc58dba9691ec53cbcf0420b470acf28dc17cc05b2edef192e45510cf96ae524fd830c67833aa3530f521371f28c1f734ce3c55aa
+  data.tar.gz: c84cf08482ef6e85183f1063933f9a4c2c38a98678bde8b736f8185dd9bde4494d28c2a3776f9789846aa94006b49b9b983a57d1ebd9c35a11b1f6830e63b59d

data/bin/commit

@@ -1,15 +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
@@ -20,29 +18,68 @@ 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:"
+
+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")
 
-abort "no staged files" if STAGED.strip.empty?
+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
 
-request = Net::HTTP::Post.new(uri.path, {
-  "Content-Type" => "application/json",
-  "Authorization" => "Bearer #{TOKEN}"
-})
+request =
+  Net::HTTP::Post.new(
+    uri.path,
+    {
+      "Content-Type" => "application/json",
+      "Authorization" => "Bearer #{TOKEN}"
+    }
+  )
 
 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.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -24,10 +24,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  commit with openai api
-
-  e.g. `commit`
+- !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:
 - commit
@@ -58,5 +69,5 @@ requirements: []
 rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
-summary: commit with openai api
+summary: commit with ai
 test_files: []