@babajide234/git-merge-workflow 1.0.2 → 1.0.4

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 babajide Tomoshegbo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -108,5 +108,26 @@ Publish-Module -Path . -NuGetApiKey <Your-API-Key>
 - `New-GitWorkflowConfig`: Generates the `.git-merge-workflow.json` configuration file.
 - `Get-GitWorkflowConfig`: Reads the current configuration.
 
+## Cross-Platform Support (Mac/Linux)
+
+This tool works on Windows, macOS, and Linux.
+
+### Requirements for macOS/Linux
+You must have **PowerShell Core** (`pwsh`) installed.
+
+**macOS (Homebrew):**
+```bash
+brew install --cask powershell
+```
+
+**Linux (Ubuntu):**
+```bash
+sudo apt-get install -y wget apt-transport-https software-properties-common
+wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb"
+sudo dpkg -i packages-microsoft-prod.deb
+sudo apt-get update
+sudo apt-get install -y powershell
+```
+
 ## License
 MIT

package/bin/cli.js

@@ -9,20 +9,45 @@ const modulePath = path.resolve(__dirname, '../GitMergeWorkflow.psd1');
 // Arguments passed to the CLI
 const args = process.argv.slice(2);
 
+// Determine which PowerShell executable to use
+// On Windows: try 'pwsh' (PowerShell Core) first, fallback to 'powershell' (Windows PowerShell)
+// On macOS/Linux: must use 'pwsh'
+const isWin = process.platform === 'win32';
+const psExecutable = isWin ? 'powershell' : 'pwsh';
+
 // Construct the PowerShell command
 // We import the module and then invoke the function with passed arguments
+// We need to ensure args are passed correctly. 
+// Since we are passing a command string, we rely on the user's shell to have parsed quotes,
+// and we rejoin them. Ideally, we would quote arguments that contain spaces.
+const formattedArgs = args.map(arg => {
+    if (arg.includes(' ') && !arg.startsWith('"') && !arg.startsWith("'")) {
+        return `"${arg}"`;
+    }
+    return arg;
+}).join(' ');
+
 const psCommand = `
     $ErrorActionPreference = 'Stop'
     Import-Module '${modulePath}' -Force
-    Invoke-GitMergeWorkflow ${args.join(' ')}
+    Invoke-GitMergeWorkflow ${formattedArgs}
 `;
 
-// Determine which PowerShell executable to use (pwsh for Core, powershell for Windows PowerShell)
-const psExecutable = process.platform === 'win32' ? 'powershell' : 'pwsh';
-
 const child = spawn(psExecutable, ['-NoProfile', '-Command', psCommand], {
     stdio: 'inherit',
-    shell: true
+    shell: false // set to false to avoid shell injection, we are executing pwsh directly
+});
+
+child.on('error', (err) => {
+    if (err.code === 'ENOENT') {
+        console.error(`Error: Could not find '${psExecutable}'. Please ensure PowerShell is installed.`);
+        if (!isWin) {
+            console.error('On macOS/Linux, install PowerShell via Homebrew: brew install --cask powershell');
+        }
+    } else {
+        console.error('Failed to start PowerShell process:', err);
+    }
+    process.exit(1);
 });
 
 child.on('exit', (code) => {

package/package.json

@@ -1,12 +1,22 @@
 {
   "name": "@babajide234/git-merge-workflow",
-  "version": "1.0.2",
+  "version": "1.0.4",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "description": "Automated Git workflow for merging feature branches through staging to develop",
-  "main": "index.js",
   "bin": {
     "git-merge-workflow": "./bin/cli.js",
     "gmw": "./bin/cli.js"
   },
+  "files": [
+    "bin/",
+    "GitMergeWorkflow.psd1",
+    "GitMergeWorkflow.psm1",
+    "Install.ps1",
+    "README.md"
+  ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/.github/workflows/npm-publish-github-packages.yml

@@ -1,36 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: npm ci
-      - run: npm test
-
-  publish-gpr:
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://npm.pkg.github.com/
-      - run: npm ci
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/.github/workflows/publish.yml

@@ -1,34 +0,0 @@
-name: Publish PowerShell Module
-
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-
-jobs:
-  publish-to-gallery:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build and Publish
-        env:
-          NUGET_KEY: ${{ secrets.NUGET_KEY }}
-        shell: pwsh
-        run: |
-          Publish-Module -Path . -NuGetApiKey $env:NUGET_KEY -Verbose
-
-  publish-to-npm:
-    runs-on: ubuntu-latest
-    needs: publish-to-gallery
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
-          registry-url: 'https://registry.npmjs.org'
-      
-      - run: npm install
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}