image-inspector-client 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a6c042421c36dc77cbdf06b8ac27fed24fae08
-  data.tar.gz: 4a902b2d59cafde219c5c1e4d8b66a73a37553b7
+  metadata.gz: 72ce115d700fd6aea872826048f485b1d8d5986d
+  data.tar.gz: b54b8036062a6d01b8a6b1fe37590e4ce1801559
 SHA512:
-  metadata.gz: 12ff422fbadf19288d00bda3be488f967519a43784d649b3c515fc6e8ef38a7208f865f9af958de9d12678c6114c32dc0376906cab49ac27a68603673ce59c75
-  data.tar.gz: 337932fe6766926c5ffdee79e1d12c3d60aa5e661ce9ce615b3bf614e0cf6174e2658496bfc228db143ffe8fd334a261e3b200ec55303b9ab80e26d8c0a79fc0
+  metadata.gz: f746679909baefd5ec70737b70754d25626149e59eb8aadd5a381d46b3a7c841e6f0f0a7da2201953c3a0beec091862cb96a5f6bcb7544b4d818883b2a97dbf7
+  data.tar.gz: 55b2e9deac240d87cb2447c3245a313997be06881640d3cee516e38eb0cdde601fe1c65adbbac293f9388f9038739880559933ccf80e5605e8aa4adf20410dc0

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - "2.0"
-  - "2.1"
   - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5"
 sudo: false
 cache: bundler

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in kubeclient.gemspec
+# Specify your gem's dependencies in image-inspector-client.gemspec
 gemspec

data/README.md

@@ -1,5 +1,5 @@
 # image-inspector-client
-a ruby client for [image-inspector](https://github.com/simon3z/image-inspector)
+a ruby client for [image-inspector](https://github.com/openshift/image-inspector)
 
 ## installing gem
 gem install image-inspector-client

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'
 
-task default: [:test, :rubocop]
+task default: %i[test rubocop]
 
 Rake::TestTask.new do |t|
   t.libs << 'test'

data/image-inspector-client.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'image-inspector-client/version'
@@ -10,22 +11,22 @@ Gem::Specification.new do |spec|
   spec.email         = ['mtayer@redhat.com']
   spec.summary       = 'A client for image_inspector REST API'
   spec.description   = 'A client for image_inspector REST API'
-  spec.homepage      = 'https://github.com/moolitayer/image-inspector-client'
+  spec.homepage      = 'https://github.com/openshift/image-inspector-client-ruby'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'rubocop', '= 0.30.0'
+  spec.add_development_dependency 'webmock', '~> 3.0.1'
+  spec.add_development_dependency 'rubocop', '~> 0.49.1'
 
   spec.add_dependency 'json'
-  spec.add_dependency 'recursive-open-struct', '= 1.0.0'
-  spec.add_dependency 'rest-client'
+  spec.add_dependency 'recursive-open-struct', '~> 1.0'
+  spec.add_dependency 'rest-client', '~> 2.0'
 end

data/lib/image-inspector-client.rb

@@ -2,7 +2,7 @@ require 'json'
 require 'rest-client'
 require 'recursive_open_struct'
 
-# Client for image inspector: https://github.com/simon3z/image-inspector
+# Client for image inspector: https://github.com/openshift/image-inspector
 module ImageInspectorClient
   # module entry point
   class Client
@@ -19,9 +19,10 @@ module ImageInspectorClient
       auth_options: {
         username:          nil,
         password:          nil,
-        bearer_token:      nil
+        bearer_token:      nil,
+        auth_token:        nil
       },
-      http_proxy_uri:   nil
+      http_proxy_uri: nil
     )
       @endpoint = URI.parse("#{uri}/api/#{version}")
       @auth_options = auth_options
@@ -74,13 +75,12 @@ module ImageInspectorClient
     end
 
     def http_headers
+      headers = {}
       if @auth_options[:bearer_token]
-        {
-          Authorization: "Bearer #{@auth_options[:bearer_token]}"
-        }
-      else
-        {}
+        headers[:Authorization] = "Bearer #{@auth_options[:bearer_token]}"
       end
+      headers[:'X-Auth-Token'] = @auth_options[:auth_token] if @auth_options[:auth_token]
+      headers
     end
   end
 
@@ -94,7 +94,7 @@ module ImageInspectorClient
     end
 
     def to_s
-      'HTTP status code ' + @error_code.to_s + ', ' + @message
+      "HTTP status code #{@error_code}, #{@message}"
     end
   end
 end

data/lib/image-inspector-client/version.rb

@@ -1,4 +1,4 @@
-# Client for image inspector: https://github.com/simon3z/image-inspector
+# Client for image inspector: https://github.com/openshift/image-inspector
 module ImageInspectorClient
-  VERSION = '1.0.3'
+  VERSION = '2.0.0'.freeze
 end

data/test/test_client.rb

@@ -7,7 +7,8 @@ class TestClient < MiniTest::Test
       .to_return(status: 404)
 
     assert_raises(ImageInspectorClient::InspectorClientException) do
-      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+      ImageInspectorClient::Client
+        .new('http://localhost:8080', 'v1')
         .fetch_metadata
     end
   end

data/test/test_metadata.rb

@@ -8,7 +8,8 @@ class TestMetadata < MiniTest::Test
       status: 200
     )
 
