awestruct 0.4.2.x6 → 0.4.2.x7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/awestruct/cli/auto.rb +21 -18
  2. data/lib/awestruct/engine.rb +1 -1
  3. data/lib/awestruct/handlers/file_handler.rb +8 -1
  4. data/lib/awestruct/version.rb +1 -1
  5. metadata +122 -129
  6. data/lib/guard/awestruct.rb +0 -38
data/lib/awestruct/cli/auto.rb CHANGED
@@ -1,4 +1,6 @@
1
- require 'guard/awestruct'
1
+ #require 'guard/awestruct'
2
+
3
+ require 'listen'
2
4
 
3
5
  module Awestruct
4
6
  module CLI
@@ -9,25 +11,26 @@ module Awestruct
9
11
  end
10
12
 
11
13
  def run()
12
- Guard.setup
13
- Guard.start( :guardfile_contents=>guardfile_contents,
14
- :watchdir=>@config.dir,
15
- :watch_all_modifications=>true )
14
+ listener = Listen.to( @config.dir, :relative_paths=>true )
15
+ listener.ignore( %r(\.awestruct) )
16
+ listener.ignore( %r(^#{File.basename( @config.tmp_dir )}) )
17
+ listener.ignore( %r(^#{File.basename( @config.output_dir )}) )
18
+ listener.change do |modified, added, removed|
19
+ puts "modified #{modified.inspect}"
20
+ puts "added #{added.inspect}"
21
+ puts "removed #{removed.inspect}"
22
+ modified.each do |path|
23
+ engine = ::Awestruct::Engine.instance
24
+ puts "path -> #{path}"
25
+ puts "bn -> #{File.basename( engine.config.output_dir )}"
26
+ unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ )
27
+ engine.generate_page_by_output_path( path )
28
+ end
29
+ end
30
+ end
31
+ listener.start( false )
16
32
  end
17
33
 
18
- def guardfile_contents
19
- ignored = [
20
- "'.awestruct'",
21
- "'#{File.basename( @config.tmp_dir )}'",
22
- "'#{File.basename( @config.output_dir )}'",
23
- ]
24
- c = ''
25
- c += "guard :awestruct do\n"
26
- c += " watch %r(.*)\n"
27
- c += " ignore_paths #{ignored.join(', ')}"
28
- c += "end\n"
29
- c
30
- end
31
34
  end
32
35
 
33
36
  end
data/lib/awestruct/engine.rb CHANGED
@@ -223,7 +223,7 @@ module Awestruct
223
223
  c = page.rendered_content
224
224
  c = site.engine.pipeline.apply_transformers( site, page, c )
225
225
 
226
- File.open( generated_path, 'w' ) do |file|
226
+ File.open( generated_path, 'wb' ) do |file|
227
227
  file << c
228
228
  end
229
229
  elsif ( site.config.track_dependencies )
data/lib/awestruct/handlers/file_handler.rb CHANGED
@@ -54,10 +54,17 @@ module Awestruct
54
54
  private
55
55
 
56
56
  def read
57
- ( @content = File.read( @path ) ) if stale?
57
+ ( @content = open ) if stale?
58
58
  @mtime = File.mtime( @path )
59
59
  return @content
60
60
  end
61
+
62
+ def open
63
+ input_stream = IO.open(IO.sysopen(@path, "rb"), "rb" )
64
+ result = input_stream.read
65
+ input_stream.close
66
+ return result
67
+ end
61
68
 
62
69
  end
63
70
  end
data/lib/awestruct/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
 
2
2
  module Awestruct
3
- VERSION='0.4.2.x6'
3
+ VERSION='0.4.2.x7'
4
4
  end
metadata CHANGED
@@ -1,233 +1,224 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: awestruct
3
- version: !ruby/object:Gem::Version
4
- version: 0.4.2.x6
3
+ version: !ruby/object:Gem::Version
5
4
  prerelease: 6
5
+ version: 0.4.2.x7
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Bob McWhirter
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-07 00:00:00.000000000 -04:00
13
- default_executable:
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
12
+
13
+ date: 2012-06-07 00:00:00 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
16
  name: hpricot
17
- requirement: &70251073468020 !ruby/object:Gem::Requirement
17
+ requirement: &id001 !ruby/object:Gem::Requirement
18
18
  none: false
19
- requirements:
19
+ requirements:
20
20
  - - ~>
21
- - !ruby/object:Gem::Version
21
+ - !ruby/object:Gem::Version
22
22
  version: 0.8.6
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70251073468020
26
- - !ruby/object:Gem::Dependency
27
- name: versionomy
28
- requirement: &70251073467060 !ruby/object:Gem::Requirement
29
- none: false
30
- requirements:
31
- - - ~>
32
- - !ruby/object:Gem::Version
33
- version: 0.4.3
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: *70251073467060
37
- - !ruby/object:Gem::Dependency
25
+ version_requirements: *id001
26
+ - !ruby/object:Gem::Dependency
38
27
  name: haml
39
- requirement: &70251073461280 !ruby/object:Gem::Requirement
28
+ requirement: &id002 !ruby/object:Gem::Requirement
40
29
  none: false
41
- requirements:
30
+ requirements:
42
31
  - - ~>
43
- - !ruby/object:Gem::Version
32
+ - !ruby/object:Gem::Version
44
33
  version: 3.1.4
45
34
  type: :runtime
46
35
  prerelease: false
47
- version_requirements: *70251073461280
48
- - !ruby/object:Gem::Dependency
36
+ version_requirements: *id002
37
+ - !ruby/object:Gem::Dependency
49
38
  name: sass
50
- requirement: &70251073459640 !ruby/object:Gem::Requirement
39
+ requirement: &id003 !ruby/object:Gem::Requirement
51
40
  none: false
52
- requirements:
41
+ requirements:
53
42
  - - ~>
54
- - !ruby/object:Gem::Version
43
+ - !ruby/object:Gem::Version
55
44
  version: 3.1.15
56
45
  type: :runtime
57
46
  prerelease: false
58
- version_requirements: *70251073459640
59
- - !ruby/object:Gem::Dependency
47
+ version_requirements: *id003
48
+ - !ruby/object:Gem::Dependency
60
49
  name: hashery
61
- requirement: &70251073458640 !ruby/object:Gem::Requirement
50
+ requirement: &id004 !ruby/object:Gem::Requirement
62
51
  none: false
63
- requirements:
52
+ requirements:
64
53
  - - ~>
65
- - !ruby/object:Gem::Version
54
+ - !ruby/object:Gem::Version
66
55
  version: 1.5.0
67
56
  type: :runtime
68
57
  prerelease: false
69
- version_requirements: *70251073458640
70
- - !ruby/object:Gem::Dependency
58
+ version_requirements: *id004
59
+ - !ruby/object:Gem::Dependency
71
60
  name: rdiscount
72
- requirement: &70251073457480 !ruby/object:Gem::Requirement
61
+ requirement: &id005 !ruby/object:Gem::Requirement
73
62
  none: false
74
- requirements:
63
+ requirements:
75
64
  - - ~>
76
- - !ruby/object:Gem::Version
65
+ - !ruby/object:Gem::Version
77
66
  version: 1.6.8
78
67
  type: :runtime
79
68
  prerelease: false
80
- version_requirements: *70251073457480
81
- - !ruby/object:Gem::Dependency
69
+ version_requirements: *id005
70
+ - !ruby/object:Gem::Dependency
82
71
  name: RedCloth
83
- requirement: &70251073456460 !ruby/object:Gem::Requirement
72
+ requirement: &id006 !ruby/object:Gem::Requirement
84
73
  none: false
85
- requirements:
74
+ requirements:
86
75
  - - ~>
87
- - !ruby/object:Gem::Version
76
+ - !ruby/object:Gem::Version
88
77
  version: 4.2.9
89
78
  type: :runtime
90
79
  prerelease: false
91
- version_requirements: *70251073456460
92
- - !ruby/object:Gem::Dependency
80
+ version_requirements: *id006
81
+ - !ruby/object:Gem::Dependency
93
82
  name: coffee-script
94
- requirement: &70251073455260 !ruby/object:Gem::Requirement
83
+ requirement: &id007 !ruby/object:Gem::Requirement
95
84
  none: false
96
- requirements:
85
+ requirements:
97
86
  - - ~>
98
- - !ruby/object:Gem::Version
87
+ - !ruby/object:Gem::Version
99
88
  version: 2.2.0
100
89
  type: :runtime
101
90
  prerelease: false
102
- version_requirements: *70251073455260
103
- - !ruby/object:Gem::Dependency
91
+ version_requirements: *id007
92
+ - !ruby/object:Gem::Dependency
104
93
  name: nokogiri
105
- requirement: &70251073454260 !ruby/object:Gem::Requirement
94
+ requirement: &id008 !ruby/object:Gem::Requirement
106
95
  none: false
107
- requirements:
96
+ requirements:
108
97
  - - ~>
109
- - !ruby/object:Gem::Version
98
+ - !ruby/object:Gem::Version
110
99
  version: 1.5.2
111
100
  type: :runtime
112
101
  prerelease: false
113
- version_requirements: *70251073454260
114
- - !ruby/object:Gem::Dependency
102
+ version_requirements: *id008
103
+ - !ruby/object:Gem::Dependency
115
104
  name: compass
116
- requirement: &70251073452840 !ruby/object:Gem::Requirement
105
+ requirement: &id009 !ruby/object:Gem::Requirement
117
106
  none: false
118
- requirements:
107
+ requirements:
119
108
  - - ~>
120
- - !ruby/object:Gem::Version
109
+ - !ruby/object:Gem::Version
121
110
  version: 0.12.1
122
111
  type: :runtime
123
112
  prerelease: false
124
- version_requirements: *70251073452840
125
- - !ruby/object:Gem::Dependency
113
+ version_requirements: *id009
114
+ - !ruby/object:Gem::Dependency
126
115
  name: compass-960-plugin
127
- requirement: &70251073451800 !ruby/object:Gem::Requirement
116
+ requirement: &id010 !ruby/object:Gem::Requirement
128
117
  none: false
129
- requirements:
118
+ requirements:
130
119
  - - ~>
131
- - !ruby/object:Gem::Version
120
+ - !ruby/object:Gem::Version
132
121
  version: 0.10.4
133
122
  type: :runtime
134
123
  prerelease: false
135
- version_requirements: *70251073451800
136
- - !ruby/object:Gem::Dependency
124
+ version_requirements: *id010
125
+ - !ruby/object:Gem::Dependency
137
126
  name: bootstrap-sass
138
- requirement: &70251073449940 !ruby/object:Gem::Requirement
127
+ requirement: &id011 !ruby/object:Gem::Requirement
139
128
  none: false
140
- requirements:
129
+ requirements:
141
130
  - - ~>
142
- - !ruby/object:Gem::Version
131
+ - !ruby/object:Gem::Version
143
132
  version: 2.0.1
144
133
  type: :runtime
145
134
  prerelease: false
146
- version_requirements: *70251073449940
147
- - !ruby/object:Gem::Dependency
135
+ version_requirements: *id011
136
+ - !ruby/object:Gem::Dependency
148
137
  name: org-ruby
149
- requirement: &70251073448060 !ruby/object:Gem::Requirement
138
+ requirement: &id012 !ruby/object:Gem::Requirement
150
139
  none: false
151
- requirements:
140
+ requirements:
152
141
  - - ~>
153
- - !ruby/object:Gem::Version
142
+ - !ruby/object:Gem::Version
154
143
  version: 0.5.3
155
144
  type: :runtime
156
145
  prerelease: false
157
- version_requirements: *70251073448060
158
- - !ruby/object:Gem::Dependency
146
+ version_requirements: *id012
147
+ - !ruby/object:Gem::Dependency
159
148
  name: json
160
- requirement: &70251073446920 !ruby/object:Gem::Requirement
149
+ requirement: &id013 !ruby/object:Gem::Requirement
161
150
  none: false
162
- requirements:
151
+ requirements:
163
152
  - - ~>
164
- - !ruby/object:Gem::Version
153
+ - !ruby/object:Gem::Version
165
154
  version: 1.6.6
166
155
  type: :runtime
167
156
  prerelease: false
168
- version_requirements: *70251073446920
169
- - !ruby/object:Gem::Dependency
157
+ version_requirements: *id013
158
+ - !ruby/object:Gem::Dependency
170
159
  name: notifier
171
- requirement: &70251073445840 !ruby/object:Gem::Requirement
160
+ requirement: &id014 !ruby/object:Gem::Requirement
172
161
  none: false
173
- requirements:
162
+ requirements:
174
163
  - - ~>
175
- - !ruby/object:Gem::Version
164
+ - !ruby/object:Gem::Version
176
165
  version: 0.1.4
177
166
  type: :runtime
178
167
  prerelease: false
179
- version_requirements: *70251073445840
180
- - !ruby/object:Gem::Dependency
168
+ version_requirements: *id014
169
+ - !ruby/object:Gem::Dependency
181
170
  name: git
182
- requirement: &70251073433620 !ruby/object:Gem::Requirement
171
+ requirement: &id015 !ruby/object:Gem::Requirement
183
172
  none: false
184
- requirements:
173
+ requirements:
185
174
  - - ~>
186
- - !ruby/object:Gem::Version
175
+ - !ruby/object:Gem::Version
187
176
  version: 1.2.5
188
177
  type: :runtime
189
178
  prerelease: false
190
- version_requirements: *70251073433620
191
- - !ruby/object:Gem::Dependency
192
- name: guard
193
- requirement: &70251073432900 !ruby/object:Gem::Requirement
179
+ version_requirements: *id015
180
+ - !ruby/object:Gem::Dependency
181
+ name: listen
182
+ requirement: &id016 !ruby/object:Gem::Requirement
194
183
  none: false
195
- requirements:
196
- - - ! '>='
197
- - !ruby/object:Gem::Version
198
- version: '0'
184
+ requirements:
185
+ - - ~>
186
+ - !ruby/object:Gem::Version
187
+ version: 0.4.2
199
188
  type: :runtime
200
189
  prerelease: false
201
- version_requirements: *70251073432900
202
- - !ruby/object:Gem::Dependency
190
+ version_requirements: *id016
191
+ - !ruby/object:Gem::Dependency
203
192
  name: rspec
204
- requirement: &70251073431580 !ruby/object:Gem::Requirement
193
+ requirement: &id017 !ruby/object:Gem::Requirement
205
194
  none: false
206
- requirements:
195
+ requirements:
207
196
  - - ~>
208
- - !ruby/object:Gem::Version
209
- version: '2.9'
197
+ - !ruby/object:Gem::Version
198
+ version: "2.9"
210
199
  type: :development
211
200
  prerelease: false
212
- version_requirements: *70251073431580
213
- - !ruby/object:Gem::Dependency
201
+ version_requirements: *id017
202
+ - !ruby/object:Gem::Dependency
214
203
  name: rake
215
- requirement: &70251073429900 !ruby/object:Gem::Requirement
204
+ requirement: &id018 !ruby/object:Gem::Requirement
216
205
  none: false
217
- requirements:
206
+ requirements:
218
207
  - - ~>
219
- - !ruby/object:Gem::Version
208
+ - !ruby/object:Gem::Version
220
209
  version: 0.9.2
221
210
  type: :development
222
211
  prerelease: false
223
- version_requirements: *70251073429900
212
+ version_requirements: *id018
224
213
  description: Awestruct is a framework for creating static HTML sites.
225
214
  email: bob@mcwhirter.org
226
- executables:
215
+ executables:
227
216
  - awestruct
228
217
  extensions: []
218
+
229
219
  extra_rdoc_files: []
230
- files:
220
+
221
+ files:
231
222
  - lib/awestruct/astruct.rb
232
223
  - lib/awestruct/astruct_mixin.rb
233
224
  - lib/awestruct/cli/auto.rb
@@ -300,7 +291,6 @@ files:
300
291
  - lib/awestruct/util/default_inflections.rb
301
292
  - lib/awestruct/util/inflector.rb
302
293
  - lib/awestruct/version.rb
303
- - lib/guard/awestruct.rb
304
294
  - lib/awestruct/extensions/sitemap.xml.haml
305
295
  - lib/awestruct/extensions/tag_cloud.html.haml
306
296
  - lib/awestruct/extensions/template.atom.haml
@@ -310,32 +300,35 @@ files:
310
300
  - lib/awestruct/frameworks/bootstrap/base_index.html.haml
311
301
  - lib/awestruct/frameworks/bootstrap/base_layout.html.haml
312
302
  - bin/awestruct
313
- has_rdoc: true
314
303
  homepage: http://awestruct.org
315
304
  licenses: []
305
+
316
306
  post_install_message:
317
307
  rdoc_options: []
318
- require_paths:
308
+
309
+ require_paths:
319
310
  - lib
320
- required_ruby_version: !ruby/object:Gem::Requirement
311
+ required_ruby_version: !ruby/object:Gem::Requirement
321
312
  none: false
322
- requirements:
323
- - - ! '>='
324
- - !ruby/object:Gem::Version
325
- version: '0'
326
- segments:
313
+ requirements:
314
+ - - ">="
315
+ - !ruby/object:Gem::Version
316
+ hash: -3441842577235075834
317
+ segments:
327
318
  - 0
328
- hash: -4082832764021711331
329
- required_rubygems_version: !ruby/object:Gem::Requirement
319
+ version: "0"
320
+ required_rubygems_version: !ruby/object:Gem::Requirement
330
321
  none: false
331
- requirements:
332
- - - ! '>'
333
- - !ruby/object:Gem::Version
322
+ requirements:
323
+ - - ">"
324
+ - !ruby/object:Gem::Version
334
325
  version: 1.3.1
335
326
  requirements: []
327
+
336
328
  rubyforge_project:
337
- rubygems_version: 1.6.2
329
+ rubygems_version: 1.8.15
338
330
  signing_key:
339
331
  specification_version: 3
340
332
  summary: Static site-baking utility
341
333
  test_files: []
334
+
data/lib/guard/awestruct.rb DELETED
@@ -1,38 +0,0 @@
1
- require 'guard'
2
- require 'guard/guard'
3
-
4
- require 'awestruct/engine'
5
-
6
- module Guard
7
- class Awestruct < Guard
8
-
9
- def initialize(watchers=[], options={})
10
- super
11
- end
12
-
13
- def start
14
- @engine = ::Awestruct::Engine.instance
15
- end
16
-
17
- def stop
18
- end
19
-
20
- def reload
21
- end
22
-
23
- def run_all
24
- end
25
-
26
- def run_on_change(paths)
27
- paths.each do |path|
28
- unless ( path =~ %r(#{File.basename( @engine.config.output_dir) }) || path =~ /.awestruct/ )
29
- @engine.generate_page_by_output_path( path )
30
- end
31
- end
32
- end
33
-
34
- def run_on_deletion(paths)
35
- end
36
-
37
- end
38
- end