staticmatic2 2.1.6 → 2.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/VERSION.yml +2 -2
  2. data/lib/staticmatic/base.rb +17 -17
  3. data/lib/staticmatic/configuration.rb +8 -2
  4. data/lib/staticmatic/mixins/build.rb +1 -1
  5. data/staticmatic2.gemspec +3 -3
  6. metadata +74 -24
data/VERSION.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  :major: 2
3
3
  :minor: 1
4
- :patch: 6
5
- :build: !!null
4
+ :patch: 7
5
+ :build:
data/lib/staticmatic/base.rb CHANGED
@@ -1,13 +1,13 @@
1
- module StaticMatic
1
+ module StaticMatic
2
2
  class Base
3
-
3
+
4
4
  include StaticMatic::RenderMixin
5
5
  include StaticMatic::BuildMixin
6
6
  include StaticMatic::SetupMixin
7
- include StaticMatic::HelpersMixin
8
- include StaticMatic::ServerMixin
9
- include StaticMatic::RescueMixin
10
-
7
+ include StaticMatic::HelpersMixin
8
+ include StaticMatic::ServerMixin
9
+ include StaticMatic::RescueMixin
10
+
11
11
  attr_accessor :configuration, :mode
12
12
  attr_reader :src_dir, :site_dir
13
13
 
@@ -33,10 +33,6 @@ module StaticMatic
33
33
  @current_file_stack = []
34
34
  @mode = mode
35
35
 
36
- @base_dir = base_dir
37
- @src_dir = File.join(@base_dir, "src")
38
- @site_dir = File.join(@base_dir, "build")
39
-
40
36
  @default_layout_name = "default"
41
37
 
42
38
  @scope = Object.new
@@ -44,17 +40,21 @@ module StaticMatic
44
40
  @scope.instance_eval do
45
41
  extend StaticMatic::Helpers
46
42
  end
47
-
48
- load_configuration
49
- configure_compass
50
43
 
44
+ load_configuration
45
+
46
+ @base_dir = base_dir
47
+ @src_dir = File.join(@base_dir, @configuration.site_dir)
48
+ @site_dir = File.join(@base_dir, @configuration.build_dir)
49
+
50
+ configure_compass
51
51
  load_helpers
52
52
  end
53
53
 
54
54
  def load_configuration
55
55
  configuration = StaticMatic::Configuration.new
56
56
  config_file = File.join(@base_dir, "config", "site.rb")
57
-
57
+
58
58
  if File.exists?(config_file)
59
59
  config = File.read(config_file)
60
60
  eval(config)
@@ -69,7 +69,7 @@ module StaticMatic
69
69
 
70
70
  def run(command)
71
71
  puts "Site root is: #{@base_dir}"
72
-
72
+
73
73
  if %w(build setup preview).include?(command)
74
74
  send(command)
75
75
  else
@@ -120,10 +120,10 @@ module StaticMatic
120
120
  end
121
121
 
122
122
  def configure_compass
123
- Compass.configuration.project_path = @base_dir
123
+ Compass.configuration.project_path = @base_dir
124
124
 
125
125
  compass_config_path = File.join(@base_dir, "config", "compass.rb")
126
-
126
+
127
127
  if File.exists?(compass_config_path)
128
128
  Compass.add_configuration(compass_config_path)
129
129
  end
data/lib/staticmatic/configuration.rb CHANGED
@@ -6,13 +6,16 @@ module StaticMatic
6
6
  attr_accessor :ssl_enable
7
7
  attr_accessor :ssl_private_key_path
8
8
  attr_accessor :ssl_certificate_path
9
-
9
+
10
+ attr_accessor :site_dir
11
+ attr_accessor :build_dir
12
+
10
13
  attr_accessor :use_extensions_for_page_links
11
14
  attr_accessor :default_template_engine
12
15
 
13
16
  attr_accessor :engine_options, :preview_engine_options
14
17
  attr_accessor :reverse_ext_mappings
15
-
18
+
16
19
  def initialize
17
20
  self.preview_server = Rack::Handler::WEBrick
18
21
  self.preview_server_host = "localhost"
@@ -21,6 +24,9 @@ module StaticMatic
21
24
  self.use_extensions_for_page_links = true
22
25
  self.default_template_engine = 'haml'
23
26
 
27
+ self.site_dir = 'src'
28
+ self.build_dir = 'build'
29
+
24
30
  self.engine_options = {
25
31
  'haml' => {}, 'sass' => {}, 'scss' => {},
26
32
  }
data/lib/staticmatic/mixins/build.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module StaticMatic::BuildMixin
2
-
2
+
3
3
  def build
4
4
  src_file_paths('*').each do |src_path|
5
5
  ext = File.extname(src_path).sub(/^\./, '')
data/staticmatic2.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "staticmatic2"
8
- s.version = "2.1.6"
8
+ s.version = "2.1.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Stephen Bartholomew", "Gilbert B Garza"]
12
- s.date = "2012-11-01"
12
+ s.date = "2013-10-20"
13
13
  s.description = " StaticMatic helps you quickly create maintainable Amazon S3 static websites using\n tools such as Haml and Sass.\n \n Quickly deploy to services such as Amazon S3 in a single command.\n"
14
14
  s.email = "gilbertbgarza@gmail.com"
15
15
  s.executables = ["staticmatic"]
@@ -119,7 +119,7 @@ Gem::Specification.new do |s|
119
119
  s.licenses = ["MIT"]
120
120
  s.require_paths = ["lib"]
121
121
  s.rubyforge_project = "staticmatic2"
122
- s.rubygems_version = "1.8.11"
122
+ s.rubygems_version = "1.8.25"
123
123
  s.summary = "Build Amazon S3 static websites using modern dynamic tools"