-    md = ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+    md = ImageInspectorClient::Client
+         .new('http://localhost:8080', 'v1')
          .fetch_metadata
 
     assert_instance_of(RecursiveOpenStruct, md)

data/test/test_openscap.rb

@@ -8,7 +8,8 @@ class TestOpenscap < MiniTest::Test
       status: 200
     )
 
-    md = ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+    md = ImageInspectorClient::Client
+         .new('http://localhost:8080', 'v1')
          .fetch_oscap_arf
 
     assert_equal(File.read('test/xml/openscap.xml'), md)
@@ -26,7 +27,8 @@ class TestOpenscap < MiniTest::Test
       status: 200
     )
 
-    md = ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+    md = ImageInspectorClient::Client
+         .new('http://localhost:8080', 'v1')
          .fetch_oscap_arf
 
     assert_equal('', md)
@@ -45,8 +47,9 @@ class TestOpenscap < MiniTest::Test
     )
 
     e = assert_raises(ImageInspectorClient::InspectorClientException) do
-      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
-      .fetch_oscap_arf
+      ImageInspectorClient::Client
+        .new('http://localhost:8080', 'v1')
+        .fetch_oscap_arf
     end
 
     assert_equal(404, e.error_code)

data/test/test_rest_client.rb

@@ -9,8 +9,9 @@ class TestRestClient < MiniTest::Test
     )
 
     e = assert_raises(ImageInspectorClient::InspectorClientException) do
-      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
-      .fetch_metadata
+      ImageInspectorClient::Client
+        .new('http://localhost:8080', 'v1')
+        .fetch_metadata
     end
 
     assert_equal(404, e.error_code)
@@ -24,8 +25,9 @@ class TestRestClient < MiniTest::Test
     )
 
     e = assert_raises(ImageInspectorClient::InspectorClientException) do
-      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
-      .fetch_metadata
+      ImageInspectorClient::Client
+        .new('http://localhost:8080', 'v1')
+        .fetch_metadata
     end
 
     assert_equal(404, e.error_code)
@@ -39,8 +41,9 @@ class TestRestClient < MiniTest::Test
     )
 
     e = assert_raises(ImageInspectorClient::InspectorClientException) do
-      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
-      .fetch_metadata
+      ImageInspectorClient::Client
+        .new('http://localhost:8080', 'v1')
+        .fetch_metadata
     end
 
     assert_equal(404, e.error_code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image-inspector-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Mooli Tayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,30 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,30 @@ dependencies:
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: A client for image_inspector REST API
 email:
 - mtayer@redhat.com
@@ -146,7 +146,7 @@ files:
 - test/test_openscap.rb
 - test/test_rest_client.rb
 - test/xml/openscap.xml
-homepage: https://github.com/moolitayer/image-inspector-client
+homepage: https://github.com/openshift/image-inspector-client-ruby
 licenses:
 - MIT
 metadata: {}
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A client for image_inspector REST API