devcenter 1.1.4 → 1.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +5 -5
  2. data/devcenter.gemspec +1 -0
  3. data/lib/devcenter.rb +1 -1
  4. data/lib/devcenter/article_file.rb +3 -5
  5. data/lib/devcenter/client.rb +3 -3
  6. data/lib/devcenter/commands/base.rb +3 -3
  7. data/lib/devcenter/commands/pull.rb +3 -3
  8. data/lib/devcenter/commands/push.rb +3 -5
  9. data/lib/devcenter/version.rb +1 -1
  10. metadata +54 -40
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: fea3d9978f51459acaac1903a951689ab8f60dc4
4
- data.tar.gz: e920d84a5f10a9c116cc9612c09f7f207274c197
2
+ SHA1:
3
+ metadata.gz: f2023754c3d37f2b4829ec8fc14b1a9aeeb5d89f
4
+ data.tar.gz: 351e2cffee10475d6f84c441e63ade3906b1eb4d
5
5
  SHA512:
6
- metadata.gz: 7ee27901288a2fe03eb20809bafcd98d8b23b1f35fcb5ef33a58c95de761f6dc5a1474dee97457db885f4e9bb0f0f01947a4945a0fb56b86d4862e829751bcfe
7
- data.tar.gz: 758cd0de83c5e503f80896e91591621e7921a13be3c060ee8a45877eaed820003bb019338d80003b5048fc04be04e6b435daed07f6240de1a3224631e8ab243f
6
+ metadata.gz: c36795febe5ff9fea72596eedb08d058503c5a4d28ff83beaed303fbac62a7a90323bf92e9fbbe6c56881678d4da88593c3b351482dbb3320355b2e586e7401b
7
+ data.tar.gz: e59e22564a27de9d2e8a718df3553f2fc9baf9ea7117507a7f99220f5beb61526d9d494aa119ea09a4d8b64fe45c7c3d7c56d029e710661741f5a11aaa14a41d
data/devcenter.gemspec CHANGED
@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
27
27
  gem.add_runtime_dependency('rack-protection', '~>1.3.2')
28
28
  gem.add_runtime_dependency('sinatra', '~>1.3.4')
29
29
  gem.add_runtime_dependency('tilt', '~>1.3.3')
30
+ gem.add_runtime_dependency('psych', '~>2.0.15')
30
31
  gem.add_runtime_dependency('rack-highlighter', '~>0.2.0')
31
32
  gem.add_runtime_dependency('devcenter-parser', '~>1.4', '>= 1.4.8')
32
33
  gem.add_runtime_dependency('netrc', '~>0.10', '>= 0.10.2')
data/lib/devcenter.rb CHANGED
@@ -6,4 +6,4 @@ require_relative 'devcenter/client'
6
6
  require_relative 'devcenter/coderay_extensions'
7
7
  require_relative 'devcenter/article_file'
8
8
  require_relative 'devcenter/previewer'
9
- require_relative 'devcenter/cli'
9
+ require_relative 'devcenter/cli'
data/lib/devcenter/article_file.rb CHANGED
@@ -9,9 +9,8 @@ module Devcenter
9
9
  def initialize(opts = {})
10
10
  @metadata = opts[:metadata] || OpenStruct.new
11
11
  @content = opts[:content] || ''
12
- markdown_flavour = @metadata.markdown_flavour || :maruku
13
12
  begin
14
- @html = ::DevcenterParser.to_html(@content, markdown_flavour.to_sym)
13
+ @html = ::DevcenterParser.to_html(@content, :github)
15
14
  rescue Exception => e
16
15
  @parsing_error = e.to_s
17
16
  @html = ''
@@ -22,11 +21,10 @@ module Devcenter
22
21
  def self.read(src_path)
23
22
  src = IO.read(src_path)
24
23
  metadata_yaml, content = src.split(/\r*\n\r*\n/, 2)
25
- metadata = OpenStruct.new YAML.load(metadata_yaml)
26
- markdown_flavour = metadata.markdown_flavour || :maruku
24
+ metadata = OpenStruct.new Psych.load(metadata_yaml)
27
25
  new(metadata: metadata, content: content)
28
26
  end
29
27
 
30
28
  end
31
29
 
32
- end
30
+ end
data/lib/devcenter/client.rb CHANGED
@@ -49,8 +49,8 @@ module Devcenter
49
49
  auth_request(:put, token, path: update_article_path(article_id), body: form, :headers => { "Content-Type" => "application/x-www-form-urlencoded" })
50
50
  end
51
51
 
52
- def check_broken_links(token, content, parser)
53
- form = URI.encode_www_form({content: content, parser: parser})
52
+ def check_broken_links(token, content)
53
+ form = URI.encode_www_form({content: content})
54
54
  auth_request(:post, token, path: broken_link_checks_path, body: form, :headers => { "Content-Type" => "application/x-www-form-urlencoded" })
55
55
  end
56
56
 
@@ -100,4 +100,4 @@ module Devcenter
100
100
  end
101
101
  end
102
102
 
103
- end
103
+ end
data/lib/devcenter/commands/base.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'excon'
2
- require 'launchy'
3
2
  require 'json'
4
- require 'yaml'
3
+ require 'launchy'
4
+ require 'psych'
5
5
 
6
6
  module Devcenter::Commands
7
7
 
@@ -52,4 +52,4 @@ module Devcenter::Commands
52
52
  end
53
53
 
54
54
  end
55
- end
55
+ end
data/lib/devcenter/commands/pull.rb CHANGED
@@ -20,7 +20,7 @@ module Devcenter::Commands
20
20
  article_not_found!(@slug) unless article_received
21
21
 
22
22
  article = response.body['article']
23
- metadata = {'title' => article['title'], 'id' => article['id'], 'markdown_flavour' => article['markdown_flavour']}
23
+ metadata = {'title' => article['title'], 'id' => article['id']}
24
24
  file_path = md_file_path(@slug)
25
25
 
26
26
  unless @force_overwrite
@@ -28,10 +28,10 @@ module Devcenter::Commands
28
28
  return if cancel_save
29
29
  end
30
30
 
31
- file_content = [metadata.to_yaml, article['content']].join("\n\n")
31
+ file_content = [Psych.dump(metadata), article['content']].join("\n\n")
32
32
  write_file(file_path, file_content)
33
33
  say "\"#{metadata['title']}\" article saved as #{file_path}"
34
34
  end
35
35
 
36
36
  end
37
- end
37
+ end
data/lib/devcenter/commands/push.rb CHANGED
@@ -36,19 +36,18 @@ module Devcenter::Commands
36
36
  article_params = {
37
37
  'article[content]' => @article.content,
38
38
  'article[title]' => @article.metadata.title,
39
- 'article[parser]' => @article.metadata.parser || @article.metadata.markdown_flavour
40
39
  }
41
40
  response = Devcenter::Client.validate_article(token, article_id, article_params)
42
41
  errors = response.body
43
42
  if errors.any?
44
43
  say "The article \"#{@slug}\" can't be saved:"
45
- abort errors.to_yaml.gsub(/\A(\-+)\n-/, '')
44
+ abort Psych.dump(errors).gsub(/\A(\-+)\n-/, '')
46
45
  end
47
46
  errors.empty?
48
47
  end
49
48
 
50
49
  def display_broken_links(token)
51
- response = Devcenter::Client.check_broken_links(token, @article.content, @article.metadata.markdown_flavour)
50
+ response = Devcenter::Client.check_broken_links(token, @article.content)
52
51
  broken_links = response.body
53
52
  if broken_links.any?
54
53
  say "The article \"#{@slug}\" contains broken link/s:"
@@ -62,7 +61,6 @@ module Devcenter::Commands
62
61
  article_params = {
63
62
  'article[content]' => @article.content,
64
63
  'article[title]' => @article.metadata.title,
65
- 'article[parser]' => @article.metadata.parser || @article.metadata.markdown_flavour
66
64
  }
67
65
  response = Devcenter::Client.update_article(token, article_id, article_params)
68
66
  if response.ok?
@@ -86,4 +84,4 @@ module Devcenter::Commands
86
84
  end
87
85
  end
88
86
  end
89
- end
87
+ end
data/lib/devcenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Devcenter
2
- VERSION = "1.1.4"
2
+ VERSION = "1.1.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devcenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Raul Murciano
@@ -9,220 +9,234 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-02-18 00:00:00.000000000 Z
12
+ date: 2015-11-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: listen
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: 1.3.1
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: 1.3.1
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: commander
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: 4.1.3
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: 4.1.3
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: json
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '1.8'
49
- - - ! '>='
49
+ - - ">="
50
50
  - !ruby/object:Gem::Version
51
51
  version: 1.8.2
52
52
  type: :runtime
53
53
  prerelease: false
54
54
  version_requirements: !ruby/object:Gem::Requirement
55
55
  requirements:
56
- - - ~>
56
+ - - "~>"
57
57
  - !ruby/object:Gem::Version
58
58
  version: '1.8'
59
- - - ! '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: 1.8.2
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: excon
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 0.15.4
69
69
  type: :runtime
70
70
  prerelease: false
71
71
  version_requirements: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 0.15.4
76
76
  - !ruby/object:Gem::Dependency
77
77
  name: launchy
78
78
  requirement: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 2.1.0
83
83
  type: :runtime
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 2.1.0
90
90
  - !ruby/object:Gem::Dependency
91
91
  name: coderay
92
92
  requirement: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.0.8
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.0.8
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: thin
106
106
  requirement: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.5.0
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: 1.5.0
118
118
  - !ruby/object:Gem::Dependency
