marv 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. data/CHANGELOG.md +16 -0
  2. data/README.md +1 -1
  3. data/VERSION +1 -1
  4. data/lib/marv/project/actions.rb +6 -1
  5. data/lib/marv/project/builder/engines.rb +2 -0
  6. data/lib/marv/server/actions.rb +5 -4
  7. data/lib/marv/server/server.rb +18 -8
  8. data/marv.gemspec +7 -7
  9. data/pkg/marv-0.4.0.gem +0 -0
  10. metadata +71 -38
  11. checksums.yaml +0 -7
data/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ ## v0.6.1
2
+ * Fix server running message when server not running
3
+ * Use specific version of tilt gem
4
+
5
+ ## v0.6.0
6
+ * Use specific guard versions
7
+ * Use specific livereload versions
8
+ * Add debug option for server
9
+ * Fix marv link creating link inside project
10
+ * Give option to change server port if port unavailable
11
+ * Add option to list running servers
12
+ * Add option to stop all servers
13
+
14
+ ## v0.5.0
15
+ * Fix issues after complete rewrite
16
+
1
17
  ## v0.4.0
2
18
  * Complete rewrite
3
19
  * Make server subcommand
data/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Marv is a free command-line toolkit for bootstrapping and developing WordPress themes and plugins in a tidy environment using front-end languages like Sass, LESS, and CoffeeScript.
4
4
 
