git-maintain 0.2.2.pre.17.g20dc612 → 0.2.2.pre.20.g5532fb0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240b6bd240fc20b4e3341f843f06c45fd55f03140498e5bffb8cbeebebbb6256
-  data.tar.gz: c2e6cd3928921c2b85fad72a5b82e22184cb2cc8d0b731056d5ae9dd473bc4f3
+  metadata.gz: 544badee7e7e98d99bce948243a45eec5ad001d18e68d827188c171d7bd138b5
+  data.tar.gz: e878c8f846377d1abc3778bbff1c55410dae0de8b841d7402a6567c94566525f
 SHA512:
-  metadata.gz: ed2bf140560ceec97931c80a866c4feea698081a4769922c28a48915c88ecfdb20a2626b962d50d9ee53b931358b1008ba9d976698a58966c42d4077d0c57059
-  data.tar.gz: 75116df9f34d345dad6e894c3dddecf791c32a4d68cd3309050c40e6240290459a1420ad29211ec9a54b72e7b10f86591ab30f59bc3427e09b6ee18327bda3e2
+  metadata.gz: 6b17ac2069b9c7c193f94ae7a72649693adf2cb661db65788373d59be1d46de0cdcc5cbccca67a9e99dcc4e6512168419020335c1a41c3c2c9b97d2f9606721b
+  data.tar.gz: b719766f18390b104953db995c8a6a0278a8a47d735ce728d3f60ee3dc6f6224dd626daefa10c3ab22b769aeffc43acd2baaeac5ed8800f7b84dee12b262fd2a

data/README.md

@@ -27,9 +27,11 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 - Load git-maintain-completion.sh for shell completion
 
 ## Remote setup
-- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo
+- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo.
+  Also know as the 'Validation' repo. It can be switched to another remote by setting maintain.valid-repo=xxx in your gitconfig
 - the 'origin' remote should be the official repo in read-only mode to avoid any accidental pushes
 - the 'stable' remote should be the official repo in RW mode
+  Also know as the 'Stable' repo. It can be switched to another remote by setting maintain.stable-repo=xxx in your gitconfig
 
 ## Stealing commits
 

data/lib/branch.rb

@@ -135,7 +135,7 @@ module GitMaintain
             end
 
             @head          = @repo.runGit("rev-parse #{@local_branch}")
-            @remote_ref    = "#{@repo.getStableRepo()}/#{@remote_branch}"
+            @remote_ref    = "#{@repo.stable_repo}/#{@remote_branch}"
             @stable_head   = @repo.runGit("rev-parse #{@remote_ref}")
             @stable_base   = @repo.findStableBase(@local_branch)
 
@@ -202,7 +202,7 @@ module GitMaintain
 
         # Push the branch to the validation repo
         def push(opts)
-           @repo.runGit("push #{opts[:push_force] == true ? "-f" : ""} #{@repo.getValidRepo()} #{@local_branch}")
+           @repo.runGit("push #{opts[:push_force] == true ? "-f" : ""} #{@repo.valid_repo} #{@local_branch}")
         end
 
         # Monitor the build status on Travis
@@ -237,7 +237,7 @@ module GitMaintain
             end
             rep = GitMaintain::checkLog(opts, @local_branch, @remote_ref, "submit")
             if rep == "y" then
-                @repo.runGit("push #{@repo.getStableRepo()} #{@local_branch}:#{@remote_branch}")
+                @repo.runGit("push #{@repo.stable_repo} #{@local_branch}:#{@remote_branch}")
             else
                 puts "Skipping push to stable"
                 return

data/lib/repo.rb

@@ -36,13 +36,6 @@ module GitMaintain
             repo.send(action, opts)
         end
 
-        def getValidRepo()
-            return @@VALID_REPO
-        end
-        def getStableRepo()
-            return @@STABLE_REPO
-        end
-
         def initialize(path=nil)
             GitMaintain::checkDirectConstructor(self.class)
 
@@ -54,9 +47,15 @@ module GitMaintain
             if path == nil
                 @path = Dir.pwd()
             end
-            @remote_valid=runGit("remote -v | egrep '^#{@@VALID_REPO}' | grep fetch |
+
+            @valid_repo = runGit("config maintain.valid-repo 2> /dev/null").chomp()
+            @valid_repo = @@VALID_REPO if @valid_repo == ""
+            @stable_repo = runGit("config maintain.stable-repo 2>/dev/null").chomp()
+            @stable_repo = @@STABLE_REPO if @stable_repo == ""
+
+            @remote_valid=runGit("remote -v | egrep '^#{@valid_repo}' | grep fetch |
                                 awk '{ print $2}' | sed -e 's/.*://' -e 's/\.git//'")
-            @remote_stable=runGit("remote -v | egrep '^#{@@STABLE_REPO}' | grep fetch |
+            @remote_stable=runGit("remote -v | egrep '^#{@stable_repo}' | grep fetch |
                                       awk '{ print $2}' | sed -e 's/.*://' -e 's/\.git//'")
             @stable_base_patterns=
                 runGit("config --get-regexp   stable-base | egrep '^stable-base\.' | "+
@@ -66,7 +65,7 @@ module GitMaintain
                 m
                 }
         end
-        attr_reader :path, :remote_valid, :remote_stable
+        attr_reader :path, :remote_valid, :remote_stable, :valid_repo, :stable_repo
 
         def run(cmd)
             return `cd #{@path} && #{cmd}`
@@ -93,7 +92,7 @@ module GitMaintain
 
         def stableUpdate()
             puts "# Fetching stable updates..."
-            runGit("fetch #{@@STABLE_REPO}")
+            runGit("fetch #{@stable_repo}")
         end
         def getStableList(br_suff)
             return @stable_list if @stable_list != nil
@@ -118,7 +117,7 @@ module GitMaintain
         end
 
         def submitReleases(opts)
-            remote_tags=runGit("ls-remote --tags #{@@STABLE_REPO} |
+            remote_tags=runGit("ls-remote --tags #{@stable_repo} |
                                  egrep 'refs/tags/v[0-9.]*$'").split("\n").map(){
                 |x| x.gsub(/.*refs\/tags\//, '')
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre.17.g20dc612
+  version: 0.2.2.pre.20.g5532fb0
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin