middlesite 0.1.2 → 0.1.3

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.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MzJkZDNkMWYxZDIzZDI3ZjJjNTRkMWNjMjRlOGQ5NDVjNDE4ZTM1NQ==
4
+ YjMxOTU0NDVhNjE3ZDlhODJjZThkZTgwZmUwNTgxMzc5YTQyYTQ2Yg==
5
5
  data.tar.gz: !binary |-
6
- N2UwYzhjYTZkNzFkY2VmOWNjMWY2NThiMDMxNmQ3ZTQwZGYzMDkwYw==
6
+ Mjc3OTM5ODFkZjZkMTBkZmRjYTM1ODhlZGQxMzI3YTgzM2UyNDU2ZA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- M2VkNDVmMTY3M2U5NmQzZmM2ZjhmYWRhNDY4YTcxYjE1YWIyOTc5NjRmN2U4
10
- ZGVjMDQyNzE1MGUwNzBmZjFhOGExZGJhODU5YmNhMjg1ODY3Y2RlOWQ1OWJi
11
- MTJiMDlhMzNjMjczNDUwMzBjZTZjYjRiMWNiMzdiNjEzZDI4ZWM=
9
+ YTk1ZmUzNWI0NjJkMTExNjhhOWYwODkwNGYzMzJlZDgyZmFjMGFmNmNjNzBm
10
+ Y2M4ZDM5MjIzNzc0NjYwOWM2NTBjZDkyYmExNzllN2JlNzVjMWMzNDQ1YjU1
11
+ Yzg2ZjY1OWJlYzRhMWE1OTkyMGNhZWE2ZGJjMjczZmQzODZiNDk=
12
12
  data.tar.gz: !binary |-
13
- YTQ0OGJiMzVlZTZlYTE5MTk5MDBlMGYyNWJhMTEyYjhmMjk4ODI0MGJlNjhi
14
- YjRhMmYxZTMxMGMwMGRiNzJjZmU4NDEyNmUyYTA0MWY4MzY5ZjI4NWRmNGJk
15
- OTc4Njk2YWYzYjM0YmQ2MGQ3OGE4OTgwNDdmNTE1MjlkMGUzYzg=
13
+ MjllOWIxYzM4N2ZiZTM5NWJmZWY5Mzk2YmQ3YjFjOTRhMTNlMmNkMTU0ZjQ1
14
+ NGQ3NTBiNzU2OWU0M2RmMzAzOTAwMWE3MGY0MGQyM2E5ZDk3NjViMGYwODVm
15
+ YWU3OTk5MDhiNjE5ZGMyYzc0MTg4ODFiNDVhNjdhNWQ4YzJkNDU=
data/README.md CHANGED
@@ -1,5 +1,7 @@
1
1
  # middlesite
2
2
 
3
+ [![Gem Version](https://badge.fury.io/rb/middlesite.png)](http://badge.fury.io/rb/middlesite)
4
+
3
5
  > Gem containing tasks to build, release and deploy your Middleman site.
4
6
 
5
7
  ## Installation
@@ -41,6 +41,11 @@ module Middlesite
41
41
  g = ::Git.open(".")
42
42
  raise Thor::Error, "Uncommitted git changes!" unless g.status.changed.empty?
43
43
 
44
+ # checking for remote changes
45
+ puts "Updating remote..."
46
+ system "git remote update"
47
+ raise Thor::Error, "Unmerged remote commits! Run: `git pull`!" unless g.gtree("HEAD..origin/master").log.first.nil?
48
+
44
49
  config = get_config()
45
50
  version = config["version"]
46
51
 
@@ -1,3 +1,3 @@
1
1
  module Middlesite
2
- VERSION = "0.1.2"
2
+ VERSION = "0.1.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middlesite
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - franklin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-18 00:00:00.000000000 Z
11
+ date: 2013-12-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: git