dorian 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 784498bc6998897d504352f4d0ddf7d5e447acb398928f629a1e8ece8a3588ac
-  data.tar.gz: 5671d0b44c5021c61048ba7be6f95e9b16a822f0abd9f6a7d5e064f4cac77212
+  metadata.gz: a0a6f772eca1bab50085d4218db923c9cbb075d199f916b3466b3ef2b3ebcf73
+  data.tar.gz: cf651f86c12d4be9321eabd66ce6688c8e9080633c218e05b92ace51159a7002
 SHA512:
-  metadata.gz: aa76e3f50983a9d002ec06a260e16b1bb135a4f9f09a4158e87af582fe13d1283870ac11d320d2c3287d6b0cf47ca157da28c31e55ef336dc3099ac31472d5b7
-  data.tar.gz: 6521dd9fc06e9343ad01a4b4b686ffe260ff7c0f5028d41639035733935afa17dbfe2acd368db09e6afaf11a2a0491ba97c38a57b42c47dd7d7357f32207db7d
+  metadata.gz: ad150cb4d72cc18cc629bf5a4c4bf5348f89d057b2bdb50cb458bd85a53aadd5bbdfe6e8e3f5861fe754eb81a16d3753c81b6e622d5d63ef4034d25cd6004a76
+  data.tar.gz: 7a1d457ad1490a568bfd7627d7d6281057c00c2efc1720cdce96c41b0941290b50fd40ec2cc01c855e5003ab9d89dcf0640674d41c411aa8d049a8f03ac698e6

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/dorian/bin.rb

@@ -87,7 +87,9 @@ class Dorian
             alias: :d
           },
           progress: :boolean,
-          headers: { default: true },
+          headers: {
+            default: true
+          },
           progress_format: {
             alias: :pf,
             type: :string
@@ -96,6 +98,7 @@ class Dorian
             default: true
           },
           io: :string,
+          self: :boolean,
           version: {
             alias: :v
           },
@@ -179,6 +182,30 @@ class Dorian
         arguments.delete("commit")
         @command = :commit
         command_commit
+      when :compare
+        arguments.delete("compare")
+        @command = :compare
+        command_compare
+      when :dir
+        arguments.delete("dir")
+        @command = :dir
+        command_dir
+      when :submodules
+        arguments.delete("submodules")
+        @command = :submodules
+        command_submodules
+      when :dot
+        arguments.delete("dot")
+        @command = :dot
+        command_dot
+      when :eval
+        arguments.delete("eval")
+        @command = :eval
+        command_eval
+      when :ls
+        arguments.delete("ls")
+        @command = :ls
+        command_ls
       else
         arguments.delete("read")
         @command = :read
@@ -190,6 +217,10 @@ class Dorian
       parsed.files
     end
 
