puppet_forge 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e92036b548aa46fca8fb793b61ea0440812fea1e9dcada78d402a39be216fdf9
-  data.tar.gz: e0a230adaf5703424981c755fd05a893520c16703904ac20d3b503ba75b48f1c
+  metadata.gz: 14fb262a13e9382bc404ebf162e70c8fa48ccd73f33f53113e75524da106bed9
+  data.tar.gz: 0316cbac8bd7c7d3dc18d792a0dfc25a4cca095fce0974a5f54a50e546ef1c92
 SHA512:
-  metadata.gz: 2a7ec0344a4f7a2f2d6ecc674a50bc0c9b95b08b44a26f52551bb97b4becfcc2f17d226bd18cbc5773370b53d9f9bac95df39e90d1eb3b6c95742b8e6ed42455
-  data.tar.gz: 71424aa172611723b89edb31fa249beba56d73cab50db3ae180bead75eb0486ff194be3131d5f452fd3353c227630804d8e4f0432d99bf9000e296b7a405cad5
+  metadata.gz: f909a3a4b8bf942f104f1a9f5a798edeb8a29e03adaaa24dbd4170efd97f2e09c23ef44b3b88ad406d32d5d10aba98d382d21ce10e1db115ee5c87d8cd01e30f
+  data.tar.gz: 2da931edf4e563a6e0962d834c9e3db3dec6ff33fd9a172f5d50a12066863b336fae173c8ad860d6c85f6df1ef02da4e1e0fc61e0a3182e92552ac988db3ce7b

data/.gitignore

@@ -20,4 +20,3 @@ _yardoc
 *.o
 *.a
 mkmf.log
-locales/forge-ruby.pot

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 Starting with v2.0.0, all notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v3.2.0 - 2021-11-09
+
+* Allow requests to follow redirects
+* Remove the `gettext-setup` gem dependency, which was unused
+
 ## v3.1.0 - 2021-08-20
 
 ### Changed

data/README.md

@@ -205,26 +205,6 @@ PuppetForge::Connection.authorization = "<your-api-key-here>"
 
 You can generate API keys on your user profile page once you've [logged into the Forge website](https://forge.puppet.com/login).
 
