From 8b6252a5ffba8aa0bf73c38e7bd71c0efaa327e2 Mon Sep 17 00:00:00 2001 From: Peter Schmalfeldt Date: Wed, 25 May 2022 01:04:18 -0400 Subject: [PATCH] Porting over my Personal SFCC DevOps Projects to New `SFCC DevOps` GitHub Org --- .github/CODE_OF_CONDUCT.md | 2 +- .github/CONTRIBUTING.md | 12 +++---- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/cla/agreement.md | 44 ------------------------- .github/workflows/assign_to_project.yml | 2 +- .github/workflows/cla.yml | 25 -------------- README.md | 15 ++++++--- bin/cli.js | 4 +-- package.json | 10 +++--- 9 files changed, 26 insertions(+), 90 deletions(-) delete mode 100644 .github/cla/agreement.md delete mode 100644 .github/workflows/cla.yml diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index 7f7a52c..43b7944 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -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. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cae304b..b22c9b6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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 === @@ -12,11 +12,11 @@ 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 @@ -24,11 +24,11 @@ Issues & Feature Requests ### 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 @@ -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 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index fbf6fb5..0696964 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 diff --git a/.github/cla/agreement.md b/.github/cla/agreement.md deleted file mode 100644 index 67afc84..0000000 --- a/.github/cla/agreement.md +++ /dev/null @@ -1,44 +0,0 @@ -![Logo](https://red-van-workshop.s3.us-east-1.amazonaws.com/logo.png "Logo") - -RVW Individual Contributor License Agreement -=== - -Thank you for your interest in contributing to open source software projects (“Projects”) made available by Red Van Workshop or its affiliates (“RVW”). This Individual Contributor License Agreement (“Agreement”) sets out the terms governing any source code, object code, bug fixes, configuration changes, tools, specifications, documentation, data, materials, feedback, information or other works of authorship that you submit or have submitted, in any form and in any manner, to RVW in respect of any of the Projects (collectively “Contributions”). If you have any questions respecting this Agreement, please contact peter@redvanworkshop.com. - -You agree that the following terms apply to all of your past, present and future Contributions. Except for the licenses granted in this Agreement, you retain all of your right, title and interest in and to your Contributions. - -### Copyright License - -You hereby grant, and agree to grant, to RVW a non-exclusive, perpetual, irrevocable, worldwide, fully-paid, royalty-free, transferable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute your Contributions and such derivative works, with the right to sublicense the foregoing rights through multiple tiers of sublicensees. - -### Patent License - -You hereby grant, and agree to grant, to RVW a non-exclusive, perpetual, irrevocable, worldwide, fully-paid, royalty-free, transferable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your Contributions, where such license applies only to those patent claims licensable by you that are necessarily infringed by your Contributions alone or by combination of your Contributions with the Project to which such Contributions were submitted, with the right to sublicense the foregoing rights through multiple tiers of sublicensees. - -### Moral Rights - -To the fullest extent permitted under applicable law, you hereby waive, and agree not to assert, all of your “moral rights” in or relating to your Contributions for the benefit of RVW, its assigns, and their respective direct and indirect sublicensees. - -### Third Party Content/Rights - -If your Contribution includes or is based on any source code, object code, bug fixes, configuration changes, tools, specifications, documentation, data, materials, feedback, information or other works of authorship that were not authored by you (“Third Party Content”) or if you are aware of any third party intellectual property or proprietary rights associated with your Contribution (“Third Party Rights”), then you agree to include with the submission of your Contribution full details respecting such Third Party Content and Third Party Rights, including, without limitation, identification of which aspects of your Contribution contain Third Party Content or are associated with Third Party Rights, the owner/author of the Third Party Content and Third Party Rights, where you obtained the Third Party Content, and any applicable third party license terms or restrictions respecting the Third Party Content and Third Party Rights. For greater certainty, the foregoing obligations respecting the identification of Third Party Content and Third Party Rights do not apply to any portion of a Project that is incorporated into your Contribution to that same Project. - -### Representations - -You represent that, other than the Third Party Content and Third Party Rights identified by you in accordance with this Agreement, you are the sole author of your Contributions and are legally entitled to grant the foregoing licenses and waivers in respect of your Contributions. If your Contributions were created in the course of your employment with your past or present employer(s), you represent that such employer(s) has authorized you to make your Contributions on behalf of such employer(s) or such employer(s) has waived all of their right, title or interest in or to your Contributions. - -### Disclaimer - -To the fullest extent permitted under applicable law, your Contributions are provided on an "asis" basis, without any warranties or conditions, express or implied, including, without limitation, any implied warranties or conditions of non-infringement, merchantability or fitness for a particular purpose. You are not required to provide support for your Contributions, except to the extent you desire to provide support. - -### No Obligation - -You acknowledge that RVW is under no obligation to use or incorporate your Contributions into any of the Projects. The decision to use or incorporate your Contributions into any of the Projects will be made at the sole discretion of RVW or its authorized delegates. - -### Disputes - -This Agreement shall be governed by and construed in accordance with the laws of the State of New York, United States of America, without giving effect to its principles or rules regarding conflicts of laws, other than such principles directing application of New York law. The parties hereby submit to venue in, and jurisdiction of the courts located in New York, New York for purposes relating to this Agreement. In the event that any of the provisions of this Agreement shall be held by a court or other tribunal of competent jurisdiction to be unenforceable, the remaining portions hereof shall remain in full force and effect. - -### Assignment - -You agree that RVW may assign this Agreement, and all of its rights, obligations and licenses hereunder. diff --git a/.github/workflows/assign_to_project.yml b/.github/workflows/assign_to_project.yml index a571947..fdc37c9 100644 --- a/.github/workflows/assign_to_project.yml +++ b/.github/workflows/assign_to_project.yml @@ -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' diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml deleted file mode 100644 index 3cff122..0000000 --- a/.github/workflows/cla.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: RVW CLA Agreement -on: - issue_comment: - types: - - created - pull_request_target: - types: - - opened - - closed - - synchronize -jobs: - CLAssistant: - runs-on: ubuntu-latest - steps: - - name: CLA Agreement - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.0.1-alpha - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PERSONAL_ACCESS_TOKEN : ${{ secrets.RVW_WORKFLOWS }} - with: - path-to-signatures: '.github/cla/signatures.json' - path-to-cla-document: 'https://github.com/redvanworkshop/sfcc-cartridge-diff/blob/develop/.github/cla/agreement.md' - branch: 'develop' - allowlist: manifestinteractive,sergeystoma,johnkramlich,bot* diff --git a/README.md b/README.md index 061a244..4e9728d 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 ``` @@ -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: @@ -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. diff --git a/bin/cli.js b/bin/cli.js index d9ee200..9bd0bb4 100755 --- a/bin/cli.js +++ b/bin/cli.js @@ -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') @@ -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 diff --git a/package.json b/package.json index 8459dd3..3ad6d4e 100644 --- a/package.json +++ b/package.json @@ -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": { @@ -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",