ghpages_deploy 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ghpages_deploy/git_manager.rb +4 -0
  3. data/lib/ghpages_deploy/version.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b35f38b0196a50b325f381543805ebfbc1f38f47
4
- data.tar.gz: 36ebb1d01aafc3691e93828776b3d625862812dd
3
+ metadata.gz: 59ac136640fdcc0432608421513d74cb75d17262
4
+ data.tar.gz: df337b6b4cf6607a8a5f69c8fdb256418575193d
5
5
  SHA512:
6
- metadata.gz: d4974b458cf20f06c0c5a164a829efea888d26f8b8dcb3a81a8a29904cb114e0fab3caa0099a43b43a7cfc0fa8d59874c1c0f48e24db8143be18845b4fd7f52a
7
- data.tar.gz: 0d9bc46ee6d830106c063662271cf40e1d59649905ad6820b9576595e0e16a833f1dcc9d465f889103eeb0882ff7ac14853477c6cdd424132f835dd88dfeee09
6
+ metadata.gz: 9878ee14bfc7d0364948636c822379ab1c1b34a02468ab478f4659912c7bdeb548fd4ad9fc24e730c2f7ad5e60bd89b3aa86f959be9cd3c7f346fe15659e2bb3
7
+ data.tar.gz: 7135d4bc20cbfa153d8deba5bc2d19769e3eb3f14158b4a464a220cd20117f47950847ee33e4c3d458b5eb253d6192ebbacfd7eae154afe3beef7df39d236024
data/lib/ghpages_deploy/git_manager.rb CHANGED
@@ -88,6 +88,10 @@ module GithubPages
88
88
 
89
89
  # remove files already staged by checkout
90
90
  @git.remove staged_modifications('.')
91
+
92
+ if @git.is_remote_branch?(branch)
93
+ @git.pull(remote, branch)
94
+ end
91
95
  end
92
96
 
93
97
  def setup_credentials
data/lib/ghpages_deploy/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
  # Copyright (c) 2016 Nathan Currier
3
3
 
4
4
  module GithubPages
5
- VERSION = '1.1.0'.freeze
5
+ VERSION = '1.1.1'.freeze
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ghpages_deploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Currier