site_hook 0.6.1 → 0.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/site_hook/sender.rb +15 -21
- data/lib/site_hook/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2111c48199b164cebd109b5501f5d5917bc8ed52dadb5399948ea7b9cc7edbcf
|
4
|
+
data.tar.gz: 563f6850fbe028c6edbde43638b1094025d0f7e7acbc06825ce8505537ce4176
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6bed5baa92e5e6b4e29c190b5070c081e3d5b8a3ba921d2c912e9626c580b9b5ef99b788d5d0a3a7572ab0a33be223217bea0da5807940b080dad1430356a6f8
|
7
|
+
data.tar.gz: 6ecb4076048ad00fcc76b98a4425e818aa6a851e902315e0a8ade024b98e104525ae4e88d16a935804f7086ea323730101133c2fb6e6a7da61bf4729b7b33c77
|
data/lib/site_hook/sender.rb
CHANGED
@@ -11,7 +11,7 @@ module SiteHook
|
|
11
11
|
|
12
12
|
def do_grab_version
|
13
13
|
jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
|
14
|
-
log
|
14
|
+
log = Jekyll.instance_variable_get('@log')
|
15
15
|
begin
|
16
16
|
stdout_str, status = Open3.capture2({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "jekyll --version --source #{jekyll_source}")
|
17
17
|
log.info("Jekyll Version: #{stdout_str.chomp!}")
|
@@ -22,11 +22,11 @@ module SiteHook
|
|
22
22
|
end
|
23
23
|
|
24
24
|
def do_pull
|
25
|
-
fakelog
|
26
|
-
reallog
|
25
|
+
fakelog = SiteHook::HookLogger::FakeLog.new
|
26
|
+
reallog = SiteHook::HookLogger::GitLog.new(SiteHook.log_levels['git']).log
|
27
27
|
jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
|
28
|
-
build_dest
|
29
|
-
g
|
28
|
+
build_dest = Jekyll.instance_variable_get('@build_dest')
|
29
|
+
g = Git.open(jekyll_source, :log => fakelog)
|
30
30
|
g.pull
|
31
31
|
fakelog.entries.each do |level, entries|
|
32
32
|
entries.each { |entry| reallog.send("#{level}", entry) }
|
@@ -35,8 +35,8 @@ module SiteHook
|
|
35
35
|
|
36
36
|
def do_build
|
37
37
|
jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
|
38
|
-
build_dest
|
39
|
-
log
|
38
|
+
build_dest = Jekyll.instance_variable_get('@build_dest')
|
39
|
+
log = Jekyll.instance_variable_get('@log')
|
40
40
|
Open3.popen2e({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "bundle exec jekyll build --source #{Pathname(jekyll_source).realdirpath.to_path} --destination #{Pathname(build_dest).to_path}") { |in_io, outerr_io, thr|
|
41
41
|
pid = thr.pid
|
42
42
|
|
@@ -76,19 +76,15 @@ module SiteHook
|
|
76
76
|
# @param [BuildLog] logger Build Logger Instance
|
77
77
|
def self.build(jekyll_source, build_dest, logger)
|
78
78
|
@jekyll_source = jekyll_source
|
79
|
-
@build_dest
|
80
|
-
@log
|
81
|
-
instance
|
82
|
-
meths
|
83
|
-
@thrs = []
|
79
|
+
@build_dest = build_dest
|
80
|
+
@log = logger
|
81
|
+
instance = self::Build.new
|
82
|
+
meths = instance.methods.select { |x| x =~ /^do_/ }
|
84
83
|
begin
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
@log.debug("Ran #{m}")
|
90
|
-
end
|
91
|
-
Thread.exit
|
84
|
+
meths.each do |m|
|
85
|
+
@log.debug("Running #{m}")
|
86
|
+
instance.method(m).call
|
87
|
+
@log.debug("Ran #{m}")
|
92
88
|
end
|
93
89
|
return {message: 'success', status: 0}
|
94
90
|
rescue TypeError => e
|
@@ -97,9 +93,7 @@ module SiteHook
|
|
97
93
|
return {message: "#{e}", status: -2}
|
98
94
|
rescue ArgumentError => e
|
99
95
|
return {message: "#{e}", status: -3}
|
100
|
-
|
101
96
|
end
|
102
|
-
|
103
97
|
end
|
104
98
|
end
|
105
99
|
end
|
data/lib/site_hook/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: site_hook
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ken Spencer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-06-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sinatra
|