Merge branch 'release-1.12.0'. Refs #336.

Author: ivanperez-keera

.github/workflows/repo-ghc-8.6-cabal-2.4-cfs.yml

@@ -53,7 +53,7 @@ jobs:
         git clone --recursive -b v6.7.0a https://github.com/nasa/cfs.git
 
         # Generate cFS app with Ogma
-        ogma cfs --app-target-dir cfs/apps/copilot \
+        ogma cfs --target-dir cfs/apps/copilot \
                  --input-file ogma-cli/examples/cfs-001-hello-ogma/expressions.json \
                  --input-format ogma-cli/examples/cfs-001-hello-ogma/json-format.cfg \
                  --prop-format literal \

.github/workflows/repo-ghc-8.6-cabal-2.4-diagram.yml

@@ -0,0 +1,69 @@
+name: diagram-ghc-8.6-cabal-2.4
+
+on:
+  - pull_request
+  - push
+
+jobs:
+  cabal:
+    name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        cabal: ["2.4"]
+        ghc:
+          - "8.6"
+
+    steps:
+
+    - uses: haskell-actions/setup@main
+      id: setup-haskell-cabal
+      name: Setup Haskell
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: ${{ matrix.cabal }}
+
+    - name: Prepare environment
+      run: |
+        echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+        echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+
+    - uses: actions/checkout@v4
+
+    - name: Create sandbox
+      run: |
+        echo "$PWD/.cabal-sandbox/bin" >> $GITHUB_PATH
+        cabal v1-sandbox init
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y libz-dev libbz2-dev libexpat-dev
+        cabal v1-install alex happy
+        cabal v1-install BNFC
+
+    - name: Install ogma
+      run: |
+        cabal v1-install copilot-4.6 ogma-**/ --constraint="aeson >= 2.0.3.0"
+
+    - name: Generate and enable app from diagram
+      run: |
+        ogma diagram --target-dir demo \
+                     --prop-format literal \
+                     --mode calculate \
+                     --input-format dot \
+                     --input-file ogma-cli/examples/diagram-001-hello-ogma/diagram-copilot.dot
+        cd demo/
+        cabal v1-sandbox init --sandbox=$PWD/../.cabal-sandbox
+        cabal v1-exec -- runhaskell Copilot.hs
+        gcc $PWD/../ogma-cli/examples/diagram-001-hello-ogma/main.c monitor.c -I$PWD -o main
+
+    - name: Run app and compare against expectation
+      run: |
+        cd demo/
+        if [ "$(./main | sed -n 's/.*new state: \([0-9]\+\).*/\1/p' | paste -sd' ' -)" = "0 1 1 0 2 2 0" ]; then \
+          echo "Execution of diagram test matches expectation"; \
+        else \
+          echo "Mismatch"; \
+          exit 1; \
+        fi

.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml

@@ -45,7 +45,7 @@ jobs:
 
     - name: Generate ROS app
       run: |
-        ogma ros --app-target-dir demo --input-file ogma-cli/examples/ros-copilot/document.json --input-format ogma-cli/examples/ros-copilot/json-format.cfg --prop-format literal --variable-db ogma-cli/examples/ros-copilot/vars-db.json
+        ogma ros --target-dir demo --input-file ogma-cli/examples/ros-copilot/document.json --input-format ogma-cli/examples/ros-copilot/json-format.cfg --prop-format literal --variable-db ogma-cli/examples/ros-copilot/vars-db.json
         cd demo/copilot/src/
         runhaskell Copilot.hs
         cd ../../

ogma-cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Revision history for ogma-cli
 