119
119
  name: rack
120
120
  requirement: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 1.4.4
125
125
  type: :runtime
126
126
  prerelease: false
127
127
  version_requirements: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 1.4.4
132
132
  - !ruby/object:Gem::Dependency
133
133
  name: rack-protection
134
134
  requirement: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 1.3.2
139
139
  type: :runtime
140
140
  prerelease: false
141
141
  version_requirements: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: 1.3.2
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: sinatra
148
148
  requirement: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 1.3.4
153
153
  type: :runtime
154
154
  prerelease: false
155
155
  version_requirements: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.3.4
160
160
  - !ruby/object:Gem::Dependency
161
161
  name: tilt
162
162
  requirement: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: 1.3.3
167
167
  type: :runtime
168
168
  prerelease: false
169
169
  version_requirements: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ~>
171
+ - - "~>"
172
172
  - !ruby/object:Gem::Version
173
173
  version: 1.3.3
174
+ - !ruby/object:Gem::Dependency
175
+ name: psych
176
+ requirement: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - "~>"
179
+ - !ruby/object:Gem::Version
180
+ version: 2.0.15
181
+ type: :runtime
182
+ prerelease: false
183
+ version_requirements: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - "~>"
186
+ - !ruby/object:Gem::Version
187
+ version: 2.0.15
174
188
  - !ruby/object:Gem::Dependency
175
189
  name: rack-highlighter
176
190
  requirement: !ruby/object:Gem::Requirement
177
191
  requirements:
178
- - - ~>
192
+ - - "~>"
179
193
  - !ruby/object:Gem::Version
180
194
  version: 0.2.0
181
195
  type: :runtime
182
196
  prerelease: false
183
197
  version_requirements: !ruby/object:Gem::Requirement
184
198
  requirements:
185
- - - ~>
199
+ - - "~>"
186
200
  - !ruby/object:Gem::Version
187
201
  version: 0.2.0
188
202
  - !ruby/object:Gem::Dependency
189
203
  name: devcenter-parser
190
204
  requirement: !ruby/object:Gem::Requirement
191
205
  requirements:
192
- - - ~>
206
+ - - "~>"
193
207
  - !ruby/object:Gem::Version
194
208
  version: '1.4'
195
- - - ! '>='
209
+ - - ">="
196
210
  - !ruby/object:Gem::Version
197
211
  version: 1.4.8
198
212
  type: :runtime
199
213
  prerelease: false
200
214
  version_requirements: !ruby/object:Gem::Requirement
201
215
  requirements:
202
- - - ~>
216
+ - - "~>"
203
217
  - !ruby/object:Gem::Version
204
218
  version: '1.4'
205
- - - ! '>='
219
+ - - ">="
206
220
  - !ruby/object:Gem::Version
207
221
  version: 1.4.8
208
222
  - !ruby/object:Gem::Dependency
209
223
  name: netrc
210
224
  requirement: !ruby/object:Gem::Requirement
211
225
  requirements:
212
- - - ~>
226
+ - - "~>"
213
227
  - !ruby/object:Gem::Version
214
228
  version: '0.10'
215
- - - ! '>='
229
+ - - ">="
216
230
  - !ruby/object:Gem::Version
217
231
  version: 0.10.2
218
232
  type: :runtime
219
233
  prerelease: false
220
234
  version_requirements: !ruby/object:Gem::Requirement
221
235
  requirements:
222
- - - ~>
236
+ - - "~>"
223
237
  - !ruby/object:Gem::Version
224
238
  version: '0.10'
225
- - - ! '>='
239
+ - - ">="
226
240
  - !ruby/object:Gem::Version
227
241
  version: 0.10.2
228
242
  description: CLI to interact with Heroku's Dev Center
@@ -233,7 +247,7 @@ executables:
233
247
  extensions: []
234
248
  extra_rdoc_files: []
235
249
  files:
236
- - .gitignore
250
+ - ".gitignore"
237
251
  - CONTRIBUTING.md
238
252
  - Gemfile
239
253
  - LICENSE.txt
@@ -322,17 +336,17 @@ require_paths:
322
336
  - lib
323
337
  required_ruby_version: !ruby/object:Gem::Requirement
324
338
  requirements:
325
- - - ! '>='
339
+ - - ">="
326
340
  - !ruby/object:Gem::Version
327
341
  version: '0'
328
342
  required_rubygems_version: !ruby/object:Gem::Requirement
329
343
  requirements:
330
- - - ! '>='
344
+ - - ">="
331
345
  - !ruby/object:Gem::Version
332
346
  version: '0'
333
347
  requirements: []
334
348
  rubyforge_project:
335
- rubygems_version: 2.2.2
349
+ rubygems_version: 2.4.5.1
336
350
  signing_key:
337
351
  specification_version: 4
338
352
  summary: CLI to interact with Heroku's Dev Center