+    def command_eval
+      each(everything) { |thing| outputs(evaluates(ruby: thing).returned) }
+    end
+
     def command_chat
       puts completion(
              token: token(".chat"),
@@ -239,6 +270,100 @@ class Dorian
       read_stdin_files + stdin_arguments + read_files + arguments
     end
 
+    def command_dir
+      puts(
+        Git
+          .open(".")
+          .ls_files
+          .map(&:first)
+          .map { |path| path.split("/").first }
+          .select { |path| Dir.exist?(path) }
+          .reject { |path| path.start_with?(".") }
+          .sort
+          .uniq
+      )
+
+      puts "." if self?
+    end
+
+    def command_ls
+      puts(
+        Git
+          .open(".")
+          .ls_files
+          .map(&:first)
+          .map { |path| path.split("/").first }
+          .reject { |path| path.start_with?(".") }
+          .select { |path| match_filetypes?(path) }
+          .sort
+          .uniq
+      )
+
+      puts "." if self?
+    end
+
+    def command_submodules
+      puts(
+        File
+          .read(".gitmodules")
+          .lines
+          .grep(/path = /)
+          .map { |path| path.split("=").last.strip }
+      )
+
+      puts "." if self?
+    end
+
+    def command_dot
+      dir = files.first || arguments.first || "."
+
+      ignore_file = File.expand_path("#{dir.chomp("/")}/.dotignore")
+      ignore_content = File.exist?(ignore_file) ? File.read(ignore_file) : ""
+      ignore_patterns =
+        ignore_content
+          .lines
+          .map(&:strip)
+          .reject { |line| line.empty? || line.start_with?("#") }
+          .map { |pattern| Regexp.new("\\A#{pattern}\\z") }
+
+      Git
+        .open(dir)
+        .ls_files
+        .map(&:first)
+        .each do |file|
+          next if ignore_patterns.any? { |pattern| pattern.match?(file) }
+
+          homefile = "#{Dir.home}/#{file}"
+          dotfile = File.expand_path("#{dir.chomp("/")}/#{file}")
+          File.delete(homefile) if File.exist?(homefile) || File.symlink?(homefile)
+          FileUtils.mkdir_p(File.dirname(homefile))
+          FileUtils.ln_s(dotfile, homefile, verbose: true)
+        end
+    end
+
+    def self?
+      !!options.self
+    end
+
+    def command_compare
+      file_1, file_2 = files
+      key_1, key_2 = arguments
+      read_1, read_2 =
+        files.map.with_index do |file, index|
+          read = reads(File.read(file))
+
+          if arguments[index] && read.from_deep_struct.key?(arguments[index])
+            read[arguments[index]]
+          elsif arguments[index]
+            nil
+          else
+            read
+          end
+        end
+
+      compare(read_1, read_2, file_1:, file_2:)
+    end
+
     def command_each
       each(everything) do |input|
         each(lines(reads(input)), progress: true) { |line| evaluates(it: line) }
@@ -344,7 +469,7 @@ class Dorian
     def outputs(content, file: nil)
       if write? && file
         File.write(file, to_output(content))
-      else
+      elsif !content.nil?
         puts to_output(content)
       end
     end
@@ -750,6 +875,57 @@ class Dorian
       http.request(request).body
     end
 
+    def compare(content_1, content_2, file_1:, file_2:, path: ".")
+      content_1 = content_1.from_deep_struct
+      content_2 = content_2.from_deep_struct
+
+      if content_1.is_a?(Hash) && content_2.is_a?(Hash)
+        (content_1.keys + content_2.keys).uniq.each do |key|
+          new_path = path == "." ? "#{path}#{key}" : "#{path}.#{key}"
+
+          if content_1[key] && !content_2[key]
+            warn "#{new_path} present in #{file_1} but not in #{file_2}"
+            next
+          elsif !content_1[key] && content_2[key]
+            warn "#{new_path} present in #{file_2} but not in #{file_1}"
+            next
+          end
+
+          compare(
+            content_1[key],
+            content_2[key],
+            path: new_path,
+            file_1:,
+            file_2:
+          )
+        end
+      elsif content_1.is_a?(Array) && content_2.is_a?(Array)
+        (0...([content_1.size, content_2.size].max)).each do |index|
+          new_path = "#{path}[#{index}]"
+          if content_1[index] && !content_2[index]
+            warn "#{new_path} present in #{file_1} but not in #{file_2}"
+            next
+          elsif !content_1[index] && content_2[index]
+            warn "#{new_path} present in #{file_2} but not in #{file_1}"
+            next
+          end
+
+          compare(
+            content_1[index],
+            content_2[index],
+            path: new_path,
+            file_1:,
+            file_2:
+          )
+        end
+      elsif content_1.class != content_2.class
+        warn(
+          "#{path} has #{content_1.class} for #{file_1} " \
+            "and #{content_2.class} for #{file_2}"
+        )
+      end
+    end
+
     def short(string)
       string[0..5000]
     end
@@ -758,6 +934,79 @@ class Dorian
       Tiktoken.encoding_for_model("gpt-4o")
     end
 
+    def match_filetypes?(path)
+      return true unless arguments.any?
+      return true unless arguments.intersect?(["rb", "ruby"])
+
+      ruby_extensions = %w[
+        .rb
+        .arb
+        .axlsx
+        .builder
+        .fcgi
+        .gemfile
+        .gemspec
+        .god
+        .jb
+        .jbuilder
+        .mspec
+        .opal
+        .pluginspec
+        .podspec
+        .rabl
+        .rake
+        .rbuild
+        .rbw
+        .rbx
+        .ru
+        .ruby
+        .schema
+        .spec
+        .thor
+        .watchr
+      ]
+
+      ruby_filenames = %w[
+        .irbrc
+        .pryrc
+        .simplecov
+        Appraisals
+        Berksfile
+        Brewfile
+        Buildfile
+        Capfile
+        Cheffile
+        Dangerfile
+        Deliverfile
+        Fastfile
+        Gemfile
+        Guardfile
+        Jarfile
+        Mavenfile
+        Podfile
+        Puppetfile
+        Rakefile
+        rakefile
+        Schemafile
+        Snapfile
+        Steepfile
+        Thorfile
+        Vagabondfile
+        Vagrantfile
+        buildfile
+      ]
+
+      return false if Dir.exist?(path)
+      return true if ruby_filenames.include?(path)
+      return true if ruby_extensions.include?(File.extname(path))
+      return false unless File.exist?(path)
+
+      first_line =
+        File.open(path, &:gets).to_s.encode("UTF-8", invalid: :replace)
+
+      /\A#!.*ruby\z/.match?(first_line)
+    end
+
     def evaluates(
       ruby: @ruby,
       it: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yaml
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="