marv 0.2.5 → 0.3.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.
Files changed (41) hide show
  1. data/.rspec +1 -0
  2. data/CHANGELOG.md +13 -0
  3. data/Gemfile +3 -4
  4. data/Gemfile.lock +70 -28
  5. data/LICENSE +24 -0
  6. data/Rakefile +7 -1
  7. data/VERSION +1 -1
  8. data/layouts/bramble/functions/functions.php.erb +12 -12
  9. data/layouts/bramble/includes/options.php.erb +4 -4
  10. data/layouts/config/{config.tt → project-config.rb} +4 -1
  11. data/layouts/config/rack-config.ru +38 -0
  12. data/layouts/config/wp-config.php.erb +105 -0
  13. data/layouts/default/functions/functions.php.erb +25 -25
  14. data/layouts/default/includes/filters-admin.php.erb +8 -8
  15. data/layouts/default/includes/filters.php.erb +11 -11
  16. data/layouts/default/includes/helpers.php.erb +1 -1
  17. data/layouts/default/templates/404.php.erb +2 -2
  18. data/layouts/default/templates/archive.php.erb +5 -5
  19. data/layouts/default/templates/author.php.erb +1 -1
  20. data/layouts/default/templates/partials/comments.php.erb +8 -8
  21. data/layouts/default/templates/partials/content-none.php.erb +3 -3
  22. data/layouts/default/templates/partials/content.php.erb +2 -2
  23. data/layouts/default/templates/partials/searchform.php.erb +3 -3
  24. data/layouts/default/templates/search.php.erb +2 -2
  25. data/lib/guard/marv/assets.rb +11 -3
  26. data/lib/guard/marv/config.rb +2 -0
  27. data/lib/guard/marv/folders.rb +37 -0
  28. data/lib/guard/marv/functions.rb +13 -9
  29. data/lib/guard/marv/templates.rb +12 -3
  30. data/lib/marv.rb +1 -0
  31. data/lib/marv/builder.rb +49 -15
  32. data/lib/marv/cli.rb +135 -10
  33. data/lib/marv/engines.rb +3 -1
  34. data/lib/marv/generator.rb +13 -8
  35. data/lib/marv/guard.rb +4 -1
  36. data/lib/marv/project.rb +18 -10
  37. data/lib/marv/server.rb +301 -0
  38. data/lib/marv/version.rb +1 -1
  39. data/marv.gemspec +18 -16
  40. data/spec/lib/marv/project_spec.rb +3 -4
  41. metadata +27 -38
data/lib/marv/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Marv
2
- VERSION = "0.2.5"
2
+ VERSION = "0.3.0"
3
3
  end
data/marv.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "marv"
8
- s.version = "0.2.5"
8
+ s.version = "0.3.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Jonian Guveli", "Olibia Tsati"]
12
- s.date = "2014-08-05"
12
+ s.date = "2014-09-08"
13
13
  s.description = "A toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript."
14
14
  s.email = "info@hardpixel.eu"
15
15
  s.executables = ["marv"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
18
18
  "README.md"
19
19
  ]
