From 5d99d1b12f32609358d6cb98f9010755e9dbee4d Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Fri, 7 Apr 2023 02:09:26 +0000 Subject: [PATCH] chore: modify MIT license and inspiration --- LICENSE | 1 + README.md | 7 +++++++ commands/cmdutils/factory.go | 22 ---------------------- commands/help/help.go | 25 ------------------------- 4 files changed, 8 insertions(+), 47 deletions(-) diff --git a/LICENSE b/LICENSE index bdad41cf..37a0bf1a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License Copyright (c) 2022-present GitLab B.V. +Copyright (c) 2019 GitHub Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 46996b88..5c214f44 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ GLab is an open source GitLab CLI tool bringing GitLab to your terminal next to - [Environment variables](#environment-variables) - [Issues](#issues) - [Contributing](#contributing) +- [Inspiration](#inspiration) ## Usage @@ -226,3 +227,9 @@ If you have an issue: report it on the [issue tracker](https://gitlab.com/gitlab ## Contributing Feel like contributing? That's awesome! We have a [contributing guide](https://gitlab.com/gitlab-org/cli/-/blob/main/CONTRIBUTING.md) and [Code of conduct](https://gitlab.com/gitlab-org/cli/-/blob/main/CODE_OF_CONDUCT.md) to help guide you. + +## Inspiration + +The GitLab CLI was adopted from [Clement Sam](https://gitlab.com/profclems) in 2022 to serve as the official CLI of GitLab. Over the years the project has been inspired by both the [GitHub CLI](https://github.com/cli/cli) and [Zaq? Wiedmann's](https://gitlab.com/zaquestion) [lab](https://github.com/zaquestion/lab). + +Lab has served as the foundation for many of the GitLab CI/CD commands including `ci view` and `ci trace`. diff --git a/commands/cmdutils/factory.go b/commands/cmdutils/factory.go index 409f7ae3..03f5c6eb 100644 --- a/commands/cmdutils/factory.go +++ b/commands/cmdutils/factory.go @@ -27,28 +27,6 @@ type Factory struct { IO *iostreams.IOStreams } -// MIT License -// -// Copyright (c) 2019 GitHub Inc. -// -// 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. - func (f *Factory) RepoOverride(repo string) error { f.BaseRepo = func() (glrepo.Interface, error) { return glrepo.FromFullName(repo) diff --git a/commands/help/help.go b/commands/help/help.go index 541fb0ef..dd67e3fd 100644 --- a/commands/help/help.go +++ b/commands/help/help.go @@ -12,31 +12,6 @@ import ( "github.com/spf13/cobra" ) -// This code forked from the GitHub CLI at http://github.com/cli - cli/pkg/text/indent.go -// https://github.com/cli/cli/blob/929e082c13909044e2585af292ae952c9ca6f25c/pkg/text/indent.go - -// MIT License -// -// Copyright (c) 2019 GitHub Inc. -// -// 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. - func RootUsageFunc(command *cobra.Command) error { command.Printf("Usage: %s", command.UseLine())