yerba 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86361985dbd8ef5a839f6899270ac89a933f349bee785c61e1eefd542ae654b3
-  data.tar.gz: 5e7f39dcf92666dd989bce2eb670af60733ab03d493659f6ba2384d28d44cb6d
+  metadata.gz: 9ab1031fe2ea6b59f49bad4c2b7acf7e6679f16a97cbf7fa93d4e2790cc3c421
+  data.tar.gz: 79f77237c9ecbc6ed8404d31d50407e9ab4296829c8db983fba2300347ff06bc
 SHA512:
-  metadata.gz: fcefa6ad88faa024b773afe65c1393e268814f28500440dd9889a561fc56a9d0f42e85ca1801003e4563c30a7c113c7dac4a25831fdfa18cf55fb0077910821d
-  data.tar.gz: aeb85890af8a7e7bd98197521adec73d8f2fbcd5b13598922358594a8b1d13929c51b58a41edad2261596c2adb83b540cba614626b77c13a3d4b1328b099434f
+  metadata.gz: b38dcb297b53bdae8ac76a174922a544271a0564111149a864a2d0b6a4e5572b9219b266e29e22510cf567ac48b351d08ab47a9fb563734ea3834bed3655396b
+  data.tar.gz: 41907521d78760c21315891b7aa26bc772b7f9f871f72275f215f65e42726313612e61997d8458823e4d67ed25cb6dca5bf7dfcae913306a0e4cd5269f5065a0

data/README.md

@@ -36,7 +36,7 @@ yerba get config.yml path.to.key
 
 ### Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rake test` to run the tests.
 
 ### Rust
 

data/lib/yerba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yerba
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/rust/Cargo.lock

@@ -409,7 +409,7 @@ dependencies = [
 
 [[package]]
 name = "yerba"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "clap",
  "glob",

data/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yerba"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["Marco Roth <marco.roth@intergga.ch>"]
 description = "YAML Editing and Refactoring with Better Accuracy"

data/rust/src/document.rs

@@ -974,9 +974,14 @@ impl Document {
     }
   }
 
