#64 updated to json 2.0

express42 · Jan 13, 2017 · 7b4ce71 · 7b4ce71
1 parent a9fe894
commit 7b4ce71
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+gemfile:
+  - Gemfile
+  - json-1.x.Gemfile
 dist: trusty
 sudo: required
 
@@ -29,3 +33,9 @@ before_script:
   - echo "$(curl -fsSL https://gist.githubusercontent.com/evtuhovich/9544441/raw/d661863063b76cc8e2599bc44d8595b1f86ece38/zabbix)" | sudo tee /etc/zabbix/web/zabbix.conf.php
   - sudo service apache2 restart
 script: "ZABBIX_HOST_URL=http://localhost/zabbix/api_jsonrpc.php bundle exec rspec spec/*"
+
+matrix:
+  exclude:
+    # json 2.x requires ruby 2.x
+    - rvm: 1.9.3
+      gemfile: json-1.x.Gemfile
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem "rspec"
-gem "rake"
-gem "json"
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,22 +1,36 @@
+PATH
+  remote: .
+  specs:
+    zabbixapi (2.4.9)
+      json
+
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    json (1.8.3)
-    rake (0.9.2.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    diff-lcs (1.2.5)
+    json (2.0.3)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  json
   rake
   rspec
+  zabbixapi!
+
+BUNDLED WITH
+   1.12.5
diff --git a/json-1.x.Gemfile b/json-1.x.Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'json', '~> 1.8'
+gem 'rspec'
diff --git a/json-1.x.Gemfile.lock b/json-1.x.Gemfile.lock
@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    json (1.8.5)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  json (~> 1.8)
+  rspec
+
+BUNDLED WITH
+   1.12.5
diff --git a/zabbixapi.gemspec b/zabbixapi.gemspec
@@ -12,7 +12,10 @@ Gem::Specification.new do |s|
   s.description = %q{Allows you to work with zabbix api from ruby.}
   s.licenses    = %w(MIT)
 
-  s.add_dependency('json', '~> 1.6', '>= 1.6.0')
+  s.add_runtime_dependency 'json'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
   s.rubyforge_project = "zabbixapi"