Migrate to GitQL 0.38.0

Author: AmrDeveloper

Cargo.lock

@@ -13,12 +13,12 @@ categories = ["command-line-utilities"]
 exclude = [".github/**", "docs/**", "media/**", "scripts/**"]
 
 [dependencies]
-gitql-core = "0.14.0"
-gitql-std = "0.14.0"
-gitql-cli = "0.37.0"
-gitql-ast = "0.33.0"
-gitql-parser = "0.36.0"
-gitql-engine = "0.37.0"
+gitql-core = "0.15.0"
+gitql-std = "0.15.0"
+gitql-cli = "0.38.0"
+gitql-ast = "0.34.0"
+gitql-parser = "0.37.0"
+gitql-engine = "0.38.0"
 clang-sys = { version = "1.8.1", features = ["clang_16_0"] }
 dyn-clone = "1.0.19"
 

Cargo.toml

@@ -1,4 +1,4 @@
-use gitql_cli::arguments::OutputFormat;
+use gitql_cli::printer::OutputFormatKind;
 
 /// Arguments for ClangQL
 #[derive(Debug, PartialEq)]
@@ -7,7 +7,7 @@ pub struct Arguments {
     pub analysis: bool,
     pub pagination: bool,
     pub page_size: usize,
-    pub output_format: OutputFormat,
+    pub output_format: OutputFormatKind,
 }
 
 /// Create a new instance of Arguments with the default settings
@@ -18,7 +18,7 @@ impl Arguments {
             analysis: false,
             pagination: false,
             page_size: 10,
-            output_format: OutputFormat::Render,
+            output_format: OutputFormatKind::Table,
         }
     }
 }
@@ -140,15 +140,16 @@ pub fn parse_arguments(args: &[String]) -> Command {
 
                 let output_type = &args[arg_index].to_lowercase();
                 if output_type == "csv" {
-                    arguments.output_format = OutputFormat::CSV;
+                    arguments.output_format = OutputFormatKind::CSV;
                 } else if output_type == "json" {
-                    arguments.output_format = OutputFormat::JSON;
-                } else if output_type == "render" {
-                    arguments.output_format = OutputFormat::Render;
+                    arguments.output_format = OutputFormatKind::JSON;
+                } else if output_type == "render" || output_type == "table" {
+                    arguments.output_format = OutputFormatKind::Table;
+                } else if output_type == "yaml" {
+                    arguments.output_format = OutputFormatKind::YAML;
                 } else {
                     return Command::Error("Invalid output format".to_string());
                 }
-
                 arg_index += 1;
             }
             _ => return Command::Error(format!("Unknown command {}", arg)),

src/arguments.rs

@@ -7,13 +7,14 @@ use arguments::Command;
 use clang_ql::clang_parser::parse_files;
 use clang_ql::data_provider::ClangDataProvider;
 use clang_ql::schema::create_clang_ql_environment;
-use gitql_cli::arguments::OutputFormat;
 use gitql_cli::diagnostic_reporter;
 use gitql_cli::diagnostic_reporter::DiagnosticReporter;
-use gitql_cli::printer::base::OutputPrinter;
-use gitql_cli::printer::csv_printer::CSVPrinter;
-use gitql_cli::printer::json_printer::JSONPrinter;
-use gitql_cli::printer::table_printer::TablePrinter;
+use gitql_cli::printer::BaseOutputPrinter;
+use gitql_cli::printer::CSVPrinter;
+use gitql_cli::printer::JSONPrinter;
+use gitql_cli::printer::OutputFormatKind;
+use gitql_cli::printer::TablePrinter;
+use gitql_cli::printer::YAMLPrinter;
 use gitql_core::environment::Environment;
 use gitql_engine::data_provider::DataProvider;
 use gitql_engine::engine;
@@ -180,12 +181,13 @@ fn execute_clang_ql_query(
     // Render the result only if they are selected groups not any other statement
     let engine_duration = engine_start.elapsed();
 
-    let printer: Box<dyn OutputPrinter> = match arguments.output_format {
-        OutputFormat::Render => {
+    let printer: Box<dyn BaseOutputPrinter> = match arguments.output_format {
+        OutputFormatKind::Table => {
             Box::new(TablePrinter::new(arguments.pagination, arguments.page_size))
         }
-        OutputFormat::JSON => Box::new(JSONPrinter {}),
-        OutputFormat::CSV => Box::new(CSVPrinter {}),
+        OutputFormatKind::JSON => Box::new(JSONPrinter),
+        OutputFormatKind::CSV => Box::new(CSVPrinter),
+        OutputFormatKind::YAML => Box::new(YAMLPrinter),
     };
 
     // Render the result only if they are selected groups not any other statement