song_pro 0.1.6 → 0.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. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/Gemfile.lock +14 -16
  4. data/lib/song_pro/version.rb +1 -1
  5. data/lib/song_pro.rb +3 -2
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2cc000fc4571c9fa968eab38c8f17fd41018ce41bcadf232ae0322f3b945c24c
4
- data.tar.gz: 0d022723e2b367d8a5eb8830cdcb4d49fc1d802798dfdb36ea61ce4599c77de2
3
+ metadata.gz: 18d4e592d767147e96e7de58fc3c381cc8a1c4508e983a381546c1fdd23c56f9
4
+ data.tar.gz: b8f7cc5d7629f5479514c4868351b1c23bf70a101b5f362eb4411ef2de9178ae
5
5
  SHA512:
6
- metadata.gz: eeea491a0ef30fed63a319473e8915f8b56d1c3a3d347e422574a12f8cd253200368bfbd131608bd42e1b4bcfa7309ede20de2a1c623fd6fb7c51d2b4650d0ec
7
- data.tar.gz: 8a229476ec09221725d4b25b38c7b5e6c1c11217ef6ea7ba933acfbfe1f419d3d2ee87d80b15c64eec813e1aba18649cd9ca5cebbfcc21cb99d17c9e0253f77a
6
+ metadata.gz: 59c15b7f3e86ba3d4b1112cc25900aae6d4f8d964265dd36a45142f1f56c53c5b202f9eea2feef0138dda243e00f5c7e70e4b4c128e5326681ac5a6d0d7a8b4c
7
+ data.tar.gz: 30d3e35b2d6784129432e86851b0cb42f4a51073c996badcd6b0c4e7496c50415db2dc8ef04446a0c7a929a2f3581e31f3d1ab4a0192f55a7485dd53524b4b14
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.6.3
1
+ 2.7.0
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- song_pro (0.1.6)
4
+ song_pro (0.1.7)
5
5
  markaby
6
6
 
7
7
  GEM
@@ -10,38 +10,36 @@ GEM
10
10
  ast (2.4.0)
11
11
  builder (3.2.3)
12
12
  diff-lcs (1.3)
13
- jaro_winkler (1.5.1)
13
+ jaro_winkler (1.5.3)
14
14
  markaby (0.9.0)
15
15
  builder
16
- parallel (1.12.1)
17
- parser (2.5.1.2)
16
+ parallel (1.17.0)
17
+ parser (2.6.4.0)
18
18
  ast (~> 2.4.0)
19
- powerpack (0.1.2)
20
19
  rainbow (3.0.0)
21
20
  rake (10.5.0)
22
21
  rspec (3.8.0)
23
22
  rspec-core (~> 3.8.0)
24
23
  rspec-expectations (~> 3.8.0)
25
24
  rspec-mocks (~> 3.8.0)
26
- rspec-core (3.8.0)
25
+ rspec-core (3.8.2)
27
26
  rspec-support (~> 3.8.0)
28
- rspec-expectations (3.8.1)
27
+ rspec-expectations (3.8.4)
29
28
  diff-lcs (>= 1.2.0, < 2.0)
30
29
  rspec-support (~> 3.8.0)
31
- rspec-mocks (3.8.0)
30
+ rspec-mocks (3.8.1)
32
31
  diff-lcs (>= 1.2.0, < 2.0)
33
32
  rspec-support (~> 3.8.0)
34
- rspec-support (3.8.0)
35
- rubocop (0.58.2)
33
+ rspec-support (3.8.2)
34
+ rubocop (0.74.0)
36
35
  jaro_winkler (~> 1.5.1)
37
36
  parallel (~> 1.10)
38
- parser (>= 2.5, != 2.5.1.1)
39
- powerpack (~> 0.1)
37
+ parser (>= 2.6)
40
38
  rainbow (>= 2.2.2, < 4.0)
41
39
  ruby-progressbar (~> 1.7)
42
- unicode-display_width (~> 1.0, >= 1.0.1)
43
- ruby-progressbar (1.10.0)
44
- unicode-display_width (1.4.0)
40
+ unicode-display_width (>= 1.4.0, < 1.7)
41
+ ruby-progressbar (1.10.1)
42
+ unicode-display_width (1.6.0)
45
43
 
46
44
  PLATFORMS
47
45
  ruby
@@ -54,4 +52,4 @@ DEPENDENCIES
54
52
  song_pro!
55
53
 
56
54
  BUNDLED WITH
57
- 1.17.2
55
+ 2.1.4
data/lib/song_pro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SongPro
2
- VERSION = '0.1.6'.freeze
2
+ VERSION = '0.1.7'.freeze
3
3
  end
data/lib/song_pro.rb CHANGED
@@ -11,7 +11,8 @@ module SongPro
11
11
  SECTION_REGEX = /#\s*([^$]*)/
12
12
  ATTRIBUTE_REGEX = /@(\w*)=([^%]*)/
13
13
  CUSTOM_ATTRIBUTE_REGEX = /!(\w*)=([^%]*)/
14
- CHORDS_AND_LYRICS_REGEX = %r{(\[[\w#b\/]+\])?([\w\s',.!()_\-"]*)}i
14
+ CHORDS_AND_LYRICS_REGEX = %r{(\[[\w#b\/]+\])?([^\[]*)}i
15
+
15
16
  MEASURES_REGEX = %r{([\[[\w#b\/]+\]\s]+)[|]*}i
16
17
  CHORDS_REGEX = %r{\[([\w#b\/]+)\]?}i
17
18
  COMMENT_REGEX = />\s*([^$]*)/
@@ -100,7 +101,7 @@ module SongPro
100
101
  part = Part.new
101
102
  chord = pair[0]&.strip || ''
102
103
  part.chord = chord.delete('[').delete(']')
103
- part.lyric = pair[1]&.strip || ''
104
+ part.lyric = pair[1] || ''
104
105
 
105
106
  line.parts << part unless (part.chord == '') && (part.lyric == '')
106
107
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: song_pro
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian Kelly
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-07-04 00:00:00.000000000 Z
11
+ date: 2020-01-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: markaby
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
126
126
  - !ruby/object:Gem::Version
127
127
  version: '0'
128
128
  requirements: []
129
- rubygems_version: 3.0.3
129
+ rubygems_version: 3.1.2
130
130
  signing_key:
131
131
  specification_version: 4
132
132
  summary: Converts SongPro files to HTML