compose 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2431419357d7c817741c34e2f795e85ef015127e0e8d3e42b1f59c726b62f8f
-  data.tar.gz: 0e97b8ac1259e62671019195fe10425abfcfd87756a88673bf9c935eedb1f2ce
+  metadata.gz: '0181e80bc473a0e67c074cc18b299be97ecad391875a7578780a3f8a93286cdc'
+  data.tar.gz: a4d171f396fd690387c122958565eb047efd3b0ef11c99acd6fc6e557a78f1e4
 SHA512:
-  metadata.gz: 2aa977b296f3bb5ad630f8689727955ffcdc067254e5ffcc88491e84233f1814436bac94ab083211aa9871f0c3c334aeec982314799d9f23a4d5bb061d3367ac
-  data.tar.gz: 71c0bbccdc9da5a9edaad609a8afbac268734203e1f2f815c481c23137649a3ac60e54e2789a2e785b40b6ea79275b4e21fd6a486752ad41f2f1663e21e9ffa8
+  metadata.gz: 172b6babed118da8b989bffb8dad311eef02a27c21200df782fccf29783d929559ca44e98023c4ac2e3607e1ece53a36e7490834c9fc09aaffe82aaf8dfc94ec
+  data.tar.gz: 89b5cd472edfe13a5007e753d23bca1be694ae056314f71376f442af323de21e1bdcf395c0560445534172c22a7304185df21d0b1835c7e65f05c26c325bf050

data/config/prompts/task.txt

@@ -7,6 +7,8 @@ Facts:
 2. Leave toLine empty for additions.
 3. Make sure the code snippet in the edit is complete. Feel free to make multiple edits, avoid repeating existing code if you can.
 4. Ensure the line numbers are accurate. Feel free to repeat existing code from previous or after lines to be sure.
+5. When adding new code to the end of a file, make sure to repeat the last
+   line of the file in the edit before adding a new line.
 
 ```json
 {
@@ -22,7 +24,7 @@ Facts:
         "fromLineNumber": number;
         "toLineNumber": number;
       };
-  "code": string; // Code to insert or replace, make sure \n and " are double escaped.
+  "code": string; // Code to insert or replace, make sure " are double escaped.
 }
 ```
 

data/config/prompts/verify.txt

@@ -10,7 +10,10 @@ Verify this change:
 {{CHANGE}}
 ```
 
-and make sure it's needed and it's only replacing the correct lines, or adding the code to the correct place. Feel free to change additions to replacements or vice versa, or skip edits if they're not needed.
+and make sure it's needed and it's only replacing the correct lines, or adding
+the code to the correct place. Feel free to change additions to replacements
+or vice versa, fix atLine, fromLineNumber, toLineNumber if they would produce
+duplicated code lines, `or skip edits if they're not needed.
 Return only the fixed change object following this JSON spec:
 
 ```json

data/lib/compose/cli.rb

@@ -22,7 +22,7 @@ module Compose
       ApiKeyUtils.setup(verifier_model)
 
       file_processor = FileProcessor.new(files, include_imports: options[:include_imports], model: code_model)
-      puts "Loaded #{file_processor.files.count} file(s)."
+      puts "Loaded #{file_processor.files.count} file(s): #{file_processor.files.keys.map { |path| File.exist?(path) ? Pathname.new(path).relative_path_from(Pathname.pwd).to_s : path }.join(', ')}"
 
       task = ask('What do you need me to do? (Type \'ask\' followed by your question to ask a question instead):')
 

data/lib/compose/edit_processor.rb

@@ -86,7 +86,7 @@ module Compose
 
       case edit[:change][:type]
       when 'addition'
-        new_content.insert(edit[:change][:atLine] - 1, edit[:code])
+        new_content.insert(edit[:change][:atLine] - 1, edit[:code].split("\n").map { |line| line + "\n" })
       when 'replacement'
         new_content[edit[:change][:fromLineNumber] - 1..edit[:change][:toLineNumber] - 1] = edit[:code].split("\n").map { |line| line + "\n" }
       end
@@ -109,7 +109,7 @@ module Compose
           case edit[:change][:type]
           when 'addition'
             adjusted_line = edit[:change][:atLine] + line_offset
-            content.insert(adjusted_line - 1, edit[:code])
+            content.insert(adjusted_line - 1, edit[:code].split("\n").map { |line| line + "\n" })
             line_offset += edit[:code].count("\n") + 1
           when 'replacement'
             from_line = edit[:change][:fromLineNumber] + line_offset
@@ -121,6 +121,8 @@ module Compose
           end
         end
 
+        content = content.flatten
+
         FileUtils.mkdir_p(File.dirname(filename))
         File.write(filename, content.join)
         puts "Applied changes to #{filename}".green

data/lib/compose/file_processor.rb

@@ -80,7 +80,22 @@ module Compose
     private
 
     def find_files_in_directory(directory)
-      Find.find(directory).select { |path| File.file?(path) && path =~ /\.(rb|py|js|ts)$/ }
+      tracked_files = `git ls-files #{directory}`.split("\n")
+      tracked_files.select do |path|
+        File.file?(path) && text_file?(path)
+      end
+    end
+
+    def text_file?(path)
+      return false if File.zero?(path)
+
+      bytes = File.read(path, 1024) or return false
+      bytes.each_byte do |byte|
+        return false if [0, 1, 2, 3, 4, 5, 6, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31].include?(byte)
+      end
+      true
+    rescue
+      false
     end
   end
 end

data/lib/compose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Compose
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compose
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Dreaming Tulpa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai