yerba 0.1.1 → 0.2.0

data/rust/src/yerbafile.rs

@@ -1,6 +1,5 @@
 use rayon::prelude::*;
 use serde::Deserialize;
-use std::collections::HashMap;
 use std::fs;
 use std::path::{Path, PathBuf};
 
@@ -22,7 +21,6 @@ pub struct Rule {
 
 #[derive(Debug, Clone)]
 pub enum PipelineStep {
-  Get(GetConfig),
   SortKeys(SortKeysConfig),
   QuoteStyle(QuoteStyleConfig),
   Set(SetConfig),
@@ -31,28 +29,24 @@ pub enum PipelineStep {
   Rename(RenameConfig),
   Remove(RemoveConfig),
   BlankLines(BlankLinesConfig),
+  Sort(SortConfig),
 }
 
 #[derive(Debug, Clone, Deserialize)]
-pub struct BlankLinesConfig {
+pub struct SortConfig {
   #[serde(default)]
   pub path: Option<String>,
-  pub count: usize,
+  #[serde(default)]
+  pub by: Option<String>,
+  #[serde(default)]
+  pub case_sensitive: bool,
 }
 
 #[derive(Debug, Clone, Deserialize)]
-pub struct GetConfig {
-  pub path: String,
-  #[serde(rename = "as")]
-  pub as_name: String,
+pub struct BlankLinesConfig {
   #[serde(default)]
-  pub file: Option<String>,
-}
-
-#[derive(Debug, Clone)]
-pub enum Variable {
-  Single(String),
-  List(Vec<String>),
+  pub path: Option<String>,
+  pub count: usize,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -78,11 +72,6 @@ impl<'de> Deserialize<'de> for PipelineStep {
   {
     let mapping = serde_yaml::Mapping::deserialize(deserializer)?;
 
-    if let Some(value) = mapping.get(serde_yaml::Value::String("get".to_string())) {
-      let config: GetConfig = serde_yaml::from_value(value.clone()).map_err(serde::de::Error::custom)?;
-      return Ok(PipelineStep::Get(config));
-    }
-
     if let Some(value) = mapping.get(serde_yaml::Value::String("sort_keys".to_string())) {
       let config: SortKeysConfig = serde_yaml::from_value(value.clone()).map_err(serde::de::Error::custom)?;
       return Ok(PipelineStep::SortKeys(config));
@@ -123,8 +112,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 sort_keys, quote_style, set, insert, delete, rename, remove, blank_lines, or sort",
     ))
   }
 }
@@ -322,10 +316,9 @@ impl Yerbafile {
 
     let original = document.to_string();
     let base_path = rule.path.as_deref();
-    let mut variables: HashMap<String, Variable> = HashMap::new();
 
     for step in &rule.pipeline {
-      if let Err(error) = execute_step(&mut document, step, base_path, &mut variables) {
+      if let Err(error) = execute_step(&mut document, step, base_path) {
         return RuleResult {
           file: file.to_string(),
           changed: false,
@@ -355,46 +348,8 @@ impl Yerbafile {
   }
 }
 
-fn execute_step(
-  document: &mut Document,
-  step: &PipelineStep,
-  base_path: Option<&str>,
-  variables: &mut HashMap<String, Variable>,
-) -> Result<(), YerbaError> {
+fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<&str>) -> Result<(), YerbaError> {
   match step {
-    PipelineStep::Get(config) => {
-      let full_path = resolve_step_path(base_path, Some(&config.path));
-
-      if let Some(file_pattern) = &config.file {
-        let mut all_values = Vec::new();
-
-        let files =
-          glob::glob(file_pattern).map_err(|error| YerbaError::ParseError(format!("invalid glob: {}", error)))?;
-
-        for entry in files.flatten() {
-          let external_document = Document::parse_file(&entry)?;
-          all_values.extend(external_document.get_all(&config.path));
-        }
-
-        if all_values.len() == 1 && !config.path.contains('[') {
-          variables.insert(config.as_name.clone(), Variable::Single(all_values.remove(0)));
-        } else {
-          variables.insert(config.as_name.clone(), Variable::List(all_values));
-        }
-      } else if config.path.contains('[') {
-        let values = document.get_all(&full_path);
-
-        variables.insert(config.as_name.clone(), Variable::List(values));
-      } else {
-        let value = document
-          .get(&full_path)
-          .ok_or_else(|| YerbaError::PathNotFound(full_path.clone()))?;
-        variables.insert(config.as_name.clone(), Variable::Single(value));
-      }
-
-      Ok(())
-    }
-
     PipelineStep::QuoteStyle(config) => {
       let dot_path = config.path.as_deref();
 
@@ -420,44 +375,39 @@ fn execute_step(
 
     PipelineStep::Set(config) => {
       let full_path = resolve_step_path(base_path, Some(&config.path));
-      let resolved_value = resolve_template(&config.value, document, base_path, variables)?;
 
       if let Some(condition) = &config.condition {
-        let resolved_condition = resolve_template(condition, document, base_path, variables)?;
         let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
 
-        if !document.evaluate_condition(parent_path, &resolved_condition) {
+        if !document.evaluate_condition(parent_path, condition) {
           return Ok(());
         }
       }
 
-      document.set(&full_path, &resolved_value)
+      document.set(&full_path, &config.value)
     }
 
     PipelineStep::Insert(config) => {
       let full_path = resolve_step_path(base_path, Some(&config.path));
-      let resolved_value = resolve_template(&config.value, document, base_path, variables)?;
 
       if let Some(condition) = &config.condition {
-        let resolved_condition = resolve_template(condition, document, base_path, variables)?;
         let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
 
-        if !document.evaluate_condition(parent_path, &resolved_condition) {
+        if !document.evaluate_condition(parent_path, condition) {
           return Ok(());
         }
       }
 
-      document.insert_into(&full_path, &resolved_value, crate::InsertPosition::Last)
+      document.insert_into(&full_path, &config.value, crate::InsertPosition::Last)
     }
 
     PipelineStep::Delete(config) => {
       let full_path = resolve_step_path(base_path, Some(&config.path));
 
       if let Some(condition) = &config.condition {
-        let resolved_condition = resolve_template(condition, document, base_path, variables)?;
         let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
 
-        if !document.evaluate_condition(parent_path, &resolved_condition) {
+        if !document.evaluate_condition(parent_path, condition) {
           return Ok(());
         }
       }
@@ -469,10 +419,9 @@ fn execute_step(
       let full_path = resolve_step_path(base_path, Some(&config.from));
 
       if let Some(condition) = &config.condition {
-        let resolved_condition = resolve_template(condition, document, base_path, variables)?;
         let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
 
-        if !document.evaluate_condition(parent_path, &resolved_condition) {
+        if !document.evaluate_condition(parent_path, condition) {
           return Ok(());
         }
       }
@@ -482,18 +431,16 @@ fn execute_step(
 
     PipelineStep::Remove(config) => {
       let full_path = resolve_step_path(base_path, Some(&config.path));
-      let resolved_value = resolve_template(&config.value, document, base_path, variables)?;
 
       if let Some(condition) = &config.condition {
-        let resolved_condition = resolve_template(condition, document, base_path, variables)?;
         let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
 
-        if !document.evaluate_condition(parent_path, &resolved_condition) {
+        if !document.evaluate_condition(parent_path, condition) {
           return Ok(());
         }
       }
 
-      document.remove(&full_path, &resolved_value)
+      document.remove(&full_path, &config.value)
     }
 
     PipelineStep::BlankLines(config) => {
@@ -501,53 +448,18 @@ fn execute_step(
 
       document.enforce_blank_lines(&full_path, config.count)
     }
-  }
-}
-
-pub fn resolve_template(
-  template: &str,
-  document: &Document,
-  base_path: Option<&str>,
-  variables: &HashMap<String, Variable>,
-) -> Result<String, YerbaError> {
-  if !template.contains("${") {
-    return Ok(template.to_string());
-  }
-
-  let mut result = String::new();
-  let mut rest = template;
-
-  while let Some(start) = rest.find("${") {
-    result.push_str(&rest[..start]);
 
-    let after_dollar = &rest[start + 2..];
-
-    let end = after_dollar
-      .find('}')
-      .ok_or_else(|| YerbaError::ParseError("unclosed ${ in template".to_string()))?;
-
-    let reference = &after_dollar[..end];
-
-    let resolved = if let Some(variable) = variables.get(reference) {
-      match variable {
-        Variable::Single(value) => value.clone(),
-        Variable::List(values) => values.join(", "),
-      }
-    } else {
-      let full_path = resolve_step_path(base_path, Some(reference));
-
-      document
-        .get(&full_path)
-        .ok_or_else(|| YerbaError::ReferenceNotFound(reference.to_string()))?
-    };
+    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();
 
-    result.push_str(&resolved);
-    rest = &after_dollar[end + 1..];
+      document.sort_items(&full_path, &sort_fields, config.case_sensitive)
+    }
   }
-
-  result.push_str(rest);
-
-  Ok(result)
 }
 
 fn resolve_step_path(base_path: Option<&str>, step_path: Option<&str>) -> String {

data/yerba.gemspec

@@ -28,6 +28,10 @@ Gem::Specification.new do |spec|
     "sig/**/*.rbs",
     "exe/yerba",
     "ext/yerba/extconf.rb",
+    "ext/yerba/yerba.c",
+    "ext/yerba/include/**/*.h",
+    "rust/build.rs",
+    "rust/cbindgen.toml",
     "rust/Cargo.toml",
     "rust/Cargo.lock",
     "rust/src/**/*.rs",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marco Roth
@@ -23,18 +23,50 @@ files:
 - README.md
 - exe/yerba
 - ext/yerba/extconf.rb
+- ext/yerba/include/yerba.h
+- ext/yerba/yerba.c
 - lib/yerba.rb
+- lib/yerba/collection.rb
+- lib/yerba/document.rb
+- lib/yerba/formatting.rb
+- lib/yerba/location.rb
+- lib/yerba/map.rb
+- lib/yerba/scalar.rb
+- lib/yerba/sequence.rb
 - lib/yerba/version.rb
 - rust/Cargo.lock
 - rust/Cargo.toml
+- rust/build.rs
+- rust/cbindgen.toml
 - rust/rustfmt.toml
+- rust/src/commands/apply.rs
+- rust/src/commands/blank_lines.rs
+- rust/src/commands/check.rs
+- rust/src/commands/delete.rs
+- rust/src/commands/get.rs
+- rust/src/commands/init.rs
+- rust/src/commands/insert.rs
+- rust/src/commands/mate.rs
+- rust/src/commands/mod.rs
+- rust/src/commands/move_item.rs
+- rust/src/commands/move_key.rs
+- rust/src/commands/quote_style.rs
+- rust/src/commands/remove.rs
+- rust/src/commands/rename.rs
+- rust/src/commands/set.rs
+- rust/src/commands/sort.rs
+- rust/src/commands/sort_keys.rs
+- rust/src/commands/version.rs
 - rust/src/document.rs
 - rust/src/error.rs
+- rust/src/ffi.rs
 - rust/src/json.rs
 - rust/src/lib.rs
 - rust/src/main.rs
 - rust/src/quote_style.rs
+- rust/src/selector.rs
 - rust/src/syntax.rs
+- rust/src/yaml_writer.rs
 - rust/src/yerbafile.rs
 - sig/yerba.rbs
 - yerba.gemspec