Merge branch 'master' into add-merge-base

tarcinil · web-flow · commit 9aa902424c10 · 2018-08-24T18:04:20.000-05:00
diff --git a/.jrubyrc b/.jrubyrc
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,12 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+  - ruby-head
   - jruby
+
 matrix:
   allow_failures:
   - rvm: jruby
-  fast_finish: true
-before_install:
-  - gem install bundler
-  - bundle --version
-  - git --version
+  - rvm: ruby-head
+  fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.5.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.5.0
+
+## 1.4.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.4.0
+
 ## 1.3.0
 
  * Dropping Ruby 1.8.x support
diff --git a/VERSION b/VERSION
diff --git a/git.gemspec b/git.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
     'MAINTAINERS.md',
     'LICENSE',
     'README.md',
-    'VERSION',
     'lib/git.rb',
     'lib/git/author.rb',
     'lib/git/base.rb',
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -604,10 +604,12 @@ def stashes_all
       arr = []
       filename = File.join(@git_dir, 'logs/refs/stash')
       if File.exist?(filename)
-        File.open(filename).each_with_index { |line, i|
-          m = line.match(/:(.*)$/)
-          arr << [i, m[1].strip]
-        }
+        File.open(filename) do |f|
+          f.each_with_index do |line, i|
+            m = line.match(/:(.*)$/)
+            arr << [i, m[1].strip]
+          end
+        end
       end
       arr
     end
@@ -770,6 +772,7 @@ def push(remote, branch = 'master', opts = {})
 
       arr_opts = []
       arr_opts << '--mirror'  if opts[:mirror]
+      arr_opts << '--delete'  if opts[:delete]
       arr_opts << '--force'  if opts[:force] || opts[:f]
       arr_opts << remote
 
diff --git a/lib/git/stashes.rb b/lib/git/stashes.rb
@@ -13,6 +13,17 @@ def initialize(base)
         @stashes.unshift(Git::Stash.new(@base, message, true))
       end
     end
+
+    #
+    # Returns an multi-dimensional Array of elements that have been stash saved.
+    # Array is based on position and name. See Example
+    #
+    # @example Returns Array of items that have been stashed
+    #     .all - [0, "testing-stash-all"]]
+    # @return [Array]
+    def all
+      @base.lib.stashes_all
+    end
     
     def save(message)
       s = Git::Stash.new(@base, message)
diff --git a/lib/git/version.rb b/lib/git/version.rb
@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.4.0'
+  VERSION='1.5.0'
 end
diff --git a/tests/units/test_stashes.rb b/tests/units/test_stashes.rb
@@ -32,5 +32,27 @@ def test_stash_unstash
       end
     end
   end
+
+  def test_stashes_all
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'stash_test')
+      Dir.chdir('stash_test') do
+        assert_equal(0, g.branch.stashes.size)
+        new_file('test-file1', 'blahblahblah1')
+        new_file('test-file2', 'blahblahblah2')
+        assert(g.status.untracked.assoc('test-file1'))
+
+        g.add
+
+        assert(g.status.added.assoc('test-file1'))
+
+        g.branch.stashes.save('testing-stash-all')
+
+        stashes = g.branch.stashes.all
+
+        assert(stashes[0].include?('testing-stash-all'))
+      end
+    end
+  end
   
 end
