gitlab-branch-rename 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424f84193ada40997121c855bcc939cf1b50435f6ba542f642c525a25a3f088f
-  data.tar.gz: 26df9104c015809fb90d3d90ba45cc01a30d0957f7a0f3d904eae7572d46b6ed
+  metadata.gz: 9f2589ca09aff738a566db1d7a72d15f8dcb29572fc761e33e2821223af3d2ab
+  data.tar.gz: 602a4c2746dc40c862447d50c2f53eded008d37303e89f5d27e395ef3c1f11d7
 SHA512:
-  metadata.gz: b4f80d2e06173b854f1949678f127503ff571d2cad55f2c53892a3108087e2ce8e12aca8efa5ace5252b5468b228ec344cb2b027e1b9e10a1b96cc446f2fbad1
-  data.tar.gz: 2bb13e416b288a1d70e762a4a81737d864dd64ff21af4a142eacf8a483a561640fe361030160a1148c321b948531f18d605a65b87301f67df4809176955cc654
+  metadata.gz: 4c84b600439182dd10729fd2ee47c05998ad2f8df2ae2c93d5c63c5bbe777ca8dfa5d72c9c9018349fb89fff2b82d2bd50822c301d33b30eaa120573eebfe3f3
+  data.tar.gz: b03da6446520c0e4fa3b81c5353c228d43a488757992c919f5fbc7b090508a8e9eca6f85b22932da0c3175afa39c5595ca84133d5a93c225581a87e8d3e0afc5

data/CODE_OF_CONDUCT.md

@@ -2,73 +2,128 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ap@apfritts.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.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement via
+[Twitter] or email `ap` at `apfritts` dot `com`.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+[Twitter]: https://twitter.com/apfritts
 
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

data/README.md

@@ -2,6 +2,11 @@
 
 This is a simple tool to rename your Gitlab project branches en masse.
 
+Other steps you'll need to take on your own:
+
+* Update your CI configuration that point to old branches
+* Update links in your documentation that point to old branches
+
 ## Motivation
 
 To support Black Lives Matter and create safer spaces, I wanted to rename all of the default branches in my Gitlab 
@@ -62,7 +67,7 @@ The gem is available as open source under the terms of the [MIT License].
 Everyone interacting in the Gitlab::Branch::Rename project's codebases, issue trackers, chat rooms and mailing lists 
 is expected to follow the [code of conduct].
 
-[code of conduct]: https://gitlab.com/apfritts/gitlab-branch-rename/blob/master/CODE_OF_CONDUCT.md
+[code of conduct]: https://gitlab.com/apfritts/gitlab-branch-rename/blob/trunk/CODE_OF_CONDUCT.md
 [Gitlab]: https://gitlab.com/apfritts/gitlab-branch-rename
 [MIT License]: https://opensource.org/licenses/MIT
 [Twitter thread]: https://twitter.com/mislav/status/1270388510684598272

data/lib/gitlab_branch_rename/main.rb

@@ -29,7 +29,7 @@ module GitlabBranchRename
     logger.info("    git branch -d #{c.branch_to_rename}")
     logger.info("")
     logger.info("Or all as one line:")
-    logger.info("    git fetch `git remote` --prune && git checkout trunk && git remote set-head `git remote` trunk && git branch -d master")
+    logger.info("    git fetch `git remote` --prune && git checkout #{c.new_branch_name} && git remote set-head `git remote` #{c.new_branch_name} && git branch -d #{c.branch_to_rename}")
     logger.close
   end
 end

data/lib/gitlab_branch_rename/operation.rb

@@ -120,7 +120,7 @@ module GitlabBranchRename
           end
         end
 
-        # Delete master branch
+        # Delete old branch
         begin
           Gitlab.delete_branch(project.id, old_branch.name)
           @logger.debug("Deleted old branch")

data/lib/gitlab_branch_rename/version.rb

@@ -1,3 +1,3 @@
 module GitlabBranchRename
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-branch-rename
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - AP Fritts