ironflow-ops-git 0.1.0

Git operations for Ironflow workflows, powered by git2
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
//! Commit operations.

use std::path::PathBuf;
use std::str::from_utf8;

use async_trait::async_trait;
use git2::{Commit, Error, Oid, Repository, Signature};
use ironflow_core::error::OperationError;
use ironflow_core::operation::{Operation, OperationContext, TypedOperation};
use serde::{Deserialize, Serialize};
use serde_json::Value;

use crate::helpers::{blocking, prepare_commit, to_value};

/// Output of [`CommitCreate`] and [`CommitAmend`].
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CommitOutput {
    /// The OID of the created/amended commit.
    pub oid: String,
    /// The commit message.
    pub message: String,
}

/// Output of [`CommitSigned`].
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CommitSignedOutput {
    /// The OID of the signed commit.
    pub oid: String,
    /// The commit message.
    pub message: String,
    /// Whether the commit is signed.
    pub signed: bool,
}

/// Author information returned by [`CommitFind`].
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CommitAuthor {
    /// Author name.
    pub name: String,
    /// Author email.
    pub email: String,
}

/// Output of [`CommitFind`].
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CommitFindOutput {
    /// The commit OID.
    pub oid: String,
    /// The commit message.
    pub message: String,
    /// Author information.
    pub author: CommitAuthor,
    /// Unix timestamp of the commit.
    pub time: i64,
}

/// Create a new commit on HEAD.
///
/// Stages the current index as a tree, creates a commit with the given
/// message and author, and updates HEAD to point to the new commit.
///
/// # Examples
///
/// ```no_run
/// use ironflow_ops_git::commit::CommitCreate;
/// use ironflow_core::operation::Operation;
///
/// let op = CommitCreate::new("/path/to/repo", "Initial commit", "Alice", "alice@example.com");
/// assert_eq!(op.kind(), "git");
/// ```
pub struct CommitCreate {
    repo_path: PathBuf,
    message: String,
    author_name: String,
    author_email: String,
}

impl CommitCreate {
    /// Create a new commit operation.
    pub fn new(
        repo_path: impl Into<PathBuf>,
        message: impl Into<String>,
        author_name: impl Into<String>,
        author_email: impl Into<String>,
    ) -> Self {
        Self {
            repo_path: repo_path.into(),
            message: message.into(),
            author_name: author_name.into(),
            author_email: author_email.into(),
        }
    }

    /// Execute and return a typed result.
    pub async fn run(&self, _ctx: &OperationContext) -> Result<CommitOutput, OperationError> {
        let repo_path = self.repo_path.clone();
        let message = self.message.clone();
        let name = self.author_name.clone();
        let email = self.author_email.clone();
        blocking(move || {
            let repo = Repository::open(&repo_path)?;
            let sig = Signature::now(&name, &email)?;
            let (tree, parents) = prepare_commit(&repo)?;
            let parent_refs: Vec<&Commit<'_>> = parents.iter().collect();

            let oid = repo.commit(Some("HEAD"), &sig, &sig, &message, &tree, &parent_refs)?;
            Ok(CommitOutput {
                oid: oid.to_string(),
                message,
            })
        })
        .await
    }
}

#[async_trait]
impl Operation for CommitCreate {
    fn kind(&self) -> &str {
        "git"
    }

    async fn execute(&self, ctx: &OperationContext) -> Result<Value, OperationError> {
        to_value(&self.run(ctx).await?)
    }

    fn input(&self) -> Option<Value> {
        Some(serde_json::json!({
            "repo_path": self.repo_path,
            "message": self.message,
            "author": format!("{} <{}>", self.author_name, self.author_email),
        }))
    }
}

impl TypedOperation for CommitCreate {
    type Output = CommitOutput;
}

/// Find a commit by its OID.
///
/// # Examples
///
/// ```no_run
/// use ironflow_ops_git::commit::CommitFind;
/// use ironflow_core::operation::Operation;
///
/// let op = CommitFind::new("/path/to/repo", "abc123");
/// assert_eq!(op.kind(), "git");
/// ```
pub struct CommitFind {
    repo_path: PathBuf,
    oid: String,
}

impl CommitFind {
    /// Create a new find-commit operation.
    pub fn new(repo_path: impl Into<PathBuf>, oid: impl Into<String>) -> Self {
        Self {
            repo_path: repo_path.into(),
            oid: oid.into(),
        }
    }