5
- [![Gem Version](https://badge.fury.io/rb/marv.png)](http://badge.fury.io/rb/marv)
5
+ [![Gem Version](https://badge.fury.io/rb/marv.svg)](http://badge.fury.io/rb/marv)
6
6
  [![Code Climate](https://codeclimate.com/github/hardpixel/marv/badges/gpa.png)](https://codeclimate.com/github/hardpixel/marv)
7
7
 
8
8
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.0
1
+ 0.6.1
data/lib/marv/project/actions.rb CHANGED
@@ -77,7 +77,12 @@ module Marv
77
77
  end
78
78
  end
79
79
 
80
- @task.create_link @link_target, @project.build_path
80
+ begin
81
+ @task.create_link @link_target, @project.build_path
82
+ rescue Exception => e
83
+ @task.say "An error occured while creating project link", :red
84
+ @task.say e.message
85
+ end
81
86
  end
82
87
 
83
88
  # Create package
data/lib/marv/project/builder/engines.rb CHANGED
@@ -1,3 +1,5 @@
1
+ gem 'tilt', '!= 1.3.0', '~> 1.1'
2
+
1
3
  require 'tilt'
2
4
 
3
5
  module Tilt
data/lib/marv/server/actions.rb CHANGED
@@ -40,7 +40,7 @@ module Marv
40
40
  ::Process.kill('KILL', pid)
41
41
  @task.say "Server #{@name} stopped", :yellow
42
42
  end
43
- rescue Exception => e
43
+ rescue
44
44
  @task.say "Server #{@name} is not running", :yellow
45
45
  end
46
46
  end
@@ -116,7 +116,7 @@ module Marv
116
116
  pid = ::File.read(pid_file).to_i
117
117
 
118
118
  ::Process.kill(0, pid)
119
- rescue Exception => e
119
+ rescue
120
120
  return false
121
121
  end
122
122
 
@@ -126,8 +126,9 @@ module Marv
126
126
  # Check if port is available
127
127
  def is_port_available?(host=@server.host, port=@server.port)
128
128
  begin
129
- ::TCPServer.new(host, port)
130
- rescue Exception => e
129
+ server = ::TCPServer.new(host, port)
130
+ server.close()
131
+ rescue
131
132
  return false
132
133
  end
133
134
 
data/lib/marv/server/server.rb CHANGED
@@ -169,18 +169,28 @@ module Marv
169
169
 
170
170
  # Create MySQL database
171
171
  def create_database
172
- db_client_create
173
- db_client_grant_all
174
- db_client_flush_priv
175
- @database.close
172
+ begin
173
+ db_client_create
174
+ db_client_grant_all
175
+ db_client_flush_priv
176
+ @database.close
177
+ rescue Exception => e
178
+ @task.say "An error occured while creating database", :red
179
+ @task.say e.message
180
+ end
176
181
  end
177
182
 
178
183
  # Remove MySQL database
179
184
  def remove_database
180
- db_client_drop
181
- db_client_revoke_all
182
- db_client_flush_priv
183
- @database.close
185
+ begin
186
+ db_client_drop
187
+ db_client_revoke_all
188
+ db_client_flush_priv
189
+ @database.close
190
+ rescue Exception => e
191
+ @task.say "An error occured while removing database", :red
192
+ @task.say e.message
193
+ end
184
194
  end
185
195
 
186
196
  # Get server class context
data/marv.gemspec CHANGED
@@ -2,16 +2,14 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: marv 0.6.0 ruby lib
6
5
 
7
6
  Gem::Specification.new do |s|
8
7
  s.name = "marv"
9
- s.version = "0.6.0"
8
+ s.version = "0.6.1"
10
9
 
11
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
- s.require_paths = ["lib"]
13
11
  s.authors = ["Jonian Guveli", "Olibia Tsati"]
14
- s.date = "2015-03-25"
12
+ s.date = "2015-03-26"
15
13
  s.description = "A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript."
16
14
  s.email = "info@hardpixel.eu"
17
15
  s.executables = ["marv"]
@@ -89,15 +87,17 @@ Gem::Specification.new do |s|
89
87
  "lib/marv/server/actions.rb",
90
88
  "lib/marv/server/create.rb",
91
89
  "lib/marv/server/server.rb",
92
- "marv.gemspec"
90
+ "marv.gemspec",
91
+ "pkg/marv-0.4.0.gem"
93
92
  ]
94
93
  s.homepage = "http://hardpixel.github.io/marv"
95
94
  s.licenses = ["MIT"]
96
- s.rubygems_version = "2.2.2"
95
+ s.require_paths = ["lib"]
96
+ s.rubygems_version = "1.8.23"
97
97
  s.summary = "A command-line tool for developing wordpress themes and plugins"
98
98
 
99
99
  if s.respond_to? :specification_version then
100
- s.specification_version = 4
100
+ s.specification_version = 3
101
101
 
102
102
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
103
103
  s.add_runtime_dependency(%q<guard>, ["~> 2.8.0"])
data/pkg/marv-0.4.0.gem ADDED
Binary file
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marv
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Jonian Guveli
@@ -9,216 +10,246 @@ authors:
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2015-03-25 00:00:00.000000000 Z
13
+ date: 2015-03-26 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: guard
16
17
  requirement: !ruby/object:Gem::Requirement
18
+ none: false
17
19
  requirements:
18
- - - "~>"
20
+ - - ~>
19
21
  - !ruby/object:Gem::Version
20
22
  version: 2.8.0
21
23
  type: :runtime
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
24
27
  requirements:
25
- - - "~>"
28
+ - - ~>
26
29
  - !ruby/object:Gem::Version
27
30
  version: 2.8.0
28
31
  - !ruby/object:Gem::Dependency
29
32
  name: guard-livereload
30
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
31
35
  requirements:
32
- - - "~>"
36
+ - - ~>
33
37
  - !ruby/object:Gem::Version
34
38
  version: 2.4.0
35
39
  type: :runtime
36
40
  prerelease: false
37
41
  version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
38
43
  requirements:
39
- - - "~>"
44
+ - - ~>
40
45
  - !ruby/object:Gem::Version
41
46
  version: 2.4.0
42
47
  - !ruby/object:Gem::Dependency
43
48
  name: thor
44
49
  requirement: !ruby/object:Gem::Requirement
50
+ none: false
45
51
  requirements:
46
- - - "~>"
52
+ - - ~>
47
53
  - !ruby/object:Gem::Version
48
54
  version: '0.19'
49
55
  type: :runtime
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
52
59
  requirements:
53
- - - "~>"
60
+ - - ~>
54
61
  - !ruby/object:Gem::Version
55
62
  version: '0.19'
56
63
  - !ruby/object:Gem::Dependency
57
64
  name: sprockets
58
65
  requirement: !ruby/object:Gem::Requirement
66
+ none: false
59
67
  requirements:
60
- - - "~>"
68
+ - - ~>
61
69
  - !ruby/object:Gem::Version
62
70
  version: '2.12'
63
71
  type: :runtime
64
72
  prerelease: false
65
73
  version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
66
75
  requirements:
67
- - - "~>"
76
+ - - ~>
68
77
  - !ruby/object:Gem::Version
69
78
  version: '2.12'
70
79
  - !ruby/object:Gem::Dependency
71
80
  name: childprocess
72
81
  requirement: !ruby/object:Gem::Requirement
82
+ none: false
73
83
  requirements:
74
- - - "~>"
84
+ - - ~>
75
85
  - !ruby/object:Gem::Version
76
86
  version: '0.5'
77
87
  type: :runtime
78
88
  prerelease: false
79
89
  version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
80
91
  requirements:
81
- - - "~>"
92
+ - - ~>
82
93
  - !ruby/object:Gem::Version
83
94
  version: '0.5'
84
95
  - !ruby/object:Gem::Dependency
85
96
  name: mysql2
86
97
  requirement: !ruby/object:Gem::Requirement
98
+ none: false
87
99
  requirements:
88
- - - "~>"
100
+ - - ~>
89
101
  - !ruby/object:Gem::Version
90
102
  version: '0.3'
91
103
  type: :runtime
92
104
  prerelease: false
93
105
  version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
94
107
  requirements:
95
- - - "~>"
108
+ - - ~>
96
109
  - !ruby/object:Gem::Version
97
110
  version: '0.3'
98
111
  - !ruby/object:Gem::Dependency
99
112
  name: uglifier
100
113
  requirement: !ruby/object:Gem::Requirement
114
+ none: false
101
115
  requirements:
102
- - - "~>"
116
+ - - ~>
103
117
  - !ruby/object:Gem::Version
104
118
  version: '2.7'
105
119
  type: :runtime
106
120
  prerelease: false
107
121
  version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
108
123
  requirements:
109
- - - "~>"
124
+ - - ~>
110
125
  - !ruby/object:Gem::Version
111
126
  version: '2.7'
112
127
  - !ruby/object:Gem::Dependency
113
128
  name: sass
114
129
  requirement: !ruby/object:Gem::Requirement
130
+ none: false
115
131
  requirements:
116
- - - "~>"
132
+ - - ~>
117
133
  - !ruby/object:Gem::Version
118
134
  version: '3.4'
119
135
  type: :runtime
120
136
  prerelease: false
121
137
  version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
122
139
  requirements:
123
- - - "~>"
140
+ - - ~>
124
141
  - !ruby/object:Gem::Version
125
142
  version: '3.4'
126
143
  - !ruby/object:Gem::Dependency
127
144
  name: less
128
145
  requirement: !ruby/object:Gem::Requirement
146
+ none: false
129
147
  requirements:
130
- - - "~>"
148
+ - - ~>
131
149
  - !ruby/object:Gem::Version
132
150
  version: '2.6'
133
151
  type: :runtime
134
152
  prerelease: false
135
153
  version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
136
155
  requirements:
137
- - - "~>"
156
+ - - ~>
138
157
  - !ruby/object:Gem::Version
139
158
  version: '2.6'
140
159
  - !ruby/object:Gem::Dependency
141
160
  name: coffee-script
142
161
  requirement: !ruby/object:Gem::Requirement
162
+ none: false
143
163
  requirements:
144
- - - "~>"
164
+ - - ~>
145
165
  - !ruby/object:Gem::Version
146
166
  version: '2.3'
147
167
  type: :runtime
148
168
  prerelease: false
149
169
  version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
150
171
  requirements:
151
- - - "~>"
172
+ - - ~>
152
173
  - !ruby/object:Gem::Version
153
174
  version: '2.3'
154
175
  - !ruby/object:Gem::Dependency
155
176
  name: therubyracer
156
177
  requirement: !ruby/object:Gem::Requirement
178
+ none: false
157
179
  requirements:
158
- - - "~>"
180
+ - - ~>
159
181
  - !ruby/object:Gem::Version
160
182
  version: '0.12'
161
183
  type: :runtime
162
184
  prerelease: false
163
185
  version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
164
187
  requirements:
165
- - - "~>"
188
+ - - ~>
166
189
  - !ruby/object:Gem::Version
167
190
  version: '0.12'
168
191
  - !ruby/object:Gem::Dependency
169
192
  name: rubyzip
170
193
  requirement: !ruby/object:Gem::Requirement
194
+ none: false
171
195
  requirements:
172
- - - "~>"
196
+ - - ~>
173
197
  - !ruby/object:Gem::Version
174
198
  version: '1.1'
175
199
  type: :runtime
176
200
  prerelease: false
177
201
  version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
178
203
  requirements:
179
- - - "~>"
204
+ - - ~>
180
205
  - !ruby/object:Gem::Version
181
206
  version: '1.1'
182
207
  - !ruby/object:Gem::Dependency
183
208
  name: rdoc
184
209
  requirement: !ruby/object:Gem::Requirement
210
+ none: false
185
211
  requirements:
186
- - - "~>"
212
+ - - ~>
187
213
  - !ruby/object:Gem::Version
188
214
  version: '3.12'
189
215
  type: :development
190
216
  prerelease: false
191
217
  version_requirements: !ruby/object:Gem::Requirement
218
+ none: false
192
219
  requirements:
193
- - - "~>"
220
+ - - ~>
194
221
  - !ruby/object:Gem::Version
195
222
  version: '3.12'
196
223
  - !ruby/object:Gem::Dependency
197
224
  name: bundler
198
225
  requirement: !ruby/object:Gem::Requirement
226
+ none: false
199
227
  requirements:
200
- - - "~>"
228
+ - - ~>
201
229
  - !ruby/object:Gem::Version
202
230
  version: '1.0'
203
231
  type: :development
204
232
  prerelease: false
205
233
  version_requirements: !ruby/object:Gem::Requirement
234
+ none: false
206
235
  requirements:
207
- - - "~>"
236
+ - - ~>
208
237
  - !ruby/object:Gem::Version
209
238
  version: '1.0'
210
239
  - !ruby/object:Gem::Dependency
211
240
  name: jeweler
212
241
  requirement: !ruby/object:Gem::Requirement
242
+ none: false
213
243
  requirements:
214
- - - "~>"
244
+ - - ~>
215
245
  - !ruby/object:Gem::Version
216
246
  version: '2.0'
217
247
  type: :development
218
248
  prerelease: false
219
249
  version_requirements: !ruby/object:Gem::Requirement
250
+ none: false
220
251
  requirements:
221
- - - "~>"
252
+ - - ~>
222
253
  - !ruby/object:Gem::Version
223
254
  version: '2.0'
224
255
  description: A toolkit for bootstrapping and developing WordPress themes and plugins
@@ -231,7 +262,7 @@ extra_rdoc_files:
231
262
  - LICENSE.txt
232
263
  - README.md
233
264
  files:
234
- - ".document"
265
+ - .document
235
266
  - CHANGELOG.md
236
267
  - Gemfile
237
268
  - Gemfile.lock
@@ -301,28 +332,30 @@ files:
301
332
  - lib/marv/server/create.rb
302
333
  - lib/marv/server/server.rb
303
334
  - marv.gemspec
335
+ - pkg/marv-0.4.0.gem
304
336
  homepage: http://hardpixel.github.io/marv
305
337
  licenses:
306
338
  - MIT
307
- metadata: {}
308
339
  post_install_message:
309
340
  rdoc_options: []
310
341
  require_paths:
311
342
  - lib
312
343
  required_ruby_version: !ruby/object:Gem::Requirement
344
+ none: false
313
345
  requirements:
314
- - - ">="
346
+ - - ! '>='
315
347
  - !ruby/object:Gem::Version
316
348
  version: '0'
317
349
  required_rubygems_version: !ruby/object:Gem::Requirement
350
+ none: false
318
351
  requirements:
319
- - - ">="
352
+ - - ! '>='
320
353
  - !ruby/object:Gem::Version
321
354
  version: '0'
322
355
  requirements: []
323
356
  rubyforge_project:
324
- rubygems_version: 2.2.2
357
+ rubygems_version: 1.8.23
325
358
  signing_key:
326
- specification_version: 4
359
+ specification_version: 3
327
360
  summary: A command-line tool for developing wordpress themes and plugins
328
361
  test_files: []
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 268d564fe9ebeed1c8c5adec5efb6b84307a205a
4
- data.tar.gz: 6e67dedb9abceb7d9555b2dec039ecda22854299
5
- SHA512:
6
- metadata.gz: 30ac14ddb72cae4f18504e8248a641c16f951ae042dba69ccb51724f0d1c81298a19ad6d2b147d7157ce75ebdbd366c11b472d5841d10baaa52881131b5f4943
7
- data.tar.gz: 86c1c6d25429843a187d4255a54269169226b9b6757596421e17dcc3e7e05074f6ef56b6d139630908ecc8541e25fd807bf51a399b216cde29dad34b30a8726f