gemfury 0.12.0 → 0.13.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d50766d71c2b10ccc4ec4f57b945cc4b2fed2e3444d96907434572ab2b7cadc
-  data.tar.gz: ad62d9a9fd6504d4bc547f68a4fe460aca5ce786aa7c752672c51ea2164394f2
+  metadata.gz: 228c435c571bdaf3167db63c72c433b29619f31ecd0ffcb8ac4b1d3494996751
+  data.tar.gz: f9c4a05c60ff574af54d73cb80c0a501978b1a708b77daee1ad6eca2de126dbc
 SHA512:
-  metadata.gz: 9c25f64ac0534ba79f1c59c80043c31789eba91d56495f897326aeac345a679fe834c7b75d1d0d83177e3916b508b904698f11399d769d69fae574af2072bb66
-  data.tar.gz: f127672f054ee53ab288363b6111dc9ecf54f36f4ee0a7a73bb56e55fd4da4d1f3f611b066ad1911057e23b91bb99f3422749c50bb1ca21e632687a88b8b82dc
+  metadata.gz: 588d530bbf6410a607916d3a2f20c2474ae6f91a0c4135f2ab78cd6cfffd164a26e59ce712f960890f76eeb465beeb7cdaf87e184532026bf479e9ab34d4828a
+  data.tar.gz: 4dc1bdaa0ddbe30cc4e96f2dca7a00bfbf55a4c580f6d4616b58b79c1c5170f615f92741ce5d5ac0b40f573dabf925ab6a48fd9f8983e82574c6aa41574c8b10

data/README.md

