razor-client 1.6.1 → 1.7.0

data/NEWS.md

@@ -1,5 +1,10 @@
 # Razor Client Release Notes
 
+## 1.7.0 - 2018-01-17
+
+* NEW: Removed support for Ruby < 2.0
+* BUGFIX: Removed security vulnerabilities in gems
+
 ## 1.4.0 - 2017-03-07
 
 * Added support for internationalization by setting the Accept-Language

data/bin/razor

@@ -1,14 +1,5 @@
 #!/usr/bin/env ruby
 
-# Needed to make the client work on Ruby 1.8.7
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end
-
 require 'rubygems'
 require 'gettext-setup'
 require_relative "../lib/razor/cli"
@@ -60,10 +51,15 @@ end
 
 begin
   document = parse.navigate.get_document
+  p document
   url = parse.navigate.last_url
   result = format_document document, parse
   # TRANSLATORS: This is a template for all results that the client outputs.
   puts _("From %{url}:\n\n%{result}\n\n") % {url: url, result: result}
+rescue RestClient::Unauthorized
+  puts _(<<-UNAUTH) % {url: url}
+Error: Credentials are required to connect to the server at %{url}"
+  UNAUTH
 rescue OptionParser::InvalidOption => e
   # TRANSLATORS: This occurs when invalid flags are passed in the navigation.
   die _("%{error}\nTry 'razor --help' for more information") %
@@ -79,6 +75,7 @@ rescue RestClient::SSLCertificateNotVerified
 rescue RestClient::Exception => e
   r = e.response
   unexpected_error(e) if r.nil?
+  p r.methods
   request_type = r.args[:method].to_s.upcase
   url = r.args[:url]
   puts _("Error from doing %{request_type} %{url}") % {request_type: request_type, url: url}

data/lib/razor/cli/navigate.rb

@@ -3,42 +3,6 @@ require 'multi_json'
 require 'yaml'
 require 'forwardable'
 
-# Needed to make the client work on Ruby 1.8.7
-unless URI.respond_to?(:encode_www_form)
-  module URI
-    def self.encode_www_form_component(str)
-      str = str.to_s
-      if HTML5ASCIIINCOMPAT.include?(str.encoding)
-        str = str.encode(Encoding::UTF_8)
-      else
-        str = str.dup
-      end
-      str.force_encoding(Encoding::ASCII_8BIT)
-      str.gsub!(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
-      str.force_encoding(Encoding::US_ASCII)
-    end
-    def self.encode_www_form(enum)
-      enum.map do |k,v|
-        if v.nil?
-          encode_www_form_component(k)
-        elsif v.respond_to?(:to_ary)
-          v.to_ary.map do |w|
-            str = encode_www_form_component(k)
-            unless w.nil?
-              str << '='
-              str << encode_www_form_component(w)
-            end
-          end.join('&')
-        else
-          str = encode_www_form_component(k)
-          str << '='
-          str << encode_www_form_component(v)
-        end
-      end.join('&')
-    end
-  end
-end
-
 module Razor::CLI
   class Navigate
     extend Forwardable
@@ -47,7 +11,6 @@ module Razor::CLI
       @parse = parse
       @segments = segments||[]
       @doc = entrypoint
-      @username, @password = parse.api_url.userinfo.to_s.split(':')
       @doc_resource = create_resource parse.api_url, {:accept => :json,
                                                       :accept_language => accept_language}
     end
@@ -160,6 +123,8 @@ module Razor::CLI
       # Add extra parameters to URL.
       url.query = URI.encode_www_form(params)
       url.query = nil if url.query.empty? # Remove dangling '?' from URL.
+      @username ||= url.user
+      @password ||= url.password
 
       response = get(url,headers.merge(:accept => :json,
                                        :accept_language => accept_language))
@@ -170,6 +135,9 @@ module Razor::CLI
     end
 
     def json_post(url, body)
+      @username ||= url.user
+      @password ||= url.password
+
       headers = { :accept=>:json, "Content-Type" => :json,
                   :accept_language => accept_language}
       begin
@@ -187,11 +155,13 @@ module Razor::CLI
     private
 
     def create_resource(url, headers)
-      @doc_resource = RestClient::Resource.new(url.to_s, :headers => headers,
-                                         :verify_ssl => @parse.verify_ssl?,
-                                         :ssl_ca_file      =>  @parse.ssl_ca_file,
-                                         :user => @username,
-                                         :password => @password)
+      @doc_resource = RestClient::Resource.new(url.to_s,
+          :headers => headers,
+          :verify_ssl => @parse.verify_ssl?,
+          :ssl_ca_file => @parse.ssl_ca_file,
+          # Add these in case the URL above doesn't include authentication.
+          :user => @username || url.user,
+          :password => @password || url.password)
     end
   end
 end

data/lib/razor/cli/version.rb

@@ -18,7 +18,7 @@ module Razor
     #
     # The next line is the one that our packaging tools modify, so please make
     # sure that any change to it is discussed and agreed first.
-    version = '1.6.1'
+    version = '1.7.0'
 
     if version == "DEVELOPMENT"
       root = File.expand_path("../../..", File.dirname(__FILE__))

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_preserve_that_across_navigation.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -35,7 +35,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:54:50 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/tags
+    uri: http://localhost:8150/api/collections/tags
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_supply_that_to_the_API_service.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_append_limit.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -35,7 +35,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:54:56 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/events?limit=1
+    uri: http://localhost:8150/api/collections/events?limit=1
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_append_start.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -35,7 +35,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:01 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/events?start=1
+    uri: http://localhost:8150/api/collections/events?start=1
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_not_fail_when_query_returns_details_for_one_item.yml

@@ -213,7 +213,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:12 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -246,7 +246,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:12 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes
+    uri: http://localhost:8150/api/collections/nodes
     body:
       encoding: US-ASCII
       string: ''
@@ -279,7 +279,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:12 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes/node1
+    uri: http://localhost:8150/api/collections/nodes/node1
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_store_query_without_query_parameters.yml

@@ -424,7 +424,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:24 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -457,7 +457,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:24 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes
+    uri: http://localhost:8150/api/collections/nodes
     body:
       encoding: US-ASCII
       string: ''
@@ -490,7 +490,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:24 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes/node1
+    uri: http://localhost:8150/api/collections/nodes/node1
     body:
       encoding: US-ASCII
       string: ''
@@ -523,7 +523,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:24 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes/node1/log?limit=1
+    uri: http://localhost:8150/api/collections/nodes/node1/log?limit=1
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_throw_an_error_if_the_query_parameter_is_not_in_the_API.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_query_parameters/should_throw_an_error_if_the_query_parameter_is_not_in_the_API_from_a_single_item.yml

@@ -213,7 +213,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:18 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -246,7 +246,7 @@ http_interactions:
   recorded_at: Mon, 09 Mar 2015 19:55:18 GMT
 - request:
     method: get
-    uri: http://fred:dead@localhost:8150/api/collections/nodes
+    uri: http://localhost:8150/api/collections/nodes
     body:
       encoding: US-ASCII
       string: ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor-client
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types