master_to_main 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e3451ce977f600d84510976915b39c28d18a68596b2a9118731fde10d9d4d9
-  data.tar.gz: 9b73f2ec8d863bf86fa4b763f07fddd662676a351f17c5d845767c61bca05a6c
+  metadata.gz: 6a64928607b005c31d0d4ad4e01994c12733d5744bd75d72fcf9e3d58279be81
+  data.tar.gz: 2b72700b70c3d2f07ca291e3b18e0d147fbf1e4ae5636ba124af0d522bed8db1
 SHA512:
-  metadata.gz: 34ef7eab028716de82af81e41154ea9e4a0cc963c720c84d9aae6e2118391357e411e6c796d12c8fbce514ada5d145f18575fe0f79c5b76c108a12e60c98453a
-  data.tar.gz: bffc48a13f395255bc403bb8c0270007bd997edd2afd2dede41668bf86387fe7166edd29021785789526b6ba43ff4ed7d5bba1c60fc9ea4b1493900bb3a95e78
+  metadata.gz: 76c82db75d6c0157219f6700bebdf6b81d48e3a0954da7ebde4e31c051282e463935e4d3c377a37dc2424ffd909a5e7757c1e106256ec4bf8bce87da1e229a46
+  data.tar.gz: 6af1841e036951b0f8a2f8ed37e4477d7f8d9ffda9b99a93b121de43e215a32567f36488256f2d6696ca183ffac142278e59e7842817724fecc7330c1e3c29fd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
 # 0.0.1 - 2020-06-17
 
-Initiale release for testing
+Fix checkout of local branch, add local master branch deletion
+
+# 0.0.1 - 2020-06-17
+
+Initial release for testing

data/lib/master_to_main/cli.rb

@@ -11,14 +11,15 @@ module MasterToMain
     def github
 
       prompt_info
-
       create_client
+
       ensure_old_branch_exists
       ensure_new_branch_exists
       clone_branch_protections
       change_default_branch
       rebase_pull_requests
       change_origin
+      delete_local_old_branch
     end
 
     desc "update_local", "point local clone to new branch"
@@ -140,11 +141,20 @@ module MasterToMain
 
       def change_origin
         if yes?("Would you like to change origin to point to #{@repo.new_branch}?")
-          `git push -u origin master`
+          `git checkout #{@repo.new_branch}`
+          `git push -u origin #{@repo.new_branch}`
         else
           say "Be sure to change your local `origin` setting"
         end
       end
+
+      def delete_local_old_branch
+        `git branch -D #{@repo.old_branch}` if yes?("Would you like to delete your local #{@repo.old_branch} branch?")
+
+        say "----------------"
+        say "In order to ensure no builds or deployments break, please delete your remote #{@repo.old_branch} on github", :green
+        say "----------------"
+      end
     end
   end
 end

data/lib/master_to_main/version.rb

@@ -1,3 +1,3 @@
 module MasterToMain
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_to_main
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John DeWyze