-### i18n
-
-When adding new error or log messages please follow the instructions for
-[writing translatable code](https://github.com/puppetlabs/gettext-setup-gem#writing-translatable-code).
-
-The PuppetForge gem will default to outputing all error messages in English, but you may set the locale
-using the `FastGettext.set_locale` method. If translations do not exist for the language you request then the gem will
-default to English. The `set_locale` method will return the locale, as a string, that FastGettext will now
-use to report PuppetForge errors.
-
-```ruby
-# Assuming the German translations exist, this will set the reporting language
-# to German
-
-locale = FastGettext.set_locale "de_DE"
-
-# If it successfully finds Germany's locale, locale will be "de_DE"
-# If it fails to find any German locale, locale will be "en"
-```
-
 ## Caveats
 
 This library currently does no response caching of its own, instead opting to

data/Rakefile

@@ -1,7 +1 @@
 require "bundler/gem_tasks"
-
-# i18n/gettext Rake tasks
-spec = Gem::Specification.find_by_name 'gettext-setup'
-load "#{spec.gem_dir}/lib/tasks/gettext.rake"
-GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
-

data/lib/puppet_forge/connection/connection_failure.rb

@@ -9,21 +9,11 @@ module PuppetForge
         @app.call(env)
       rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
         baseurl = env[:url].dup
+        errmsg = "Unable to connect to %{scheme}://%{host}" % { scheme: baseurl.scheme, host: baseurl.host }
         if proxy = env[:request][:proxy]
-          errmsg = _("Unable to connect to %{scheme}://%{host} (using proxy %{proxy}) (for request %{path_query})") % {
-            scheme: baseurl.scheme,
-            host: baseurl.host,
-            proxy: proxy.uri.to_s,
-            path_query: baseurl.request_uri,
-          }
-        else
-          errmsg = _("Unable to connect to %{scheme}://%{host} (for request %{path_query})") % {
-            scheme: baseurl.scheme,
-            host: baseurl.host,
-            path_query: baseurl.request_uri,
-          }
+          errmsg << " (using proxy %{proxy})" % { proxy: proxy.uri.to_s }
         end
-        errmsg << ": #{e.message}"
+        errmsg << " (for request %{path_query}): %{message}" % { message: e.message, path_query: baseurl.request_uri }
         m = Faraday::ConnectionFailed.new(errmsg)
         m.set_backtrace(e.backtrace)
         raise m

data/lib/puppet_forge/connection.rb

@@ -115,6 +115,7 @@ module PuppetForge
       end
 
       Faraday.new(url, options) do |builder|
+        builder.use FaradayMiddleware::FollowRedirects
         builder.response(:json, :content_type => /\bjson$/, :parser_options => { :symbolize_names => true })
         builder.response(:raise_error)
         builder.use(:connection_failure)

data/lib/puppet_forge/error.rb

@@ -16,11 +16,15 @@ module PuppetForge
     def initialize(options)
       @entry_path = options[:entry_path]
       @directory  = options[:directory]
-      super _("Attempt to install file into %{path} under %{directory}") % {path: @entry_path.inspect, directory: @directory.inspect}
+      super "Attempt to install file into #{@entry_path.inspect} under #{@directory.inspect}"
     end
 
     def multiline
-      _("Could not install package\n  Package attempted to install file into\n  %{path} under %{directory}.") % {path: @entry_path.inspect, directory: @directory.inspect}
+      <<-MSG.strip
+Could not install package
+  Package attempted to install file into
+  #{@entry_path.inspect} under #{@directory.inspect}.
+      MSG
     end
   end
 

data/lib/puppet_forge/lazy_relations.rb

@@ -24,7 +24,7 @@ module PuppetForge
       version = class_name.split("::")[-2]
 
       if version.nil?
-        raise RuntimeError, _("Unable to determine the parent PuppetForge version module")
+        raise RuntimeError, "Unable to determine the parent PuppetForge version module"
       end
 
       PuppetForge.const_get(version)

data/lib/puppet_forge/unpacker.rb

@@ -39,7 +39,7 @@ module PuppetForge
       begin
         PuppetForge::Tar.instance.unpack(@filename, @tmpdir)
       rescue PuppetForge::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{error_msg}") % {error_msg: e.message}
+        raise RuntimeError, "Could not extract contents of module archive: #{e.message}"
       end
     end
 
@@ -61,7 +61,7 @@ module PuppetForge
       if metadata_file
         @root_dir = Pathname.new(metadata_file).dirname
       else
-        raise _("No valid metadata.json found!")
+        raise "No valid metadata.json found!"
       end
     end
   end

data/lib/puppet_forge/v3/metadata.rb

@@ -63,7 +63,7 @@ module PuppetForge
         validate_version_range(version_requirement) if version_requirement
 
         if dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
-          raise ArgumentError, _("Dependency conflict for %{module_name}: Dependency %{conflict_name} was given conflicting version requirements %{version} and %{conflict_version}. Verify that there are no duplicates in the metadata.json or the Modulefile.") % {module_name: full_module_name, conflict_name: name, version: version_requirement, conflict_version: dup.version_requirement}
+          raise ArgumentError, "Dependency conflict for #{full_module_name}: Dependency #{name} was given conflicting version requirements #{version_requirement} and #{dup.version_requirement}. Verify that there are no duplicates in the metadata.json or the Modulefile."
         end
 
         dep = Dependency.new(name, version_requirement, repository)
@@ -165,30 +165,31 @@ module PuppetForge
 
         err = case modname
         when nil, '', :namespace_missing
-          _("the field must be a namespaced module name")
+          "the field must be a namespaced module name"
         when /[^a-z0-9_]/i
-          _("the module name contains non-alphanumeric (or underscore) characters")
+          "the module name contains non-alphanumeric (or underscore) characters"
         when /^[^a-z]/i
-          _("the module name must begin with a letter")
+          "the module name must begin with a letter"
         else
-          _("the namespace contains non-alphanumeric characters")
+          "the namespace contains non-alphanumeric characters"
         end
 
-        raise ArgumentError, _("Invalid 'name' field in metadata.json: %{error}") % {error: err}
+        raise ArgumentError, "Invalid 'name' field in metadata.json: #{err}"
       end
 
       # Validates that the version string can be parsed by SemanticPuppet.
       def validate_version(version)
         return if SemanticPuppet::Version.valid?(version)
 
-        raise ArgumentError, _("Invalid 'version' field in metadata.json: version string cannot be parsed as a valid Semantic Version")
+        err = "version string cannot be parsed as a valid Semantic Version"
+        raise ArgumentError, "Invalid 'version' field in metadata.json: #{err}"
       end
 
       # Validates that the version range can be parsed by SemanticPuppet.
       def validate_version_range(version_range)
         SemanticPuppet::VersionRange.parse(version_range)
       rescue ArgumentError => e
-        raise ArgumentError, _("Invalid 'version_range' field in metadata.json: %{error}") % {error: e} 
+        raise ArgumentError, "Invalid 'version_range' field in metadata.json: #{e}"
       end
     end
   end

data/lib/puppet_forge/v3/release.rb

@@ -29,7 +29,7 @@ module PuppetForge
         resp = self.class.conn.get(download_url)
         path.open('wb') { |fh| fh.write(resp.body) }
       rescue Faraday::ResourceNotFound => e
-        raise PuppetForge::ReleaseNotFound, (_("The module release %{release_slug} does not exist on %{url}.") % {release_slug: slug, url: self.class.conn.url_prefix}), e.backtrace
+        raise PuppetForge::ReleaseNotFound, "The module release #{slug} does not exist on #{self.class.conn.url_prefix}.", e.backtrace
       rescue Faraday::ClientError => e
         if e.response && e.response[:status] == 403
           raise PuppetForge::ReleaseForbidden.from_response(e.response)

data/lib/puppet_forge/version.rb

@@ -1,3 +1,3 @@
 module PuppetForge
-  VERSION = '3.1.0' # Library version
+  VERSION = '3.2.0' # Library version
 end

data/lib/puppet_forge.rb

@@ -1,5 +1,4 @@
 require 'puppet_forge/version'
-require 'gettext-setup'
 
 module PuppetForge
   class << self
@@ -15,8 +14,6 @@ module PuppetForge
     end
   end
 
-  GettextSetup.initialize(File.absolute_path('../locales', File.dirname(__FILE__)))
-
   DEFAULT_FORGE_HOST = 'https://forgeapi.puppet.com/'
 
   self.host = DEFAULT_FORGE_HOST

data/puppet_forge.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday_middleware", "~> 1.0"
   spec.add_dependency "semantic_puppet", "~> 1.0"
   spec.add_dependency "minitar"
-  spec.add_dependency "gettext-setup", "~> 0.11"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_forge
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gettext-setup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +198,6 @@ files:
 - lib/puppet_forge/v3/release.rb
 - lib/puppet_forge/v3/user.rb
 - lib/puppet_forge/version.rb
-- locales/config.yaml
 - puppet_forge.gemspec
 - spec/fixtures/uri/prefix/v3/bases/puppet.headers
 - spec/fixtures/uri/prefix/v3/bases/puppet.json

data/locales/config.yaml

@@ -1,21 +0,0 @@
----
-# This is the project-specific configuration file for setting up
-# fast_gettext for your project.
-gettext:
-  # This is used for the name of the .pot and .po files; they will be
-  # called <project_name>.pot?
-  project_name: 'forge-ruby'
-  # This is used in comments in the .pot and .po files to indicate what
-  # project the files belong to and should bea little more desctiptive than
-  # <project_name>
-  package_name: Puppet Forge Gem
-  # The locale that the default messages in the .pot file are in
-  default_locale: en
-  # The email used for sending bug reports.
-  bugs_address: docs@puppetlabs.com
-  # The holder of the copyright.
-  copyright_holder: Puppet, Inc.
-  # Patterns for +Dir.glob+ used to find all files that might contain
-  # translatable content, relative to the project root directory
-  source_files:
-    - 'lib/**/*.rb'