cowrite 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92022a9db5707f4dae9c95807e6eb39b813056ea3b39c252d3f65aa67d62acf5
-  data.tar.gz: 5b18e63cc172da86b5dba8d098510a00bb7c888fd2560f3f6f38a007f77c2aa5
+  metadata.gz: '0802510583d99ef115f4b8b21bcbf2ecb6d9924f0b8da3e5e494c47c74e7f5f3'
+  data.tar.gz: 591ba65a82edf2263336d8fe1cc1114c0462eac8138d0d587160187e6ea72b52
 SHA512:
-  metadata.gz: 8b7560a50a193d66dd3208786deeb95638a67517c9cd630377ac8b3653f262f112f3b93e8ffcf820ef1b604661725bf2f0208c3891daa16abe2078f9f3374f37
-  data.tar.gz: dcb4ee5bbb99036cdd506425102c905d7dc22ecedeed3125b02e08d700b7d35dc766247ac4827d30b01372bde42afec7a7004c76ebf44682e5d509c6f30eeb1e
+  metadata.gz: 7c5af9c56e2198b2976af8137f984e99632d52978b1002639e5ab8c6e23e7094b8acef41865d75e04a6802d4463eda1cf041790b0ce91c2c890b47f5c7784c76
+  data.tar.gz: 32aa39788c1ea19c2acb3eb0af9ea836d2d0a54688eac498a915248b2b2446f6ee645cd0ed582572488190adf0dfd3eff53ad35a031906fc379ecda3a92ec360

data/lib/cowrite/cli.rb

@@ -19,19 +19,21 @@ class Cowrite
     end
 
     def run(argv)
-      abort "Use only first argument for prompt" if argv.size != 1 # TODO: remove
-      prompt = ARGV[0]
+      argv, files = parse_argv(argv)
 
-      files = find_files prompt
+      abort "Use only first argument for prompt" if argv.size != 1
+      prompt = argv[0]
+
+      files = find_files prompt if files.empty?
 
       # prompting on main thread so we can go 1-by-1
       finish = lambda do |file, i, diff|
         # ask user if diff is fine (TODO: add a "no" option and re-prompt somehow)
         prompt "Diff for #{file}:\n#{color_diff(diff)}Apply diff to #{file}?", ["yes"]
 
-        with_content_in_file("#{diff.strip}\n") do |path|
+        with_content_in_file(diff) do |path|
           # apply diff (force sus changes, do not make backups)
-          cmd = "patch -f --posix #{file} < #{path}"
+          cmd = "patch --posix #{file} < #{path}"
           out = `#{cmd}`
           return if $?.success?
 
@@ -81,15 +83,21 @@ class Cowrite
     # prompt user with questions and answers until they pick one of them
     # - supports replying with the first letter of the answer
     # - supports enter for yes
+    # - when not interactive assume yes
     def prompt(question, answers)
-      colored_answers = answers.map { |a| color(:underline, a[0]) + a[1...] }.join("/")
-      loop do
-        read = prompt_freeform "#{color_last_line(QUESTION_COLOR, question)} [#{colored_answers}]", color: :none
-        read = "yes" if read == "" && answers.include?("yes")
-        return read if answers.include?(read)
-        if (ai = answers.map { |a| a[0] }.index(read))
-          return answers[ai]
+      if $stdin.tty?
+        colored_answers = answers.map { |a| color(:underline, a[0]) + a[1...] }.join("/")
+        loop do
+          read = prompt_freeform "#{color_last_line(QUESTION_COLOR, question)} [#{colored_answers}]", color: :none
+          read = "yes" if read == "" && answers.include?("yes")
+          return read if answers.include?(read)
+          if (ai = answers.map { |a| a[0] }.index(read))
+            return answers[ai]
+          end
         end
+      else
+        return "yes" if answers.include?("yes")
+        abort "need answer but was not in interactive mode"
       end
     end
 
@@ -106,9 +114,9 @@ class Cowrite
     def color_diff(diff)
       modify_lines(diff) do |l, _, _|
         if l =~ /^-[^-]/
-          color(:bg_light_green, l)
-        elsif l =~ /^\+[^+]/
           color(:bg_light_red, l)
+        elsif l =~ /^\+[^+]/
+          color(:bg_light_green, l)
         else
           l
         end
@@ -138,5 +146,14 @@ class Cowrite
     def remove_shell_colors(string)
       string.gsub(/\e\[(\d+)(;\d+)*m/, "")
     end
+
+    # allow passing files after --
+    def parse_argv(argv)
+      if (dash_index = argv.index("--"))
+        [argv[0...dash_index], argv[dash_index + 1..]]
+      else
+        [argv, []]
+      end
+    end
   end
 end

data/lib/cowrite/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Cowrite
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/cowrite.rb

@@ -37,6 +37,8 @@ class Cowrite
     # - tried "patch format" but that is often invalid
     # - tied "full fixed content" but that is always missing the fix
     # - need "ONLY" or it adds comments
+    # - tried asking for a diff but it's always in the wrong direction or has sublet bugs that make it unusable
+    content = File.read file
     prompt = <<~MSG
       Solve this prompt:
       ```
@@ -48,12 +50,17 @@ class Cowrite
       #{File.read file}
       ```
 
-      Reply with ONLY the change in diff format.
+      Reply with ONLY:
+      - all changed content inside a single ``` block
+      - what range lines from the original content need to be removed as "LINES: <start>-<end>"
     MSG
     puts "prompt:#{prompt}" if ENV["DEBUG"]
     answer = send_to_openai(prompt)
     puts "answer:\n#{answer}" if ENV["DEBUG"]
-    without_quotes(answer)
+    lines = answer.match(/LINES: (\d+)-(\d+)/)
+    answer.sub!(/.*\z/, "") # remove "LINES" line
+    section = without_quotes(answer).chomp # remove trailing newline since it always emits with an extra one
+    generate_diff content, section, from: Integer(lines[1]), to: Integer(lines[2])
   end
 
   private
@@ -63,6 +70,28 @@ class Cowrite
     answer.strip.sub(/\A```\S*\n(.*)```\z/m, "\\1")
   end
 
+  def generate_diff(original, changed, from:, to:)
+    Tempfile.create "cowrite-diff-a" do |a|
+      Tempfile.create "cowrite-diff-b" do |b|
+        a.write original
+        a.close
+
+        lines = original.split("\n", -1)
+        lines[(from - 1)..(to - 1)] = changed.split("\n", -1)
+        b.write lines.join("\n")
+        b.close
+
+        diff = `diff #{a.path} #{b.path}`
+        if $?.exitstatus == 0
+          raise "No diff found"
+        elsif $?.exitstatus != 1
+          raise "diff failed: #{diff}"
+        end
+        diff
+      end
+    end
+  end
+
   # def lines_from_file(file_path, line_number)
   #   start_line = [line_number - @context, 1].max
   #   end_line = line_number + @context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cowrite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel