misty 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38a7bebc3932af882c764468517ea29bf58fd63
-  data.tar.gz: 983fccc9ff8b973fb061eb29d4e6c8b0ce35b721
+  metadata.gz: '0108d5bb9451b9500d689c21f6cf43b4ae90186c'
+  data.tar.gz: a6d0744f4806007d55044ad7fe3f96e4be645ec0
 SHA512:
-  metadata.gz: 250e7593f02b12ae22e74d8ff95c7adf62835c6a42ba55f54e7d87c71d205156b9fb868a4e8c094177e899ccd66885ea9106332126b1f3e26739858fae5a5b6a
-  data.tar.gz: ff9ddfb7376a44aba4f21f663afd293a15e73223635104c7426a2f7da11e13f480e66080ac2748cf93208c569f7fb369f5f35d37c19e9dc92e6daf2385d49ded
+  metadata.gz: b73c8d875c03a7495c5e84be31ca00e9b6b13667d0a576334e710f76a6586ec47a7400022ef29f6e896cea866793ac2d41f174cbfb9b81b6b016137875957335
+  data.tar.gz: 8df0ce513d52b08551537a0fe6dc702ce1d6f7e9f06ac43082c1f14a7c27d33952d136273592a8eb8ba6a936077c9eca8450bc49a897ef3dfcc85caae4d5a943

data/README.md

@@ -212,6 +212,10 @@ The following options are applied to each service unless specifically provided f
   Type: String  
   Allowed values: "public", "internal", "admin"  
   Default: "public"  
+* :http_proxy  
+  For example: `"http://userid:password@somewhere.com:8080/"` or `ENV["http_proxy"]`  
+  Type: String  
+  Default: `""`  
 * :ssl_verify_mode  
   When using SSL mode (defined by URI scheme => "https://")  
   Type: Boolean  

data/lib/misty/auth.rb

@@ -24,19 +24,20 @@ module Misty
 
     attr_reader :catalog
 
-    def initialize(options, ssl_verify_mode, log)
+    def initialize(options, proxy, ssl_verify_mode, log)
       @ssl_verify_mode, @log =  ssl_verify_mode, log
       @credentials = scoped_authentication
 
       raise URLError, "No URL provided" unless options[:url] && !options[:url].empty?
       @uri = URI.parse(options[:url])
+      @proxy = proxy
       @token = nil
       setup(authenticate)
       raise CatalogError, "No catalog provided during authentication" if @catalog.empty?
     end
 
     def authenticate
-      http = net_http(@uri, @ssl_verify_mode, @log)
+      http = net_http(@uri, @proxy, @ssl_verify_mode, @log)
       response = http.post(self.class.path, @credentials.to_json, Misty::HEADER_JSON)
       raise AuthenticationError, "Response code=#{response.code}, Msg=#{response.msg}" unless response.code =~ /200|201/
       response

data/lib/misty/cloud.rb

@@ -3,7 +3,9 @@ require 'misty/auth/auth_v3'
 
 module Misty
   class Cloud
-    Setup   = Struct.new(:auth, :content_type, :log, :interface, :region_id, :ssl_verify_mode)
+    class Setup
+      attr_accessor :auth, :content_type, :log, :interface, :proxy, :region_id, :ssl_verify_mode
+    end
 
     Options = Struct.new(:alarming, :baremetal, :block_storage, :clustering, :compute, :container, :data_processing,
       :database, :data_protection, :dns, :identity, :image, :messaging, :metering, :network, :object_storage,
@@ -25,7 +27,9 @@ module Misty
       setup.log.level = params[:log_level] ? params[:log_level] : Misty::LOG_LEVEL
       setup.region_id = params[:region_id] ? params[:region_id] : Misty::REGION_ID
       setup.ssl_verify_mode = params.key?(:ssl_verify_mode) ? params[:ssl_verify_mode] : Misty::SSL_VERIFY_MODE
-      setup.auth = Misty::Auth.factory(params[:auth], setup.ssl_verify_mode, setup.log)
+      http_proxy = params[:http_proxy] ? params[:http_proxy] : ""
+      setup.proxy = URI.parse(http_proxy)
+      setup.auth = Misty::Auth.factory(params[:auth], setup.proxy, setup.ssl_verify_mode, setup.log)
       setup
     end
 

data/lib/misty/http/client.rb

@@ -51,7 +51,7 @@ module Misty
         @uri = URI.parse(@setup.auth.get_endpoint(@options.service_names, @options.region_id, @options.interface))
         @base_path = @options.base_path ? @options.base_path : @uri.path
         @base_path = @base_path.chomp("/")
-        @http = net_http(@uri, @options[:ssl_verify_mode], @setup.log)
+        @http = net_http(@uri, @setup.proxy, @options[:ssl_verify_mode], @setup.log)
         @version = nil
         @microversion = false
       end

data/lib/misty/http/net_http.rb

@@ -1,10 +1,10 @@
 module Misty
   module HTTP
     module NetHTTP
-      def net_http(uri, ssl_verify_mode, log)
-        http = Net::HTTP.new(uri.host, uri.port)
+      def net_http(endpoint, proxy, ssl_verify_mode, log)
+        http = Net::HTTP.new(endpoint.host, endpoint.port, proxy.host, proxy.port, proxy.user, proxy.password)
         http.set_debug_output(log) if log.level == Logger::DEBUG
-        if uri.scheme == "https"
+        if endpoint.scheme == "https"
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless ssl_verify_mode
         end

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/unit/auth_test.rb

@@ -19,7 +19,7 @@ describe Misty::Auth do
             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).
           to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        Misty::AuthV3.new(auth, false, log)
