yodel_admin 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
@@ -52,7 +52,7 @@ class AdminSyncPage < Page
|
|
52
52
|
private
|
53
53
|
def commit
|
54
54
|
Dir.chdir(site.root_directory.to_s) do
|
55
|
-
status = `#{Yodel.config.git_path} status -z`.split("\0").collect(&:strip)
|
55
|
+
status = `#{Yodel.config.git_path} status --porcelain -z`.split("\0").collect(&:strip)
|
56
56
|
status.each do |change|
|
57
57
|
state, file = change.split
|
58
58
|
`#{Yodel.config.git_path} add #{file}` if state == '??' || state.include?('U')
|
@@ -70,7 +70,7 @@ class AdminSyncPage < Page
|
|
70
70
|
|
71
71
|
Dir.chdir(site.root_directory.to_s) do
|
72
72
|
`#{Yodel.config.git_path} pull #{REMOTE_NAME} master`
|
73
|
-
status = `#{Yodel.config.git_path} status -z`.split("\0").collect(&:strip)
|
73
|
+
status = `#{Yodel.config.git_path} status --porcelain -z`.split("\0").collect(&:strip)
|
74
74
|
status.each do |change|
|
75
75
|
state, file = change.split
|
76
76
|
conflicts << file if state.include?('U')
|
data/lib/yodel_admin.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: yodel_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-12-
|
12
|
+
date: 2011-12-12 00:00:00.000000000Z
|
13
13
|
dependencies: []
|
14
14
|
description: Yodel CMS Admin Extension
|
15
15
|
email:
|