slideshow 1.2.0 → 1.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +2 -2
- data/config/slideshow.yml +2 -1
- data/lib/slideshow/cli/runner.rb +23 -2
- data/lib/slideshow/config.rb +11 -1
- data/lib/slideshow/version.rb +1 -1
- metadata +12 -12
data/Rakefile
CHANGED
@@ -13,9 +13,9 @@ Hoe.spec 'slideshow' do
|
|
13
13
|
self.email = 'webslideshow@googlegroups.com'
|
14
14
|
|
15
15
|
self.extra_deps = [
|
16
|
-
['
|
16
|
+
['props','>= 1.0.0'],
|
17
|
+
['markdown','>= 1.0.0'],
|
17
18
|
['textutils','>= 0.2.0'],
|
18
|
-
['props','>= 0.2.0'],
|
19
19
|
['pakman','>= 0.4.0'],
|
20
20
|
['activesupport', '>= 3.2.6'],
|
21
21
|
['RedCloth','>= 4.2.9']
|
data/config/slideshow.yml
CHANGED
@@ -95,4 +95,5 @@ fetch:
|
|
95
95
|
quick:
|
96
96
|
slidy: https://raw.github.com/geraldb/slideshow-slidy/master/slidy.txt.quick
|
97
97
|
deck.js: https://raw.github.com/geraldb/slideshow-deck.js/master/deck.js.txt.quick
|
98
|
-
impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt.quick
|
98
|
+
impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt.quick
|
99
|
+
csss: https://raw.github.com/geraldb/slideshow-csss/master/csss.txt.quick
|
data/lib/slideshow/cli/runner.rb
CHANGED
@@ -145,17 +145,28 @@ EOS
|
|
145
145
|
|
146
146
|
#{Slideshow.generator}
|
147
147
|
|
148
|
-
Gems
|
148
|
+
Gems versions:
|
149
149
|
- pakman #{Pakman::VERSION}
|
150
150
|
- fetcher #{Fetcher::VERSION}
|
151
151
|
- markdown #{Markdown::VERSION}
|
152
152
|
- textutils #{TextUtils::VERSION}
|
153
153
|
- props #{Props::VERSION}
|
154
154
|
|
155
|
-
|
155
|
+
Env home: #{Env.home}
|
156
|
+
Slideshow config: #{config.config_dir}
|
157
|
+
Slideshow cache: #{config.cache_dir}
|
158
|
+
Slideshow root: #{Slideshow.root}
|
156
159
|
|
157
160
|
EOS
|
158
161
|
|
162
|
+
# dump Slideshow settings
|
163
|
+
config.dump
|
164
|
+
puts
|
165
|
+
|
166
|
+
# dump Markdown settings
|
167
|
+
Markdown.dump
|
168
|
+
puts
|
169
|
+
|
159
170
|
# todo:
|
160
171
|
# add verison for rubygems
|
161
172
|
|
@@ -178,6 +189,16 @@ EOS
|
|
178
189
|
|
179
190
|
puts Slideshow.generator
|
180
191
|
|
192
|
+
if logger.level == Logger::DEBUG
|
193
|
+
# dump Slideshow settings
|
194
|
+
config.dump
|
195
|
+
puts
|
196
|
+
|
197
|
+
# dump Markdown settings
|
198
|
+
Markdown.dump
|
199
|
+
puts
|
200
|
+
end
|
201
|
+
|
181
202
|
if opts.list?
|
182
203
|
List.new( logger, opts, config ).run ### todo: remove opts (merge access into config)
|
183
204
|
elsif opts.plugins?
|
data/lib/slideshow/config.rb
CHANGED
@@ -32,7 +32,6 @@ class Config
|
|
32
32
|
end
|
33
33
|
|
34
34
|
|
35
|
-
|
36
35
|
def load
|
37
36
|
|
38
37
|
# load builtin config file @ <gem>/config/slideshow.yml
|
@@ -63,6 +62,17 @@ class Config
|
|
63
62
|
@props = @props_work = Props.load_file_with_erb( props_work_file, binding(), @props )
|
64
63
|
end
|
65
64
|
end
|
65
|
+
|
66
|
+
def dump # dump settings for debugging
|
67
|
+
puts "Slideshow settings:"
|
68
|
+
@props_builtin.dump if @props_builtin
|
69
|
+
@props_default.dump if @props_default
|
70
|
+
@props_home.dump if @props_home
|
71
|
+
@props_work.dump if @props_work
|
72
|
+
|
73
|
+
## todo: add more config settings?
|
74
|
+
end
|
75
|
+
|
66
76
|
|
67
77
|
def header( key )
|
68
78
|
@props.fetch_from_section( 'headers', normalize_key( key ), nil )
|
data/lib/slideshow/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: slideshow
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 29
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 1.2.
|
9
|
+
- 1
|
10
|
+
version: 1.2.1
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Gerald Bauer
|
@@ -15,26 +15,26 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2012-06-
|
18
|
+
date: 2012-06-23 00:00:00 Z
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
21
|
-
name:
|
21
|
+
name: props
|
22
22
|
prerelease: false
|
23
23
|
requirement: &id001 !ruby/object:Gem::Requirement
|
24
24
|
none: false
|
25
25
|
requirements:
|
26
26
|
- - ">="
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
hash:
|
28
|
+
hash: 23
|
29
29
|
segments:
|
30
|
+
- 1
|
30
31
|
- 0
|
31
|
-
- 4
|
32
32
|
- 0
|
33
|
-
version: 0.
|
33
|
+
version: 1.0.0
|
34
34
|
type: :runtime
|
35
35
|
version_requirements: *id001
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
|
-
name:
|
37
|
+
name: markdown
|
38
38
|
prerelease: false
|
39
39
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
@@ -43,14 +43,14 @@ dependencies:
|
|
43
43
|
- !ruby/object:Gem::Version
|
44
44
|
hash: 23
|
45
45
|
segments:
|
46
|
+
- 1
|
46
47
|
- 0
|
47
|
-
- 2
|
48
48
|
- 0
|
49
|
-
version: 0.
|
49
|
+
version: 1.0.0
|
50
50
|
type: :runtime
|
51
51
|
version_requirements: *id002
|
52
52
|
- !ruby/object:Gem::Dependency
|
53
|
-
name:
|
53
|
+
name: textutils
|
54
54
|
prerelease: false
|
55
55
|
requirement: &id003 !ruby/object:Gem::Requirement
|
56
56
|
none: false
|