textmerge 0.0.3 → 0.0.5

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 (25) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +0 -0
  3. data/Gemfile +0 -0
  4. data/Gemfile.lock +3 -1
  5. data/Guardfile +0 -0
  6. data/LICENSE.txt +0 -0
  7. data/README.md +0 -0
  8. data/Rakefile +0 -0
  9. data/lib/cli.rb +0 -0
  10. data/lib/textmerge/merge.rb +1 -1
  11. data/lib/textmerge/version.rb +1 -1
  12. data/lib/textmerge.rb +0 -0
  13. data/spec/lib/test_input.txt +0 -0
  14. data/spec/lib/textmerge_spec.rb +0 -0
  15. data/spec/spec_helper.rb +0 -0
  16. data/textmerge/.gitignore +0 -0
  17. data/textmerge/Gemfile +0 -0
  18. data/textmerge/LICENSE.txt +0 -0
  19. data/textmerge/README.md +0 -0
  20. data/textmerge/Rakefile +0 -0
  21. data/textmerge/lib/textmerge/version.rb +0 -0
  22. data/textmerge/lib/textmerge.rb +0 -0
  23. data/textmerge/textmerge.gemspec +0 -0
  24. data/textmerge.gemspec +0 -0
  25. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 30f4a41741f4feccf2f820eeb2597224acf4852d
4
- data.tar.gz: bd08ae4fa5f8ceb776afd137c6d4ff1af0c24fa5
3
+ metadata.gz: bd9f6d61f20aa9533baf76805d69fea511a0def9
4
+ data.tar.gz: 2df098a4aade4002451372c504b1aa41fb6b2baa
5
5
  SHA512:
6
- metadata.gz: ae1b5d25ff5b2d9f0aed30ece807d26fdd6b4d3347ee8755f09145bfdbcd286252a432899e3335b41a5b6587edc105b8240b81cf2edf556ec17e15ad44142a77
7
- data.tar.gz: 8bb1e0fee7a42d6ef6a2199c8b2d8e0306168f2e1678a78d09250157524a38a809abea92d95332378a1abdaf8664fe7d6db8d815b5c8fdd993a9fd928a0fd754
6
+ metadata.gz: 52385ef656f03b5a513acf6c58592e47837415a2974971743278898ca574cccf01f57e3d3fe15e7e83b472ce4cecccb50967433321676d8c1e54f773c409d778
7
+ data.tar.gz: c931aeea16e200902f654664ad7168deedd0a320b9a477065273fa008b8730c2f0562ac7540504f97e2198bdd11ab71f6c477198f4e3e34483bba91794f6fb94
data/.gitignore CHANGED
File without changes
data/Gemfile CHANGED
File without changes
data/Gemfile.lock CHANGED
@@ -1,7 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- textmerge (0.0.3)
4
+ textmerge (0.0.5)
5
+ highline (~> 1.6)
6
+ thor
5
7
 
6
8
  GEM
7
9
  remote: https://rubygems.org/
data/Guardfile CHANGED
File without changes
data/LICENSE.txt CHANGED
File without changes
data/README.md CHANGED
File without changes
data/Rakefile CHANGED
File without changes
data/lib/cli.rb CHANGED
File without changes
data/lib/textmerge/merge.rb CHANGED
@@ -24,7 +24,7 @@ module Textmerge
24
24
  end
25
25
 
26
26
  def get_requests(data)
27
- regex = /\{(\d)\:(.*?)\}/
27
+ regex = /\{(\d{1,3})\:(.*?)\}/
28
28
  collection = data.scan(regex)
29
29
  collection.sort!
30
30
  array_to_hash(collection)
data/lib/textmerge/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Textmerge
2
- VERSION = "0.0.3"
2
+ VERSION = "0.0.5"
3
3
  end
data/lib/textmerge.rb CHANGED
File without changes
data/spec/lib/test_input.txt CHANGED
File without changes
data/spec/lib/textmerge_spec.rb CHANGED
File without changes
data/spec/spec_helper.rb CHANGED
File without changes
data/textmerge/.gitignore CHANGED
File without changes
data/textmerge/Gemfile CHANGED
File without changes
data/textmerge/LICENSE.txt CHANGED
File without changes
data/textmerge/README.md CHANGED
File without changes
data/textmerge/Rakefile CHANGED
File without changes
data/textmerge/lib/textmerge/version.rb CHANGED
File without changes
data/textmerge/lib/textmerge.rb CHANGED
File without changes
data/textmerge/textmerge.gemspec CHANGED
File without changes
data/textmerge.gemspec CHANGED
File without changes
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: textmerge
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Simpson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-04 00:00:00.000000000 Z
11
+ date: 2015-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
146
146
  version: '0'
147
147
  requirements: []
148
148
  rubyforge_project:
149
- rubygems_version: 2.1.11
149
+ rubygems_version: 2.0.14
150
150
  signing_key:
151
151
  specification_version: 4
152
152
  summary: Good for configuration files and whatever