Skip to content

Commit

Permalink
Porting over my Personal SFCC DevOps Projects to New SFCC DevOps Gi…
Browse files Browse the repository at this point in the history
…tHub Org
  • Loading branch information
manifestinteractive committed May 25, 2022
1 parent 8c9c0e1 commit 8b6252a
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at peter@redvanworkshop.com. All
reported by contacting the project team at me@peterschmalfeldt.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
12 changes: 6 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Logo](https://red-van-workshop.s3.us-east-1.amazonaws.com/logo.png "Logo")
![Logo](https://sfccdevops.s3.amazonaws.com/logo-128.png "Logo")

Contributing Guide
===
Expand All @@ -12,23 +12,23 @@ Issues & Feature Requests

### Bug Fix

[![Staging Environment](https://img.shields.io/badge/Create-Bug_Report-fbca04.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/redvanworkshop/sfcc-cartridge-diff/issues/new?labels=Bug%20Report)
[![Staging Environment](https://img.shields.io/badge/Create-Bug_Report-fbca04.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/sfccdevops/sfcc-cartridge-diff/issues/new?labels=Bug%20Report)

> We're sorry things are not working as expected, and want to get things fixed ASAP. In order to help us do that, we need a few things from you.
1. Create a [New Bug Report](https://github.com/redvanworkshop/sfcc-cartridge-diff/issues/new?labels=Bug%20Report)
1. Create a [New Bug Report](https://github.com/sfccdevops/sfcc-cartridge-diff/issues/new?labels=Bug%20Report)
2. Enter a Short but Descriptive Title for the Issue
3. Use the Template Provided and fill in as much as you can, if something does not apply, enter `N/A`
4. Look for the `Labels` section, and select `Bug Report` from the drop down menu
5. Click `Submit new issue` button

### Feature Request

[![Staging Environment](https://img.shields.io/badge/Create-Feature_Request-9933cc.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/redvanworkshop/sfcc-cartridge-diff/issues/new?labels=Feature%20Request)
[![Staging Environment](https://img.shields.io/badge/Create-Feature_Request-9933cc.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/sfccdevops/sfcc-cartridge-diff/issues/new?labels=Feature%20Request)

> Got an idea for a new feature? We'd love to hear it! In order to get this knocked out, we will need a few things from you.
1. Create a [New Feature Request](https://github.com/redvanworkshop/sfcc-cartridge-diff/issues/new?labels=Feature%20Request)
1. Create a [New Feature Request](https://github.com/sfccdevops/sfcc-cartridge-diff/issues/new?labels=Feature%20Request)
2. Enter a Short but Descriptive Title for the Feature Request
3. Use the Template Provided and fill in as much as you can, if something does not apply, enter `N/A` ( you can delete the `Steps to Duplicate:` section as that does not apply )
4. Look for the `Labels` section, and select `Feature Request` from the drop down menu
Expand All @@ -37,7 +37,7 @@ Issues & Feature Requests
Pull Requests
---

[![Staging Environment](https://img.shields.io/badge/Create-Pull_Request-006b75.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/redvanworkshop/sfcc-cartridge-diff/compare?labels=Ready%20For%20Code%20Review)
[![Staging Environment](https://img.shields.io/badge/Create-Pull_Request-006b75.svg?style=for-the-badge&logo=github&logoColor=ffffff&logoWidth=16)](https://github.com/sfccdevops/sfcc-cartridge-diff/compare?labels=Ready%20For%20Code%20Review)

### Bug Fix

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Checklist:

> I have tested each of the following, and they work as expected: ( required )
- [ ] Meets [Contributing Guide](https://github.com/redvanworkshop/sfcc-cartridge-diff/blob/develop/.github/CONTRIBUTING.md) Requirements
- [ ] Meets [Contributing Guide](https://github.com/sfccdevops/sfcc-cartridge-diff/blob/develop/.github/CONTRIBUTING.md) Requirements
- [ ] Pulled in the Latest Code from the `develop` branch
- [ ] Works on a Desktop / Laptop Device
- [ ] Works on a Mobile Device
Expand Down
44 changes: 0 additions & 44 deletions .github/cla/agreement.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/assign_to_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
uses: srggrs/assign-one-project-github-action@1.2.0
if: github.event.action == 'opened'
with:
project: 'https://github.com/redvanworkshop/sfcc-cartridge-diff/projects/1'
project: 'https://github.com/sfccdevops/sfcc-cartridge-diff/projects/1'
25 changes: 0 additions & 25 deletions .github/workflows/cla.yml

This file was deleted.

15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
![Logo](https://red-van-workshop.s3.us-east-1.amazonaws.com/logo.png "Logo")
![Logo](https://sfccdevops.s3.amazonaws.com/logo-128.png "Logo")

SFCC Cartridge Diff Tool
---

> Command Line Tool for Salesforce Commerce Cloud Cartridge Compare. SFCC Cartridge Diff Tool. Working with SFCC Cartridge overrides just got easier: Compare client cartridge against other cartridges, Generate diffs between override files & Filter using local git changes.
![demo](https://red-van-workshop.s3.us-east-1.amazonaws.com/sfcc-cartridge-diff.gif?v=1.1.0)
![demo](https://sfccdevops.s3.amazonaws.com/sfcc-cartridge-diff.gif)


Introduction
Expand Down Expand Up @@ -33,7 +33,7 @@ npm install -g sfcc-cartridge-diff
#### Install via Clone

```bash
git clone https://github.com/redvanworkshop/sfcc-cartridge-diff.git
git clone https://github.com/sfccdevops/sfcc-cartridge-diff.git
cd sfcc-cartridge-diff
npm install -g
```
Expand Down Expand Up @@ -77,8 +77,8 @@ sfcc-diff -c app_client_name
> If you only care about a couple of cartridges, you can speed things up by specifying which ones to compare against.
```bash
sfcc-diff --cartridge app_client_name --include storefront-reference-architecture,rvw_autobahn_core
sfcc-diff -c app_client_name -i storefront-reference-architecture,rvw_autobahn_core
sfcc-diff --cartridge app_client_name --include storefront-reference-architecture,third_party_core
sfcc-diff -c app_client_name -i storefront-reference-architecture,third_party_core
```

#### Comparing Client Cartridge to All Cartridges Except Specific Ones:
Expand Down Expand Up @@ -174,3 +174,8 @@ Here are a couple of apps you can use for external diffs, and how to configure t
trustExitCode = true
cmd = open -W -a kdiff3 -n --args \"$LOCAL\" \"$REMOTE\" &> /dev/null &
```

Disclaimer
---

> The trademarks and product names of Salesforce®, including the mark Salesforce®, are the property of Salesforce.com. SFCC DevOps is not affiliated with Salesforce.com, nor does Salesforce.com sponsor or endorse the SFCC DevOps products or website. The use of the Salesforce® trademark on this project does not indicate an endorsement, recommendation, or business relationship between Salesforce.com and SFCC DevOps.
4 changes: 2 additions & 2 deletions bin/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const cli = yargs
.example('sfcc-diff -c app_client_name -m -d ksdiff', 'Modified Only and Diff')
.example('sfcc-diff -c app_client_name -f .isml', 'Filter for ISML files')
.example('sfcc-diff -c app_client_name -f common.properties', 'Filter for Specific File')
.example('sfcc-diff -c app_client_name -i rvw_autobahn_core', 'Compare Two Cartridges')
.example('sfcc-diff -c app_client_name -i third_party_core', 'Compare Two Cartridges')
.updateStrings({
'Options:': chalk.cyan('Options:\n'),
'Examples:': chalk.cyan('Examples:\n')
Expand All @@ -69,7 +69,7 @@ const cli = yargs
.wrap(100)
.help('help')
.alias('help', 'h')
.epilogue(`${chalk.bold.cyan('Need Help?')} https://github.com/redvanworkshop/sfcc-cartridge-diff`)
.epilogue(`${chalk.bold.cyan('Need Help?')} https://github.com/sfccdevops/sfcc-cartridge-diff`)
.strict()
.version().argv

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sfcc-cartridge-diff",
"version": "1.1.0",
"description": "SFCC Cartridge Diff Tool",
"homepage": "https://github.com/redvanworkshop/sfcc-cartridge-diff#readme",
"homepage": "https://github.com/sfccdevops/sfcc-cartridge-diff#readme",
"license": "MIT",
"main": "./bin/cli.js",
"bin": {
Expand All @@ -23,16 +23,16 @@
"contributors": [
{
"name": "Peter Schmalfeldt",
"email": "peter@redvanworkshop.com",
"url": "https://redvanworkshop.com"
"email": "me@peterschmalfeldt.com",
"url": "https://peterschmalfeldt.com"
}
],
"repository": {
"type": "git",
"url": "git+https://github.com/redvanworkshop/sfcc-cartridge-diff.git"
"url": "git+https://github.com/sfccdevops/sfcc-cartridge-diff.git"
},
"bugs": {
"url": "https://github.com/redvanworkshop/sfcc-cartridge-diff/issues"
"url": "https://github.com/sfccdevops/sfcc-cartridge-diff/issues"
},
"scripts": {
"test": "npm run -s test:lint && npm run -s test:unit",
Expand Down

0 comments on commit 8b6252a

Please sign in to comment.