+## [1.12.0] - 2026-01-21
+
+* Version bump 1.12.0 (#336).
+* Add CI job to test diagram backend (#332).
+* Standardize argument names across commands (#334).
+
 ## [1.11.0] - 2025-11-21
 
 * Version bump 1.11.0 (#325).

ogma-cli/README.md

@@ -129,9 +129,8 @@ cFS applications are generated using the Ogma command `cfs`, which accepts
 the following arguments:
 - `--input-file FILENAME`: location of the specification or source file for
   which a cFS application is being generated.
-- `--app-target-dir DIR`: location where the cFS application files must be
-  stored.
-- `--app-template-dir DIR`: location of the cFS application template to use.
+- `--target-dir DIR`: location where the cFS application files must be stored.
+- `--template-dir DIR`: location of the cFS application template to use.
 - `--variable-file FILENAME`: a file containing a list of variables to monitor
 in the cFS application.
 - `--variable-db FILENAME`: a file containing a database of known variables,
@@ -228,12 +227,12 @@ with a set of files with a cFS application template, which Ogma will use
 instead.
 
 To choose this feature, one must call Ogma's `cfs` command with the argument
-`--app-template-dir DIR`, where `DIR` is the path to a directory containing a
-cFS application template. For example, assuming that the directory
-`my_template` contains a custom cFS application template, one can execute:
+`--template-dir DIR`, where `DIR` is the path to a directory containing a cFS
+application template. For example, assuming that the directory `my_template`
+contains a custom cFS application template, one can execute:
 
 ```
-$ ogma cfs --app-template-dir my_template/ --variable-db examples/cfs-variable-db.json --variable-file examples/cfs-variables
+$ ogma cfs --template-dir my_template/ --variable-db examples/cfs-variable-db.json --variable-file examples/cfs-variables
 ```
 
 Ogma will copy the files in that directory to the target path, filling in
@@ -304,9 +303,9 @@ for ROS app generation is considered preliminary.
 
 ROS applications are generated using the Ogma command `ros`, which receives
 five main arguments:
-- `--app-target-dir DIR`: location where the ROS application files must be
+- `--target-dir DIR`: location where the ROS application files must be
   stored.
-- `--app-template-dir DIR`: location of the ROS application template to use.
+- `--template-dir DIR`: location of the ROS application template to use.
 - `--variable-file FILENAME`: a file containing a list of variables that must
 be made available to the monitor.
 - `--variable-db FILENAME`: a file containing a database of known variables,
@@ -319,7 +318,7 @@ and the topic they are included with.
 The following execution generates an initial ROS application for runtime
 monitoring using Copilot:
 ```sh
-$ ogma ros --handlers filename --variable-file variables --variable-db ros-variable-db.json --app-target-dir ros_demo
+$ ogma ros --handlers filename --variable-file variables --variable-db ros-variable-db.json --target-dir ros_demo
 ```
 
 The application generated by Ogma contains the following files:
@@ -418,12 +417,12 @@ package. It's possible to customize the output by providing a directory with a
 set of files with a ROS package template, which Ogma will use instead.
 
 To choose this feature, one must call Ogma's `ros` command with the argument
-`--app-template-dir DIR`, where `DIR` is the path to a directory containing a
-ROS 2 package template. For example, assuming that the directory `my_template`
+`--template-dir DIR`, where `DIR` is the path to a directory containing a ROS 2
+package template. For example, assuming that the directory `my_template`
 contains a custom ROS package template, one can execute:
 
 ```
-$ ogma ros --app-template-dir my_template/ --handlers filename --variable-file variables --variable-db ros-variable-db.json --app-target-dir ros_demo
+$ ogma ros --template-dir my_template/ --handlers filename --variable-file variables --variable-db ros-variable-db.json --target-dir ros_demo
 ```
 
 Ogma will copy the files in that directory to the target path, filling in
@@ -475,9 +474,8 @@ for F' component generation is considered preliminary.
 
 F' components are generated using the Ogma command `fprime`, which receives
 five main arguments:
-- `--app-target-dir DIR`: location where the F' application files must be
-  stored.
-- `--app-template-dir DIR`: directory holding F' component source template.
+- `--target-dir DIR`: location where the F' application files must be stored.
+- `--template-dir DIR`: directory holding F' component source template.
 - `--variable-file FILENAME`: a file containing a list of variables that must
 be made available to the monitor.
 - `--variable-db FILENAME`: a file containing a database of known variables,
@@ -490,7 +488,7 @@ and their types.
 The following execution generates an initial F' component for runtime
 monitoring using Copilot:
 ```sh
-$ ogma fprime --handlers filename --variable-file filename --variable-db fprime-variable-db.json --app-target-dir fprime_demo
+$ ogma fprime --handlers filename --variable-file filename --variable-db fprime-variable-db.json --target-dir fprime_demo
 ```
 
 The component generated by Ogma contains the following files:
@@ -565,12 +563,12 @@ component. It's possible to customize the output by providing a directory with
 a set of files with an F' component template, which Ogma will use instead.
 
 To choose this feature, one must call Ogma's `fprime` command with the argument
-`--app-template-dir DIR`, where `DIR` is the path to a directory containing an
-F' component specification template. For example, assuming that the directory
+`--template-dir DIR`, where `DIR` is the path to a directory containing an F'
+component specification template. For example, assuming that the directory
 `my_template` contains a custom F' component template, one can execute:
 
 ```
-$ ogma fprime --app-template-dir my_template/ --handlers filename --variable-file variables --variable-db fprime-variable-db.json --app-target-dir fprime_demo
+$ ogma fprime --template-dir my_template/ --handlers filename --variable-file variables --variable-db fprime-variable-db.json --target-dir fprime_demo
 ```
 
 Ogma will copy the files in that directory to the target path, filling in
@@ -633,7 +631,7 @@ files generated.
   code being generated. See the files under `ogma-core/templates/diagram/`, as
 well as other commands supporting template customization, to understand how to
 customize the template.
-- `--file-name FILENAME`: File with the diagram being transformed.
+- `--input-file FILENAME`: File with the diagram being transformed.
 - `-f,--input-format FORMAT_NAME`: Name of the input format. See below for
   details.
 - `-p,--prop-format FORMAT_NAME`: Format for the boolean properties or
@@ -751,7 +749,7 @@ typedef struct {
 Ogma can generate that code automatically with the `structs` subcommand:
 
 ```haskell
-$ ogma structs --header-file-name examples/point.h
+$ ogma structs --input-file examples/point.h
 data Point = Point
   { pX :: Field "x" Double
   , pY :: Field "y" Double

ogma-cli/examples/cfs-001-hello-ogma/README.md

@@ -52,7 +52,7 @@ message is sent out to indicate that a trigger fired.
 An invocation of Ogma's cFS backend may look like the following:
 
 ```sh
-$ ogma cfs --app-target-dir demo \
+$ ogma cfs --target-dir demo \
            --input-file ogma-cli/examples/cfs-001-hello-ogma/expressions.json \
            --input-format ogma-cli/examples/cfs-001-hello-ogma/json-format.cfg \
            --prop-format literal \
@@ -228,7 +228,7 @@ To generate the cFS application from the source files listed above, we invoke
 `ogma` with the following arguments:
 
 ```sh
-$ ogma cfs --app-target-dir demo \
+$ ogma cfs --target-dir demo \
            --input-file ogma-cli/examples/cfs-001-hello-ogma/expressions.json \
            --input-format ogma-cli/examples/cfs-001-hello-ogma/json-format.cfg \
            --prop-format literal \

ogma-cli/examples/diagram-001-hello-ogma/README.md

@@ -54,7 +54,7 @@ An invocation of Ogma's diagram backend may look like the following:
 ```sh
 $ ogma diagram --app-target-dir demo \
                --mode calculate \
-               --file-name ogma-cli/examples/diagram-001-hello-ogma/diagram-copilot.dot \
+               --input-file ogma-cli/examples/diagram-001-hello-ogma/diagram-copilot.dot \
                --file-format dot \
                --prop-format literal
 ```
@@ -199,7 +199,7 @@ $ ogma diagram --app-target-dir demo \
                --prop-format literal \
                --mode calculate \
                --file-format dot \
-               --file-name ogma-cli/examples/diagram-001-hello-ogma/diagram-copilot.dot
+               --input-file ogma-cli/examples/diagram-001-hello-ogma/diagram-copilot.dot
 ```
 
 We specify the mode of operation `calculate`, which instructs Ogma to generate

ogma-cli/examples/ros2-001-hello-ogma/README.md

@@ -49,7 +49,7 @@ message is sent out to indicate that a trigger fired.
 An invocation of Ogma's ROS 2 backend may look like the following:
 
 ```sh
-$ ogma ros --app-target-dir demo \
+$ ogma ros --target-dir demo \
            --input-file expressions.json \
            --input-format json-format.cfg \
            --prop-format literal \
@@ -195,7 +195,7 @@ To generate the ROS 2 application from the source files listed above, we invoke
 `ogma` with the following arguments:
 
 ```sh
-$ ogma ros --app-target-dir demo \
+$ ogma ros --target-dir demo \
            --input-file expressions.json \
            --input-format json-format.cfg \
            --prop-format literal \

ogma-cli/ogma-cli.cabal

@@ -19,7 +19,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-cli
-version:             1.11.0
+version:             1.12.0
 homepage:            https://github.com/nasa/ogma
 bug-reports:         https://github.com/nasa/ogma/issues
 license:             Apache-2.0
@@ -143,7 +143,7 @@ executable ogma
     , microstache          >= 1.0      && < 1.1
     , text                 >= 1.2.3.1  && < 2.2
 
-    , ogma-core            >= 1.11.0 && < 1.12
+    , ogma-core            >= 1.12.0 && < 1.13
 
   hs-source-dirs:
     src

ogma-cli/src/CLI/CommandCFSApp.hs

@@ -104,15 +104,15 @@ commandOptsParser = CommandOpts
             )
         )
   <*> strOption
-        (  long "app-target-dir"
+        (  long "target-dir"
         <> metavar "DIR"
         <> showDefault
         <> value "copilot-cfs-demo"
         <> help strCFSAppDirArgDesc
         )
   <*> optional
         ( strOption
-            (  long "app-template-dir"
+            (  long "template-dir"
             <> metavar "DIR"
             <> help strCFSAppTemplateDirArgDesc
             )