From 753ad4655f86cdecebbfeef59c051acf54a3383a Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 18 Jun 2016 13:01:47 +0200 Subject: [PATCH] Fix #23 & #24 - move to https and new forge url So forge now redirects to https AND it moved to forge.puppet.com. --- README.md | 4 +-- .../duplicated_dependencies/Puppetfile | 2 +- .../Puppetfile | 2 +- features/examples/metadata_syntax/Puppetfile | 2 +- .../examples/modulefile_syntax/Puppetfile | 2 +- .../Puppetfile | 2 +- .../with_puppetfile_and_modulefile/Puppetfile | 2 +- features/install.feature | 16 +++++----- features/install/forge.feature | 30 ++++++++--------- features/install/git.feature | 16 +++++----- features/install/github_tarball.feature | 2 +- features/install/path.feature | 2 +- features/outdated.feature | 8 ++--- features/package.feature | 6 ++-- features/update.feature | 32 +++++++++---------- lib/librarian/puppet/dsl.rb | 2 +- lib/librarian/puppet/source/forge/repo.rb | 2 +- lib/librarian/puppet/source/forge/repo_v1.rb | 4 +-- spec/source/forge_repo_spec.rb | 2 +- spec/source/forge_spec.rb | 2 +- 20 files changed, 70 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 0ac5412a..2f3153f6 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ Librarian-puppet is a bundler for your puppet infrastructure. You can use librarian-puppet to manage the puppet modules your infrastructure depends on, -whether the modules come from the [Puppet Forge](https://forge.puppetlabs.com/), +whether the modules come from the [Puppet Forge](https://forge.puppet.com/), Git repositories or just a path. * Librarian-puppet can reuse the dependencies listed in your `Modulefile` or `metadata.json` -* Forge modules can be installed from [Puppetlabs Forge](https://forge.puppetlabs.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/) +* Forge modules can be installed from [Puppetlabs Forge](https://forge.puppet.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/) * Git modules can be installed from a branch, tag or specific commit, optionally using a path inside the repository * Modules can be installed from GitHub using tarballs, without needing Git installed * Modules can be installed from a filesystem path diff --git a/features/examples/duplicated_dependencies/Puppetfile b/features/examples/duplicated_dependencies/Puppetfile index 2303f7e3..3b8093fb 100644 --- a/features/examples/duplicated_dependencies/Puppetfile +++ b/features/examples/duplicated_dependencies/Puppetfile @@ -1,3 +1,3 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' metadata diff --git a/features/examples/duplicated_dependencies_transitive/Puppetfile b/features/examples/duplicated_dependencies_transitive/Puppetfile index 24a51ab2..d62c4c53 100644 --- a/features/examples/duplicated_dependencies_transitive/Puppetfile +++ b/features/examples/duplicated_dependencies_transitive/Puppetfile @@ -1,4 +1,4 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' metadata diff --git a/features/examples/metadata_syntax/Puppetfile b/features/examples/metadata_syntax/Puppetfile index 2303f7e3..3b8093fb 100644 --- a/features/examples/metadata_syntax/Puppetfile +++ b/features/examples/metadata_syntax/Puppetfile @@ -1,3 +1,3 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' metadata diff --git a/features/examples/modulefile_syntax/Puppetfile b/features/examples/modulefile_syntax/Puppetfile index b4050b6b..b067ece1 100644 --- a/features/examples/modulefile_syntax/Puppetfile +++ b/features/examples/modulefile_syntax/Puppetfile @@ -1,3 +1,3 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' modulefile diff --git a/features/examples/with_puppetfile_and_metadata_json/Puppetfile b/features/examples/with_puppetfile_and_metadata_json/Puppetfile index f5375977..f5f67b8e 100644 --- a/features/examples/with_puppetfile_and_metadata_json/Puppetfile +++ b/features/examples/with_puppetfile_and_metadata_json/Puppetfile @@ -1,3 +1,3 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' mod 'maestrodev/test' diff --git a/features/examples/with_puppetfile_and_modulefile/Puppetfile b/features/examples/with_puppetfile_and_modulefile/Puppetfile index f5375977..f5f67b8e 100644 --- a/features/examples/with_puppetfile_and_modulefile/Puppetfile +++ b/features/examples/with_puppetfile_and_modulefile/Puppetfile @@ -1,3 +1,3 @@ -forge 'http://forge.puppetlabs.com' +forge 'https://forge.puppet.com' mod 'maestrodev/test' diff --git a/features/install.feature b/features/install.feature index 273b2554..7de9133b 100644 --- a/features/install.feature +++ b/features/install.feature @@ -19,7 +19,7 @@ Feature: cli/install Scenario: Install a module transitive dependency from git and forge should be deterministic Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git', :ref => '4.6.0' mod 'librarian/test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/test' @@ -32,7 +32,7 @@ Feature: cli/install Scenario: Install duplicated dependencies from git and forge, last one wins Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" metadata mod 'puppetlabs-stdlib', :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git', :ref => '4.6.0' @@ -57,7 +57,7 @@ Feature: cli/install Scenario: Installing two modules with same name and using exclusions Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'librarian-duplicated_dependencies', :path => '../../features/examples/duplicated_dependencies' exclusion 'ripienaar-concat' @@ -70,7 +70,7 @@ Feature: cli/install Scenario: Installing two modules with same name and using exclusions, apply transitively Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'librarian-duplicated_dependencies_transitive', :path => '../../features/examples/duplicated_dependencies_transitive' """ @@ -82,7 +82,7 @@ Feature: cli/install Scenario: Install a module with Modulefile without version Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'librarian-bad_modulefile', :path => 'bad_modulefile' """ @@ -101,7 +101,7 @@ Feature: cli/install Scenario: Install a module with the rsync configuration using the --clean flag Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'maestrodev/test' """ @@ -125,7 +125,7 @@ Feature: cli/install Scenario: Install a module with the rsync configuration using the --destructive flag Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'maestrodev/test' """ @@ -150,7 +150,7 @@ Feature: cli/install Scenario: Install a module with the rsync configuration Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'maestrodev/test' """ diff --git a/features/install/forge.feature b/features/install/forge.feature index 9e199e5d..e7efc860 100644 --- a/features/install/forge.feature +++ b/features/install/forge.feature @@ -55,7 +55,7 @@ Feature: cli/install/forge Scenario: Installing an exact version of a module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apt', '0.0.4' """ @@ -72,7 +72,7 @@ Feature: cli/install/forge Scenario: Installing a module in a path with spaces Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', '4.1.0' """ When PENDING I run `librarian-puppet install` @@ -82,7 +82,7 @@ Feature: cli/install/forge Scenario: Installing a module with invalid versions in the forge Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apache', '0.4.0' mod 'puppetlabs/postgresql', '2.0.1' @@ -98,7 +98,7 @@ Feature: cli/install/forge Scenario: Installing a module with several constraints Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apt', '>=1.0.0', '<1.0.1' """ @@ -112,7 +112,7 @@ Feature: cli/install/forge Given a directory named "puppet" And a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/ntp', '3.0.3' """ @@ -126,7 +126,7 @@ Feature: cli/install/forge Scenario: Handle range version numbers Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/postgresql', '3.2.0' mod 'puppetlabs/apt', '< 1.4.1' # 1.4.2 causes trouble in travis @@ -138,7 +138,7 @@ Feature: cli/install/forge Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/postgresql', :git => 'git://github.com/puppetlabs/puppet-postgresql', :ref => '3.3.0' """ @@ -150,7 +150,7 @@ Feature: cli/install/forge Scenario: Installing a module that does not exist Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/xxxxx' """ @@ -164,7 +164,7 @@ Feature: cli/install/forge Scenario: Install a module with conflicts Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apache', '0.6.0' mod 'puppetlabs/stdlib', '<2.2.1' @@ -176,7 +176,7 @@ Feature: cli/install/forge Scenario: Install a module from the Forge with dependencies without version Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'sbadia/gitlab', '0.1.0' """ @@ -187,7 +187,7 @@ Feature: cli/install/forge Scenario: Source dependencies from Modulefile Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" modulefile """ @@ -203,7 +203,7 @@ Feature: cli/install/forge Scenario: Source dependencies from metadata.json Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" metadata """ @@ -226,7 +226,7 @@ Feature: cli/install/forge Scenario: Source dependencies from Modulefile using dash instead of slash Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" modulefile """ @@ -242,7 +242,7 @@ Feature: cli/install/forge Scenario: Installing a module with duplicated dependencies Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'pdxcat/collectd', '2.1.0' """ @@ -254,7 +254,7 @@ Feature: cli/install/forge Scenario: Installing two modules with same name, alphabetical order wins Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'ripienaar-concat', '0.2.0' mod 'puppetlabs-concat', '1.2.0' diff --git a/features/install/git.feature b/features/install/git.feature index 1ee8c80f..12ec71ac 100644 --- a/features/install/git.feature +++ b/features/install/git.feature @@ -4,7 +4,7 @@ Feature: cli/install/git Scenario: Installing a module from git Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apache', :git => 'https://github.com/puppetlabs/puppetlabs-apache.git', :ref => '1.4.0' @@ -34,7 +34,7 @@ Feature: cli/install/git Scenario: Installing a module with invalid versions in git Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod "apache", :git => "https://github.com/puppetlabs/puppetlabs-apache.git", :ref => "1.4.0" @@ -47,7 +47,7 @@ Feature: cli/install/git Scenario: Switching a module from forge to git Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/postgresql', '4.0.0' """ @@ -58,7 +58,7 @@ Feature: cli/install/git And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/ When I overwrite "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/postgresql', :git => 'https://github.com/puppetlabs/puppetlabs-postgresql.git', :ref => '4.3.0' @@ -113,7 +113,7 @@ Feature: cli/install/git Scenario: Running install with no Modulefile nor metadata.json Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git', :ref => '4.6.0' """ @@ -123,7 +123,7 @@ Feature: cli/install/git Scenario: Running install with metadata.json without dependencies Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/sqlite', :git => 'https://github.com/puppetlabs/puppetlabs-sqlite.git', :ref => '84a0a6' """ @@ -153,7 +153,7 @@ Feature: cli/install/git Scenario: Install a module from git and using path Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'librarian-test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/test' """ @@ -165,7 +165,7 @@ Feature: cli/install/git Scenario: Install a module from git without version Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/dependency_without_version' """ diff --git a/features/install/github_tarball.feature b/features/install/github_tarball.feature index 4b21a2c9..3c482b72 100644 --- a/features/install/github_tarball.feature +++ b/features/install/github_tarball.feature @@ -5,7 +5,7 @@ Feature: cli/install/github_tarball Scenario: Installing a module from github tarballs Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apache', '0.6.0', :github_tarball => 'puppetlabs/puppetlabs-apache' mod 'puppetlabs/stdlib', '2.3.0', :github_tarball => 'puppetlabs/puppetlabs-stdlib' diff --git a/features/install/path.feature b/features/install/path.feature index a72f41e7..10b804c8 100644 --- a/features/install/path.feature +++ b/features/install/path.feature @@ -45,7 +45,7 @@ Feature: cli/install/path Scenario: Install a module from path without version Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'test', :path => '../../features/examples/dependency_without_version' """ diff --git a/features/outdated.feature b/features/outdated.feature index 6a9dc8ee..f9344220 100644 --- a/features/outdated.feature +++ b/features/outdated.feature @@ -4,14 +4,14 @@ Feature: cli/outdated Scenario: Running outdated with forge modules Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', '>=3.1.x' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -28,14 +28,14 @@ Feature: cli/outdated Scenario: Running outdated with git modules Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'test', :git => 'https://github.com/rodjek/librarian-puppet.git', :path => 'features/examples/test' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) diff --git a/features/package.feature b/features/package.feature index 43699fc6..2998e0fe 100644 --- a/features/package.feature +++ b/features/package.feature @@ -4,7 +4,7 @@ Feature: cli/package Scenario: Packaging a forge module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apt', '1.4.0' mod 'puppetlabs/stdlib', '4.1.0' @@ -20,7 +20,7 @@ Feature: cli/package Scenario: Packaging a git module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apt', '1.5.0', :git => 'https://github.com/puppetlabs/puppetlabs-apt.git', :ref => '1.5.0' mod 'puppetlabs/stdlib', '4.1.0' @@ -37,7 +37,7 @@ Feature: cli/package Scenario: Packaging a github tarball module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/apt', '1.4.0', :github_tarball => 'puppetlabs/puppetlabs-apt' mod 'puppetlabs/stdlib', '4.1.0' diff --git a/features/update.feature b/features/update.feature index f11cce26..26bd605c 100644 --- a/features/update.feature +++ b/features/update.feature @@ -17,7 +17,7 @@ Feature: cli/update And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -40,7 +40,7 @@ Feature: cli/update And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -57,14 +57,14 @@ Feature: cli/update Scenario: Updating a module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', '3.1.x' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -80,14 +80,14 @@ Feature: cli/update Scenario: Updating a module using organization/module Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', '3.1.x' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -103,7 +103,7 @@ Feature: cli/update Scenario: Updating a module from git with a branch ref Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod "puppetlabs-stdlib", :git => "https://github.com/puppetlabs/puppetlabs-stdlib.git", :ref => "3.2.x" @@ -130,7 +130,7 @@ Feature: cli/update Scenario: Updating a module with invalid versions in git Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod "apache", :git => "https://github.com/puppetlabs/puppetlabs-apache.git", :ref => "0.5.0-rc1" @@ -138,7 +138,7 @@ Feature: cli/update And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/firewall (0.0.4) puppetlabs/stdlib (3.2.0) @@ -164,14 +164,14 @@ Feature: cli/update Scenario: Updating a module that is not in the Puppetfile Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'puppetlabs/stdlib', '3.1.x' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: puppetlabs/stdlib (3.1.0) @@ -185,14 +185,14 @@ Feature: cli/update Scenario: Updating a module to a .10 release to ensure versions are correctly ordered Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'maestrodev/test' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: maestrodev/test (1.0.2) @@ -208,14 +208,14 @@ Feature: cli/update Scenario: Updating a forge module with the rsync configuration Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod 'maestrodev/test' """ And a file named "Puppetfile.lock" with: """ FORGE - remote: http://forge.puppetlabs.com + remote: https://forge.puppet.com specs: maestrodev/test (1.0.2) @@ -243,7 +243,7 @@ Feature: cli/update Scenario: Updating a git module with the rsync configuration Given a file named "Puppetfile" with: """ - forge "http://forge.puppetlabs.com" + forge "https://forge.puppet.com" mod "puppetlabs-stdlib", :git => "https://github.com/puppetlabs/puppetlabs-stdlib.git", :ref => "3.2.x" diff --git a/lib/librarian/puppet/dsl.rb b/lib/librarian/puppet/dsl.rb index f9f93f04..caa7cd1f 100644 --- a/lib/librarian/puppet/dsl.rb +++ b/lib/librarian/puppet/dsl.rb @@ -7,7 +7,7 @@ module Librarian module Puppet class Dsl < Librarian::Dsl - FORGE_URL = "http://forge.puppetlabs.com" + FORGE_URL = "https://forge.puppet.com" dependency :mod diff --git a/lib/librarian/puppet/source/forge/repo.rb b/lib/librarian/puppet/source/forge/repo.rb index cd4ea9e9..ae600e86 100644 --- a/lib/librarian/puppet/source/forge/repo.rb +++ b/lib/librarian/puppet/source/forge/repo.rb @@ -87,7 +87,7 @@ def cache_version_unpacked!(version) target = vendored?(name, version) ? vendored_path(name, version).to_s : name # can't pass the default v3 forge url (http://forgeapi.puppetlabs.com) - # to clients that use the v1 API (https://forge.puppetlabs.com) + # to clients that use the v1 API (https://forge.puppet.com) # nor the other way around module_repository = source.to_s diff --git a/lib/librarian/puppet/source/forge/repo_v1.rb b/lib/librarian/puppet/source/forge/repo_v1.rb index a08002d9..7ac08e07 100644 --- a/lib/librarian/puppet/source/forge/repo_v1.rb +++ b/lib/librarian/puppet/source/forge/repo_v1.rb @@ -11,10 +11,10 @@ class RepoV1 < Librarian::Puppet::Source::Forge::Repo def initialize(source, name) super(source, name) # API returned data for this module including all versions and dependencies, indexed by module name - # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name} + # from https://forge.puppet.com/api/v1/releases.json?module=#{name} @api_data = nil # API returned data for this module and a specific version, indexed by version - # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version} + # from https://forge.puppet.com/api/v1/releases.json?module=#{name}&version=#{version} @api_version_data = {} end diff --git a/spec/source/forge_repo_spec.rb b/spec/source/forge_repo_spec.rb index 479b72d6..554c2b71 100644 --- a/spec/source/forge_repo_spec.rb +++ b/spec/source/forge_repo_spec.rb @@ -4,7 +4,7 @@ describe Librarian::Puppet::Source::Forge::Repo do let(:environment) { Librarian::Puppet::Environment.new } - let(:uri) { "https://forge.puppetlabs.com" } + let(:uri) { "https://forge.puppet.com" } let(:source) { Librarian::Puppet::Source::Forge.new(environment, uri) } subject { Librarian::Puppet::Source::Forge::Repo.new(source, "puppetlabs/stdlib") } diff --git a/spec/source/forge_spec.rb b/spec/source/forge_spec.rb index 0ce40783..340f4375 100644 --- a/spec/source/forge_spec.rb +++ b/spec/source/forge_spec.rb @@ -7,7 +7,7 @@ describe Forge do let(:environment) { Librarian::Puppet::Environment.new } - let(:uri) { "https://forge.puppetlabs.com" } + let(:uri) { "https://forge.puppet.com" } let(:puppet_version) { "3.6.0" } subject { Forge.new(environment, uri) }