slideshow 1.2.0.beta5 → 1.2.0

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.
data/Rakefile CHANGED
@@ -13,12 +13,12 @@ Hoe.spec 'slideshow' do
13
13
  self.email = 'webslideshow@googlegroups.com'
14
14
 
15
15
  self.extra_deps = [
16
- ['RedCloth','>= 4.2.9'],
17
16
  ['markdown','>= 0.4.0'],
18
17
  ['textutils','>= 0.2.0'],
19
18
  ['props','>= 0.2.0'],
20
- ['pakman','>= 0.3.0'],
21
- ['activesupport', '>= 3.2.6']
19
+ ['pakman','>= 0.4.0'],
20
+ ['activesupport', '>= 3.2.6'],
21
+ ['RedCloth','>= 4.2.9']
22
22
  ]
23
23
 
24
24
  # switch extension to .markdown for gihub formatting
data/lib/slideshow.rb CHANGED
@@ -1,4 +1,4 @@
1
- $KCODE = 'utf'
1
+ # encoding: utf-8
2
2
 
3
3
  ###
4
4
  # NB: for local testing run like:
@@ -251,7 +251,7 @@ class Gen
251
251
 
252
252
  logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )
253
253
 
254
- Pakman::Templater.new( logger ).copy_pak( manifestsrc, pakpath, binding, basename, content )
254
+ Pakman::Templater.new( logger ).merge_pak( manifestsrc, pakpath, binding, basename )
255
255
 
256
256
  ## pop/restore working folder/dir
257
257
  unless newcwd == oldcwd
@@ -103,20 +103,13 @@ def run( args )
103
103
  opts.quick_manifest = q if q.nil? == false
104
104
  end
105
105
 
