git_chain 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d10b1d1d8aeeb25f7e63ebd82f29259e06ab8c78c6d2b499954062abc9b2b90
-  data.tar.gz: c9d0787527d8a90c154a440f19bf626a0f91107ea0371197f9b56e44b1fa6602
+  metadata.gz: d85a7c86255d54f43461fb946ccdda25046436573311884057cc5152882d72c6
+  data.tar.gz: dc21fe06c6a067f91eca4aba3a53b716d22f6d5d4be3e019e083e15ff3457756
 SHA512:
-  metadata.gz: b3d68f79be20659a5967e5a49dd0c2e52fbe1dd63f399f4b45d421b9eb5dde9e8c1b6af607d8f52e8f312e6b06d4ce12b58837d316e5d5feb2ccf8cc669be3a2
-  data.tar.gz: e92ab72e1bb85bb1ebd44f3b0fc4bd7a9f0c6750efba20c1fe8cbe914390955a3f6c6c80c229d961176d1bebdd47ecedf497c99cff7f2afc8672d461ae6868a6
+  metadata.gz: 5b8b48b7b2f8a056f6b82784da379a7b5ae39ad185089aaa39b3b4e9f873aafb70bdd1b12e5c1982ed442a6c32458aafad5d3cd07ecce213a71c490a91a4e802
+  data.tar.gz: a2bcc8999be97eb6a81dbd20b83306d6b6b665e5282f97d658d21a4cc6f2870274a5abb471126aa05433b8998d6734794b033b14ceff7ff4ee896eb33fc43f82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_chain (0.1.0)
+    git_chain (0.1.1)
       git
 
 GEM

data/lib/git_chain/chain.rb

@@ -7,14 +7,10 @@ class GitChain::Chain < Struct.new(:storage, :git)
     storage.save_data
   end
 
-  def rebase(child, chain: false)
+  def rebase(child)
     raise "No chain for #{child}" unless record = storage.record_for(child)
     raise "Git Directory is not clean" unless git.clean?
 
-    if record[:parent] != 'master' && chain
-      rebase(record[:parent], chain: true)
-    end
-
     old_base = record[:base]
     parent   = record[:parent]
     branch   = git.branches[parent]
@@ -25,6 +21,21 @@ class GitChain::Chain < Struct.new(:storage, :git)
     update_dependent(child: child, parent: parent, base: new_base.sha)
   end
 
+  def rebase_all(child)
+    raise "Git Directory is not clean" unless git.clean?
+    raise "No chain for #{child}" unless last_record = storage.record_for(child)
+
+    records = [last_record]
+    while new_record = storage.record_for(last_record[:parent])
+      records << new_record
+      last_record = new_record
+    end
+
+    records.reverse.each do |record|
+      rebase(record[:child])
+    end
+  end
+
   private
 
   def update_dependent(child:, parent:, base:)

data/lib/git_chain/runner.rb

@@ -18,10 +18,10 @@ class GitChain::Runner
         old_base: args[1]
       )
     when 'rebase'
-      if args[0] == 'all'
-        chain.rebase(git.current_branch, chain: true)
+      if args.first == 'all'
+        chain.rebase_all(git.current_branch)
       else
-        chain.rebase(git.current_branch, chain: false)
+        chain.rebase(git.current_branch)
       end
     else
       raise "Unknown Command: #{command}"

data/lib/git_chain/version.rb

@@ -1,3 +1,3 @@
 module GitChain
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_chain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan McGarvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git