meld 1.0.0 → 1.1.0

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 +4 -4
  2. data/.prospectus +11 -0
  3. data/CHANGELOG.md +4 -0
  4. data/README.md +3 -3
  5. data/circle.yml +12 -0
  6. data/lib/meld/hash/deep_merge.rb +3 -1
  7. data/meld.gemspec +5 -5
  8. data/spec/spec_helper.rb +7 -6
  9. metadata +14 -13
  10. data/.travis.yml +0 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b51b7e506fd31218fc910168885864ffd44fe24f
4
- data.tar.gz: 2656279b91f4f527ef5c9a256620091b8c22c8fb
3
+ metadata.gz: 0087c314520ba5c9c542c90e03a8c3856d07d709
4
+ data.tar.gz: 2d14ec779b7e7e85ef1309c9932e01ad890c4bd2
5
5
  SHA512:
6
- metadata.gz: eb1bd6ca73cc2fc7756de17b35ac2ee3cc6822000745f4ab117e3e8f7d7a9160421ee515a51ec597327061f48235277065d2ef4798e42402c8b82045ba2c820b
7
- data.tar.gz: d64560178d81d1c2c1e50ac90e4ed87ce72e8dee4b1da8a53ddb3f31be33eaec48d50420ae2bdfaf88d14bc58e569f16dd6954ae1de31725368d4a229a7aff93
6
+ metadata.gz: 9225c65fef492c67be4df1d6c54ca564dbb314657f78837220e781fad83363357c9e50ccfc8ebe9081eb9ac1dd3aab262ea49f5dcf97a5cb44c8f045e1695da9
7
+ data.tar.gz: 75cc0271c771721033a7b2c3cd1234903027b0eb96297600bbe79c086ab53739824e11b64225245d221c93af999dbd3dcfba4c1e0f36b63c0987c9cc84437aee
data/.prospectus ADDED
@@ -0,0 +1,11 @@
1
+ item do
2
+ expected do
3
+ static
4
+ set 'green'
5
+ end
6
+
7
+ actual do
8
+ gemnasium
9
+ slug 'akerl/meld'
10
+ end
11
+ end
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 1.1.0 / 2016-01-24
2
+
3
+ * [FEATURE] Merge arrays as well
4
+
1
5
  # 1.0.0 / 2015-01-22
2
6
 
3
7
  * [ENHANCEMENT] Stabilized API
data/README.md CHANGED
@@ -3,9 +3,9 @@ meld
3
3
 