@@ -2,10 +2,10 @@ Gemfury CLI
 ===========
 
 [![Gem Version](https://badge.fury.io/rb/gemfury.svg)](http://badge.fury.io/rb/gemfury)
-[![Build Status](https://secure.travis-ci.org/gemfury/gemfury.svg?branch=master)](https://travis-ci.org/gemfury/gemfury)
-[![Code Climate](https://codeclimate.com/github/gemfury/gemfury/badges/gpa.svg)](https://codeclimate.com/github/gemfury/gemfury)
 [![Documentation](https://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/gemfury)
-[![Documentation completeness](https://inch-ci.org/github/gemfury/gemfury.svg?branch=master)](http://inch-ci.org/github/gemfury/gemfury)
+[![Documentation completeness](https://inch-ci.org/github/gemfury/gemfury.svg?branch=main)](http://inch-ci.org/github/gemfury/gemfury)
+[![Build Status](https://github.com/gemfury/gemfury/actions/workflows/specs.yml/badge.svg?branch=main)](https://github.com/gemfury/gemfury/actions/workflows/specs.yml)
+[![Code Climate](https://codeclimate.com/github/gemfury/gemfury/badges/gpa.svg)](https://codeclimate.com/github/gemfury/gemfury)
 
 This is the Gemfury CLI used to manage your Gemfury packages from the command line.  If you're
 familiar with the service and want to jump straight into command line action, please proceed to

data/bin/fury

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-lib = File.expand_path('../../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'rubygems'
 require 'gemfury'
 require 'gemfury/command'
 
-if defined?(Warning) && Warning.respond_to?('[]')
-  Warning[:deprecated] = !!ENV['DEBUG']
-end
+Warning[:deprecated] = !!ENV['DEBUG'] if defined?(Warning) && Warning.respond_to?('[]')
 
 Gemfury::Command::App.start

data/bin/gemfury

@@ -1,2 +1,4 @@
 #!/usr/bin/env ruby
-exec(File.expand_path('../fury', __FILE__), *ARGV)
+# frozen_string_literal: true
+
+exec(File.expand_path('fury', __dir__), *ARGV)

data/lib/faraday/adapter/fury_http.rb

@@ -1,32 +1,25 @@
+# frozen_string_literal: true
+
 # This is a Faraday adapter that bypasses Faraday's response body
 # processing and streams body to STDOUT for text requests
 
 class Faraday::Adapter
   class FuryHttp < NetHttp
-    def perform_request(http, env)
-      accept = env.request_headers['Accept']
-      return super if accept !~ /text\z/
-
-      # Stream response body to STDOUT on success
-      http.request(create_request(env)) do |resp|
-        unless resp.is_a?(Net::HTTPSuccess)
-          resp.body # Cache error body
-        else
-          resp.read_body do |chunk|
-            $stdout.print(chunk)
-            $stdout.flush
-          end
+    def request_with_wrapped_block(http, env, &block)
+      is_text = env.request_headers['Accept'] =~ /text\z/
+      return super if !block.nil? || !is_text
 
-          # Prevent #body from calling #read_body again
-          klass = (class << resp; self; end)
-          klass.send(:define_method, :body) { nil }
-        end
-
-        # Return response to NetHttp adapter
-        return resp
+      # Stream chunks directly to STDOUT
+      resp = super(http, env) do |chunk|
+        $stdout.print(chunk)
+        $stdout.flush
       end
+
+      # Client sees nil body
+      resp.body = nil
+      resp
     end
   end
 
-  register_middleware(:fury_http => FuryHttp)
+  register_middleware(fury_http: FuryHttp)
 end

data/lib/faraday/request/multipart_with_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 
 # @private
@@ -5,13 +7,11 @@ module Faraday
   # @private
   class Request::MultipartWithFile < Faraday::Middleware
     def call(env)
-
       if env[:body].is_a?(Hash)
 
         # Check for IO (and IO-like objects, like Zip::InputStream) in the request,
         # which represent data to be uploaded.  Replace these with Faraday
         env[:body].each do |key, value|
-
           # Faraday seems to expect a few IO methods to be available, but that's all:
           # https://github.com/lostisland/faraday/blob/master/lib/faraday/file_part.rb
           # :length seems to be an optional one
@@ -21,7 +21,7 @@ module Faraday
           #
           # We attempt to make our duck typing compatible with their duck typing
           if value.respond_to?(:read) && value.respond_to?(:rewind) && value.respond_to?(:close)
-            env[:body][key] = Faraday::UploadIO.new(value, mime_type(value))
+            env[:body][key] = Faraday::Multipart::FilePart.new(value, mime_type(value))
           end
         end
       end

data/lib/gemfury/client/filters.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 module Gemfury
   class Client
     module Filters
+      private
 
-    private
       def ensure_ready!(*args)
         # Ensure authorization
-        if args.include?(:authorization)
-          raise Unauthorized unless authenticated?
-        end
+        return unless args.include?(:authorization)
+        raise Unauthorized unless authenticated?
       end
 
       def authenticated?
-        self.user_api_key && !self.user_api_key.empty?
+        user_api_key && !user_api_key.empty?
       end
     end
   end
-end
+end

data/lib/gemfury/client/middleware.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Gemfury
   class Client
     class Handle503 < Faraday::Middleware
       def call(env)
-        # This prevents errors in ParseJson 
+        # This prevents errors in ParseJson
         @app.call(env).on_complete do |out|
           out[:body] = '' if out[:status] == 503
         end
       end
     end
 
-    class ParseJson < Faraday::Response::Middleware
+    class ParseJson < Faraday::Middleware
       def parse(body)
         body =~ /\A\s*\z/ ? nil : MultiJson.decode(body)
       end
@@ -20,4 +22,4 @@ module Gemfury
       end
     end
   end
-end
+end

data/lib/gemfury/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemfury
   class Client
     include Gemfury::Client::Filters
@@ -5,7 +7,7 @@ module Gemfury
 
     # Creates a new API
     # @param options [Hash] values for attributes described in {Gemfury::Configuration}
-    def initialize(options={})
+    def initialize(options = {})
       options = Gemfury.options.merge(options)
       Gemfury::VALID_OPTIONS_KEYS.each do |key|
         send("#{key}=", options[key])
@@ -34,8 +36,8 @@ module Gemfury
     # @return [Hash]
     def push_gem(file, options = {})
       ensure_ready!(:authorization)
-      push_api = connection(:url => self.pushpoint)
-      response = push_api.post('uploads', options.merge(:file => file))
+      push_api = connection(url: pushpoint)
+      response = push_api.post('uploads', options.merge(file: file))
       checked_response_body(response)
     end
 
@@ -83,7 +85,7 @@ module Gemfury
     # @return [Hash]
     def login(email, password, opts = {})
       ensure_ready!
-      opts = opts.merge(:email => email, :password => password)
+      opts = opts.merge(email: email, password: password)
       checked_response_body(connection.post('login', opts))
     end
 
@@ -161,7 +163,7 @@ module Gemfury
     def git_rebuild(repo, options = {})
       ensure_ready!(:authorization)
       url = "#{git_repo_path(repo)}/builds"
-      api = connection(:api_format => :text)
+      api = connection(api_format: :text)
       checked_response_body(api.post(url, options))
     end
 
@@ -184,51 +186,48 @@ module Gemfury
     def git_config_update(repo, updates, options = {})
       ensure_ready!(:authorization)
       path = "#{git_repo_path(repo)}/config-vars"
-      opts = options.merge(:config_vars => updates)
+      opts = options.merge(config_vars: updates)
       response = connection.patch(path, opts)
       checked_response_body(response)
     end
 
-  private
+    private
+
     def escape(str)
       CGI.escape(str)
     end
 
     def git_repo_path(*args)
       rest = args.map { |a| escape(a) }
-      ['git/repos', self.account || 'me'].concat(rest).join('/')
+      ['git/repos', account || 'me'].concat(rest).join('/')
     end
 
     def connection(options = {})
       # The 'Accept' HTTP header for API versioning
       http_accept = begin
-        v = options.delete(:api_version) || self.api_version
+        v = options.delete(:api_version) || api_version
         f = options.delete(:api_format)  || :json
         "application/vnd.fury.v#{v.to_i}+#{f}"
       end
 
       # Faraday client options
       options = {
-        :url => self.endpoint,
-        :params => {},
-        :headers => {
-          :accept => http_accept,
-          :user_agent => self.user_agent,
-          :x_gem_version => Gemfury::VERSION,
+        url: endpoint,
+        params: {},
+        headers: {
+          accept: http_accept,
+          user_agent: user_agent,
+          x_gem_version: Gemfury::VERSION
         }.merge(options.delete(:headers) || {})
       }.merge(options)
 
-      if self.user_api_key
-        options[:headers][:authorization] = self.user_api_key
-      end
+      options[:headers][:authorization] = user_api_key if user_api_key
 
-      if self.account
-        options[:params][:as] = self.account
-      end
+      options[:params][:as] = account if account
 
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::MultipartWithFile
-        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Multipart::Middleware
         builder.use Faraday::Request::UrlEncoded
         builder.use ParseJson
         builder.use Handle503
@@ -237,37 +236,35 @@ module Gemfury
     end
 
     def checked_response_body(response)
-      if response.success?
-        return response.body
-      else
-        error = (response.body || {})['error'] || {}
-        error_class = case error['type']
-        when 'Forbidden'       then Gemfury::Forbidden
-        when 'GemVersionError' then Gemfury::InvalidGemVersion
-        when 'InvalidGemFile'  then Gemfury::CorruptGemFile
-        when 'DupeVersion'     then Gemfury::DupeVersion
-        else
-          case response.status
-          when 401 then Gemfury::Unauthorized
-          when 403 then Gemfury::Forbidden
-          when 404 then Gemfury::NotFound
-          when 409 then Gemfury::Conflict
-          when 503 then Gemfury::TimeoutError
-          else          Gemfury::Error
-          end
-        end
-
-        raise(error_class, error['message'])
-      end
+      return response.body if response.success?
+
+      error = (response.body || {})['error'] || {}
+      error_class = case error['type']
+                    when 'Forbidden'       then Gemfury::Forbidden
+                    when 'GemVersionError' then Gemfury::InvalidGemVersion
+                    when 'InvalidGemFile'  then Gemfury::CorruptGemFile
+                    when 'DupeVersion'     then Gemfury::DupeVersion
+                    else
+                      case response.status
+                      when 401 then Gemfury::Unauthorized
+                      when 403 then Gemfury::Forbidden
+                      when 404 then Gemfury::NotFound
+                      when 409 then Gemfury::Conflict
+                      when 503 then Gemfury::TimeoutError
+                      else          Gemfury::Error
+                      end
+                    end
+
+      raise(error_class, error['message'])
     end
 
     def s3_put_file(uri, file)
       Faraday::Connection.new(uri) do |f|
         f.adapter :net_http
       end.put(uri, file, {
-        :content_length => file.stat.size.to_s,
-        :content_type => ''
-      })
+                content_length: file.stat.size.to_s,
+                content_type: ''
+              })
     end
   end
 end