git_commands 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9273b6fcf3e6160c02ab5ace87657dc7cbea7e25
-  data.tar.gz: dc7c1131ede3796899f45e7832880816215dc6a3
+  metadata.gz: 4ad33ca845ac648e2761f3db92d014af3f6ace5d
+  data.tar.gz: 6ee733b4cd530e14eb84b5a8e06bcadbdb7f477d
 SHA512:
-  metadata.gz: 6fb9e1376c354ea33113914a22775d9816ed133f905ca790cafbe890a5a6a60b0d09ccf293df7317cb6cd3043f4a6795fa26a3a0a4205ad11db16569958c3a26
-  data.tar.gz: 08d54209eedec2ed4beb5331382f54cf8f8cb5890326059302854c81af0d5135c5962f64550b97fb32fbb32735f2676f2bf47bb4007ead9adc892663e0b666cc
+  metadata.gz: 12627a0f046695c1e314c965134ec00c00ffa143317e43a0839fccc1f9fffac08ed3b65b34f952765c3fb2e25328ab7856e73d79dab324d6290630967a05a223
+  data.tar.gz: bf319f1c824ffa149dda539385b81b1a8f2ed8ab969733d2e56fca6f15ffd22884acc46a1cd231c6def4b3b440c345a7a68ccc8ffb8117e0fdbc0dd92d843148

data/lib/git_commands/computer.rb

@@ -81,13 +81,6 @@ module GitCommands
       `git pull`
     end
 
-    private def rebase_with_master
-      `git rebase origin/#{Branch::MASTER}`
-      return true unless @repo.locked?
-      @repo.unlock
-      error("Got conflicts, aborting rebase!")
-    end
-
     private def rebase_with(branch = "#{Branch::ORIGIN}#{Branch::MASTER}")
       `git rebase #{branch}`
       return true unless @repo.locked?

data/lib/git_commands/repository.rb

@@ -19,27 +19,22 @@ module GitCommands
 
     def locked?
       LOCKING_FILES.any? do |name| 
-        File.exists?(@path.join(".git", name))
+        @path.join(".git", name).exist?
       end
     end
 
     def unlock
-      Dir.chdir(@path) do
+      Dir.chdir(self) do
         `git rebase --abort`
       end
     end
 
     private def valid?
-      return false unless exists?
-      work_tree?
-    end
-
-    private def exists?
-      File.directory?(@path)
+      @path.directory? && work_tree?
     end
 
     private def work_tree?
-      Dir.chdir(@path) do
+      Dir.chdir(self) do
         `git rev-parse --is-inside-work-tree 2> /dev/null`.strip == "true"
       end
     end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - costajob