-  pub fn sort_items(&mut self, dot_path: &str, sort_fields: &[SortField]) -> Result<(), YerbaError> {
+  pub fn sort_items(
+    &mut self,
+    dot_path: &str,
+    sort_fields: &[SortField],
+    case_sensitive: bool,
+  ) -> Result<(), YerbaError> {
     if dot_path.contains("[].") {
-      return self.sort_each_items(dot_path, sort_fields);
+      return self.sort_each_items(dot_path, sort_fields, case_sensitive);
     }
 
     let keys: Vec<&str> = dot_path.split('.').collect();
@@ -1022,7 +1027,11 @@ impl Document {
         let value_a = &values_a[index];
         let value_b = &values_b[index];
 
-        let ordering = value_a.cmp(value_b);
+        let ordering = if case_sensitive {
+          value_a.cmp(value_b)
+        } else {
+          value_a.to_lowercase().cmp(&value_b.to_lowercase())
+        };
 
         let ordering = if field.ascending { ordering } else { ordering.reverse() };
 
@@ -1032,7 +1041,11 @@ impl Document {
       }
 
       if sort_fields.is_empty() && !values_a.is_empty() && !values_b.is_empty() {
-        return values_a[0].cmp(&values_b[0]);
+        return if case_sensitive {
+          values_a[0].cmp(&values_b[0])
+        } else {
+          values_a[0].to_lowercase().cmp(&values_b[0].to_lowercase())
+        };
       }
 
       std::cmp::Ordering::Equal
@@ -1055,7 +1068,12 @@ impl Document {
     self.apply_edit(sequence_range, &sequence_text)
   }
 
-  fn sort_each_items(&mut self, dot_path: &str, sort_fields: &[SortField]) -> Result<(), YerbaError> {
+  fn sort_each_items(
+    &mut self,
+    dot_path: &str,
+    sort_fields: &[SortField],
+    case_sensitive: bool,
+  ) -> Result<(), YerbaError> {
     let (parent_path, child_path) = if let Some(last_bracket) = dot_path.rfind("[].") {
       (&dot_path[..last_bracket + 2], &dot_path[last_bracket + 3..])
     } else {
@@ -1114,7 +1132,12 @@ impl Document {
             let value_a = &values_a[index];
             let value_b = &values_b[index];
 
-            let ordering = value_a.cmp(value_b);
+            let ordering = if case_sensitive {
+              value_a.cmp(value_b)
+            } else {
+              value_a.to_lowercase().cmp(&value_b.to_lowercase())
+            };
+
             let ordering = if field.ascending { ordering } else { ordering.reverse() };
 
             if ordering != std::cmp::Ordering::Equal {
@@ -1123,7 +1146,11 @@ impl Document {
           }
 
           if sort_fields.is_empty() && !values_a.is_empty() && !values_b.is_empty() {
-            return values_a[0].cmp(&values_b[0]);
+            return if case_sensitive {
+              values_a[0].cmp(&values_b[0])
+            } else {
+              values_a[0].to_lowercase().cmp(&values_b[0].to_lowercase())
+            };
           }
 
           std::cmp::Ordering::Equal

data/rust/src/main.rs

@@ -265,6 +265,9 @@ enum Command {
     /// Comma-separated sort fields, optionally with :desc (e.g. "date:desc,title")
     #[arg(long)]
     by: Option<String>,
+    /// Case-sensitive sort (default: case-insensitive)
+    #[arg(long)]
+    case_sensitive: bool,
     #[arg(long)]
     dry_run: bool,
   },
@@ -669,6 +672,7 @@ fn main() {
       file,
       path,
       by,
+      case_sensitive,
       dry_run,
     } => {
       let sort_fields = by.as_deref().map(yerba::SortField::parse_list).unwrap_or_default();
@@ -676,7 +680,7 @@ fn main() {
       for resolved_file in resolve_files(&file) {
         let mut document = parse_file(&resolved_file);
 
-        if document.sort_items(&path, &sort_fields).is_ok() {
+        if document.sort_items(&path, &sort_fields, case_sensitive).is_ok() {
           output(&resolved_file, &document, dry_run);
         }
       }

data/rust/src/yerbafile.rs

@@ -31,6 +31,17 @@ pub enum PipelineStep {
   Rename(RenameConfig),
   Remove(RemoveConfig),
   BlankLines(BlankLinesConfig),
+  Sort(SortConfig),
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct SortConfig {
+  #[serde(default)]
+  pub path: Option<String>,
+  #[serde(default)]
+  pub by: Option<String>,
+  #[serde(default)]
+  pub case_sensitive: bool,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -123,8 +134,13 @@ impl<'de> Deserialize<'de> for PipelineStep {
       return Ok(PipelineStep::BlankLines(config));
     }
 
+    if let Some(value) = mapping.get(serde_yaml::Value::String("sort".to_string())) {
+      let config: SortConfig = serde_yaml::from_value(value.clone()).map_err(serde::de::Error::custom)?;
+      return Ok(PipelineStep::Sort(config));
+    }
+
     Err(serde::de::Error::custom(
-      "unknown pipeline step: expected get, sort_keys, quote_style, set, insert, delete, rename, remove, or blank_lines",
+      "unknown pipeline step: expected get, sort_keys, quote_style, set, insert, delete, rename, remove, blank_lines, or sort",
     ))
   }
 }
@@ -501,6 +517,17 @@ fn execute_step(
 
       document.enforce_blank_lines(&full_path, config.count)
     }
+
+    PipelineStep::Sort(config) => {
+      let full_path = resolve_step_path(base_path, config.path.as_deref());
+      let sort_fields = config
+        .by
+        .as_deref()
+        .map(crate::SortField::parse_list)
+        .unwrap_or_default();
+
+      document.sort_items(&full_path, &sort_fields, config.case_sensitive)
+    }
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marco Roth