124
124
 
125
125
  if s.respond_to? :specification_version then
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: staticmatic2
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.6
4
+ version: 2.1.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-11-01 00:00:00.000000000Z
13
+ date: 2013-10-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: haml
17
- requirement: &2158271400 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,15 @@ dependencies:
22
22
  version: '3.1'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2158271400
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ version: '3.1'
26
31
  - !ruby/object:Gem::Dependency
27
32
  name: sass
28
- requirement: &2158263300 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
29
34
  none: false
30
35
  requirements:
31
36
  - - ~>
@@ -33,10 +38,15 @@ dependencies:
33
38
  version: '3.1'
34
39
  type: :runtime
35
40
  prerelease: false
36
- version_requirements: *2158263300
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ~>
45
+ - !ruby/object:Gem::Version
46
+ version: '3.1'
37
47
  - !ruby/object:Gem::Dependency
38
48
  name: tilt
39
- requirement: &2158260920 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
40
50
  none: false
41
51
  requirements:
42
52
  - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
44
54
  version: '1.3'
45
55
  type: :runtime
46
56
  prerelease: false
47
- version_requirements: *2158260920
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '1.3'
48
63
  - !ruby/object:Gem::Dependency
49
64
  name: compass
50
- requirement: &2158258520 !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
51
66
  none: false
52
67
  requirements:
53
68
  - - ~>
@@ -55,10 +70,15 @@ dependencies:
55
70
  version: 0.12.1
56
71
  type: :runtime
57
72
  prerelease: false
58
- version_requirements: *2158258520
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ~>
77
+ - !ruby/object:Gem::Version
78
+ version: 0.12.1
59
79
  - !ruby/object:Gem::Dependency
60
80
  name: rack
61
- requirement: &2158244860 !ruby/object:Gem::Requirement
81
+ requirement: !ruby/object:Gem::Requirement
62
82
  none: false
63
83
  requirements:
64
84
  - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
66
86
  version: '1.0'
67
87
  type: :runtime
68
88
  prerelease: false
69
- version_requirements: *2158244860
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '1.0'
70
95
  - !ruby/object:Gem::Dependency
71
96
  name: thor
72
- requirement: &2158241180 !ruby/object:Gem::Requirement
97
+ requirement: !ruby/object:Gem::Requirement
73
98
  none: false
74
99
  requirements:
75
100
  - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
77
102
  version: 0.14.6
78
103
  type: :runtime
79
104
  prerelease: false
80
- version_requirements: *2158241180
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: 0.14.6
81
111
  - !ruby/object:Gem::Dependency
82
112
  name: aws-s3
83
- requirement: &2158236780 !ruby/object:Gem::Requirement
113
+ requirement: !ruby/object:Gem::Requirement
84
114
  none: false
85
115
  requirements:
86
116
  - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
88
118
  version: '0'
89
119
  type: :runtime
90
120
  prerelease: false
91
- version_requirements: *2158236780
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: '0'
92
127
  - !ruby/object:Gem::Dependency
93
128
  name: bundler
94
- requirement: &2158232120 !ruby/object:Gem::Requirement
129
+ requirement: !ruby/object:Gem::Requirement
95
130
  none: false
96
131
  requirements:
97
132
  - - ~>
@@ -99,10 +134,15 @@ dependencies:
99
134
  version: '1.0'
100
135
  type: :development
101
136
  prerelease: false
102
- version_requirements: *2158232120
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ~>
141
+ - !ruby/object:Gem::Version
142
+ version: '1.0'
103
143
  - !ruby/object:Gem::Dependency
104
144
  name: jeweler
105
- requirement: &2158223720 !ruby/object:Gem::Requirement
145
+ requirement: !ruby/object:Gem::Requirement
106
146
  none: false
107
147
  requirements:
108
148
  - - ~>
@@ -110,10 +150,15 @@ dependencies:
110
150
  version: '1.6'
111
151
  type: :development
112
152
  prerelease: false
113
- version_requirements: *2158223720
153
+ version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
155
+ requirements:
156
+ - - ~>
157
+ - !ruby/object:Gem::Version
158
+ version: '1.6'
114
159
  - !ruby/object:Gem::Dependency
115
160
  name: rspec
116
- requirement: &2158221400 !ruby/object:Gem::Requirement
161
+ requirement: !ruby/object:Gem::Requirement
117
162
  none: false
118
163
  requirements:
119
164
  - - ~>
@@ -121,7 +166,12 @@ dependencies:
121
166
  version: 1.3.1
122
167
  type: :development
123
168
  prerelease: false
124
- version_requirements: *2158221400
169
+ version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
171
+ requirements:
172
+ - - ~>
173
+ - !ruby/object:Gem::Version
174
+ version: 1.3.1
125
175
  description: ! " StaticMatic helps you quickly create maintainable Amazon S3 static
126
176
  websites using\n tools such as Haml and Sass.\n \n Quickly deploy to services
127
177
  such as Amazon S3 in a single command.\n"
@@ -244,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
244
294
  version: '0'
245
295
  segments:
246
296
  - 0
247
- hash: -347663051862138105
297
+ hash: -1972387484885406647
248
298
  required_rubygems_version: !ruby/object:Gem::Requirement
249
299
  none: false
250
300
  requirements:
@@ -253,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
253
303
  version: '0'
254
304
  requirements: []
255
305
  rubyforge_project: staticmatic2
256
- rubygems_version: 1.8.11
306
+ rubygems_version: 1.8.25
257
307
  signing_key:
258
308
  specification_version: 3
259
309
  summary: Build Amazon S3 static websites using modern dynamic tools