git_commands 3.3.7 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b9df5d09769634c3dc383e862a2a0f6effe9141
-  data.tar.gz: 2e903481e8ad0a0a7efa12ccc018f55158d418eb
+  metadata.gz: c4e5ee0c7fb792943323a8df9f026e46ed043c2e
+  data.tar.gz: a1d6e9c1709de3a742c9c20aa22cfbd6bdc86290
 SHA512:
-  metadata.gz: 7430f5fcd09df1229cbc6dab10631e54a37cd6209df1a529910a18f89932ad62647ce07639932cc31633e576f10258f6372e192972381de8b6449ba69ee09aa9
-  data.tar.gz: 02a8e71e2f28e97f92eec396a25394e49afa2a156983f7ce5c595de98e2c7868f43ce9bb45eaa8945077e959d592f27dbcb2abeae9862811bcdb6acb0081bc46
+  metadata.gz: 725df66a77dd900e4f2c2aa5543c1e25ffc24d62cc332bc9e8fb7d7d29123f0eac821a57b8912d56c039eebcc1135f3ae1187531cddcfeb10c8f204e87854d53
+  data.tar.gz: 2b3162474ae63758828d6c1e9dc071c813a92565200e7a69d91c4808507718f11b62a05ab6598da26035e7c4fc95c3c6db38e6724f2d2c5ffda8b9a899836042

data/README.md

@@ -51,6 +51,7 @@ rebase --help
 Usage: rebase --repo=/Users/Elvis/greatest_hits --branches=feature/love_me_tender,fetaure/teddybear
     -r, --repo=REPO                  The path to the existing GIT repository
     -b, --branches=BRANCHES          Specify branches as: 1. a comma-separated list of names 2. the path to a file containing names on each line 3. via pattern matching
+    -t, --target=TARGET              Specify the target branch, default to master
     -h, --help                       Prints this help
 ```
 
@@ -147,7 +148,7 @@ Successfully loaded 1 branch:
 Here are the available GIT commands:
 
 #### Rebase
-This command is useful in case you have several branches to rebase with _origin/master_ frequently.
+This command is useful in case you have several branches to rebase with _origin/master_ (or another specified target) frequently.
 A confirmation is asked to before rebasing.  
 
 ```
@@ -155,6 +156,19 @@ rebase --repo=/Users/Elvis/greatest_hits --branches=feature/love_me_tender,featu
 ...
 ```
 
+##### Target branch
+The rebasing runs considering master branch as the target one.  
+In case you need to rebase against a different target branch you can specify it:
+```
+rebase --repo=/Users/Elvis/greatest_hits --target=rc/release_to_graceland --branches=feature/love_me_tender
+
+Loading branches file...
+Successfully loaded 1 branch:
+01. feature/love_me_tender
+
+Proceed rebasing these branches with rc/release_to_graceland (Y/N)?
+```
+
 #### Remove
 This command remove the specified branches locally and remotely.  
 A confirmation is asked before removal.  

data/lib/git_commands/cli.rb

@@ -20,13 +20,17 @@ module GitCommands
 
     def call
       parser.parse!(@args)
-      computer = @computer_klass.new(repo: @repo, branches: @branches)
+      computer = @computer_klass.new(repo: @repo, branches: @branches, target: target)
       computer.send(@command_name)
     rescue Repository::PathError, Computer::GitError, AbortError, Repository::InvalidError => e
       error(e.message)  
       exit
     end
 
+    private def target
+      @target || Branch::MASTER
+    end
+
     private def check_command_name(name)
       return name if VALID_COMMANDS.include?(name)
       fail UnknownCommandError, "#{name} is not a supported command"
@@ -44,6 +48,10 @@ module GitCommands
           @branches = branches
         end
 
+        opts.on("-tTARGET", "--target=TARGET", "Specify the target branch, default to master") do |target|
+          @target = target
+        end
+
         opts.on("-h", "--help", "Prints this help") do
           @out.puts opts
           exit

data/lib/git_commands/computer.rb

@@ -9,10 +9,12 @@ module GitCommands
     class GitError < StandardError; end
 
     attr_reader :out
+    attr_accessor :target
 
-    def initialize(repo:, branches:, repo_klass: Repository, branch_klass: Branch, out: STDOUT)
+    def initialize(repo:, branches:, target: Branch::MASTER, repo_klass: Repository, branch_klass: Branch, out: STDOUT)
       @out = out
       @repo = repo_klass.new(repo)
+      @target = target
       Dir.chdir(@repo) do
         @branches = branch_klass.factory(branches)
         @timestamp = Time.new.strftime("%Y-%m-%d")
@@ -33,7 +35,7 @@ module GitCommands
     end
 
     def rebase
-      confirm("Proceed rebasing these branches with master") do
+      confirm("Proceed rebasing these branches with #{@target}") do
         enter_repo do
           @branches.each do |branch|
             warning("Rebasing branch: #{branch}")
@@ -76,12 +78,12 @@ module GitCommands
       @out.puts @branches.each_with_index.map { |branch, i| "#{(i+1).to_s.rjust(2, "0")}. #{branch}" } + [""]
     end
 
-    private def pull_master
-      `git checkout #{Branch::MASTER}`
+    private def align
+      `git checkout #{@target}`
       `git pull`
     end
 
-    private def rebase_with(branch = "#{Branch::ORIGIN}#{Branch::MASTER}")
+    private def rebase_with(branch = "#{Branch::ORIGIN}#{@target}")
       `git rebase #{branch}`
       return true unless @repo.locked?
       @repo.unlock
@@ -90,13 +92,13 @@ module GitCommands
 
     private def enter_repo
       Dir.chdir(@repo) do
-        pull_master
+        align
         yield
       end
     end
 
     private def remove_locals(branches = @branches)
-      `git checkout #{Branch::MASTER}`
+      `git checkout #{@target}`
       branches.each do |branch|
         `git branch -D #{branch}`
       end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.3.7"
+  VERSION = "3.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.0
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Utility library to rebase and aggregate your project branches