    /// Execute and return a typed result.
    pub async fn run(&self, _ctx: &OperationContext) -> Result<CommitFindOutput, OperationError> {
        let repo_path = self.repo_path.clone();
        let oid_str = self.oid.clone();
        blocking(move || {
            let repo = Repository::open(&repo_path)?;
            let oid = Oid::from_str(&oid_str)?;
            let commit = repo.find_commit(oid)?;
            Ok(CommitFindOutput {
                oid: commit.id().to_string(),
                message: commit.message().unwrap_or("").to_string(),
                author: CommitAuthor {
                    name: commit.author().name().unwrap_or("").to_string(),
                    email: commit.author().email().unwrap_or("").to_string(),
                },
                time: commit.time().seconds(),
            })
        })
        .await
    }
}

#[async_trait]
impl Operation for CommitFind {
    fn kind(&self) -> &str {
        "git"
    }

    async fn execute(&self, ctx: &OperationContext) -> Result<Value, OperationError> {
        to_value(&self.run(ctx).await?)
    }

    fn input(&self) -> Option<Value> {
        Some(serde_json::json!({ "repo_path": self.repo_path, "oid": self.oid }))
    }
}

impl TypedOperation for CommitFind {
    type Output = CommitFindOutput;
}

/// Amend the most recent commit.
///
/// # Examples
///
/// ```no_run
/// use ironflow_ops_git::commit::CommitAmend;
/// use ironflow_core::operation::Operation;
///
/// let op = CommitAmend::new("/path/to/repo", "Updated message", "Alice", "alice@example.com");
/// assert_eq!(op.kind(), "git");
/// ```
pub struct CommitAmend {
    repo_path: PathBuf,
    message: String,
    author_name: String,
    author_email: String,
}

impl CommitAmend {
    /// Create a new amend operation.
    pub fn new(
        repo_path: impl Into<PathBuf>,
        message: impl Into<String>,
        author_name: impl Into<String>,
        author_email: impl Into<String>,
    ) -> Self {
        Self {
            repo_path: repo_path.into(),
            message: message.into(),
            author_name: author_name.into(),
            author_email: author_email.into(),
        }
    }

    /// Execute and return a typed result.
    pub async fn run(&self, _ctx: &OperationContext) -> Result<CommitOutput, OperationError> {
        let repo_path = self.repo_path.clone();
        let message = self.message.clone();
        let name = self.author_name.clone();
        let email = self.author_email.clone();
        blocking(move || {
            let repo = Repository::open(&repo_path)?;
            let head = repo.head()?.peel_to_commit()?;
            let sig = Signature::now(&name, &email)?;
            let mut index = repo.index()?;
            let tree_oid = index.write_tree()?;
            let tree = repo.find_tree(tree_oid)?;

            let oid = head.amend(
                Some("HEAD"),
                Some(&sig),
                Some(&sig),
                None,
                Some(&message),
                Some(&tree),
            )?;
            Ok(CommitOutput {
                oid: oid.to_string(),
                message,
            })
        })
        .await
    }
}

#[async_trait]
impl Operation for CommitAmend {
    fn kind(&self) -> &str {
        "git"
    }

    async fn execute(&self, ctx: &OperationContext) -> Result<Value, OperationError> {
        to_value(&self.run(ctx).await?)
    }

    fn input(&self) -> Option<Value> {
        Some(serde_json::json!({
            "repo_path": self.repo_path,
            "message": self.message,
        }))
    }
}

impl TypedOperation for CommitAmend {
    type Output = CommitOutput;
}

/// Create a signed commit (GPG/SSH).
///
/// The signature must be provided as a string. The caller is responsible
/// for generating the signature externally.
///
/// # Examples
///
/// ```no_run
/// use ironflow_ops_git::commit::CommitSigned;
/// use ironflow_core::operation::Operation;
///
/// let op = CommitSigned::new(
///     "/path/to/repo",
///     "Signed commit",
///     "Alice",
///     "alice@example.com",
///     "-----BEGIN PGP SIGNATURE-----\n...",
/// );
/// assert_eq!(op.kind(), "git");
/// ```
pub struct CommitSigned {
    repo_path: PathBuf,
    message: String,
    author_name: String,
    author_email: String,
    signature: String,
}

