zabbixapi 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215112a4983ad12bbe114bf2b884a99e165fc0f8
-  data.tar.gz: 0d3d0c9eba2992c8dc6ac34145657773bd90ccbe
+  metadata.gz: 4e527079a1480ac3175e6cb8db6b1754b2b59bec
+  data.tar.gz: a032b442b07c115dc0b5275dc1c26be1a387cfe8
 SHA512:
-  metadata.gz: e46a3e882b2d4abefdd27d62e8839dc85f8ecc8485905e385e4fd396d914d547119c3f44ba66e27aae1d3244215189419fc62f3f0e5edbcc27f05bec5ffef01f
-  data.tar.gz: bfca90c6b3676e1ff1dd10874ab70fceb43a464c41eb7220bbbf9e5341c7aab2e150f571431a315f72f6fe61a641e5d1b020c932f1966a0fea91673a70fe5eb7
+  metadata.gz: e6367ff0bed467de9596ed84d92c6e507b417c5b90203278c24a8f0963bbe2b16177ed8ff46010437712cbe81ca09ad029b9cb740a363304a6490ef1c763ee5b
+  data.tar.gz: d9a3b31befd619ab851aad5392bd2d2c514bf9437b313c6f4917d6ee5e15642e16a570ae089e20b68f58bf5868f7030a57ed29c9ecd7a4b2ac09c80b8bd74caf

data/.travis.yml

@@ -1,24 +1,34 @@
 language:
   - ruby
 addons:
-  postgresql: "9.4"
+  postgresql: "9.5"
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
 before_script:
-  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3
+  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5
+  - wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
   - wget -qO - http://repo.zabbix.com/zabbix-official-repo.key | sudo apt-key add -
-  - echo "deb http://repo.zabbix.com/zabbix/2.4/ubuntu/ precise main" | sudo tee /etc/apt/sources.list.d/zabbix.list
+  - echo "deb http://repo.zabbix.com/zabbix/3.0/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/zabbix.list
   - sudo apt-get update
+  - sudo dpkg-reconfigure locales
+  - sudo apt-get install curl
+  - sudo apt-get install apache2
   - sudo apt-get install libiodbc2
-  - sudo apt-get install postgresql
+  - sudo apt-get install postgresql-9.5
   - sudo apt-get install zabbix-frontend-php
   - sudo useradd -r zabbix
   - sudo apt-get install zabbix-server-pgsql
   - sudo apt-get install php5-pgsql
-  - sudo service apache2 restart
-  - 'echo -e "local   all   all trust\nhost all all 127.0.0.1/32 trust\nhost all all ::1/128 trust" | sudo tee /etc/postgresql/9.4/main/pg_hba.conf'
-  - sudo pg_ctlcluster 9.4 main reload
+  - sudo sed -i "s,;date.timezone =,date.timezone = 'US/Eastern'," /etc/php5/apache2/php.ini
+  - 'echo -e "local all postgres trust\nlocal   all   all trust\nhost all all 127.0.0.1/32 trust\nhost all all ::1/128 trust" | sudo tee /etc/postgresql/9.5/main/pg_hba.conf'
+  - sudo /etc/init.d/postgresql restart
+  - sudo pg_ctlcluster 9.5 main reload
+  - sudo -u postgres createdb zabbix
+  - sudo -u postgres createuser -a -d -E zabbix
+  - zcat /usr/share/doc/zabbix-server-pgsql/create.sql.gz | LC_ALL=C psql -U zabbix
   - 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/*"

data/lib/zabbixapi/classes/applications.rb

@@ -1,7 +1,7 @@
 class ZabbixApi
   class Applications
 
-    API_PARAMETERS = %w(applicationids groupids hostids inherited itemids templated templateids expandData selectHosts selectItems)
+    API_PARAMETERS = %w(applicationids groupids hostids inherited itemids templated templateids selectItems)
 
     def initialize(client)
       @client = client

data/lib/zabbixapi/client.rb

@@ -33,7 +33,7 @@ class ZabbixApi
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
-      unless api_version =~ /2\.4\.\d+/
+      unless api_version =~ /(2\.4|3\.[02])\.\d+/
         raise ApiError.new("Zabbix API version: #{api_version} is not support by this version of zabbixapi")
       end
       @auth_hash = auth

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.6"
+  VERSION = "2.4.7"
 end

data/spec/mediatype.rb

@@ -14,7 +14,8 @@ describe 'mediatype' do
         :description => @mediatype,
         :type => 0,
         :smtp_server => "127.0.0.1",
-        :smtp_email => "zabbix@test.com"
+        :smtp_email => "zabbix@test.com",
+        :smtp_helo => "test.com"
       )
       mediatypeid.should be_kind_of(Integer)
     end
@@ -27,7 +28,8 @@ describe 'mediatype' do
         :description => @mediatype,
         :type => 0,
         :smtp_server => "127.0.0.1",
-        :smtp_email => "zabbix@test.com"
+        :smtp_email => "zabbix@test.com",
+        :smtp_helo => "test.com"
       )
     end
 
@@ -35,7 +37,8 @@ describe 'mediatype' do
       it "should return id" do
         zbx.mediatypes.create_or_update(
           :description => @mediatype,
-          :smtp_email => "zabbix2@test.com"
+          :smtp_email => "zabbix2@test.com",
+          :smtp_helo => "test.com"
         ).should eq @mediatypeid
       end
 

data/spec/server.rb

@@ -8,8 +8,8 @@ describe 'server' do
       zbx.server.version.should be_kind_of(String)
     end
 
-    it "should be 2.4.x" do
-      zbx.server.version.should match(/2\.4\.\d+/)
+    it "should be 2.4.x or 3.0.x or 3.2.x" do
+      zbx.server.version.should match(/(2\.4|3\.[02])\.\d+/)
     end
   end
 end

data/spec/user.rb

@@ -12,7 +12,8 @@ describe 'user' do
       :description => @mediatype,
       :type => 0,
       :smtp_server => "127.0.0.1",
-      :smtp_email => "zabbix@test.com"
+      :smtp_email => "zabbix@test.com",
+      :smtp_helo => "test.com"
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json