20
20
  s.files = [
21
+ ".rspec",
21
22
  "CHANGELOG.md",
22
23
  "Gemfile",
23
24
  "Gemfile.lock",
@@ -38,7 +39,9 @@ Gem::Specification.new do |s|
38
39
  "layouts/bramble/stylesheets/_header.scss.erb",
39
40
  "layouts/bramble/stylesheets/style.scss.erb",
40
41
  "layouts/bramble/templates/sample-template.php",
41
- "layouts/config/config.tt",
42
+ "layouts/config/project-config.rb",
43
+ "layouts/config/rack-config.ru",
44
+ "layouts/config/wp-config.php.erb",
42
45
  "layouts/default/functions/functions.php.erb",
43
46
  "layouts/default/images/screenshot.png",
44
47
  "layouts/default/includes/filters-admin.php.erb",
@@ -68,6 +71,7 @@ Gem::Specification.new do |s|
68
71
  "layouts/default/templates/single.php",
69
72
  "lib/guard/marv/assets.rb",
70
73
  "lib/guard/marv/config.rb",
74
+ "lib/guard/marv/folders.rb",
71
75
  "lib/guard/marv/functions.rb",
72
76
  "lib/guard/marv/templates.rb",
73
77
  "lib/marv.rb",
@@ -78,8 +82,9 @@ Gem::Specification.new do |s|
78
82
  "lib/marv/generator.rb",
79
83
  "lib/marv/guard.rb",
80
84
  "lib/marv/project.rb",
85
+ "lib/marv/server.rb",
81
86
  "lib/marv/version.rb",
82
- "marv-0.2.5.gem",
87
+ "marv-0.3.0.gem",
83
88
  "marv.gemspec",
84
89
  "spec/lib/marv/project_spec.rb",
85
90
  "spec/spec_helper.rb"
@@ -95,55 +100,52 @@ Gem::Specification.new do |s|
95
100
 
96
101
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
97
102
  s.add_runtime_dependency(%q<thor>, [">= 0.19.1"])
98
- s.add_runtime_dependency(%q<guard>, [">= 2.2.1"])
99
103
  s.add_runtime_dependency(%q<guard-livereload>, [">= 2.3.0"])
100
104
  s.add_runtime_dependency(%q<sprockets>, [">= 2.12.0"])
101
105
  s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
102
- s.add_runtime_dependency(%q<rack>, [">= 1.5.2"])
106
+ s.add_runtime_dependency(%q<rack-legacy>, [">= 1.0.0"])
107
+ s.add_runtime_dependency(%q<mysql2>, [">= 0.3.15"])
103
108
  s.add_runtime_dependency(%q<sass>, [">= 3.3.0"])
104
109
  s.add_runtime_dependency(%q<less>, [">= 2.6.0"])
105
110
  s.add_runtime_dependency(%q<coffee-script>, [">= 2.3.0"])
106
111
  s.add_runtime_dependency(%q<therubyracer>, [">= 0.12.0"])
107
- s.add_runtime_dependency(%q<rb-fsevent>, [">= 0.9.4"])
108
112
  s.add_runtime_dependency(%q<uglifier>, [">= 2.5.0"])
113
+ s.add_development_dependency(%q<rake>, [">= 0"])
109
114
  s.add_development_dependency(%q<rspec>, [">= 0"])
110
115
  s.add_development_dependency(%q<cucumber>, [">= 0"])
111
- s.add_development_dependency(%q<aruba>, [">= 0"])
112
116
  s.add_development_dependency(%q<jeweler>, [">= 0"])
113
117
  else
114
118
  s.add_dependency(%q<thor>, [">= 0.19.1"])
115
- s.add_dependency(%q<guard>, [">= 2.2.1"])
116
119
  s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
117
120
  s.add_dependency(%q<sprockets>, [">= 2.12.0"])
118
121
  s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
119
- s.add_dependency(%q<rack>, [">= 1.5.2"])
122
+ s.add_dependency(%q<rack-legacy>, [">= 1.0.0"])
123
+ s.add_dependency(%q<mysql2>, [">= 0.3.15"])
120
124
  s.add_dependency(%q<sass>, [">= 3.3.0"])
121
125
  s.add_dependency(%q<less>, [">= 2.6.0"])
122
126
  s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
123
127
  s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
124
- s.add_dependency(%q<rb-fsevent>, [">= 0.9.4"])
125
128
  s.add_dependency(%q<uglifier>, [">= 2.5.0"])
129
+ s.add_dependency(%q<rake>, [">= 0"])
126
130
  s.add_dependency(%q<rspec>, [">= 0"])
127
131
  s.add_dependency(%q<cucumber>, [">= 0"])
128
- s.add_dependency(%q<aruba>, [">= 0"])
129
132
  s.add_dependency(%q<jeweler>, [">= 0"])
130
133
  end
131
134
  else
132
135
  s.add_dependency(%q<thor>, [">= 0.19.1"])
133
- s.add_dependency(%q<guard>, [">= 2.2.1"])
134
136
  s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
135
137
  s.add_dependency(%q<sprockets>, [">= 2.12.0"])
136
138
  s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
137
- s.add_dependency(%q<rack>, [">= 1.5.2"])
139
+ s.add_dependency(%q<rack-legacy>, [">= 1.0.0"])
140
+ s.add_dependency(%q<mysql2>, [">= 0.3.15"])
138
141
  s.add_dependency(%q<sass>, [">= 3.3.0"])
139
142
  s.add_dependency(%q<less>, [">= 2.6.0"])
140
143
  s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
141
144
  s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
142
- s.add_dependency(%q<rb-fsevent>, [">= 0.9.4"])
143
145
  s.add_dependency(%q<uglifier>, [">= 2.5.0"])
146
+ s.add_dependency(%q<rake>, [">= 0"])
144
147
  s.add_dependency(%q<rspec>, [">= 0"])
145
148
  s.add_dependency(%q<cucumber>, [">= 0"])
146
- s.add_dependency(%q<aruba>, [">= 0"])
147
149
  s.add_dependency(%q<jeweler>, [">= 0"])
148
150
  end
149
151
  end
data/spec/lib/marv/project_spec.rb CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  require 'marv/project'
3
2
 
4
3
  describe Marv::Project do
@@ -8,7 +7,7 @@ describe Marv::Project do
8
7
 
9
8
  describe :config_file do
10
9
  it "should create an expanded path to the config file" do
11
- @project.config_file.should == '/tmp/config.json'
10
+ @project.config_file.should == '/tmp/config.rb'
12
11
  end
13
12
  end
14
13
 
@@ -25,9 +24,9 @@ describe Marv::Project do
25
24
  end
26
25
  end
27
26
 
28
- describe :theme_id do
27
+ describe :project_id do
29
28
  it "should be the same as the project folder" do
30
- @project.theme_id.should == 'tmp'
29
+ @project.project_id.should == 'tmp'
31
30
  end
32
31
  end
33
32
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marv
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-08-05 00:00:00.000000000 Z
13
+ date: 2014-09-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor
@@ -29,13 +29,13 @@ dependencies:
29
29
  - !ruby/object:Gem::Version
30
30
  version: 0.19.1
31
31
  - !ruby/object:Gem::Dependency
32
- name: guard
32
+ name: guard-livereload
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  none: false
35
35
  requirements:
36
36
  - - ! '>='
37
37
  - !ruby/object:Gem::Version
38
- version: 2.2.1
38
+ version: 2.3.0
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
@@ -43,15 +43,15 @@ dependencies:
43
43
  requirements:
44
44
  - - ! '>='
45
45
  - !ruby/object:Gem::Version
46
- version: 2.2.1
46
+ version: 2.3.0
47
47
  - !ruby/object:Gem::Dependency
48
- name: guard-livereload
48
+ name: sprockets
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
- version: 2.3.0
54
+ version: 2.12.0
55
55
  type: :runtime
56
56
  prerelease: false
57
57
  version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
59
59
  requirements:
60
60
  - - ! '>='
61
61
  - !ruby/object:Gem::Version
62
- version: 2.3.0
62
+ version: 2.12.0
63
63
  - !ruby/object:Gem::Dependency
64
- name: sprockets
64
+ name: rubyzip
65
65
  requirement: !ruby/object:Gem::Requirement
66
66
  none: false
67
67
  requirements:
68
68
  - - ! '>='
69
69
  - !ruby/object:Gem::Version
70
- version: 2.12.0
70
+ version: 1.1.6
71
71
  type: :runtime
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
75
75
  requirements:
76
76
  - - ! '>='
77
77
  - !ruby/object:Gem::Version
78
- version: 2.12.0
78
+ version: 1.1.6
79
79
  - !ruby/object:Gem::Dependency
80
- name: rubyzip
80
+ name: rack-legacy
81
81
  requirement: !ruby/object:Gem::Requirement
82
82
  none: false
83
83
  requirements:
84
84
  - - ! '>='
85
85
  - !ruby/object:Gem::Version
86
- version: 1.1.6
86
+ version: 1.0.0
87
87
  type: :runtime
88
88
  prerelease: false
89
89
  version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
91
91
  requirements:
92
92
  - - ! '>='
93
93
  - !ruby/object:Gem::Version
94
- version: 1.1.6
94
+ version: 1.0.0
95
95
  - !ruby/object:Gem::Dependency
96
- name: rack
96
+ name: mysql2
97
97
  requirement: !ruby/object:Gem::Requirement
98
98
  none: false
99
99
  requirements:
100
100
  - - ! '>='
101
101
  - !ruby/object:Gem::Version
102
- version: 1.5.2
102
+ version: 0.3.15
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
107
107
  requirements:
108
108
  - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
- version: 1.5.2
110
+ version: 0.3.15
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: sass
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -172,22 +172,6 @@ dependencies:
172
172
  - - ! '>='
173
173
  - !ruby/object:Gem::Version
174
174
  version: 0.12.0
175
- - !ruby/object:Gem::Dependency
176
- name: rb-fsevent
177
- requirement: !ruby/object:Gem::Requirement
178
- none: false
179
- requirements:
180
- - - ! '>='
181
- - !ruby/object:Gem::Version
182
- version: 0.9.4
183
- type: :runtime
184
- prerelease: false
185
- version_requirements: !ruby/object:Gem::Requirement
186
- none: false
187
- requirements:
188
- - - ! '>='
189
- - !ruby/object:Gem::Version
190
- version: 0.9.4
191
175
  - !ruby/object:Gem::Dependency
192
176
  name: uglifier
193
177
  requirement: !ruby/object:Gem::Requirement
@@ -205,7 +189,7 @@ dependencies:
205
189
  - !ruby/object:Gem::Version
206
190
  version: 2.5.0
207
191
  - !ruby/object:Gem::Dependency
208
- name: rspec
192
+ name: rake
209
193
  requirement: !ruby/object:Gem::Requirement
210
194
  none: false
211
195
  requirements:
@@ -221,7 +205,7 @@ dependencies:
221
205
  - !ruby/object:Gem::Version
222
206
  version: '0'
223
207
  - !ruby/object:Gem::Dependency
224
- name: cucumber
208
+ name: rspec
225
209
  requirement: !ruby/object:Gem::Requirement
226
210
  none: false
227
211
  requirements:
@@ -237,7 +221,7 @@ dependencies:
237
221
  - !ruby/object:Gem::Version
238
222
  version: '0'
239
223
  - !ruby/object:Gem::Dependency
240
- name: aruba
224
+ name: cucumber
241
225
  requirement: !ruby/object:Gem::Requirement
242
226
  none: false
243
227
  requirements:
@@ -278,6 +262,7 @@ extra_rdoc_files:
278
262
  - LICENSE
279
263
  - README.md
280
264
  files:
265
+ - .rspec
281
266
  - CHANGELOG.md
282
267
  - Gemfile
283
268
  - Gemfile.lock
@@ -298,7 +283,9 @@ files:
298
283
  - layouts/bramble/stylesheets/_header.scss.erb
299
284
  - layouts/bramble/stylesheets/style.scss.erb
300
285
  - layouts/bramble/templates/sample-template.php
301
- - layouts/config/config.tt
286
+ - layouts/config/project-config.rb
287
+ - layouts/config/rack-config.ru
288
+ - layouts/config/wp-config.php.erb
302
289
  - layouts/default/functions/functions.php.erb
303
290
  - layouts/default/images/screenshot.png
304
291
  - layouts/default/includes/filters-admin.php.erb
@@ -328,6 +315,7 @@ files:
328
315
  - layouts/default/templates/single.php
329
316
  - lib/guard/marv/assets.rb
330
317
  - lib/guard/marv/config.rb
318
+ - lib/guard/marv/folders.rb
331
319
  - lib/guard/marv/functions.rb
332
320
  - lib/guard/marv/templates.rb
333
321
  - lib/marv.rb
@@ -338,8 +326,9 @@ files:
338
326
  - lib/marv/generator.rb
339
327
  - lib/marv/guard.rb
340
328
  - lib/marv/project.rb
329
+ - lib/marv/server.rb
341
330
  - lib/marv/version.rb
342
- - marv-0.2.5.gem
331
+ - marv-0.3.0.gem
343
332
  - marv.gemspec
344
333
  - spec/lib/marv/project_spec.rb
345
334
  - spec/spec_helper.rb