impl CommitSigned {
    /// Create a new signed-commit operation.
    pub fn new(
        repo_path: impl Into<PathBuf>,
        message: impl Into<String>,
        author_name: impl Into<String>,
        author_email: impl Into<String>,
        signature: impl Into<String>,
    ) -> Self {
        Self {
            repo_path: repo_path.into(),
            message: message.into(),
            author_name: author_name.into(),
            author_email: author_email.into(),
            signature: signature.into(),
        }
    }

    /// Execute and return a typed result.
    pub async fn run(&self, _ctx: &OperationContext) -> Result<CommitSignedOutput, OperationError> {
        let repo_path = self.repo_path.clone();
        let message = self.message.clone();
        let name = self.author_name.clone();
        let email = self.author_email.clone();
        let signature = self.signature.clone();
        blocking(move || {
            let repo = Repository::open(&repo_path)?;
            let sig = Signature::now(&name, &email)?;
            let (tree, parents) = prepare_commit(&repo)?;
            let parent_refs: Vec<&Commit<'_>> = parents.iter().collect();

            let buf = repo.commit_create_buffer(&sig, &sig, &message, &tree, &parent_refs)?;
            let content = from_utf8(&buf)
                .map_err(|e| Error::from_str(&format!("invalid UTF-8 in commit buffer: {e}")))?;
            let oid = repo.commit_signed(content, &signature, None)?;

            let head_ref = repo.head()?;
            let mut resolved = head_ref.resolve()?;
            resolved.set_target(oid, "commit signed")?;

            Ok(CommitSignedOutput {
                oid: oid.to_string(),
                message,
                signed: true,
            })
        })
        .await
    }
}

#[async_trait]
impl Operation for CommitSigned {
    fn kind(&self) -> &str {
        "git"
    }

    async fn execute(&self, ctx: &OperationContext) -> Result<Value, OperationError> {
        to_value(&self.run(ctx).await?)
    }

    fn input(&self) -> Option<Value> {
        Some(serde_json::json!({
            "repo_path": self.repo_path,
            "message": self.message,
            "signed": true,
        }))
    }
}

impl TypedOperation for CommitSigned {
    type Output = CommitSignedOutput;
}

#[cfg(test)]
mod tests {
    use std::fs;
    use std::path::Path;

    use super::*;
    use crate::test_helpers::ctx;

    fn init_repo_with_file(tmp: &Path) -> Repository {
        let repo = Repository::init(tmp).unwrap();
        fs::write(tmp.join("file.txt"), "hello").unwrap();
        let mut index = repo.index().unwrap();
        index.add_path(Path::new("file.txt")).unwrap();
        index.write().unwrap();
        repo
    }

    #[tokio::test]
    async fn add_and_commit() {
        let tmp = tempfile::tempdir().unwrap();
        init_repo_with_file(tmp.path());

        let op = CommitCreate::new(tmp.path(), "test commit", "Test", "test@example.com");
        let result = op.run(&ctx()).await.unwrap();
        assert!(!result.oid.is_empty());
        assert_eq!(result.message, "test commit");

        let repo = Repository::open(tmp.path()).unwrap();
        let head = repo.head().unwrap().peel_to_commit().unwrap();
        assert_eq!(head.message().unwrap(), "test commit");
    }

    #[tokio::test]
    async fn find_commit_after_create() {
        let tmp = tempfile::tempdir().unwrap();
        init_repo_with_file(tmp.path());

        let create = CommitCreate::new(tmp.path(), "find me", "Test", "test@example.com");
        let result = create.run(&ctx()).await.unwrap();

        let find = CommitFind::new(tmp.path(), &result.oid);
        let found = find.run(&ctx()).await.unwrap();
        assert_eq!(found.message, "find me");
        assert_eq!(found.author.name, "Test");
    }

    #[tokio::test]
    async fn amend_updates_message() {
        let tmp = tempfile::tempdir().unwrap();
        init_repo_with_file(tmp.path());

        let create = CommitCreate::new(tmp.path(), "original", "Test", "test@example.com");
        create.run(&ctx()).await.unwrap();

        let amend = CommitAmend::new(tmp.path(), "amended", "Test", "test@example.com");
        let result = amend.run(&ctx()).await.unwrap();
        assert_eq!(result.message, "amended");

        let repo = Repository::open(tmp.path()).unwrap();
        let head = repo.head().unwrap().peel_to_commit().unwrap();
        assert_eq!(head.message().unwrap(), "amended");
    }
}