Change ignitionrobotics.org to gazebosim.org (#304)

* Adds a deprecation warning about fuel.ignitionrobotics.org

Signed-off-by: Nate Koenig <[email protected]>

* Added deprecation notice

Signed-off-by: Nate Koenig <[email protected]>

* spelling

Signed-off-by: Nate Koenig <[email protected]>

* Update tutorials to use gazebo

Signed-off-by: Nate Koenig <[email protected]>

* fix version numbers

Signed-off-by: Nate Koenig <[email protected]>

* Change ignitionrobotics.org to gazebosim.org

Signed-off-by: Nate Koenig <[email protected]>

* Fix some tests

Signed-off-by: Nate Koenig <[email protected]>

* fix codecheck

Signed-off-by: Nate Koenig <[email protected]>

* Fixed tests

Signed-off-by: Nate Koenig <[email protected]>

* Update comments with ignitionrobotics

Signed-off-by: Nate Koenig <[email protected]>

* revert change

Signed-off-by: Nate Koenig <[email protected]>

* A few stragglers

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

CONTRIBUTING.md

@@ -1 +1 @@
-See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
+See the [Ignition Robotics contributing guide](https://gazebosim.org/docs/all/contributing).

Changelog.md

@@ -22,88 +22,88 @@
 1. Remove unused files (bitbucket-pipelines, docs)
     * [Pull request #273](https://github.com/gazebosim/gz-fuel-tools/pull/273)
 
-1. Disable `staging-fuel.ignitionrobotics.org` test
+1. Disable `staging-fuel.gazebosim.org` test
     * [Pull request #257](https://github.com/gazebosim/gz-fuel-tools/pull/257)
 
 ### Ignition Fuel Tools 4.5.0 (2022-06-01)
 
 1. APIs for retrieving models in parallel
-    * [Pull request #199](https://github.com/ignitionrobotics/ign-fuel-tools/pull/199)
+    * [Pull request #199](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/199)
 
 1. Add missing header guard for Interface.hh
-    * [Pull request #249](https://github.com/ignitionrobotics/ign-fuel-tools/pull/249)
+    * [Pull request #249](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/249)
 
 1. Print error when unzipping fails to save a file
-    * [Pull request #235](https://github.com/ignitionrobotics/ign-fuel-tools/pull/235)
+    * [Pull request #235](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/235)
 
 1. More checks when manipulating file system in tests
-    * [Pull request #227](https://github.com/ignitionrobotics/ign-fuel-tools/pull/227)
+    * [Pull request #227](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/227)
 
 1. Move test cache to build folder
-    * [Pull request #222](https://github.com/ignitionrobotics/ign-fuel-tools/pull/222)
+    * [Pull request #222](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/222)
 
 1. Improve and fix `ResultType` tests
-    * [Pull request #225](https://github.com/ignitionrobotics/ign-fuel-tools/pull/225)
+    * [Pull request #225](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/225)
 
 1. FuelClient.cc: include <deque>
-    * [Pull request #213](https://github.com/ignitionrobotics/ign-fuel-tools/pull/213)
+    * [Pull request #213](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/213)
 
 ### Ignition Fuel Tools 4.4.0 (2021-06-17)
 
 1. Remove `tools/code_check` and update codecov
-    * [Pull request #187](https://github.com/ignitionrobotics/ign-fuel-tools/pull/187)
+    * [Pull request #187](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/187)
 
 1. Fixed windows download
-    * [Pull request #178](https://github.com/ignitionrobotics/ign-fuel-tools/pull/178)
+    * [Pull request #178](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/178)
 
 1. Master branch updates
-    * [Pull request #170](https://github.com/ignitionrobotics/ign-fuel-tools/pull/170)
+    * [Pull request #170](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/170)
 
 1. Support private-token in `config.yaml`
-    * [Pull request #156](https://github.com/ignitionrobotics/ign-fuel-tools/pull/156)
+    * [Pull request #156](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/156)
 
 1. Add Windows Installation
-    * [Pull request #162](https://github.com/ignitionrobotics/ign-fuel-tools/pull/162)
+    * [Pull request #162](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/162)
 
 1. Use semantic version and prevent crash if version is missing
-    * [Pull request #151](https://github.com/ignitionrobotics/ign-fuel-tools/pull/151)
+    * [Pull request #151](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/151)
 
 1. Document `IGN_FUEL_CACHE_PATH` on command line
-    * [Pull request #149](https://github.com/ignitionrobotics/ign-fuel-tools/pull/149)
+    * [Pull request #149](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/149)
 
 1. Support editing/patching model files
-    * [Pull request #140](https://github.com/ignitionrobotics/ign-fuel-tools/pull/140)
+    * [Pull request #140](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/140)
 
 1. Set keep alive on
-    * [Pull request #141](https://github.com/ignitionrobotics/ign-fuel-tools/pull/141)
+    * [Pull request #141](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/141)
 
 ### Ignition Fuel Tools 4.3.0 (2020-12-01)
 
 1. Improve fork experience.
-    * [Pull request 126](https://github.com/ignitionrobotics/ign-fuel-tools/pull/126)
+    * [Pull request 126](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/126)
 
 1. Download dependencies.
-    * [Pull request 123](https://github.com/ignitionrobotics/ign-fuel-tools/pull/123)
+    * [Pull request 123](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/123)
 
 1. Includes all changes up to version 3.5.0.
 
 ### Ignition Fuel Tools 4.2.1 (2020-08-26)
 
 1. Fix `ign fuel download`, which was missing the `-j` option.
-    * [Pull request 116](https://github.com/ignitionrobotics/ign-fuel-tools/pull/116)
+    * [Pull request 116](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/116)
 
 ### Ignition Fuel Tools 4.2.0 (2020-08-26)
 
 1. Set license information based on licenses available from a Fuel server
    and `legal` information in a `metadata.pbtxt` file.
-    * [Pull request 69](https://github.com/ignitionrobotics/ign-fuel-tools/pull/69)
+    * [Pull request 69](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/69)
 
 1. Added `edit` subcommand to the `ign fuel`. The edit command currently
    supports editing a model's privacy.
-    * [Pull request 67](https://github.com/ignitionrobotics/ign-fuel-tools/pull/67)
+    * [Pull request 67](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/67)
 
 1. Alphabetical listing of subcommands.
-    * [Pull request 65](https://github.com/ignitionrobotics/ign-fuel-tools/pull/65)
+    * [Pull request 65](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/65)
 
 1. All changes up to and including Ignition Fuel Tools 3.3.0 are included.
 
@@ -132,52 +132,52 @@
 ### Ignition Fuel Tools 3.5.0 (2020-11-30)
 
 1. Fix windows build.
-    * [Pull request 107](https://github.com/ignitionrobotics/ign-fuel-tools/pull/107)
+    * [Pull request 107](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/107)
 
 1. Resolve updated codecheck issues.
-    * [Pull request 129](https://github.com/ignitionrobotics/ign-fuel-tools/pull/129)
+    * [Pull request 129](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/129)
 
 1. Update Backpack model to fix tests.
-    * [Pull request 132](https://github.com/ignitionrobotics/ign-fuel-tools/pull/132)
+    * [Pull request 132](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/132)
 
 1. Use lowercase resource and owner names when storing assets on disk.
-    * [Pull request 130](https://github.com/ignitionrobotics/ign-fuel-tools/pull/130)
+    * [Pull request 130](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/130)
 
 ### Ignition Fuel Tools 3.4.0 (2020-08-19)
 
 1. Modernize github actions by updating to the new style.
-    * [Pull request 94](https://github.com/ignitionrobotics/ign-fuel-tools/pull/94)
+    * [Pull request 94](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/94)
 
 1. Fix test worlds.
-    * [Pull request 100](https://github.com/ignitionrobotics/ign-fuel-tools/pull/100)
+    * [Pull request 100](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/100)
 
 1. Add capability for downloading collections.
-    * [Pull request 98](https://github.com/ignitionrobotics/ign-fuel-tools/pull/98)
+    * [Pull request 98](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/98)
 
 1. Fix windows build.t
-    * [Pull request 103](https://github.com/ignitionrobotics/ign-fuel-tools/pull/013)
+    * [Pull request 103](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/013)
 
 ### Ignition Fuel Tools 3.3.0 (2020-07-29)
 
 1. openrobotics to OpenRobotics
-    * [Pull request 75](https://github.com/ignitionrobotics/ign-fuel-tools/pull/75)
+    * [Pull request 75](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/75)
 
 1. Fix world tests
-    * [Pull request 76](https://github.com/ignitionrobotics/ign-fuel-tools/pull/76)
+    * [Pull request 76](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/76)
 
 1. Add missing dependency in Actions CI
-    * [Pull request 86](https://github.com/ignitionrobotics/ign-fuel-tools/pull/86)
+    * [Pull request 86](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/86)
 
 1. Backport file fetching
-    * [Pull request 84](https://github.com/ignitionrobotics/ign-fuel-tools/pull/84)
+    * [Pull request 84](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/84)
 
 1. Convert model:// to Fuel URLs instead of absolute paths
-    * [Pull request 85](https://github.com/ignitionrobotics/ign-fuel-tools/pull/85)
+    * [Pull request 85](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/85)
 
 ### Ignition Fuel Tools 3.2.2 (2020-05-18)
 
 1. Fix URL encodings in RestClient.
-    * [Pull request 70](https://github.com/ignitionrobotics/ign-fuel-tools/pull/70)
+    * [Pull request 70](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/70)
 
 1. Print message when downloading a resource.
     * [BitBucket pull request 102](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/102)

Migration.md

@@ -1,5 +1,11 @@
 ## Ignition Fuel Tools 3.X to 4.X
 
+### Depercations
+
+1. The `fuel.gazebosim.org` Fuel server has been deprecated, and
+    redirects to `fuel.gazebosim.org`. Use `fuel.gazebosim.org` in all Fuel
+    URLs.
+
 ### Modifications
 
 1. `FuelClient::UploadModel` takes 2 more arguments now.

NEWS

@@ -1 +1 @@
-http://bitbucket.org/ignitionrobotics/ign-rndf
+https://gazebosim.org

README.md

@@ -33,16 +33,16 @@ For a complete list of commands run `ign fuel -h` on the command line.
 ** List all models **
 ```
 $ ign fuel list -t model -r | head
-https://fuel.ignitionrobotics.org/anonymous/test_model_595389531
-https://fuel.ignitionrobotics.org/anonymous/test_model_122023392
-https://fuel.ignitionrobotics.org/anonymous/test_model_429486665
-https://fuel.ignitionrobotics.org/anonymous/test_model_887243621
-https://fuel.ignitionrobotics.org/anonymous/test_model_084900530
-https://fuel.ignitionrobotics.org/anonymous/test_model_240061059
-https://fuel.ignitionrobotics.org/anonymous/test_model_464734097
-https://fuel.ignitionrobotics.org/anonymous/test_model_658598990
-https://fuel.ignitionrobotics.org/anonymous/test_model_834617935
-https://fuel.ignitionrobotics.org/anonymous/test_model_380348669
+https://fuel.gazebosim.org/anonymous/test_model_595389531
+https://fuel.gazebosim.org/anonymous/test_model_122023392
+https://fuel.gazebosim.org/anonymous/test_model_429486665
+https://fuel.gazebosim.org/anonymous/test_model_887243621
+https://fuel.gazebosim.org/anonymous/test_model_084900530
+https://fuel.gazebosim.org/anonymous/test_model_240061059
+https://fuel.gazebosim.org/anonymous/test_model_464734097
+https://fuel.gazebosim.org/anonymous/test_model_658598990
+https://fuel.gazebosim.org/anonymous/test_model_834617935
+https://fuel.gazebosim.org/anonymous/test_model_380348669
 ```
 
 ** Download a model **
@@ -107,7 +107,7 @@ See issues beginning with [Fuel backend] in the title. Here are two examples.
 ** TODO: Find a model on disk **
 ```
 $ ign fuel locate --name am1
-/home/developer/.ignition/fuel/fuel.ignitionrobotics.org/alice/am1
+/home/developer/.ignition/fuel/fuel.gazebosim.org/alice/am1
 ```
 
 ## Dependencies

conf/config.yaml

@@ -3,7 +3,7 @@
 servers:
   -
     name: osrf
-    url: https://fuel.ignitionrobotics.org
+    url: https://fuel.gazebosim.org
 
   # -
     # name: another_server

example/download.cc

@@ -38,7 +38,7 @@ int main(int argc, char **argv)
   usage += " Usage:\n  ./download <options>\n\n";
   usage += "  Examples:\n"
     "\t ./download -t model -o OpenRobotics -n Beer\n"
-    "\t ./download -s https://fuel.ignitionrobotics.org -t world "
+    "\t ./download -s https://fuel.gazebosim.org -t world "
     "-o OpenRobotics"
     " -n Empty\n"
     "\t ./download -c /tmp/my_config.yaml -t model -o caguero -n Beer\n";

include/gz/fuel_tools/FuelClient.hh

@@ -184,7 +184,7 @@ namespace ignition
 
       /// \brief Remove a resource, such as a model or world, from Ignition Fuel
       /// \param[in] _uri The full URI of the resource, e.g:
-      /// https://fuel.ignitionrobotics.org/1.0/openrobotcs/model/my_model
+      /// https://fuel.gazebosim.org/1.0/openrobotcs/model/my_model
       /// \param[in] _headers Headers to set on the HTTP request.
       /// \return Result of the delete operation
       public: Result DeleteUrl(const gz::common::URI &_uri,
@@ -238,7 +238,7 @@ namespace ignition
       /// \brief Download a model from ignition fuel. This will override an
       /// existing local copy of the model.
       /// \param[in] _modelUrl The unique URL of the model to download.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \param[out] _path Path where the model was downloaded.
       /// \return Result of the download operation.
       public: Result DownloadModel(const common::URI &_modelUrl,
@@ -247,7 +247,7 @@ namespace ignition
       /// \brief Download a world from ignition fuel. This will override an
       /// existing local copy of the world.
       /// \param[in] _worldUrl The unique URL of the world to download.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \param[out] _path Path where the world was downloaded.
       /// \return Result of the download operation.
       public: Result DownloadWorld(const common::URI &_worldUrl,
@@ -277,29 +277,29 @@ namespace ignition
 
       /// \brief Check if a model is already present in the local cache.
       /// \param[in] _modelUrl The unique URL of the model on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \param[out] _path Local path where the model can be found.
       /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached.
       public: Result CachedModel(const common::URI &_modelUrl,
                                  std::string &_path);
 
       /// \brief Check if a model exists in the cache.
       /// \param[in] _modelUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \return True if the model exists in the cache, false otherwise.
       public: bool CachedModel(const common::URI &_modelUrl);
 
       /// \brief Check if a world is already present in the local cache.
       /// \param[in] _worldUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \param[out] _path Local path where the world can be found.
       /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached.
       public: Result CachedWorld(const common::URI &_worldUrl,
                                  std::string &_path);
 
       /// \brief Check if a world exists in the cache.
       /// \param[in] _worldUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \return True if the world exists in the cache, false otherwise.
       public: bool CachedWorld(const common::URI &_worldUrl);
 

src/ClientConfig.cc

@@ -89,7 +89,7 @@ class gz::fuel_tools::ServerConfigPrivate
           }
 
   /// \brief URL to reach server
-  public: common::URI url{"https://fuel.ignitionrobotics.org"};
+  public: common::URI url{"https://fuel.gazebosim.org"};
 
   /// \brief A key to auth with the server
   public: std::string key = "";

src/ClientConfig_TEST.cc

@@ -30,7 +30,7 @@ using namespace fuel_tools;
 /////////////////////////////////////////////////
 /// \brief Helper to remove file according to OS, while Windows
 /// has this issue:
-/// https://github.com/ignitionrobotics/ign-common/issues/51
+/// https://github.com/gazebosim/gz-common/issues/51
 /// \todo(anyone) Remove this once Windows issue is solved.
 /// \param[in] _path Path to file to be removed.
 void removeFileTemp(const std::string &_path)
@@ -98,7 +98,7 @@ TEST(ClientConfig, CustomDefaultConfiguration)
 {
   ClientConfig config;
   ASSERT_EQ(2u, config.Servers().size());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org",
+  EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers().front().Url().Str());
   EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers()[1].Url().Str());
@@ -137,7 +137,7 @@ TEST(ClientConfig, CustomConfiguration)
   EXPECT_TRUE(config.LoadConfig(testPath));
 
   ASSERT_EQ(4u, config.Servers().size());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org",
+  EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers().front().Url().Str());
   EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers()[1].Url().Str());
@@ -166,10 +166,10 @@ TEST(ClientConfig, RepeatedServerConfiguration)
       << "# The list of servers."                 << std::endl
       << "servers:"                               << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
+      << "    url: https://fuel.gazebosim.org"  << std::endl
       << ""                                       << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
+      << "    url: https://fuel.gazebosim.org"  << std::endl
       << ""                                       << std::endl
       << "# Where are the assets stored in disk." << std::endl
       << "cache:"                                 << std::endl
@@ -317,7 +317,7 @@ TEST(ClientConfig, AsString)
 #else
     EXPECT_NE(str.find(".ignition\\fuel"), std::string::npos);
 #endif
-    EXPECT_NE(str.find("https://fuel.ignitionrobotics.org"), std::string::npos);
+    EXPECT_NE(str.find("https://fuel.gazebosim.org"), std::string::npos);
   }
 
   {