106
- cmd.on( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
107
-
108
106
  cmd.on( '-v', '--version', "Show version" ) do
109
107
  puts Slideshow.generator
110
108
  exit
111
109
  end
112
-
113
- cmd.on( "--verbose", "Show debug trace" ) do
114
- logger.datetime_format = "%H:%H:%S"
115
- logger.level = Logger::DEBUG
116
- end
117
110
 
118
111
 
119
- cmd.on_tail( "-h", "--help", "Show this message" ) do
112
+ cmd.on( "-h", "--help", "Show this message" ) do
120
113
  puts <<EOS
121
114
 
122
115
  Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
@@ -144,6 +137,41 @@ Further information:
144
137
  EOS
145
138
  exit
146
139
  end
140
+
141
+ cmd.on( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
142
+
143
+ cmd.on( '--about', "(Debug) Show more version info" ) do
144
+ puts <<EOS
145
+
146
+ #{Slideshow.generator}
147
+
148
+ Gems Versions:
149
+ - pakman #{Pakman::VERSION}
150
+ - fetcher #{Fetcher::VERSION}
151
+ - markdown #{Markdown::VERSION}
152
+ - textutils #{TextUtils::VERSION}
153
+ - props #{Props::VERSION}
154
+
155
+ Slide Show Root: #{Slideshow.root}
156
+
157
+ EOS
158
+
159
+ # todo:
160
+ # add verison for rubygems
161
+
162
+ ## todo: add more gem version info
163
+ #- redcloth
164
+ #- kramdown
165
+
166
+ exit
167
+ end
168
+
169
+
170
+ cmd.on( "--verbose", "(Debug) Show debug trace" ) do
171
+ logger.datetime_format = "%H:%H:%S"
172
+ logger.level = Logger::DEBUG
173
+ end
174
+
147
175
  end
148
176
 
149
177
  opt.parse!( args )
@@ -1,3 +1,3 @@
1
1
  module Slideshow
2
- VERSION = '1.2.0.beta5'
2
+ VERSION = '1.2.0'
3
3
  end
metadata CHANGED
@@ -1,15 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slideshow
3
3
  version: !ruby/object:Gem::Version
4
- hash: -507730549
5
- prerelease: 6
4
+ hash: 31
5
+ prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 2
9
9
  - 0
10
- - beta
11
- - 5
12
- version: 1.2.0.beta5
10
+ version: 1.2.0
13
11
  platform: ruby
14
12
  authors:
15
13
  - Gerald Bauer
@@ -17,42 +15,42 @@ autorequire:
17
15
  bindir: bin
18
16
  cert_chain: []
19
17
 
20
- date: 2012-06-20 00:00:00 Z
18
+ date: 2012-06-22 00:00:00 Z
21
19
  dependencies:
22
20
  - !ruby/object:Gem::Dependency
23
- name: RedCloth
21
+ name: markdown
24
22
  prerelease: false
25
23
  requirement: &id001 !ruby/object:Gem::Requirement
26
24
  none: false
27
25
  requirements:
28
26
  - - ">="
29
27
  - !ruby/object:Gem::Version
30
- hash: 37
28
+ hash: 15
31
29
  segments:
30
+ - 0
32
31
  - 4
33
- - 2
34
- - 9
35
- version: 4.2.9
32
+ - 0
33
+ version: 0.4.0
36
34
  type: :runtime
37
35
  version_requirements: *id001
38
36
  - !ruby/object:Gem::Dependency
39
- name: markdown
37
+ name: textutils
40
38
  prerelease: false
41
39
  requirement: &id002 !ruby/object:Gem::Requirement
42
40
  none: false
43
41
  requirements:
44
42
  - - ">="
45
43
  - !ruby/object:Gem::Version
46
- hash: 15
44
+ hash: 23
47
45
  segments:
48
46
  - 0
49
- - 4
47
+ - 2
50
48
  - 0
51
- version: 0.4.0
49
+ version: 0.2.0
52
50
  type: :runtime
53
51
  version_requirements: *id002
54
52
  - !ruby/object:Gem::Dependency
55
- name: textutils
53
+ name: props
56
54
  prerelease: false
57
55
  requirement: &id003 !ruby/object:Gem::Requirement
58
56
  none: false
@@ -68,51 +66,51 @@ dependencies:
68
66
  type: :runtime
69
67
  version_requirements: *id003
70
68
  - !ruby/object:Gem::Dependency
71
- name: props
69
+ name: pakman
72
70
  prerelease: false
73
71
  requirement: &id004 !ruby/object:Gem::Requirement
74
72
  none: false
75
73
  requirements:
76
74
  - - ">="
77
75
  - !ruby/object:Gem::Version
78
- hash: 23
76
+ hash: 15
79
77
  segments:
80
78
  - 0
81
- - 2
79
+ - 4
82
80
  - 0
83
- version: 0.2.0
81
+ version: 0.4.0
84
82
  type: :runtime
85
83
  version_requirements: *id004
86
84
  - !ruby/object:Gem::Dependency
87
- name: pakman
85
+ name: activesupport
88
86
  prerelease: false
89
87
  requirement: &id005 !ruby/object:Gem::Requirement
90
88
  none: false
91
89
  requirements:
92
90
  - - ">="
93
91
  - !ruby/object:Gem::Version
94
- hash: 19
92
+ hash: 3
95
93
  segments:
96
- - 0
97
94
  - 3
98
- - 0
99
- version: 0.3.0
95
+ - 2
96
+ - 6
97
+ version: 3.2.6
100
98
  type: :runtime
101
99
  version_requirements: *id005
102
100
  - !ruby/object:Gem::Dependency
103
- name: activesupport
101
+ name: RedCloth
104
102
  prerelease: false
105
103
  requirement: &id006 !ruby/object:Gem::Requirement
106
104
  none: false
107
105
  requirements:
108
106
  - - ">="
109
107
  - !ruby/object:Gem::Version
110
- hash: 3
108
+ hash: 37
111
109
  segments:
112
- - 3
110
+ - 4
113
111
  - 2
114
- - 6
115
- version: 3.2.6
112
+ - 9
113
+ version: 4.2.9
116
114
  type: :runtime
117
115
  version_requirements: *id006
118
116
  - !ruby/object:Gem::Dependency
@@ -241,14 +239,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
241
239
  required_rubygems_version: !ruby/object:Gem::Requirement
242
240
  none: false
243
241
  requirements:
244
- - - ">"
242
+ - - ">="
245
243
  - !ruby/object:Gem::Version
246
- hash: 25
244
+ hash: 3
247
245
  segments:
248
- - 1
249
- - 3
250
- - 1
251
- version: 1.3.1
246
+ - 0
247
+ version: "0"
252
248
  requirements: []
253
249
 
254
250
  rubyforge_project: slideshow