middlesite 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzJkZDNkMWYxZDIzZDI3ZjJjNTRkMWNjMjRlOGQ5NDVjNDE4ZTM1NQ==
+    YjMxOTU0NDVhNjE3ZDlhODJjZThkZTgwZmUwNTgxMzc5YTQyYTQ2Yg==
   data.tar.gz: !binary |-
-    N2UwYzhjYTZkNzFkY2VmOWNjMWY2NThiMDMxNmQ3ZTQwZGYzMDkwYw==
+    Mjc3OTM5ODFkZjZkMTBkZmRjYTM1ODhlZGQxMzI3YTgzM2UyNDU2ZA==
 SHA512:
   metadata.gz: !binary |-
-    M2VkNDVmMTY3M2U5NmQzZmM2ZjhmYWRhNDY4YTcxYjE1YWIyOTc5NjRmN2U4
-    ZGVjMDQyNzE1MGUwNzBmZjFhOGExZGJhODU5YmNhMjg1ODY3Y2RlOWQ1OWJi
-    MTJiMDlhMzNjMjczNDUwMzBjZTZjYjRiMWNiMzdiNjEzZDI4ZWM=
+    YTk1ZmUzNWI0NjJkMTExNjhhOWYwODkwNGYzMzJlZDgyZmFjMGFmNmNjNzBm
+    Y2M4ZDM5MjIzNzc0NjYwOWM2NTBjZDkyYmExNzllN2JlNzVjMWMzNDQ1YjU1
+    Yzg2ZjY1OWJlYzRhMWE1OTkyMGNhZWE2ZGJjMjczZmQzODZiNDk=
   data.tar.gz: !binary |-
-    YTQ0OGJiMzVlZTZlYTE5MTk5MDBlMGYyNWJhMTEyYjhmMjk4ODI0MGJlNjhi
-    YjRhMmYxZTMxMGMwMGRiNzJjZmU4NDEyNmUyYTA0MWY4MzY5ZjI4NWRmNGJk
-    OTc4Njk2YWYzYjM0YmQ2MGQ3OGE4OTgwNDdmNTE1MjlkMGUzYzg=
+    MjllOWIxYzM4N2ZiZTM5NWJmZWY5Mzk2YmQ3YjFjOTRhMTNlMmNkMTU0ZjQ1
+    NGQ3NTBiNzU2OWU0M2RmMzAzOTAwMWE3MGY0MGQyM2E5ZDk3NjViMGYwODVm
+    YWU3OTk5MDhiNjE5ZGMyYzc0MTg4ODFiNDVhNjdhNWQ4YzJkNDU=

data/README.md

@@ -1,5 +1,7 @@
 # middlesite
 
+[![Gem Version](https://badge.fury.io/rb/middlesite.png)](http://badge.fury.io/rb/middlesite)
+
 > Gem containing tasks to build, release and deploy your Middleman site.
 
 ## Installation

data/lib/middlesite/cli.rb

@@ -41,6 +41,11 @@ module Middlesite
       g = ::Git.open(".")
       raise Thor::Error, "Uncommitted git changes!" unless g.status.changed.empty?
 
+      # checking for remote changes
+      puts "Updating remote..."
+      system "git remote update"
+      raise Thor::Error, "Unmerged remote commits! Run: `git pull`!" unless g.gtree("HEAD..origin/master").log.first.nil?
+
       config = get_config()
       version = config["version"]
 

data/lib/middlesite/version.rb

@@ -1,3 +1,3 @@
 module Middlesite
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middlesite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - franklin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git