4
4
  [![Gem Version](https://img.shields.io/gem/v/meld.svg)](https://rubygems.org/gems/meld)
5
5
  [![Dependency Status](https://img.shields.io/gemnasium/akerl/meld.svg)](https://gemnasium.com/akerl/meld)
6
- [![Code Climate](https://img.shields.io/codeclimate/github/akerl/meld.svg)](https://codeclimate.com/github/akerl/meld)
7
- [![Coverage Status](https://img.shields.io/coveralls/akerl/meld.svg)](https://coveralls.io/r/akerl/meld)
8
- [![Build Status](https://img.shields.io/travis/akerl/meld.svg)](https://travis-ci.org/akerl/meld)
6
+ [![Build Status](https://img.shields.io/circleci/project/akerl/meld.svg)](https://circleci.com/gh/akerl/meld)
7
+ [![Coverage Status](https://img.shields.io/codecov/c/github/akerl/meld.svg)](https://codecov.io/github/akerl/meld)
8
+ [![Code Quality](https://img.shields.io/codacy/f670580bfa704594b2230077c80c931e.svg)](https://www.codacy.com/app/akerl/meld)
9
9
  [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
10
10
 
11
11
  Utility library for combining objects
data/circle.yml ADDED
@@ -0,0 +1,12 @@
1
+ dependencies:
2
+ override:
3
+ - 'rvm-exec 1.9.3-p551 bundle install'
4
+ - 'rvm-exec 2.0.0-p645 bundle install'
5
+ - 'rvm-exec 2.1.6 bundle install'
6
+ - 'rvm-exec 2.2.2 bundle install'
7
+ test:
8
+ override:
9
+ - 'rvm-exec 1.9.3-p551 bundle exec rake'
10
+ - 'rvm-exec 2.0.0-p645 bundle exec rake'
11
+ - 'rvm-exec 2.1.6 bundle exec rake'
12
+ - 'rvm-exec 2.2.2 bundle exec rake'
data/lib/meld/hash/deep_merge.rb CHANGED
@@ -3,7 +3,9 @@
3
3
  class Hash
4
4
  def deep_merge!(second)
5
5
  merger = proc do |_, v1, v2|
6
- [v1, v2].all? { |x| x.is_a? Hash } ? v1.merge(v2, &merger) : v2
6
+ next v1.merge(v2, &merger) if [v1, v2].all? { |x| x.is_a? Hash }
7
+ next v1 + v2 if [v1, v2].all? { |x| x.is_a? Array }
8
+ v2
7
9
  end
8
10
  merge!(second, &merger)
9
11
  end
data/meld.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'meld'
3
- s.version = '1.0.0'
3
+ s.version = '1.1.0'
4
4
  s.date = Time.now.strftime("%Y-%m-%d")
5
5
 
6
6
  s.summary = 'Utility library for combining objects'
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
13
13
  s.files = `git ls-files`.split
14
14
  s.test_files = `git ls-files spec/*`.split
15
15
 
16
- s.add_development_dependency 'rubocop', '~> 0.28.0'
17
- s.add_development_dependency 'rake', '~> 10.4.0'
18
- s.add_development_dependency 'coveralls', '~> 0.7.1'
19
- s.add_development_dependency 'rspec', '~> 3.1.0'
16
+ s.add_development_dependency 'rubocop', '~> 0.36.0'
17
+ s.add_development_dependency 'rake', '~> 10.5.0'
18
+ s.add_development_dependency 'codecov', '~> 0.1.1'
19
+ s.add_development_dependency 'rspec', '~> 3.4.0'
20
20
  s.add_development_dependency 'fuubar', '~> 2.0.0'
21
21
  end
data/spec/spec_helper.rb CHANGED
@@ -1,9 +1,10 @@
1
- require 'simplecov'
2
- require 'coveralls'
3
-
4
- SimpleCov.formatter = Coveralls::SimpleCov::Formatter
5
- SimpleCov.start do
6
- add_filter '/spec/'
1
+ if ENV['CI'] == 'true'
2
+ require 'simplecov'
3
+ require 'codecov'
4
+ SimpleCov.formatter = SimpleCov::Formatter::Codecov
5
+ SimpleCov.start do
6
+ add_filter '/spec/'
7
+ end
7
8
  end
8
9
 
9
10
  require 'rspec'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: meld
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Les Aker
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-22 00:00:00.000000000 Z
11
+ date: 2016-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rubocop
@@ -16,56 +16,56 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.28.0
19
+ version: 0.36.0
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.28.0
26
+ version: 0.36.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 10.4.0
33
+ version: 10.5.0
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 10.4.0
40
+ version: 10.5.0
41
41
  - !ruby/object:Gem::Dependency
42
- name: coveralls
42
+ name: codecov
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.7.1
47
+ version: 0.1.1
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.7.1
54
+ version: 0.1.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 3.1.0
61
+ version: 3.4.0
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 3.1.0
68
+ version: 3.4.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: fuubar
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,15 @@ extensions: []
87
87
  extra_rdoc_files: []
88
88
  files:
89
89
  - ".gitignore"
90
+ - ".prospectus"
90
91
  - ".rspec"
91
92
  - ".rubocop.yml"
92
- - ".travis.yml"
93
93
  - CHANGELOG.md
94
94
  - Gemfile
95
95
  - LICENSE
96
96
  - README.md
97
97
  - Rakefile
98
+ - circle.yml
98
99
  - lib/meld.rb
99
100
  - lib/meld/hash/deep_merge.rb
100
101
  - meld.gemspec
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
121
122
  version: '0'
122
123
  requirements: []
123
124
  rubyforge_project:
124
- rubygems_version: 2.2.2
125
+ rubygems_version: 2.5.1
125
126
  signing_key:
126
127
  specification_version: 4
127
128
  summary: Utility library for combining objects
data/.travis.yml DELETED
@@ -1,14 +0,0 @@
1
- language: ruby
2
- sudo: false
3
- cache: bundler
4
- rvm:
5
- - 2.1.0
6
- - 2.0.0
7
- - 1.9.3
8
- notifications:
9
- email: false
10
- irc:
11
- template:
12
- - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
13
- channels:
14
- - irc.oftc.net#akerl