git-maintain 0.2.2.pre.13.gd8c159e → 0.2.2.pre.16.g35a06ea

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7378594cddd98d880305ebeaffb40ab8e035d858902475e3338b3496023ce5e6
-  data.tar.gz: ee2afb10e4deb3288f7051d892e225bb9a70d96a232712945d48b799b209110c
+  metadata.gz: e9136bd1f9d90b86d3af7ca47cf635dd098ea9543d1e526b23b471161748f867
+  data.tar.gz: a5d820668e7ecbdba48ffec58f024a8dda0aebab1c0f7d82e269becae220dfbf
 SHA512:
-  metadata.gz: b917954dc36f6e9996c6b54753642e9cc6fbf62622b2998f4cb8e521d3e5c7f59abc6b9226846fd13b5bf024a55272ce4a9eb135b1b54a8cf106f5cf84491fae
-  data.tar.gz: a15089ca11769891cc645415af31f7ac0e41dbd13e8d908bbf7fc3d39a83b012a8f07e28a0afadb2552f105665bbf23f66feabc14007d145c2415a92e63f7876
+  metadata.gz: 8038e5a2939531e015e747e686674b75212b2ae7b04a6b656b20196982b276827425161b3182061a998e4727cb8615e8f65db3b7b54304013b32d1448f96d7dc
+  data.tar.gz: d8dc1a7b8ab0833bfecf127a0f2fef045c4dd97abc9dd45cc275bcf56720bc38625ba9799374a6e68a117278ed7725e5e0640a1a23a65e6b6f038b3196f36cef

data/lib/branch.rb

@@ -127,7 +127,7 @@ module GitMaintain
             @version       = version
             @branch_suff   = branch_suff
 
-            if version =~ /^[0-9]$/
+            if version =~ /^[0-9]+$/
                 @local_branch  = "dev/stable-v#{@version}/#{@branch_suff}"
                 @remote_branch ="stable-v#{@version}"
             else
@@ -135,7 +135,7 @@ module GitMaintain
             end
 
             @head          = @repo.runGit("rev-parse #{@local_branch}")
-            @remote_ref    = "#{Repo::STABLE_REPO}/#{@remote_branch}"
+            @remote_ref    = "#{@repo.getStableRepo()}/#{@remote_branch}"
             @stable_head   = @repo.runGit("rev-parse #{@remote_ref}")
             @stable_base   = @repo.findStableBase(@local_branch)
 
@@ -143,7 +143,7 @@ module GitMaintain
         attr_reader :version, :local_branch, :head, :remote_branch, :remote_ref, :stable_head
 
         def is_targetted?(opts)
-            return true if @version !~ /^[0-9]$/
+            return true if @version !~ /^[0-9]+$/
             if @version.to_i < opts[:base_ver] then
                 return :too_old
             end
@@ -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::VALID_REPO} #{@local_branch}")
+           @repo.runGit("push #{opts[:push_force] == true ? "-f" : ""} #{@repo.getValidRepo()} #{@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::STABLE_REPO} #{@local_branch}:#{@remote_branch}")
+                @repo.runGit("push #{@repo.getStableRepo()} #{@local_branch}:#{@remote_branch}")
             else
                 puts "Skipping push to stable"
                 return

data/lib/repo.rb

@@ -1,8 +1,8 @@
 module GitMaintain
     class Repo
-        VALID_REPO = "github"
-        STABLE_REPO = "stable"
-        SUBMIT_BINARY="git-release"
+        @@VALID_REPO = "github"
+        @@STABLE_REPO = "stable"
+        @@SUBMIT_BINARY="git-release"
 
         ACTION_LIST = [
             :list_branches,
@@ -36,6 +36,13 @@ 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)
 
@@ -47,9 +54,9 @@ module GitMaintain
             if path == nil
                 @path = Dir.pwd()
             end
-            @remote_valid=runGit("remote -v | egrep '^#{VALID_REPO}' | grep fetch |
+            @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\.' | "+
@@ -86,7 +93,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
@@ -111,7 +118,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.13.gd8c159e
+  version: 0.2.2.pre.16.g35a06ea
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin