git-trim 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e1c14fa9ec506cd48daf024f6dd38e7461a09ef6f5ae3ceb6a075b37129a9e
-  data.tar.gz: 6db6dbb4ab2ed61c7b596b721306097ba188a07453410b91465ccdc6843c9db8
+  metadata.gz: 92db4c11447a62f7967f2beb14992824322cdc245c6cc9caba0289c5c7e19874
+  data.tar.gz: 5a87497a2f3dd09195ae8991336eec680d78e06c26af9fd5bc3ea0ff32a949d1
 SHA512:
-  metadata.gz: 854ef54bcfe17a55d1886e591b56fe1d4c854c059cd83cce0c16180760e33797eb1e0796abdc6ec114f5ee606c4e7883b1bba3fd05c7561f99a847defbd7676d
-  data.tar.gz: 22c1212df9d26f4ca4c2ac42c490a45f4b800dee4c8be6f8ae4015219cba342616b4276ec83885ccb03a462ad2ad00ac648a1c9062ac66b6ff1e4ae5174dba54
+  metadata.gz: f6059a21f04dad9126aef59197ae5ad37f9b2574df92028272aa982b36255295eea1ab82e819a63a64fba09df14c4ef2531e7c7e57a90cc748ec099a9d30b006
+  data.tar.gz: eb23ae147a5d2c5ce5eb5648d7c7cfd71050b5227d1732bb7ee53d0fce5b38f551c8254d374930d5fda429fc00b912530079a194ac758059193b8db4b8dc56e2

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    git-trim (0.1.1)
+    git-trim (0.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -28,8 +28,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   git-trim!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/README.md

@@ -22,12 +22,12 @@ Or install it yourself as:
 
 ## Usage
 
-You can call `git trim` and it will remove any branch that isn't currently merged into the current branch that isn't also in the `.git-protected-branches` file. It will not remove the master branch.
+You can call `git trim` and it will remove any branch that isn't currently merged into the current branch that isn't also in the `.git-protected-branches` file. It will not remove the main branch.
 
 The `.git-protected-branches` file can reside in the current directory or any parent directory. Branch names are each listed on a line in the file. For example:
 
 ```
-master
+main
 staging
 production
 ```
@@ -42,4 +42,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Git::Trim project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/git-trim/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Git::Trim project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/git-trim/blob/main/CODE_OF_CONDUCT.md).

data/git-trim.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "bin"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/git-trim/version.rb

@@ -1,3 +1,3 @@
 class GitTrim
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/git-trim.rb

@@ -8,9 +8,9 @@ class GitTrim
       protected_branches = File.read(".git-protected-branches").split("\n")
     end
     protected_branches ||= []
-    protected_branches << "master"
+    protected_branches << "main"
 
-    branches = %x{git branch --merged master}.split("\n").collect {|b| b.gsub('*', '').strip}
+    branches = %x{git branch --merged main}.split("\n").collect {|b| b.gsub('*', '').strip}
     branches -= protected_branches
 
     branches.each do |branch|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-trim
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christopher Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A script to remove all merged branches that aren't protected.