+        Misty::AuthV3.new(auth, URI.parse(""), false, log)
       end
 
       it "authenticates using domain scoped authorization" do
@@ -34,7 +34,7 @@ describe Misty::Auth do
             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).
           to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        Misty::AuthV3.new(auth, false, log)
+        Misty::AuthV3.new(auth, URI.parse(""), false, log)
       end
     end
 
@@ -53,7 +53,7 @@ describe Misty::Auth do
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {"x-subject-token"=>"token_data"})
 
         proc do
-          Misty::AuthV3.new({}, false, log)
+          Misty::AuthV3.new({}, URI.parse(""), false, log)
         end.must_raise Misty::Auth::CredentialsError
       end
 
@@ -61,7 +61,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, log)
+        auth = Misty::AuthV3.new(authv3_creds, URI.parse(""), false, log)
         auth.stub :expired?, false do
           auth.get_token.must_equal "token_data"
         end
@@ -71,7 +71,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, log)
+        auth = Misty::AuthV3.new(authv3_creds, URI.parse(""), false, log)
         auth.catalog.must_equal ["catalog_data"]
       end
 
@@ -79,7 +79,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
         to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, log)
+        auth = Misty::AuthV3.new(authv3_creds, URI.parse(""), false, log)
         auth.get_endpoint(%w{identity}, "regionOne", "public").must_equal "http://localhost"
       end
     end
@@ -92,7 +92,7 @@ describe Misty::Auth do
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
 
         proc do
-          Misty::AuthV2.new({}, false, log)
+          Misty::AuthV2.new({}, URI.parse(""), false, log)
         end.must_raise Misty::Auth::CredentialsError
       end
     end
@@ -111,7 +111,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, log)
+        auth = Misty::AuthV2.new(authv2_creds, URI.parse(""), false, log)
         auth.stub :expired?, false do
           auth.get_token.must_equal "token_data"
         end
@@ -121,7 +121,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, log)
+        auth = Misty::AuthV2.new(authv2_creds, URI.parse(""), false, log)
         auth.catalog.must_equal ["catalog_data"]
       end
 
@@ -129,7 +129,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => JSON.dump(auth_response_v2("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, log)
+        auth = Misty::AuthV2.new(authv2_creds, URI.parse(""), false, log)
         auth.get_endpoint(%w{identity}, "regionOne", "public").must_equal "http://localhost"
       end
     end

data/test/unit/cloud_test.rb

@@ -54,10 +54,12 @@ describe Misty::Cloud do
     it "sets up default values" do
       Misty::Auth.stub :factory, nil do
         setup = Misty::Cloud.setup({})
-        setup.must_be_kind_of Struct
+        setup.must_be_kind_of Misty::Cloud::Setup
         setup.content_type.must_equal Misty::CONTENT_TYPE
         setup.log.must_be_kind_of Logger
         setup.interface.must_equal Misty::INTERFACE
+        setup.proxy.must_be_kind_of URI
+        setup.proxy.host.must_be_nil
         setup.region_id.must_equal Misty::REGION_ID
         setup.ssl_verify_mode.must_equal Misty::SSL_VERIFY_MODE
       end

data/test/unit/http/client_test.rb

@@ -41,8 +41,9 @@ describe Misty::HTTP::Client do
 
   describe "#net_http" do
     it "returns a Net/http instance" do
-      uri = URI.parse("http://localhost")
-      service.send(:net_http, uri, false, Logger.new("/dev/null")).must_be_instance_of Net::HTTP
+      endpoint = URI.parse("http://localhost")
+      proxy = URI.parse("")
+      service.send(:net_http, endpoint, proxy, false, Logger.new("/dev/null")).must_be_instance_of Net::HTTP
     end
   end
 

data/test/unit/openstack/microversion_test.rb

@@ -31,7 +31,14 @@ describe Misty::HTTP::Microversion do
       "token_id"
     end
 
-    setup = Misty::Cloud::Setup.new(auth, :ruby, Logger.new('/dev/null'), Misty::INTERFACE, Misty::REGION_ID, Misty::SSL_VERIFY_MODE)
+    setup = Misty::Cloud::Setup.new
+    setup.auth = auth
+    setup.content_type = :ruby
+    setup.log = Logger.new('/dev/null')
+    setup.interface = Misty::INTERFACE
+    setup.proxy = URI.parse('')
+    setup.region_id = Misty::REGION_ID
+    setup.ssl_verify_mode = Misty::SSL_VERIFY_MODE
 
     stub_request(:get, "http://localhost/").
       with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).

data/test/unit/service_helper.rb

@@ -15,7 +15,14 @@ def service(content_type = :ruby)
     "token_id"
   end
 
-  setup = Misty::Cloud::Setup.new(auth, content_type, Logger.new('/dev/null'), Misty::INTERFACE, Misty::REGION_ID, Misty::SSL_VERIFY_MODE)
+  setup = Misty::Cloud::Setup.new
+  setup.auth = auth
+  setup.content_type = content_type
+  setup.log = Logger.new('/dev/null')
+  setup.interface = Misty::INTERFACE
+  setup.proxy = URI.parse("")
+  setup.region_id = Misty::REGION_ID
+  setup.ssl_verify_mode = Misty::SSL_VERIFY_MODE
 
   stub_request(:get, "http://localhost/").
     with(:headers => request_header).

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +211,7 @@ files:
 - test/unit/test_helper.rb
 homepage: https://github.com/flystack/misty
 licenses:
-- Apache License Version 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -227,6 +233,5 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Misty is a dedicated HTTP client for OpenStack providing dynamic APIs requests
-  management.
+summary: Misty is an OpenStack API client
 test_files: []