octopress-deploy 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2449ee39c7334cbd9ea05551003abbef63598bbc
-  data.tar.gz: 4ce2f24702903c8bbee9330fd86d7f34de20c458
+  metadata.gz: 6479e61abefc814081c0a514ffd00a0295db9f0d
+  data.tar.gz: 433ace76c70c4461d91a1eb514523e9cdb9f57eb
 SHA512:
-  metadata.gz: 9822b96161764cf9025b16bc867b58a019e57e5be8779244724ffe856d8233e8618fae4d213786172b04d4d44a28b3abe91cea1d7f4968c3c0eede14b793fc47
-  data.tar.gz: efe936cd944132a11d04a96151f71762a47a3bbdd20901814024e863ba12245537a0fbfb733146ee9132a787f9285e991eb1eb5d9acfe7bcd404b1c1402d9d1e
+  metadata.gz: c199172a1401517d3c0dff85ce3368879f70b4ca506d60e851fd45baf22e3dd14590953f7533f96fa6b63210a5a886ba5343a5f59c5551f0a1e1fe849dba37ed
+  data.tar.gz: 384d08b0ace02b48ba8bf52e333dc5a4ebc3ca4e2a61f942f061c570a8d46ba5a3a1200479a5aec4f4a601eb9c1fbbced1c81c15efb98c9cf3a7b84f8472b184

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.2.5
+- Fix: Ensures that deployment git remote is the same as configuration before pushing.
+
 ### 1.2.4 - 2015-05-11
 - Fix: `--site` flag now accepts an option as it should.
 

data/lib/octopress-deploy/git.rb

@@ -111,7 +111,22 @@ CONFIG
       end
 
       def git_push
-        `git push #{@remote} #{@branch}`
+        if `git remote -v` =~ /#{@remote}\s+#{@repo}.+\(push\)/
+          `git push #{@remote} #{@branch}`
+        else
+          remotes = `git remote -v`
+          push_remote = remotes.match(/^origin\s+(.+)\s+\(push\)/)
+          if push_remote
+            abort %Q{Deployment remote #{@remote} is pointing to "#{push_remote[1]}" but configuration points to #{@remote}
+  To reset your deployment, run:
+  rm -rf #{@deploy_dir}
+  octopress deploy}
+          else
+            abort %Q{Deployment remote configured improperly. To reset your deployment run:
+  rm -rf #{@deploy_dir}
+  octopress deploy}
+          end
+        end
       end
 
       # Attempt to pull from the remote branch

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Easily deploy any Jekyll or Octopress site using S3, Git, or Rsync.