master_to_main 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d7234fe688a9cb73ee0f4bf9de42557a08cd624fb55ebcc58d7d7dce01ad39
-  data.tar.gz: bb95dc6da0715587d1e4b261264af6622ecdf033d4d2060575367c4d43703422
+  metadata.gz: ceb01120a7bf45cda06d052fad7981953dff2e229591b233e5194bd009691fe5
+  data.tar.gz: d3596aada72baf60721a28784837ac82b6de77f4b24c936448336aea30654477
 SHA512:
-  metadata.gz: 3249fc202c04c40b2cc42bca971c7361af721888274422da55a79f9bef4d2732573609cea26c7e102a138464320c18fd8f806324585801bc7f503f2e533c219a
-  data.tar.gz: 44b8bb73c65c95b8e3d6bcf51e869f08a9d9596721753d64ef0f2e56b5b88eaa0f4a9dd8f2731c25b32c786dd119e8ec4dd0c1980f44b015468671f5039d0762
+  metadata.gz: 859e90c468edf7217a9d573d870a3859013e65a7c3a9f2ab1462df42b366c099b6795a16a468406fbd680920bbaa4a91c2e75db0cad31235c7755f008edbc7ad
+  data.tar.gz: 18bc616948989e6a3a185ed7f410b11ad21a105c2746bf184f7685e59ca8a0185020ac5e08e134e81e1e549a6524652b76c4b7384858cab604acefeff0e801fb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.5 - 2020-06-19
+
+- Add `find_references` for finding non doc references
+- Provide better explanation that you are updating docs only
+- Rescue from branch protection errors like in personal private repos
+
 # 0.0.4 - 2020-06-18
 
 - Change `github` to `update`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    master_to_main (0.1.0)
+    master_to_main (0.0.5)
       octokit (~> 4.0)
       thor (~> 1.0.1)
 
@@ -41,7 +41,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.0)
   master_to_main!
   rake (~> 13.0)
   rspec (~> 3.0)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -6,9 +6,9 @@ enterprise to a new branch. For example, if you wanted to change `master` to
 
 While `master` does have meanings that connote expertise or original record, it also
 has meanings that have much more oppressive and violent histories. Whether or not the
-original meaning of `master` branch was in reference to original record or slave
-matters less than what it may mean to a reader who doesn't want to bother with the
-history of git.
+original meaning of `master` branch was in reference to original record or the opposite
+of slave matters less than what it may mean to a reader who doesn't want to bother with
+the history of git.
 
 Per the twitter thread below, maybe we can just think of it as:
 

data/lib/master_to_main/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "pry"
 require "octokit"
 
 module MasterToMain
@@ -22,12 +23,19 @@ module MasterToMain
       change_origin
       delete_local_old_branch
       ask_update_docs
+      ask_find_references
     end
 
-    desc "update_docs", "update local docs to use master"
+    desc "update_docs", "update local docs to use MAIN"
     def update_docs
       prompt_info
-      gsub_docs
+      _update_docs
+    end
+
+    desc "find_references", "find references to github urls with MAIN"
+    def find_references
+      prompt_info
+      _find_references
     end
 
     desc "update_local", "point local clone to new branch"
@@ -124,7 +132,12 @@ module MasterToMain
       end
 
       def clone_branch_protections
-        options = @client.branch_protection(@repo.name, @repo.old_branch)
+        begin
+          repo = @client.repo(@repo.name)
+          options = @client.branch_protection(@repo.name, @repo.old_branch)
+        rescue Octokit::Forbidden
+          return
+        end
 
         if options && yes?("Would you like to clone branch protections from '#{@repo.old_branch}'?")
           updates =  BranchProtectionParams.build(options.to_h)
@@ -169,18 +182,32 @@ module MasterToMain
       end
 
       def ask_update_docs
-        if yes?("Would you like to update commit and branch references in your repo?")
-          gsub_docs
+        say("We can update #{@repo.github} references in '.md' files that include master in your repo")
+        say("For example: https://#{@repo.github}/#{@repo.name}/(tree|blob)/master")
+        if yes?("Would you like to update these references?")
+          _update_docs
+          say("You should consider searching for other references not in markdown files.")
+          say("We don't want to automatically change those in case something breaks.")
+          say("But you can use `master_to_main find_references` to show you where they are")
         end
       end
 
-      def gsub_docs
+      def ask_find_references
+        _find_references if yes?("Would you like to display other URL references?")
+      end
+
+      def _update_docs
         say "This will update all references of #{@repo.old_branch} to #{@repo.new_branch} in the following lines in this repo:"
         say "https://#{@repo.github}/#{@repo.name}/<tree|blob>/#{@repo.old_branch}"
         Dir.glob(File.expand_path("**/*.md", Dir.pwd)).each do |path|
-          gsub_file path, @repo.old_branch_regex, @repo.new_branch_replacement, verbose: false
+          gsub_file path, /#{@repo.old_branch_regex}/, @repo.new_branch_replacement, verbose: false
         end
       end
+
+      def _find_references
+        say "Here are the references to urls with #{@repo.old_branch}:\n\n"
+        puts `git grep -E '#{@repo.old_branch_regex}'`
+      end
     end
   end
 end

data/lib/master_to_main/repo.rb

@@ -19,15 +19,19 @@ module MasterToMain
     end
 
     def old_branch_regex
-      /https:\/\/#{github}\/#{user}\/#{repo_name}\/(tree|blob)\/#{old_branch}/
+      "(http[s]?:\/\/#{github}\/#{user}\/#{repo_name}\)/(tree|blob)\/#{old_branch}"
     end
 
     def new_branch_replacement
-      "https://#{github}/#{user}/#{repo_name}/\\1/#{new_branch}"
+      "\\1/\\2/#{new_branch}"
     end
 
     def new_branch_url
       "https://#{github}/#{name}/tree/#{new_branch}"
     end
+
+    def public_github?
+      @github == "github.com"
+    end
   end
 end

data/lib/master_to_main/version.rb

@@ -1,3 +1,3 @@
 module MasterToMain
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/master_to_main.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_to_main
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John DeWyze
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement