pygments.rb 0.2.11 → 0.2.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,3 @@
1
1
  module Pygments
2
- VERSION = '0.2.11'
2
+ VERSION = '0.2.12'
3
3
  end
@@ -112,6 +112,7 @@ class PuppetLexer(RegexLexer):
112
112
  ],
113
113
  'puppet': [
114
114
  include('comments'),
115
+ (r'(class)(\s*)(\{)', bygroups(Name.Class, Text, Punctuation), ('type', 'namevar')),
115
116
  (r'(class|define)', Keyword.Declaration, ('block','class_name')),
116
117
  (r'node', Keyword.Declaration, ('block', 'node_name')),
117
118
  (r'elsif', Keyword.Reserved, ('block', 'conditional')),
@@ -124,7 +125,7 @@ class PuppetLexer(RegexLexer):
124
125
  (r'(::)?([A-Z][\w:]+)+(\s*)(\[)', bygroups(Name.Class, Name.Class, Text, Punctuation), ('type', 'override_name')),
125
126
  (r'(@{0,2}[\w:]+)(\s*)(\{)(\s*)', bygroups(Name.Class, Text, Punctuation, Text), ('type', 'namevar')),
126
127
  (r'\$(::)?(\w+::)*\w+', Name.Variable, 'var_assign'),
127
- (r'include', Keyword.Namespace, 'include'),
128
+ (r'(include|require)', Keyword.Namespace, 'include'),
128
129
  (r'import', Keyword.Namespace, 'import'),
129
130
  (r'(\w+)(\()', bygroups(Name.Function, Punctuation), 'function'),
130
131
  (r'\s', Text),
@@ -158,7 +159,7 @@ class PuppetLexer(RegexLexer):
158
159
  ],
159
160
  'include': [
160
161
  (r'\n', Text, '#pop'),
161
- (r'[\w:]+', Name.Class),
162
+ (r'[\w:-]+', Name.Class),
162
163
  include('value'),
163
164
  (r'\s', Text),
164
165
  ],
@@ -112,6 +112,7 @@ class PuppetLexer(RegexLexer):
112
112
  ],
113
113
  'puppet': [
114
114
  include('comments'),
115
+ (r'(class)(\s*)(\{)', bygroups(Name.Class, Text, Punctuation), ('type', 'namevar')),
115
116
  (r'(class|define)', Keyword.Declaration, ('block','class_name')),
116
117
  (r'node', Keyword.Declaration, ('block', 'node_name')),
117
118
  (r'elsif', Keyword.Reserved, ('block', 'conditional')),
@@ -124,7 +125,7 @@ class PuppetLexer(RegexLexer):
124
125
  (r'(::)?([A-Z][\w:]+)+(\s*)(\[)', bygroups(Name.Class, Name.Class, Text, Punctuation), ('type', 'override_name')),
125
126
  (r'(@{0,2}[\w:]+)(\s*)(\{)(\s*)', bygroups(Name.Class, Text, Punctuation, Text), ('type', 'namevar')),
126
127
  (r'\$(::)?(\w+::)*\w+', Name.Variable, 'var_assign'),
127
- (r'include', Keyword.Namespace, 'include'),
128
+ (r'(include|require)', Keyword.Namespace, 'include'),
128
129
  (r'import', Keyword.Namespace, 'import'),
129
130
  (r'(\w+)(\()', bygroups(Name.Function, Punctuation), 'function'),
130
131
  (r'\s', Text),
@@ -158,7 +159,7 @@ class PuppetLexer(RegexLexer):
158
159
  ],
159
160
  'include': [
160
161
  (r'\n', Text, '#pop'),
161
- (r'[\w:]+', Name.Class),
162
+ (r'[\w:-]+', Name.Class),
162
163
  include('value'),
163
164
  (r'\s', Text),
164
165
  ],
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pygments.rb
3
3
  version: !ruby/object:Gem::Version
4
- hash: 1
4
+ hash: 15
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 11
10
- version: 0.2.11
9
+ - 12
10
+ version: 0.2.12
11
11
  platform: ruby
12
12
  authors:
13
13
  - Aman Gupta
@@ -15,8 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-04-09 00:00:00 -07:00
19
- default_executable:
18
+ date: 2012-04-18 00:00:00 Z
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
21
  name: rubypython
@@ -413,7 +412,6 @@ files:
413
412
  - vendor/pygments-main/tests/test_token.py
414
413
  - vendor/pygments-main/tests/test_using_api.py
415
414
  - vendor/pygments-main/tests/test_util.py
416
- has_rdoc: true
417
415
  homepage: http://github.com/tmm1/pygments.rb
418
416
  licenses: []
419
417
 
@@ -443,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
443
441
  requirements: []
444
442
 
445
443
  rubyforge_project:
446
- rubygems_version: 1.6.2
444
+ rubygems_version: 1.8.15
447
445
  signing_key:
448
446
  specification_version: 3
449
447
  summary: pygments wrapper for ruby