From c357c8275dc05017f74ea4b98bd83741edd2d77c Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:11:25 -0700 Subject: [PATCH 01/25] Update header guards Signed-off-by: methylDragon --- src/LocalCache.hh | 4 ++-- src/ModelIterPrivate.hh | 4 ++-- src/ModelPrivate.hh | 4 ++-- src/WorldIterPrivate.hh | 4 ++-- src/ign.hh | 4 ++-- test/test_config.h.in | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/LocalCache.hh b/src/LocalCache.hh index 9bc1dd8b..0f5a0be4 100644 --- a/src/LocalCache.hh +++ b/src/LocalCache.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_LOCALCACHE_HH_ -#define IGNITION_FUEL_TOOLS_LOCALCACHE_HH_ +#ifndef GZ_FUEL_TOOLS_LOCALCACHE_HH_ +#define GZ_FUEL_TOOLS_LOCALCACHE_HH_ #include #include diff --git a/src/ModelIterPrivate.hh b/src/ModelIterPrivate.hh index 497e1821..6c1608b9 100644 --- a/src/ModelIterPrivate.hh +++ b/src/ModelIterPrivate.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_MODELITERPRIVATE_HH_ -#define IGNITION_FUEL_TOOLS_MODELITERPRIVATE_HH_ +#ifndef GZ_FUEL_TOOLS_MODELITERPRIVATE_HH_ +#define GZ_FUEL_TOOLS_MODELITERPRIVATE_HH_ #include #include diff --git a/src/ModelPrivate.hh b/src/ModelPrivate.hh index 9fa064e5..bd554883 100644 --- a/src/ModelPrivate.hh +++ b/src/ModelPrivate.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_MODELPRIVATE_HH_ -#define IGNITION_FUEL_TOOLS_MODELPRIVATE_HH_ +#ifndef GZ_FUEL_TOOLS_MODELPRIVATE_HH_ +#define GZ_FUEL_TOOLS_MODELPRIVATE_HH_ #include diff --git a/src/WorldIterPrivate.hh b/src/WorldIterPrivate.hh index 1813078c..fdd6637f 100644 --- a/src/WorldIterPrivate.hh +++ b/src/WorldIterPrivate.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_WORLDITERPRIVATE_HH_ -#define IGNITION_FUEL_TOOLS_WORLDITERPRIVATE_HH_ +#ifndef GZ_FUEL_TOOLS_WORLDITERPRIVATE_HH_ +#define GZ_FUEL_TOOLS_WORLDITERPRIVATE_HH_ #include #include diff --git a/src/ign.hh b/src/ign.hh index 80358b4d..ff830fe6 100644 --- a/src/ign.hh +++ b/src/ign.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUELTOOLS_IGN_HH_ -#define IGNITION_FUELTOOLS_IGN_HH_ +#ifndef GZ_FUELTOOLS_GZ_HH_ +#define GZ_FUELTOOLS_GZ_HH_ #include "ignition/fuel_tools/Export.hh" diff --git a/test/test_config.h.in b/test/test_config.h.in index 8ce5c383..7c0e858e 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_TEST_CONFIG_HH_ -#define IGNITION_FUEL_TOOLS_TEST_CONFIG_HH_ +#ifndef GZ_FUEL_TOOLS_TEST_CONFIG_HH_ +#define GZ_FUEL_TOOLS_TEST_CONFIG_HH_ #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}" #define PROJECT_BINARY_PATH "${PROJECT_BINARY_DIR}" From fdff44d17a5a19b7b9a526fe54291f26f7450f9e Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:11:57 -0700 Subject: [PATCH 02/25] Migrate namespaces Signed-off-by: methylDragon --- README.md | 6 +- doc/ignition.in | 2 +- doc/tutorials.in | 2 +- example/details.cc | 16 +- example/download.cc | 12 +- example/list.cc | 8 +- include/gz/fuel_tools/ClientConfig.hh | 2 +- include/gz/fuel_tools/CollectionIdentifier.hh | 2 +- include/gz/fuel_tools/FuelClient.hh | 10 +- include/gz/fuel_tools/Helpers.hh | 4 +- include/gz/fuel_tools/Interface.hh | 4 +- include/gz/fuel_tools/JSONParser.hh | 2 +- include/gz/fuel_tools/Model.hh | 2 +- include/gz/fuel_tools/ModelIdentifier.hh | 2 +- include/gz/fuel_tools/ModelIter.hh | 2 +- include/gz/fuel_tools/RestClient.hh | 2 +- include/gz/fuel_tools/Result.hh | 2 +- include/gz/fuel_tools/WorldIdentifier.hh | 2 +- include/gz/fuel_tools/WorldIter.hh | 2 +- include/gz/fuel_tools/Zip.hh | 2 +- src/ClientConfig.cc | 20 +-- src/ClientConfig_TEST.cc | 16 +- src/CollectionIdentifier.cc | 4 +- src/CollectionIdentifier_TEST.cc | 14 +- src/FuelClient.cc | 64 +++---- src/FuelClient_TEST.cc | 38 ++--- src/Helpers.cc | 4 +- src/Helpers_TEST.cc | 2 +- src/Interface.cc | 30 ++-- src/Interface_TEST.cc | 4 +- src/JSONParser.cc | 2 +- src/JSONParser_TEST.cc | 2 +- src/LocalCache.cc | 4 +- src/LocalCache.hh | 2 +- src/LocalCache_TEST.cc | 44 ++--- src/Model.cc | 4 +- src/ModelIdentifier.cc | 4 +- src/ModelIdentifier_TEST.cc | 8 +- src/ModelIter.cc | 2 +- src/ModelIterPrivate.hh | 2 +- src/ModelIter_TEST.cc | 8 +- src/ModelPrivate.hh | 2 +- src/Model_TEST.cc | 4 +- src/RestClient.cc | 8 +- src/RestClient_TEST.cc | 2 +- src/Result.cc | 4 +- src/Result_TEST.cc | 4 +- src/WorldIdentifier.cc | 4 +- src/WorldIdentifier_TEST.cc | 14 +- src/WorldIter.cc | 4 +- src/WorldIterPrivate.hh | 2 +- src/WorldIter_TEST.cc | 8 +- src/Zip.cc | 26 +-- src/Zip_TEST.cc | 26 +-- src/ign.cc | 160 +++++++++--------- src/ign_src_TEST.cc | 2 +- test/integration/zip.cc | 52 +++--- tutorials/02_configuration.md | 12 +- tutorials/04_cpp_api.md | 4 +- 59 files changed, 351 insertions(+), 351 deletions(-) diff --git a/README.md b/README.md index f83bc841..b3fbb606 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,9 @@ Download succeeded. **C++ Get List models** ``` // Create a client (uses https://fuel.ignitionrobotics.org by default) - ignition::fuel_tools::ClientConfig conf; - ignition::fuel_tools::FuelClient client(conf); - ignition::fuel_tools::ModelIter iter = client.Models(); + gz::fuel_tools::ClientConfig conf; + gz::fuel_tools::FuelClient client(conf); + gz::fuel_tools::ModelIter iter = client.Models(); while (iter) { std::cout << "Got model: " << iter->Identification().Name() << "\n"; diff --git a/doc/ignition.in b/doc/ignition.in index ecdd68a0..eb0ec366 100644 --- a/doc/ignition.in +++ b/doc/ignition.in @@ -900,7 +900,7 @@ IMAGE_PATH = # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. -INPUT_FILTER = "sed -e 's/ignition::fuel_tools:://g'" +INPUT_FILTER = "sed -e 's/gz::fuel_tools:://g'" # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the diff --git a/doc/tutorials.in b/doc/tutorials.in index b78d53c3..16938eb9 100644 --- a/doc/tutorials.in +++ b/doc/tutorials.in @@ -898,7 +898,7 @@ IMAGE_PATH = # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. -INPUT_FILTER = "sed -e 's/ignition::fuel_tools:://g'" +INPUT_FILTER = "sed -e 's/gz::fuel_tools:://g'" # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the diff --git a/example/details.cc b/example/details.cc index a8dba759..266b859f 100644 --- a/example/details.cc +++ b/example/details.cc @@ -56,14 +56,14 @@ int main(int argc, char **argv) gflags::HandleCommandLineHelpFlags(); // Setup ClientConfig. - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("ExampleDetails"); if (FLAGS_s != "") { // The user specified a Fuel server via command line. - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI(FLAGS_s)); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI(FLAGS_s)); // Add the extra Fuel server. conf.AddServer(srv); @@ -80,11 +80,11 @@ int main(int argc, char **argv) } // Instantiate the FuelClient object with the configuration. - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Set the properties of the resource that we want to search. - ignition::fuel_tools::ModelIdentifier modelIdentifier; - ignition::fuel_tools::WorldIdentifier worldIdentifier; + gz::fuel_tools::ModelIdentifier modelIdentifier; + gz::fuel_tools::WorldIdentifier worldIdentifier; if (FLAGS_t == "model") { @@ -106,7 +106,7 @@ int main(int argc, char **argv) auto id = modelIdentifier; id.SetServer(server); - ignition::fuel_tools::ModelIdentifier model; + gz::fuel_tools::ModelIdentifier model; if (!client.ModelDetails(id, model)) continue; @@ -118,7 +118,7 @@ int main(int argc, char **argv) auto id = worldIdentifier; id.SetServer(server); - ignition::fuel_tools::WorldIdentifier world; + gz::fuel_tools::WorldIdentifier world; if (!client.WorldDetails(id, world)) continue; diff --git a/example/download.cc b/example/download.cc index ceb01cd2..4f7553f9 100644 --- a/example/download.cc +++ b/example/download.cc @@ -59,7 +59,7 @@ int main(int argc, char **argv) gflags::HandleCommandLineHelpFlags(); // Setup ClientConfig. - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("ExampleDownload"); if (FLAGS_c != "") @@ -75,19 +75,19 @@ int main(int argc, char **argv) if (FLAGS_s != "") { // The user specified a Fuel server via command line. - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI(FLAGS_s)); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI(FLAGS_s)); // Add the extra Fuel server. conf.AddServer(srv); } // Instantiate the FuelClient object with the configuration. - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Set the properties of the resource that we want to download. - ignition::fuel_tools::ModelIdentifier modelIdentifier; - ignition::fuel_tools::WorldIdentifier worldIdentifier; + gz::fuel_tools::ModelIdentifier modelIdentifier; + gz::fuel_tools::WorldIdentifier worldIdentifier; if (FLAGS_t == "model") { diff --git a/example/list.cc b/example/list.cc index 1dca7904..ac109d75 100644 --- a/example/list.cc +++ b/example/list.cc @@ -61,14 +61,14 @@ int main(int argc, char **argv) } // Setup ClientConfig. - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("ExampleList"); if (FLAGS_s != "") { // The user specified a Fuel server via command line. - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI(FLAGS_s)); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI(FLAGS_s)); // Add the extra Fuel server. conf.AddServer(srv); @@ -87,7 +87,7 @@ int main(int argc, char **argv) } // Instantiate the FuelClient object with the configuration. - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); for (const auto &server : client.Config().Servers()) { diff --git a/include/gz/fuel_tools/ClientConfig.hh b/include/gz/fuel_tools/ClientConfig.hh index bb272cbe..0ded161f 100644 --- a/include/gz/fuel_tools/ClientConfig.hh +++ b/include/gz/fuel_tools/ClientConfig.hh @@ -33,7 +33,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/CollectionIdentifier.hh b/include/gz/fuel_tools/CollectionIdentifier.hh index 90e42ca1..39061164 100644 --- a/include/gz/fuel_tools/CollectionIdentifier.hh +++ b/include/gz/fuel_tools/CollectionIdentifier.hh @@ -30,7 +30,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh index 2741e8e0..f1249900 100644 --- a/include/gz/fuel_tools/FuelClient.hh +++ b/include/gz/fuel_tools/FuelClient.hh @@ -36,7 +36,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { @@ -198,7 +198,7 @@ namespace ignition /// https://fuel.ignitionrobotics.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 ignition::common::URI &_uri, + public: Result DeleteUrl(const gz::common::URI &_uri, const std::vector &_headers); /// \brief Download a model from ignition fuel. This will override an @@ -412,7 +412,7 @@ namespace ignition /// \param[in] _headers Headers to set on the HTTP request. /// \return Result of the patch operation. public: Result PatchModel( - const ignition::fuel_tools::ModelIdentifier &_model, + const gz::fuel_tools::ModelIdentifier &_model, const std::vector &_headers); /// \brief Update a model using a PATCH request. @@ -429,7 +429,7 @@ namespace ignition /// \param[in] _pathToModelDir a path to a directory containing a model. /// \return Result of the patch operation. public: Result PatchModel( - const ignition::fuel_tools::ModelIdentifier &_model, + const gz::fuel_tools::ModelIdentifier &_model, const std::vector &_headers, const std::string &_pathToModelDir); @@ -458,7 +458,7 @@ namespace ignition /// \param[in] _serverConfig Server configuration /// \param[inout] _headers Vector with headers to check private: void AddServerConfigParametersToHeaders( - const ignition::fuel_tools::ServerConfig &_serverConfig, + const gz::fuel_tools::ServerConfig &_serverConfig, std::vector &_headers) const; /// \brief PIMPL diff --git a/include/gz/fuel_tools/Helpers.hh b/include/gz/fuel_tools/Helpers.hh index ddda71a8..63c3e210 100644 --- a/include/gz/fuel_tools/Helpers.hh +++ b/include/gz/fuel_tools/Helpers.hh @@ -35,7 +35,7 @@ #define ign_strdup strdup #endif -namespace ignition +namespace gz { namespace fuel_tools { @@ -44,7 +44,7 @@ namespace fuel_tools /// \param[in] _uri URI to convert. /// \return String suitable to use in file paths IGNITION_FUEL_TOOLS_VISIBLE -std::string uriToPath(const ignition::common::URI &_uri); +std::string uriToPath(const gz::common::URI &_uri); } } diff --git a/include/gz/fuel_tools/Interface.hh b/include/gz/fuel_tools/Interface.hh index e9fcb837..9dae74f7 100644 --- a/include/gz/fuel_tools/Interface.hh +++ b/include/gz/fuel_tools/Interface.hh @@ -19,7 +19,7 @@ #include "gz/fuel_tools/Export.hh" #include "gz/fuel_tools/FuelClient.hh" -namespace ignition +namespace gz { namespace fuel_tools { @@ -36,7 +36,7 @@ namespace ignition /// \param[in] _client Custom FuelClient configuration. /// \return Path to the downloaded asset. Empty on error. IGNITION_FUEL_TOOLS_VISIBLE std::string fetchResourceWithClient( - const std::string &_uri, ignition::fuel_tools::FuelClient &_client); + const std::string &_uri, gz::fuel_tools::FuelClient &_client); /// \brief Get the SDF file path for a model or world based on a directory /// containing a Fuel model or world. Here is a typical use case: diff --git a/include/gz/fuel_tools/JSONParser.hh b/include/gz/fuel_tools/JSONParser.hh index a655153e..4235a323 100644 --- a/include/gz/fuel_tools/JSONParser.hh +++ b/include/gz/fuel_tools/JSONParser.hh @@ -33,7 +33,7 @@ namespace Json class Value; } -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/Model.hh b/include/gz/fuel_tools/Model.hh index 960a1ea5..8c2e3018 100644 --- a/include/gz/fuel_tools/Model.hh +++ b/include/gz/fuel_tools/Model.hh @@ -32,7 +32,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/ModelIdentifier.hh b/include/gz/fuel_tools/ModelIdentifier.hh index 947974b3..dafa7004 100644 --- a/include/gz/fuel_tools/ModelIdentifier.hh +++ b/include/gz/fuel_tools/ModelIdentifier.hh @@ -33,7 +33,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/ModelIter.hh b/include/gz/fuel_tools/ModelIter.hh index 77c5e85d..a3a8f7d8 100644 --- a/include/gz/fuel_tools/ModelIter.hh +++ b/include/gz/fuel_tools/ModelIter.hh @@ -30,7 +30,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/RestClient.hh b/include/gz/fuel_tools/RestClient.hh index 8fa2fd5f..0bb3971b 100644 --- a/include/gz/fuel_tools/RestClient.hh +++ b/include/gz/fuel_tools/RestClient.hh @@ -33,7 +33,7 @@ #undef DELETE #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/Result.hh b/include/gz/fuel_tools/Result.hh index 13109664..e154b403 100644 --- a/include/gz/fuel_tools/Result.hh +++ b/include/gz/fuel_tools/Result.hh @@ -32,7 +32,7 @@ #undef DELETE #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/WorldIdentifier.hh b/include/gz/fuel_tools/WorldIdentifier.hh index 65e98f01..3911b970 100644 --- a/include/gz/fuel_tools/WorldIdentifier.hh +++ b/include/gz/fuel_tools/WorldIdentifier.hh @@ -30,7 +30,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/WorldIter.hh b/include/gz/fuel_tools/WorldIter.hh index 0d617c3f..c5d55ab1 100644 --- a/include/gz/fuel_tools/WorldIter.hh +++ b/include/gz/fuel_tools/WorldIter.hh @@ -29,7 +29,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/include/gz/fuel_tools/Zip.hh b/include/gz/fuel_tools/Zip.hh index d51782df..50209a34 100644 --- a/include/gz/fuel_tools/Zip.hh +++ b/include/gz/fuel_tools/Zip.hh @@ -23,7 +23,7 @@ #include "gz/fuel_tools/Export.hh" -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index f96d7de3..70635d01 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -28,18 +28,18 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/config.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ////////////////////////////////////////////////// /// \brief Private data class -class ignition::fuel_tools::ClientConfigPrivate +class gz::fuel_tools::ClientConfigPrivate { /// \brief Constructor. public: ClientConfigPrivate() { std::string homePath; - ignition::common::env(IGN_HOMEDIR, homePath); + gz::common::env(IGN_HOMEDIR, homePath); this->cacheLocation = common::joinPaths( homePath, ".ignition", "fuel"); @@ -72,7 +72,7 @@ class ignition::fuel_tools::ClientConfigPrivate ////////////////////////////////////////////////// /// \brief Private data class -class ignition::fuel_tools::ServerConfigPrivate +class gz::fuel_tools::ServerConfigPrivate { /// \brief Clear values. public: void Clear() @@ -202,9 +202,9 @@ std::string ServerConfig::AsPrettyString(const std::string &_prefix) const ClientConfig::ClientConfig() : dataPtr(new ClientConfigPrivate) { std::string ignFuelPath = ""; - if (ignition::common::env("IGN_FUEL_CACHE_PATH", ignFuelPath)) + if (gz::common::env("IGN_FUEL_CACHE_PATH", ignFuelPath)) { - if (!ignition::common::isDirectory(ignFuelPath)) + if (!gz::common::isDirectory(ignFuelPath)) { ignerr << "[" << ignFuelPath << "] is not a directory" << std::endl; return; @@ -243,7 +243,7 @@ void ClientConfig::Clear() bool ClientConfig::LoadConfig(const std::string &_file) { // Sanity check: Verify that the configuration file exists. - if (!ignition::common::exists(_file)) + if (!gz::common::exists(_file)) { ignerr << "Unable to find configuration file [" << _file<< "]" << std::endl; return false; @@ -414,8 +414,8 @@ bool ClientConfig::LoadConfig(const std::string &_file) // Default cache path. std::string homePath; - ignition::common::env(IGN_HOMEDIR, homePath); - std::string cacheLocation = ignition::common::joinPaths( + gz::common::env(IGN_HOMEDIR, homePath); + std::string cacheLocation = gz::common::joinPaths( homePath, ".ignition", "fuel"); // The user wants to overwrite the default cache path. @@ -424,7 +424,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) // Do not overwrite the cache location if IGN_FUEL_CACHE_PATH is set. std::string ignFuelPath = ""; - if (ignition::common::env("IGN_FUEL_CACHE_PATH", ignFuelPath)) + if (gz::common::env("IGN_FUEL_CACHE_PATH", ignFuelPath)) { ignwarn << "IGN_FUEL_CACHE_PATH is set to [" << ignFuelPath << "]. The " << "path in the configuration file will be ignored" << std::endl; diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 8cbcc8f0..5e41ccaa 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -24,7 +24,7 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "test_config.h" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -36,23 +36,23 @@ using namespace fuel_tools; void removeFileTemp(const std::string &_path) { #ifndef _WIN32 - EXPECT_TRUE(ignition::common::removeFile(_path)); + EXPECT_TRUE(gz::common::removeFile(_path)); #else - ignition::common::removeFile(_path); + gz::common::removeFile(_path); #endif } ///////////////////////////////////////////////// /// \brief Get home directory. /// \return Home directory or empty string if home wasn't found. -/// \ToDo: Move this function to ignition::common::Filesystem +/// \ToDo: Move this function to gz::common::Filesystem std::string homePath() { std::string homePath; #ifndef _WIN32 - ignition::common::env("HOME", homePath); + gz::common::env("HOME", homePath); #else - ignition::common::env("USERPROFILE", homePath); + gz::common::env("USERPROFILE", homePath); #endif return homePath; @@ -61,7 +61,7 @@ std::string homePath() ///////////////////////////////////////////////// /// \brief Get cache directory. /// \return Cache directory -/// \ToDo: Move this function to ignition::common::Filesystem +/// \ToDo: Move this function to gz::common::Filesystem std::string cachePath() { #ifndef _WIN32 @@ -101,7 +101,7 @@ TEST(ClientConfig, CustomDefaultConfiguration) EXPECT_EQ("https://fuel.ignitionrobotics.org", config.Servers().front().Url().Str()); - std::string defaultCacheLocation = ignition::common::joinPaths( + std::string defaultCacheLocation = gz::common::joinPaths( homePath(), ".ignition", "fuel"); EXPECT_EQ(defaultCacheLocation, config.CacheLocation()); } diff --git a/src/CollectionIdentifier.cc b/src/CollectionIdentifier.cc index 02cf65d6..b7bb0997 100644 --- a/src/CollectionIdentifier.cc +++ b/src/CollectionIdentifier.cc @@ -24,10 +24,10 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/CollectionIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -class ignition::fuel_tools::CollectionIdentifierPrivate +class gz::fuel_tools::CollectionIdentifierPrivate { /// \brief a name given to this collection by a user public: std::string name; diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc index 8e5a095d..71f4248c 100644 --- a/src/CollectionIdentifier_TEST.cc +++ b/src/CollectionIdentifier_TEST.cc @@ -22,7 +22,7 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/CollectionIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -32,7 +32,7 @@ TEST(CollectionIdentifier, SetFields) CollectionIdentifier id; id.SetName("hello"); id.SetOwner("osrf"); - ignition::fuel_tools::ServerConfig srv1; + gz::fuel_tools::ServerConfig srv1; srv1.SetUrl(common::URI("https://localhost:8001/")); id.SetServer(srv1); @@ -45,13 +45,13 @@ TEST(CollectionIdentifier, SetFields) /// \brief Unique Name TEST(CollectionIdentifier, UniqueName) { - ignition::fuel_tools::ServerConfig srv1; + gz::fuel_tools::ServerConfig srv1; srv1.SetUrl(common::URI("https://localhost:8001")); - ignition::fuel_tools::ServerConfig srv2; + gz::fuel_tools::ServerConfig srv2; srv2.SetUrl(common::URI("https://localhost:8002")); - ignition::fuel_tools::ServerConfig srv3; + gz::fuel_tools::ServerConfig srv3; srv3.SetUrl(common::URI("https://localhost:8003")); CollectionIdentifier id; @@ -75,7 +75,7 @@ TEST(CollectionIdentifier, CopyConstructorDeepCopy) id.SetName("hello"); id.SetOwner("watermelon"); - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("https://localhost:8001")); id.SetServer(srv); @@ -96,7 +96,7 @@ TEST(CollectionIdentifier, AssignmentOperatorDeepCopy) CollectionIdentifier id; id.SetName("hello"); id.SetOwner("pineapple"); - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("https://localhost:8001")); id.SetServer(srv); diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 7ae604a8..d5c6e07d 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -51,11 +51,11 @@ #include "ModelIterPrivate.hh" #include "WorldIterPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; /// \brief Private Implementation -class ignition::fuel_tools::FuelClientPrivate +class gz::fuel_tools::FuelClientPrivate { /// \brief A model URL, /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer/2 @@ -278,7 +278,7 @@ Result FuelClient::ModelDetails(const ModelIdentifier &_id, Result FuelClient::ModelDetails(const ModelIdentifier &_id, ModelIdentifier &_model, const std::vector &_headers) const { - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; auto serverUrl = _id.Server().Url().Str(); @@ -342,7 +342,7 @@ Result FuelClient::WorldDetails(const WorldIdentifier &_id, if (serverUrl.empty() || _id.Owner().empty() || _id.Name().empty()) return Result(ResultType::FETCH_ERROR); - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; auto version = _id.Server().Version(); @@ -464,7 +464,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, const ModelIdentifier &_id, const std::vector &_headers, bool _private, const std::string &_owner) { - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; std::multimap form; @@ -512,7 +512,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, ////////////////////////////////////////////////// void FuelClient::AddServerConfigParametersToHeaders( - const ignition::fuel_tools::ServerConfig &_serverConfig, + const gz::fuel_tools::ServerConfig &_serverConfig, std::vector &_headers) const { bool privateTokenDefined = false; @@ -533,10 +533,10 @@ void FuelClient::AddServerConfigParametersToHeaders( } ////////////////////////////////////////////////// -Result FuelClient::DeleteUrl(const ignition::common::URI &_uri, +Result FuelClient::DeleteUrl(const gz::common::URI &_uri, const std::vector &_headers) { - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; std::string server; @@ -646,7 +646,7 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, AddServerConfigParametersToHeaders( _id.Server(), headersIncludingServerConfig); // Request - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; resp = rest.Request(HttpMethod::GET, _id.Server().Url().Str(), _id.Server().Version(), route.Str(), {}, @@ -699,16 +699,16 @@ Result FuelClient::ModelDependencies(const ModelIdentifier &_id, // Locate any dependencies from the input model and download them. std::string path; - ignition::msgs::FuelMetadata meta; - if (this->CachedModel(ignition::common::URI(_id.UniqueName()), path)) + gz::msgs::FuelMetadata meta; + if (this->CachedModel(gz::common::URI(_id.UniqueName()), path)) { std::string metadataPath = - ignition::common::joinPaths(path, "metadata.pbtxt"); + gz::common::joinPaths(path, "metadata.pbtxt"); std::string modelConfigPath = - ignition::common::joinPaths(path, "model.config"); + gz::common::joinPaths(path, "model.config"); - bool foundMetadataPath = ignition::common::exists(metadataPath); - bool foundModelConfigPath = ignition::common::exists(modelConfigPath); + bool foundMetadataPath = gz::common::exists(metadataPath); + bool foundModelConfigPath = gz::common::exists(modelConfigPath); if (foundMetadataPath || foundModelConfigPath) { @@ -727,7 +727,7 @@ Result FuelClient::ModelDependencies(const ModelIdentifier &_id, } else { - if (!ignition::msgs::ConvertFuelMetadata(inputStr, meta)) + if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) { return Result(ResultType::UPLOAD_ERROR); } @@ -735,7 +735,7 @@ Result FuelClient::ModelDependencies(const ModelIdentifier &_id, for (int i = 0; i < meta.dependencies_size(); ++i) { - ignition::common::URI dependencyURI(meta.dependencies(i).uri()); + gz::common::URI dependencyURI(meta.dependencies(i).uri()); ModelIdentifier dependencyID; if(!this->ParseModelUrl(dependencyURI, dependencyID)) @@ -820,7 +820,7 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, _id.Server(), headersIncludingServerConfig); // Request - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; resp = rest.Request(HttpMethod::GET, _id.Server().Url().Str(), _id.Server().Version(), route.Str(), {}, @@ -970,7 +970,7 @@ std::vector FuelClient::DownloadModels( Result FuelClient::DownloadWorlds( const std::vector &_ids, size_t _jobs) { - std::deque> tasks; + std::deque> tasks; // Check for finished tasks by checking if the status of their futures is // "ready". If a task is finished, check if it succeeded and print out an // error message if it failed. When a task is finished, it gets erased from @@ -993,7 +993,7 @@ Result FuelClient::DownloadWorlds( { for (auto taskIt = finishedIt; taskIt != tasks.end(); ++taskIt) { - ignition::fuel_tools::Result result = taskIt->get(); + gz::fuel_tools::Result result = taskIt->get(); if (result) { ++itemCount; @@ -1396,7 +1396,7 @@ Result FuelClient::DownloadModel(const common::URI &_modelUrl, id.SetVersion(model.Identification().Version()); } - _path = ignition::common::joinPaths(this->Config().CacheLocation(), + _path = gz::common::joinPaths(this->Config().CacheLocation(), id.Server().Url().Path().Str(), id.Owner(), "models", id.Name(), id.VersionStr()); @@ -1516,10 +1516,10 @@ Result FuelClient::CachedModelFile(const common::URI &_fileUrl, // Check if file exists filePath = common::joinPaths(modelPath, filePath); - std::vector tokens = ignition::common::split(filePath, "/"); + std::vector tokens = gz::common::split(filePath, "/"); std::string sTemp; for (auto s : tokens) - sTemp = ignition::common::joinPaths(sTemp, s); + sTemp = gz::common::joinPaths(sTemp, s); filePath = sTemp; if (common::exists(filePath)) @@ -1566,7 +1566,7 @@ Result FuelClient::CachedWorldFile(const common::URI &_fileUrl, ////////////////////////////////////////////////// Result FuelClient::PatchModel( - const ignition::fuel_tools::ModelIdentifier &_model, + const gz::fuel_tools::ModelIdentifier &_model, const std::vector &_headers) { return this->PatchModel(_model, _headers, ""); @@ -1574,11 +1574,11 @@ Result FuelClient::PatchModel( ////////////////////////////////////////////////// Result FuelClient::PatchModel( - const ignition::fuel_tools::ModelIdentifier &_model, + const gz::fuel_tools::ModelIdentifier &_model, const std::vector &_headers, const std::string &_pathToModelDir) { - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; RestResponse resp; auto serverUrl = _model.Server().Url().Str(); @@ -1645,7 +1645,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, return false; } - ignition::msgs::FuelMetadata meta; + gz::msgs::FuelMetadata meta; // Try the `metadata.pbtxt` file first since it contains more information // than `model.config`. @@ -1673,7 +1673,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, std::string inputStr((std::istreambuf_iterator(inputFile)), std::istreambuf_iterator()); - if (!ignition::msgs::ConvertFuelMetadata(inputStr, meta)) + if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) { ignerr << "Unable to convert model config[" << _pathToModelDir << "].\n"; return false; @@ -1823,7 +1823,7 @@ void FuelClientPrivate::PopulateLicenses(const ServerConfig &_server) bool FuelClient::UpdateModels(const std::vector &_headers) { // Get a list of the most recent model versions in the cache. - std::map toProcess; + std::map toProcess; for (ModelIter iter = this->dataPtr->cache->AllModels(); iter; ++iter) { auto processIter = toProcess.find(iter->Identification().UniqueName()); @@ -1837,7 +1837,7 @@ bool FuelClient::UpdateModels(const std::vector &_headers) // Attempt to update each model. for (const auto &id : toProcess) { - ignition::fuel_tools::ModelIdentifier cloudId; + gz::fuel_tools::ModelIdentifier cloudId; if (!this->ModelDetails(id.second, cloudId, _headers)) { @@ -1864,7 +1864,7 @@ bool FuelClient::UpdateModels(const std::vector &_headers) bool FuelClient::UpdateWorlds(const std::vector &_headers) { // Get a list of the most recent world versions in the cache. - std::map toProcess; + std::map toProcess; for (WorldIter iter = this->dataPtr->cache->AllWorlds(); iter; ++iter) { auto processIter = toProcess.find(iter->UniqueName()); @@ -1878,7 +1878,7 @@ bool FuelClient::UpdateWorlds(const std::vector &_headers) // Attempt to update each world. for (const auto &id : toProcess) { - ignition::fuel_tools::WorldIdentifier cloudId; + gz::fuel_tools::WorldIdentifier cloudId; if (!this->WorldDetails(id.second, cloudId, _headers)) { diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index cb3f6d2a..a5aaf874 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -36,8 +36,8 @@ #define ChangeDirectory chdir #endif -using namespace ignition; -using namespace ignition::fuel_tools; +using namespace gz; +using namespace gz::fuel_tools; ////////////////////////////////////////////////// /// \brief Creates a directory structure in the build directory with 1 model @@ -89,7 +89,7 @@ void createLocalModel(ClientConfig &_conf) "model.dae"))); } - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("http://localhost:8007/")); _conf.AddServer(srv); } @@ -120,8 +120,8 @@ void createLocalWorld(ClientConfig &_conf) "strawberry.world"))); } - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI("http://localhost:8007/")); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI("http://localhost:8007/")); _conf.AddServer(srv); } @@ -130,7 +130,7 @@ class FuelClientTest : public ::testing::Test { public: void SetUp() override { - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); } }; @@ -146,7 +146,7 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://some.example.org/1.0/german/models/Cardboard Box"}; - EXPECT_TRUE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); EXPECT_EQ(id.Server().Url().Str(), "https://some.example.org"); EXPECT_EQ(id.Server().Version(), "1.0"); @@ -165,7 +165,7 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/1.0/german/models/Cardboard Box/4"}; - EXPECT_TRUE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); @@ -185,7 +185,7 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/5.0/german/models/Cardboard Box/6/"}; - EXPECT_TRUE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); @@ -202,7 +202,7 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/german/models/Cardboard Box"}; - EXPECT_TRUE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_FALSE(id.Server().Version().empty()); @@ -221,7 +221,7 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/tip"}; - EXPECT_TRUE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); @@ -234,7 +234,7 @@ TEST_F(FuelClientTest, ParseModelURL) { FuelClient client; ModelIdentifier id; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI("http://bad.url"), + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI("http://bad.url"), id)); } @@ -242,13 +242,13 @@ TEST_F(FuelClientTest, ParseModelURL) { FuelClient client; ModelIdentifier id; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI("bad url"), + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI("bad url"), id)); } { FuelClient client; ModelIdentifier id; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI("ba://url"), + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI("ba://url"), id)); } { @@ -256,21 +256,21 @@ TEST_F(FuelClientTest, ParseModelURL) ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/banana"}; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/banana/german/models/Cardboard Box"}; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ "https://fuel.ignitionrobotics.org/99/german/models/Cardboard Box"}; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; @@ -278,7 +278,7 @@ TEST_F(FuelClientTest, ParseModelURL) const std::string url{ "https://fuel.ignitionrobotics.org/2/2/german/models" "/Cardboard Box/banana"}; - EXPECT_FALSE(client.ParseModelUrl(ignition::common::URI(url), id)); + EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } } @@ -1071,7 +1071,7 @@ TEST_F(FuelClientTest, DownloadWorld) ASSERT_TRUE(common::createDirectories("test_cache")); ServerConfig server; - server.SetUrl(ignition::common::URI( + server.SetUrl(gz::common::URI( "https://fuel.ignitionrobotics.org")); ClientConfig config; diff --git a/src/Helpers.cc b/src/Helpers.cc index dface578..33a61a1b 100644 --- a/src/Helpers.cc +++ b/src/Helpers.cc @@ -19,11 +19,11 @@ #include "ignition/fuel_tools/Helpers.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ////////////////////////////////////////////////// -std::string ignition::fuel_tools::uriToPath(const common::URI &_uri) +std::string gz::fuel_tools::uriToPath(const common::URI &_uri) { auto path = _uri.Path().Str(); if (_uri.Path().IsAbsolute()) diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index c134149e..98dc3109 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -19,7 +19,7 @@ #include #include "ignition/fuel_tools/Helpers.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// diff --git a/src/Interface.cc b/src/Interface.cc index 84938c70..f8cced8b 100644 --- a/src/Interface.cc +++ b/src/Interface.cc @@ -29,27 +29,27 @@ #include "ignition/fuel_tools/Interface.hh" #include "ignition/fuel_tools/WorldIdentifier.hh" -namespace ignition +namespace gz { namespace fuel_tools { ////////////////////////////////////////////// std::string fetchResource(const std::string &_uri) { - ignition::fuel_tools::FuelClient client; + gz::fuel_tools::FuelClient client; return fetchResourceWithClient(_uri, client); } ////////////////////////////////////////////// std::string fetchResourceWithClient(const std::string &_uri, - ignition::fuel_tools::FuelClient &_client) + gz::fuel_tools::FuelClient &_client) { std::string result; - ignition::fuel_tools::ModelIdentifier model; - ignition::fuel_tools::WorldIdentifier world; + gz::fuel_tools::ModelIdentifier model; + gz::fuel_tools::WorldIdentifier world; std::string fileUrl; - ignition::common::URI uri(_uri); + gz::common::URI uri(_uri); // Download the model, if it is a model URI if (_client.ParseModelUrl(uri, model) && !_client.CachedModel(uri, result)) @@ -88,14 +88,14 @@ namespace ignition ////////////////////////////////////////////// std::string sdfFromPath(const std::string &_path) { - ignition::msgs::FuelMetadata meta; + gz::msgs::FuelMetadata meta; std::string metadataPath = - ignition::common::joinPaths(_path, "metadata.pbtxt"); + gz::common::joinPaths(_path, "metadata.pbtxt"); std::string modelConfigPath = - ignition::common::joinPaths(_path, "model.config"); + gz::common::joinPaths(_path, "model.config"); - bool foundMetadataPath = ignition::common::exists(metadataPath); - bool foundModelConfigPath = ignition::common::exists(modelConfigPath); + bool foundMetadataPath = gz::common::exists(metadataPath); + bool foundModelConfigPath = gz::common::exists(modelConfigPath); // Use the metadata.pbtxt or model.config first. if (foundMetadataPath || foundModelConfigPath) @@ -115,14 +115,14 @@ namespace ignition } else { - if (!ignition::msgs::ConvertFuelMetadata(inputStr, meta)) + if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) return ""; } if (meta.has_model()) - return ignition::common::joinPaths(_path, meta.model().file()); + return gz::common::joinPaths(_path, meta.model().file()); else if (meta.has_world()) - return ignition::common::joinPaths(_path, meta.world().file()); + return gz::common::joinPaths(_path, meta.world().file()); return ""; } @@ -133,7 +133,7 @@ namespace ignition { if (common::isFile(*dirIter)) { - std::string basename = ignition::common::basename(*dirIter); + std::string basename = gz::common::basename(*dirIter); // Just some safety checks. if (!basename.empty() && basename.find(".sdf") != std::string::npos) { diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index 5a8af6ec..dacac16a 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -33,8 +33,8 @@ #define ChangeDirectory chdir #endif -using namespace ignition; -using namespace ignition::fuel_tools; +using namespace gz; +using namespace gz::fuel_tools; ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows diff --git a/src/JSONParser.cc b/src/JSONParser.cc index c1f42343..2233c621 100644 --- a/src/JSONParser.cc +++ b/src/JSONParser.cc @@ -23,7 +23,7 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/JSONParser.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; #if defined(_WIN32) && !defined(timegm) diff --git a/src/JSONParser_TEST.cc b/src/JSONParser_TEST.cc index 2eaee741..3b7c06be 100644 --- a/src/JSONParser_TEST.cc +++ b/src/JSONParser_TEST.cc @@ -29,7 +29,7 @@ #include "ModelIterPrivate.hh" #include "WorldIterPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// diff --git a/src/LocalCache.cc b/src/LocalCache.cc index 226a3083..f2e6aedb 100644 --- a/src/LocalCache.cc +++ b/src/LocalCache.cc @@ -43,10 +43,10 @@ #include "WorldIterPrivate.hh" #include "LocalCache.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -class ignition::fuel_tools::LocalCachePrivate +class gz::fuel_tools::LocalCachePrivate { /// \brief return all models in a given directory /// \param[in] _path A directory for the local server cache diff --git a/src/LocalCache.hh b/src/LocalCache.hh index 0f5a0be4..280318df 100644 --- a/src/LocalCache.hh +++ b/src/LocalCache.hh @@ -33,7 +33,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc index 79ad2167..c698e1c0 100644 --- a/src/LocalCache_TEST.cc +++ b/src/LocalCache_TEST.cc @@ -38,7 +38,7 @@ #define ChangeDirectory chdir #endif -using namespace ignition; +using namespace gz; using namespace fuel_tools; /// \brief Creates a directory structure in the build directory with 6 models @@ -88,7 +88,7 @@ void createLocal6Models(ClientConfig &_conf) common::joinPaths(serverPath, "trudy", "models", "tm2", "2", "model.config"))); - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("http://localhost:8001/")); _conf.AddServer(srv); } @@ -122,8 +122,8 @@ void createLocal3Models(ClientConfig &_conf) common::joinPaths(serverPath, "trudy", "models", "tm1", "3", "model.config"))); - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI("http://localhost:8007/")); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI("http://localhost:8007/")); _conf.AddServer(srv); } @@ -174,8 +174,8 @@ void createLocal6Worlds(ClientConfig &_conf) common::joinPaths(serverPath, "trudy", "worlds", "tm2", "2", "world.world"))); - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI("http://localhost:8001/")); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI("http://localhost:8001/")); _conf.AddServer(srv); } @@ -208,7 +208,7 @@ void createLocal3Worlds(ClientConfig &_conf) common::joinPaths(serverPath, "trudy", "worlds", "tm1", "3", "world.world"))); - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("http://localhost:8007/")); _conf.AddServer(srv); } @@ -218,7 +218,7 @@ class LocalCacheTest : public ::testing::Test { public: void SetUp() override { - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); } }; @@ -234,7 +234,7 @@ TEST_F(LocalCacheTest, AllModels) createLocal6Models(conf); createLocal3Models(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); auto iter = cache.AllModels(); std::set uniqueNames; @@ -263,7 +263,7 @@ TEST_F(LocalCacheTest, MatchingModels) createLocal6Models(conf); createLocal3Models(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); ModelIdentifier am1; am1.SetServer(conf.Servers().front()); @@ -307,12 +307,12 @@ TEST_F(LocalCacheTest, MatchingModel) conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Models(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); - ignition::fuel_tools::ServerConfig srv1; + gz::fuel_tools::ServerConfig srv1; srv1.SetUrl(common::URI("http://localhost:8001/")); - ignition::fuel_tools::ServerConfig srv2; + gz::fuel_tools::ServerConfig srv2; srv2.SetUrl(common::URI("http://localhost:8002/")); ModelIdentifier am1; @@ -364,7 +364,7 @@ TEST_F(LocalCacheTest, AllWorlds) createLocal6Worlds(conf); createLocal3Worlds(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); auto iter = cache.AllWorlds(); std::set uniqueNames; @@ -376,10 +376,10 @@ TEST_F(LocalCacheTest, AllWorlds) EXPECT_EQ(9u, uniqueNames.size()); #ifdef _WIN32 EXPECT_NE(uniqueNames.end(), uniqueNames.find( - ignition::common::joinPaths("localhost8001", "alice", "worlds", "am1"))); + gz::common::joinPaths("localhost8001", "alice", "worlds", "am1"))); #else EXPECT_NE(uniqueNames.end(), uniqueNames.find( - ignition::common::joinPaths("localhost:8001", "alice", "worlds", "am1"))); + gz::common::joinPaths("localhost:8001", "alice", "worlds", "am1"))); #endif } @@ -397,7 +397,7 @@ TEST_F(LocalCacheTest, MatchingWorlds) createLocal6Worlds(conf); createLocal3Worlds(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); WorldIdentifier am1; am1.SetServer(conf.Servers().front()); @@ -429,13 +429,13 @@ TEST_F(LocalCacheTest, MatchingWorld) conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Worlds(conf); - ignition::fuel_tools::LocalCache cache(&conf); + gz::fuel_tools::LocalCache cache(&conf); - ignition::fuel_tools::ServerConfig srv1; - srv1.SetUrl(ignition::common::URI("http://localhost:8001/")); + gz::fuel_tools::ServerConfig srv1; + srv1.SetUrl(gz::common::URI("http://localhost:8001/")); - ignition::fuel_tools::ServerConfig srv2; - srv2.SetUrl(ignition::common::URI("http://localhost:8002/")); + gz::fuel_tools::ServerConfig srv2; + srv2.SetUrl(gz::common::URI("http://localhost:8002/")); WorldIdentifier am1; am1.SetServer(srv1); diff --git a/src/Model.cc b/src/Model.cc index ff3b33c4..068a3c02 100644 --- a/src/Model.cc +++ b/src/Model.cc @@ -24,8 +24,8 @@ #include "ModelPrivate.hh" -namespace ignft = ignition::fuel_tools; -using namespace ignition; +namespace ignft = gz::fuel_tools; +using namespace gz; using namespace ignft; ////////////////////////////////////////////////// diff --git a/src/ModelIdentifier.cc b/src/ModelIdentifier.cc index 1b50d0c4..acc729f9 100644 --- a/src/ModelIdentifier.cc +++ b/src/ModelIdentifier.cc @@ -26,10 +26,10 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/ModelIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -class ignition::fuel_tools::ModelIdentifierPrivate +class gz::fuel_tools::ModelIdentifierPrivate { /// \brief returns true if name follows rules /// \param[in] _name Name to validate diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index 6e77e27c..dd00c8e2 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -22,7 +22,7 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/ModelIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -57,13 +57,13 @@ TEST(ModelIdentifier, SetFields) /// \brief Unique Name TEST(ModelIdentifier, UniqueName) { - ignition::fuel_tools::ServerConfig srv1; + gz::fuel_tools::ServerConfig srv1; srv1.SetUrl(common::URI("https://localhost:8001")); - ignition::fuel_tools::ServerConfig srv2; + gz::fuel_tools::ServerConfig srv2; srv2.SetUrl(common::URI("https://localhost:8002")); - ignition::fuel_tools::ServerConfig srv3; + gz::fuel_tools::ServerConfig srv3; srv3.SetUrl(common::URI("https://localhost:8003")); ModelIdentifier id; diff --git a/src/ModelIter.cc b/src/ModelIter.cc index 0bf5e548..71ff6796 100644 --- a/src/ModelIter.cc +++ b/src/ModelIter.cc @@ -31,7 +31,7 @@ #include "ModelIterPrivate.hh" #include "ModelPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ////////////////////////////////////////////////// diff --git a/src/ModelIterPrivate.hh b/src/ModelIterPrivate.hh index 6c1608b9..234e9323 100644 --- a/src/ModelIterPrivate.hh +++ b/src/ModelIterPrivate.hh @@ -33,7 +33,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/src/ModelIter_TEST.cc b/src/ModelIter_TEST.cc index 4252084d..3664734c 100644 --- a/src/ModelIter_TEST.cc +++ b/src/ModelIter_TEST.cc @@ -25,10 +25,10 @@ #include "ModelIterPrivate.hh" #include "ModelPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -namespace ignition +namespace gz { namespace fuel_tools { @@ -45,7 +45,7 @@ namespace ignition public: static ModelIter ModelIterThreeModelIds() { - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("https://ignitionrobotics.org")); std::vector ids; @@ -67,7 +67,7 @@ namespace ignition public: static ModelIter ModelIterThreeModels() { - ignition::fuel_tools::ServerConfig srv; + gz::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("https://ignitionrobotics.org")); std::vector models; diff --git a/src/ModelPrivate.hh b/src/ModelPrivate.hh index bd554883..0dfd5f08 100644 --- a/src/ModelPrivate.hh +++ b/src/ModelPrivate.hh @@ -30,7 +30,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/src/Model_TEST.cc b/src/Model_TEST.cc index 1bc10c56..ac44e174 100644 --- a/src/Model_TEST.cc +++ b/src/Model_TEST.cc @@ -18,8 +18,8 @@ #include #include "ignition/fuel_tools/Model.hh" -namespace ignft = ignition::fuel_tools; -using namespace ignition; +namespace ignft = gz::fuel_tools; +using namespace gz; using namespace ignft; ///////////////////////////////////////////////// diff --git a/src/RestClient.cc b/src/RestClient.cc index ba65a8bc..860c5ef5 100644 --- a/src/RestClient.cc +++ b/src/RestClient.cc @@ -30,7 +30,7 @@ #include "ignition/fuel_tools/RestClient.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; // List of known file extensions and associated mime type. @@ -144,7 +144,7 @@ struct curl_httppost *BuildFormPost( std::string path = value.substr(1); // Default upload filename - std::string uploadFilename = ignition::common::basename(path); + std::string uploadFilename = gz::common::basename(path); // If the value has a semicolon, then use the string preceding the // semicolon as the local filesystem path and the string following @@ -155,7 +155,7 @@ struct curl_httppost *BuildFormPost( uploadFilename = value.substr(value.find(";") + 1); } - std::string basename = ignition::common::basename(path); + std::string basename = gz::common::basename(path); std::string contentType = "application/octet-stream"; // Figure out the content type based on the file extension. @@ -163,7 +163,7 @@ struct curl_httppost *BuildFormPost( if (dotIdx != std::string::npos) { std::string extension = - ignition::common::lowercase(basename.substr(dotIdx)); + gz::common::lowercase(basename.substr(dotIdx)); if (kContentTypes.find(extension) != kContentTypes.end()) { contentType = kContentTypes.at(extension); diff --git a/src/RestClient_TEST.cc b/src/RestClient_TEST.cc index 2f3f6abc..9c53454d 100644 --- a/src/RestClient_TEST.cc +++ b/src/RestClient_TEST.cc @@ -23,7 +23,7 @@ ///////////////////////////////////////////////// TEST(RestClient, UserAgent) { - ignition::fuel_tools::Rest rest; + gz::fuel_tools::Rest rest; EXPECT_TRUE(rest.UserAgent().empty()); rest.SetUserAgent("my_user_agent"); diff --git a/src/Result.cc b/src/Result.cc index 2a23aacc..809b2075 100644 --- a/src/Result.cc +++ b/src/Result.cc @@ -17,8 +17,8 @@ #include "ignition/fuel_tools/Result.hh" -namespace ignft = ignition::fuel_tools; -using namespace ignition; +namespace ignft = gz::fuel_tools; +using namespace gz; using namespace ignft; diff --git a/src/Result_TEST.cc b/src/Result_TEST.cc index 127269f3..dcc45aa9 100644 --- a/src/Result_TEST.cc +++ b/src/Result_TEST.cc @@ -18,7 +18,7 @@ #include #include "ignition/fuel_tools/Result.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -81,7 +81,7 @@ TEST(Result, TypeCanBeSet) /// \brief Check that there are readable strings returned TEST(Result, ReadableStringsHaveLength) { - ignition::fuel_tools::Result r(ResultType::FETCH); + gz::fuel_tools::Result r(ResultType::FETCH); EXPECT_FALSE(Result(ResultType::DELETE).ReadableResult().empty()); EXPECT_FALSE(Result(ResultType::FETCH).ReadableResult().empty()); diff --git a/src/WorldIdentifier.cc b/src/WorldIdentifier.cc index cdbe6758..e25f9201 100644 --- a/src/WorldIdentifier.cc +++ b/src/WorldIdentifier.cc @@ -26,10 +26,10 @@ #include "ignition/fuel_tools/Helpers.hh" #include "ignition/fuel_tools/WorldIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -class ignition::fuel_tools::WorldIdentifierPrivate +class gz::fuel_tools::WorldIdentifierPrivate { /// \brief a name given to this world by a user public: std::string name; diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 268ce65a..87e4e69d 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -22,7 +22,7 @@ #include "ignition/fuel_tools/ClientConfig.hh" #include "ignition/fuel_tools/WorldIdentifier.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -43,15 +43,15 @@ TEST(WorldIdentifier, SetFields) /// \brief Unique Name TEST(WorldIdentifier, UniqueName) { - ignition::fuel_tools::ServerConfig srv1; - srv1.SetUrl(ignition::common::URI("https://localhost:8001/")); + gz::fuel_tools::ServerConfig srv1; + srv1.SetUrl(gz::common::URI("https://localhost:8001/")); - ignition::fuel_tools::ServerConfig srv2; - srv2.SetUrl(ignition::common::URI("https://localhost:8002")); + gz::fuel_tools::ServerConfig srv2; + srv2.SetUrl(gz::common::URI("https://localhost:8002")); - ignition::fuel_tools::ServerConfig srv3; + gz::fuel_tools::ServerConfig srv3; - srv3.SetUrl(ignition::common::URI("https://localhost:8003/")); + srv3.SetUrl(gz::common::URI("https://localhost:8003/")); WorldIdentifier id; id.SetName("hello"); diff --git a/src/WorldIter.cc b/src/WorldIter.cc index 655a7c9b..180793da 100644 --- a/src/WorldIter.cc +++ b/src/WorldIter.cc @@ -29,7 +29,7 @@ #include "WorldIterPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ////////////////////////////////////////////////// @@ -129,7 +129,7 @@ WorldIterRestIds::WorldIterRestIds(const Rest &_rest, // Get the next page from the headers. if (resp.headers.find("Link") != resp.headers.end()) { - std::vector links = ignition::common::split( + std::vector links = gz::common::split( resp.headers["Link"], ","); for (const auto &l : links) { diff --git a/src/WorldIterPrivate.hh b/src/WorldIterPrivate.hh index fdd6637f..7a2f3c59 100644 --- a/src/WorldIterPrivate.hh +++ b/src/WorldIterPrivate.hh @@ -32,7 +32,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace fuel_tools { diff --git a/src/WorldIter_TEST.cc b/src/WorldIter_TEST.cc index f6d5e27a..98d581f0 100644 --- a/src/WorldIter_TEST.cc +++ b/src/WorldIter_TEST.cc @@ -24,10 +24,10 @@ #include "WorldIterPrivate.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; -namespace ignition +namespace gz { namespace fuel_tools { @@ -44,8 +44,8 @@ namespace ignition public: static WorldIter WorldIterThreeWorldIds() { - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI("https://ignitionrobotics.org")); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI("https://ignitionrobotics.org")); std::vector ids; for (int i = 0; i < 3; i++) diff --git a/src/Zip.cc b/src/Zip.cc index a4529f48..87bcb40c 100644 --- a/src/Zip.cc +++ b/src/Zip.cc @@ -27,7 +27,7 @@ #include "ignition/fuel_tools/Zip.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; @@ -35,7 +35,7 @@ using namespace fuel_tools; bool CompressFile(zip *_archive, const std::string &_file, const std::string &_entry) { - if (ignition::common::isDirectory(_file)) + if (gz::common::isDirectory(_file)) { if (zip_add_dir(_archive, _entry.c_str()) < 0) { @@ -43,12 +43,12 @@ bool CompressFile(zip *_archive, const std::string &_file, return false; } - ignition::common::DirIter endIt; - for (ignition::common::DirIter dirIt(_file); dirIt != endIt; ++dirIt) + gz::common::DirIter endIt; + for (gz::common::DirIter dirIt(_file); dirIt != endIt; ++dirIt) { std::string file = *dirIt; - std::string entryName = ignition::common::joinPaths(_entry, - ignition::common::basename(file)); + std::string entryName = gz::common::joinPaths(_entry, + gz::common::basename(file)); if (!CompressFile(_archive, file, entryName)) { @@ -56,7 +56,7 @@ bool CompressFile(zip *_archive, const std::string &_file, } } } - else if (ignition::common::isFile(_file)) + else if (gz::common::isFile(_file)) { std::ifstream in(_file.c_str(), std::ifstream::ate | std::ifstream::binary); @@ -83,7 +83,7 @@ bool CompressFile(zip *_archive, const std::string &_file, ///////////////////////////////////////////////// bool Zip::Compress(const std::string &_src, const std::string &_dst) { - if (!ignition::common::exists(_src)) + if (!gz::common::exists(_src)) { ignerr << "Directory does not exist: " << _src << std::endl; return false; @@ -97,7 +97,7 @@ bool Zip::Compress(const std::string &_src, const std::string &_dst) return false; } - std::string entry = ignition::common::basename(_src); + std::string entry = gz::common::basename(_src); if (!CompressFile(archive, _src, entry)) { ignerr << "Error compressing file: " << _src << std::endl; @@ -113,7 +113,7 @@ bool Zip::Compress(const std::string &_src, const std::string &_dst) bool Zip::Extract(const std::string &_src, const std::string &_dst) { - if (!ignition::common::exists(_src)) + if (!gz::common::exists(_src)) { ignerr << "Source archive does not exist: " << _src << std::endl; return false; @@ -138,13 +138,13 @@ bool Zip::Extract(const std::string &_src, auto entryname = std::string(sb.name); common::changeFromUnixPath(entryname); - std::string dst = ignition::common::joinPaths(_dst, entryname); + std::string dst = gz::common::joinPaths(_dst, entryname); // Check if the entryname contains a / at the end. if so it's a directory - auto pos = entryname.rfind(ignition::common::separator("")); + auto pos = entryname.rfind(gz::common::separator("")); if (pos != std::string::npos && pos == (entryname.size() - 1)) { - if (!ignition::common::createDirectories(dst)) + if (!gz::common::createDirectories(dst)) { ignerr << "Error creating directory [" << dst << "]. " << "Do you have the right permissions?" << std::endl; diff --git a/src/Zip_TEST.cc b/src/Zip_TEST.cc index 47b7c58e..f11264a9 100644 --- a/src/Zip_TEST.cc +++ b/src/Zip_TEST.cc @@ -142,7 +142,7 @@ bool createNewEmptyFile(const std::string &_filename) #include #include "ignition/fuel_tools/Zip.hh" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -150,7 +150,7 @@ class ZipTest : public ::testing::Test { public: void SetUp() override { - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); } }; @@ -173,25 +173,25 @@ TEST_F(ZipTest, CompressAndExtract) { std::string newTempDir; ASSERT_TRUE(createAndSwitchToTempDir(newTempDir)); - auto d = ignition::common::joinPaths(newTempDir, "d1", "d2"); - ASSERT_TRUE(ignition::common::createDirectories(d)); - auto f = ignition::common::joinPaths(d, "new_file"); + auto d = gz::common::joinPaths(newTempDir, "d1", "d2"); + ASSERT_TRUE(gz::common::createDirectories(d)); + auto f = gz::common::joinPaths(d, "new_file"); ASSERT_TRUE(createNewEmptyFile(f)); - EXPECT_TRUE(ignition::common::exists(f)); + EXPECT_TRUE(gz::common::exists(f)); // Compress. - auto d1 = ignition::common::joinPaths(newTempDir, "d1"); - auto zipOutFile = ignition::common::joinPaths(newTempDir, "new_file.zip"); + auto d1 = gz::common::joinPaths(newTempDir, "d1"); + auto zipOutFile = gz::common::joinPaths(newTempDir, "new_file.zip"); EXPECT_TRUE(Zip::Compress(d1, zipOutFile)); - EXPECT_TRUE(ignition::common::exists(zipOutFile)); + EXPECT_TRUE(gz::common::exists(zipOutFile)); // Extract. - auto extractOutDir = ignition::common::joinPaths(newTempDir, "extract"); + auto extractOutDir = gz::common::joinPaths(newTempDir, "extract"); EXPECT_TRUE(Zip::Extract(zipOutFile, extractOutDir)); auto extractOutFile = - ignition::common::joinPaths(extractOutDir, "d1", "d2", "new_file"); - EXPECT_TRUE(ignition::common::exists(extractOutFile)); + gz::common::joinPaths(extractOutDir, "d1", "d2", "new_file"); + EXPECT_TRUE(gz::common::exists(extractOutFile)); // Clean. - ignition::common::removeAll(newTempDir); + gz::common::removeAll(newTempDir); } diff --git a/src/ign.cc b/src/ign.cc index f3264923..d739441e 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -76,7 +76,7 @@ /// \param[in] _resourceMap Key is owner name, value is vector of resources /// \param[in] _resourceType Type, such as "models" extern "C" void prettyPrint( - const ignition::fuel_tools::ServerConfig &_serverConfig, + const gz::fuel_tools::ServerConfig &_serverConfig, const std::map> &_resourceMap, const std::string &_resourceType) { @@ -131,7 +131,7 @@ extern "C" void prettyPrint( /// \param[in] _resourceMap Key is owner name, value is vector of resources /// \param[in] _resourceType Type, such as "models" extern "C" void uglyPrint( - const ignition::fuel_tools::ServerConfig &_serverConfig, + const gz::fuel_tools::ServerConfig &_serverConfig, const std::map> &_resourceMap, const std::string &_resourceType) { @@ -158,8 +158,8 @@ extern "C" void uglyPrint( /// \return True if successful, will fail if there's a server error or if the /// server has no models yet. extern "C" bool getAllModels( - const ignition::fuel_tools::FuelClient &_client, - const ignition::fuel_tools::ServerConfig &_server, + const gz::fuel_tools::FuelClient &_client, + const gz::fuel_tools::ServerConfig &_server, std::map> &_resourceMap) { auto iter = _client.Models(_server); @@ -192,8 +192,8 @@ extern "C" bool getAllModels( /// \return True if successful, will fail if there's a server error or if the /// server has no worlds yet. extern "C" bool getAllWorlds( - const ignition::fuel_tools::FuelClient &_client, - const ignition::fuel_tools::ServerConfig &_server, + const gz::fuel_tools::FuelClient &_client, + const gz::fuel_tools::ServerConfig &_server, std::map> &_resourceMap) { auto iter = _client.Worlds(_server); @@ -225,11 +225,11 @@ extern "C" bool getAllWorlds( /// \return True if successful, will fail if there's a server error or if the /// server has no models yet. extern "C" bool getOwnerModels( - const ignition::fuel_tools::FuelClient &_client, - const ignition::fuel_tools::ModelIdentifier &_modelId, + const gz::fuel_tools::FuelClient &_client, + const gz::fuel_tools::ModelIdentifier &_modelId, std::map> &_resourceMap) { - ignition::fuel_tools::ModelIter iter = _client.Models(_modelId); + gz::fuel_tools::ModelIter iter = _client.Models(_modelId); if (!iter) { @@ -259,8 +259,8 @@ extern "C" bool getOwnerModels( /// \return True if successful, will fail if there's a server error or if the /// server has no worlds yet. extern "C" bool getOwnerWorlds( - const ignition::fuel_tools::FuelClient &_client, - const ignition::fuel_tools::WorldIdentifier &_worldId, + const gz::fuel_tools::FuelClient &_client, + const gz::fuel_tools::WorldIdentifier &_worldId, std::map> &_resourceMap) { auto iter = _client.Worlds(_worldId); @@ -295,13 +295,13 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels(const char *_url, const char *_owner, const char *_raw, const char *_configFile) { std::string urlStr{_url}; - if (!urlStr.empty() && !ignition::common::URI::Valid(_url)) + if (!urlStr.empty() && !gz::common::URI::Valid(_url)) { std::cout << "Invalid URL [" << _url << "]" << std::endl; return 0; } - ignition::common::URI url(urlStr); + gz::common::URI url(urlStr); std::string owner{_owner}; std::string rawStr{_raw}; std::transform(rawStr.begin(), rawStr.end(), @@ -309,7 +309,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels(const char *_url, bool pretty = rawStr != "true"; // Client - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; if (_configFile && strlen(_configFile) > 0) { conf.Clear(); @@ -319,19 +319,19 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels(const char *_url, if (url.Valid()) { conf.Clear(); - ignition::fuel_tools::ServerConfig serverConf; - serverConf.SetUrl(ignition::common::URI(url)); + gz::fuel_tools::ServerConfig serverConf; + serverConf.SetUrl(gz::common::URI(url)); conf.AddServer(serverConf); } conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); // Filter - ignition::fuel_tools::ModelIdentifier modelId; + gz::fuel_tools::ModelIdentifier modelId; if (!owner.empty()) modelId.SetOwner(owner); - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Get models for (auto server : conf.Servers()) @@ -385,13 +385,13 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, const char *_owner, const char *_raw, const char *_configFile) { std::string urlStr{_url}; - if (!urlStr.empty() && !ignition::common::URI::Valid(_url)) + if (!urlStr.empty() && !gz::common::URI::Valid(_url)) { std::cout << "Invalid URL [" << _url << "]" << std::endl; return 0; } - ignition::common::URI url(urlStr); + gz::common::URI url(urlStr); std::string owner{_owner}; std::string rawStr{_raw}; std::transform(rawStr.begin(), rawStr.end(), @@ -399,7 +399,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, bool pretty = rawStr != "true"; // Client - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; if (_configFile && strlen(_configFile) > 0) { conf.Clear(); @@ -409,7 +409,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, if (url.Valid()) { conf.Clear(); - ignition::fuel_tools::ServerConfig serverConf; + gz::fuel_tools::ServerConfig serverConf; serverConf.SetUrl(url); conf.AddServer(serverConf); } @@ -417,11 +417,11 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); // Filter - ignition::fuel_tools::WorldIdentifier worldId; + gz::fuel_tools::WorldIdentifier worldId; if (!owner.empty()) worldId.SetOwner(owner); - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Get worlds for (auto server : conf.Servers()) @@ -476,7 +476,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, { // Add signal handler for SIGTERM and SIGINT. Ctrl-C doesn't work without this // handler. - ignition::common::SignalHandler sigHandler; + gz::common::SignalHandler sigHandler; sigHandler.AddCallback([&](int _sig) { if (SIGTERM == _sig || SIGINT == _sig) { @@ -484,7 +484,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, } }); std::string urlStr{_url}; - ignition::common::URI url(urlStr); + gz::common::URI url(urlStr); if (!url.Valid()) { std::cout << "Download failed: Malformed URL" << std::endl; @@ -492,7 +492,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, } // Client - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; if (_configFile && strlen(_configFile) > 0) { conf.Clear(); @@ -501,16 +501,16 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); - ignition::fuel_tools::FuelClient client(conf); - ignition::fuel_tools::ModelIdentifier model; - ignition::fuel_tools::WorldIdentifier world; - ignition::fuel_tools::CollectionIdentifier collection; + gz::fuel_tools::FuelClient client(conf); + gz::fuel_tools::ModelIdentifier model; + gz::fuel_tools::WorldIdentifier world; + gz::fuel_tools::CollectionIdentifier collection; // Model? if (client.ParseModelUrl(url, model)) { // Download - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { std::cout << "Downloading model: " << "\033[36m" << std::endl << model.AsPrettyString(" ") << "\033[39m" << std::endl; @@ -545,7 +545,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, else if (client.ParseWorldUrl(url, world)) { // Download - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { std::cout << "Downloading world: " << "\033[36m" << std::endl << world.AsPrettyString(" ") << "\033[39m" << std::endl; @@ -558,7 +558,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, << std::endl; } - ignition::fuel_tools::Result result = client.DownloadWorld(world); + gz::fuel_tools::Result result = client.DownloadWorld(world); if (!result) { @@ -570,7 +570,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, // Collection? else if (client.ParseCollectionUrl(url, collection)) { - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { std::cout << "Downloading collection: " << "\033[36m" << std::endl << collection.AsPrettyString(" ") << "\033[39m" << std::endl; @@ -595,8 +595,8 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, } } - std::vector modelIds; - std::vector worldIds; + std::vector modelIds; + std::vector worldIds; if (downloadModels) { @@ -647,7 +647,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, return false; } - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { std::cout << "Download succeeded." << std::endl; } @@ -657,7 +657,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, ////////////////////////////////////////////////// extern "C" IGNITION_FUEL_TOOLS_VISIBLE void cmdVerbosity(const char *_verbosity) { - ignition::common::Console::SetVerbosity(std::atoi(_verbosity)); + gz::common::Console::SetVerbosity(std::atoi(_verbosity)); } ////////////////////////////////////////////////// @@ -665,21 +665,21 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, const char *_url, const char *_header, const char *_private, const char *_owner) { - ignition::common::SignalHandler handler; + gz::common::SignalHandler handler; bool sigKilled{false}; handler.AddCallback([&sigKilled](const int) { sigKilled = true; }); - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); - ignition::fuel_tools::FuelClient client(conf); - ignition::fuel_tools::ModelIdentifier model; + gz::fuel_tools::FuelClient client(conf); + gz::fuel_tools::ModelIdentifier model; // Set the server URL, if present. if (_url && std::strlen(_url) != 0) - model.Server().SetUrl(ignition::common::URI(_url)); + model.Server().SetUrl(gz::common::URI(_url)); // Store header information std::vector headers; @@ -690,11 +690,11 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, bool privateBool = false; if (_private && std::strlen(_private) != 0) { - std::string privateStr = ignition::common::lowercase(_private); + std::string privateStr = gz::common::lowercase(_private); privateBool = privateStr == "1" || privateStr == "true"; } - if (!ignition::common::exists(_path)) + if (!gz::common::exists(_path)) { ignerr << "The model path[" << _path << "] doesn't exist.\n"; return 0; @@ -704,10 +704,10 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, // be used during the upload process. client.PopulateLicenses(model.Server()); - if (ignition::common::exists( - ignition::common::joinPaths(_path, "metadata.pbtxt")) || - ignition::common::exists( - ignition::common::joinPaths(_path, "model.config"))) + if (gz::common::exists( + gz::common::joinPaths(_path, "metadata.pbtxt")) || + gz::common::exists( + gz::common::joinPaths(_path, "model.config"))) { std::cout << "Uploading a model[" << _path << "]\n"; // Upload the model @@ -716,15 +716,15 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, // If a model.config or metadata.pbtxt file does not exist, then assume // that the given path is a directory containing multiple models. - ignition::common::DirIter dirIter(_path); - ignition::common::DirIter end; + gz::common::DirIter dirIter(_path); + gz::common::DirIter end; while (!sigKilled && dirIter != end) { - if (ignition::common::isDirectory(*dirIter) && - (ignition::common::exists( - ignition::common::joinPaths(*dirIter, "metadata.pbtxt")) || - ignition::common::exists( - ignition::common::joinPaths(*dirIter, "model.config")))) + if (gz::common::isDirectory(*dirIter) && + (gz::common::exists( + gz::common::joinPaths(*dirIter, "metadata.pbtxt")) || + gz::common::exists( + gz::common::joinPaths(*dirIter, "model.config")))) { if (!client.UploadModel(*dirIter, model, headers, privateBool, _owner)) { @@ -740,21 +740,21 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, extern "C" IGNITION_FUEL_TOOLS_VISIBLE int deleteUrl( const char *_url, const char *_header) { - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Store header information std::vector headers; if (_header && strlen(_header) > 0) headers.push_back(_header); - ignition::common::URI url(_url); + gz::common::URI url(_url); - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { - ignition::fuel_tools::ModelIdentifier model; - ignition::fuel_tools::WorldIdentifier world; + gz::fuel_tools::ModelIdentifier model; + gz::fuel_tools::WorldIdentifier world; if (client.ParseModelUrl(url, model)) { @@ -781,13 +781,13 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int deleteUrl( ////////////////////////////////////////////////// extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) { - ignition::msgs::FuelMetadata meta; + gz::msgs::FuelMetadata meta; std::ifstream inputFile(_path); std::string inputStr((std::istreambuf_iterator(inputFile)), std::istreambuf_iterator()); - if (!ignition::msgs::ConvertFuelMetadata(inputStr, meta)) + if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) { ignerr << "Unable to convert model config[" << _path << "].\n"; return 0; @@ -801,7 +801,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) ////////////////////////////////////////////////// extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path) { - ignition::msgs::FuelMetadata meta; + gz::msgs::FuelMetadata meta; // Read the pbtxt file. std::ifstream inputFile(_path); @@ -812,7 +812,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path) google::protobuf::TextFormat::ParseFromString(inputStr, &meta); std::string modelConfig; - if (!ignition::msgs::ConvertFuelMetadata(meta, modelConfig)) + if (!gz::msgs::ConvertFuelMetadata(meta, modelConfig)) { std::cerr << "Unable to convert Fuel metadata to model.config\n"; return 0; @@ -827,31 +827,31 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( const char *_url, const char *_header, const char *_private, const char *_path) { - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Store header information std::vector headers; if (_header && strlen(_header) > 0) headers.push_back(_header); - ignition::common::URI url(_url); + gz::common::URI url(_url); // Get a privacy change. std::optional privateBool; if (_private && std::strlen(_private) != 0) { - std::string privateStr = ignition::common::lowercase(_private); + std::string privateStr = gz::common::lowercase(_private); privateBool = privateStr == "1" || privateStr == "true"; } - ignition::fuel_tools::ModelIdentifier model; + gz::fuel_tools::ModelIdentifier model; std::string modelPath; if (_path && std::strlen(_path) != 0) { - if (!ignition::common::exists(_path)) + if (!gz::common::exists(_path)) { ignerr << "The model path[" << _path << "] doesn't exist.\n"; return 0; @@ -862,14 +862,14 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( // Check to see if a model has been specified in the the URI. if (client.ParseModelUrl(url, model)) { - if (ignition::common::Console::Verbosity() >= 3) + if (gz::common::Console::Verbosity() >= 3) { std::cout << "Editing model: " << "\033[36m" << std::endl << model.AsPrettyString(" ") << "\033[39m" << std::endl; } // Get the model details from the server - ignition::fuel_tools::ModelIdentifier details; + gz::fuel_tools::ModelIdentifier details; if (!client.ModelDetails(model, details, headers)) { ignerr << "Failed to fetch model details for model[" @@ -905,7 +905,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int update( { // Add signal handler for SIGTERM and SIGINT. Ctrl-C doesn't work without this // handler. - ignition::common::SignalHandler sigHandler; + gz::common::SignalHandler sigHandler; sigHandler.AddCallback([&](int _sig) { if (SIGTERM == _sig || SIGINT == _sig) { @@ -916,21 +916,21 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int update( bool onlyModelsBool = false; if (_onlyModels && std::strlen(_onlyModels) != 0) { - std::string str = ignition::common::lowercase(_onlyModels); + std::string str = gz::common::lowercase(_onlyModels); onlyModelsBool = str == "1" || str == "true"; } bool onlyWorldsBool = false; if (_onlyWorlds && std::strlen(_onlyWorlds) != 0) { - std::string str = ignition::common::lowercase(_onlyWorlds); + std::string str = gz::common::lowercase(_onlyWorlds); onlyWorldsBool = str == "1" || str == "true"; } // Client - ignition::fuel_tools::ClientConfig conf; + gz::fuel_tools::ClientConfig conf; conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); - ignition::fuel_tools::FuelClient client(conf); + gz::fuel_tools::FuelClient client(conf); // Headers std::vector headers; diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 1b2bd6b7..9ef61878 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -26,7 +26,7 @@ #include "ign.hh" #include "test_config.h" -using namespace ignition; +using namespace gz; // Std streams static std::streambuf *g_stdOutFile; diff --git a/test/integration/zip.cc b/test/integration/zip.cc index 352ef2d9..85969caf 100644 --- a/test/integration/zip.cc +++ b/test/integration/zip.cc @@ -23,7 +23,7 @@ #include "ignition/fuel_tools/Zip.hh" #include "test_config.h" -using namespace ignition; +using namespace gz; using namespace fuel_tools; ///////////////////////////////////////////////// @@ -31,7 +31,7 @@ class ZipIntegrationTest : public ::testing::Test { public: void SetUp() override { - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); } }; @@ -48,24 +48,24 @@ TEST_F(ZipIntegrationTest, Extract) // check extracted contents std::string boxPath = common::joinPaths(dst, "box"); - EXPECT_TRUE(ignition::common::exists(boxPath)) << boxPath; - EXPECT_TRUE(ignition::common::isDirectory(boxPath)) << boxPath; + EXPECT_TRUE(gz::common::exists(boxPath)) << boxPath; + EXPECT_TRUE(gz::common::isDirectory(boxPath)) << boxPath; std::string boxFilePath = common::joinPaths(boxPath, "file"); - EXPECT_TRUE(ignition::common::exists(boxFilePath)) << boxFilePath; - EXPECT_TRUE(ignition::common::isFile(boxFilePath)) << boxFilePath; + EXPECT_TRUE(gz::common::exists(boxFilePath)) << boxFilePath; + EXPECT_TRUE(gz::common::isFile(boxFilePath)) << boxFilePath; std::string boxDirPath = common::joinPaths(boxPath, "dir"); - EXPECT_TRUE(ignition::common::exists(boxDirPath)) << boxDirPath; - EXPECT_TRUE(ignition::common::isDirectory(boxDirPath)) << boxDirPath; + EXPECT_TRUE(gz::common::exists(boxDirPath)) << boxDirPath; + EXPECT_TRUE(gz::common::isDirectory(boxDirPath)) << boxDirPath; std::string boxFile2Path = common::joinPaths(boxDirPath, "file2"); - EXPECT_TRUE(ignition::common::exists(boxFile2Path)) << boxFile2Path; - EXPECT_TRUE(ignition::common::isFile(boxFile2Path)); + EXPECT_TRUE(gz::common::exists(boxFile2Path)) << boxFile2Path; + EXPECT_TRUE(gz::common::isFile(boxFile2Path)); // cleanup - EXPECT_TRUE(ignition::common::removeAll(boxPath)); - EXPECT_FALSE(ignition::common::exists(boxPath)); + EXPECT_TRUE(gz::common::removeAll(boxPath)); + EXPECT_FALSE(gz::common::exists(boxPath)); } ///////////////////////////////////////////////// @@ -78,8 +78,8 @@ TEST_F(ZipIntegrationTest, Compress) std::string src = common::joinPaths(std::string(TEST_PATH), "media", "box"); EXPECT_TRUE(Zip::Compress(src, archivePath)); - EXPECT_TRUE(ignition::common::exists(archivePath)); - EXPECT_TRUE(ignition::common::isFile(archivePath)); + EXPECT_TRUE(gz::common::exists(archivePath)); + EXPECT_TRUE(gz::common::isFile(archivePath)); // extract the zip archive and verify contents std::string dst = std::string(PROJECT_BINARY_PATH); @@ -87,25 +87,25 @@ TEST_F(ZipIntegrationTest, Compress) // check extracted contents std::string boxPath = common::joinPaths(dst, "box"); - EXPECT_TRUE(ignition::common::exists(boxPath)); - EXPECT_TRUE(ignition::common::isDirectory(boxPath)); + EXPECT_TRUE(gz::common::exists(boxPath)); + EXPECT_TRUE(gz::common::isDirectory(boxPath)); std::string boxFilePath = common::joinPaths(boxPath, "file"); - EXPECT_TRUE(ignition::common::exists(boxFilePath)); - EXPECT_TRUE(ignition::common::isFile(boxFilePath)); + EXPECT_TRUE(gz::common::exists(boxFilePath)); + EXPECT_TRUE(gz::common::isFile(boxFilePath)); std::string boxDirPath = common::joinPaths(boxPath, "dir"); - EXPECT_TRUE(ignition::common::exists(boxDirPath)); - EXPECT_TRUE(ignition::common::isDirectory(boxDirPath)); + EXPECT_TRUE(gz::common::exists(boxDirPath)); + EXPECT_TRUE(gz::common::isDirectory(boxDirPath)); std::string boxFile2Path = common::joinPaths(boxDirPath, "file2"); - EXPECT_TRUE(ignition::common::exists(boxFile2Path)); - EXPECT_TRUE(ignition::common::isFile(boxFile2Path)); + EXPECT_TRUE(gz::common::exists(boxFile2Path)); + EXPECT_TRUE(gz::common::isFile(boxFile2Path)); // cleanup - EXPECT_TRUE(ignition::common::removeAll(archivePath)); - EXPECT_FALSE(ignition::common::exists(archivePath)); + EXPECT_TRUE(gz::common::removeAll(archivePath)); + EXPECT_FALSE(gz::common::exists(archivePath)); - EXPECT_TRUE(ignition::common::removeAll(boxPath)); - EXPECT_FALSE(ignition::common::exists(boxPath)); + EXPECT_TRUE(gz::common::removeAll(boxPath)); + EXPECT_FALSE(gz::common::exists(boxPath)); } diff --git a/tutorials/02_configuration.md b/tutorials/02_configuration.md index 5cd8c261..d30ef590 100644 --- a/tutorials/02_configuration.md +++ b/tutorials/02_configuration.md @@ -130,13 +130,13 @@ Let's jump to the interesting parts of the program: ``` // Setup ClientConfig. -ignition::fuel_tools::ClientConfig conf; +gz::fuel_tools::ClientConfig conf; if (FLAGS_s != "") { // The user specified a Fuel server via command line. - ignition::fuel_tools::ServerConfig srv; - srv.SetUrl(ignition::common::URI(FLAGS_s)); + gz::fuel_tools::ServerConfig srv; + srv.SetUrl(gz::common::URI(FLAGS_s)); // Add the extra Fuel server. conf.AddServer(srv); @@ -167,7 +167,7 @@ if (!conf.LoadConfig()) } // Instantiate the FuelClient object with the configuration. -ignition::fuel_tools::FuelClient client(conf); +gz::fuel_tools::FuelClient client(conf); ``` Here, we check if the user specified a `-c` (config) option. If so, we need to @@ -186,8 +186,8 @@ example. ``` // Set the properties of the resource that we want to download. -ignition::fuel_tools::ModelIdentifier modelIdentifier; -ignition::fuel_tools::WorldIdentifier worldIdentifier; +gz::fuel_tools::ModelIdentifier modelIdentifier; +gz::fuel_tools::WorldIdentifier worldIdentifier; if (FLAGS_t == "model") { diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 2425f308..8f1d1506 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -171,7 +171,7 @@ for (const auto &server : client.Config().Servers()) auto id = modelIdentifier; id.SetServer(server); - ignition::fuel_tools::ModelIdentifier model; + gz::fuel_tools::ModelIdentifier model; if (!client.ModelDetails(server, id, model)) continue; @@ -183,7 +183,7 @@ for (const auto &server : client.Config().Servers()) auto id = worldIdentifier; id.SetServer(server); - ignition::fuel_tools::WorldIdentifier world; + gz::fuel_tools::WorldIdentifier world; if (!client.WorldDetails(id, world)) continue; From 2bbde9bbf915e55a068c15ef027222c090def547 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:12:45 -0700 Subject: [PATCH 03/25] Add migration line Signed-off-by: methylDragon --- Migration.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Migration.md b/Migration.md index f7363e09..f584c526 100644 --- a/Migration.md +++ b/Migration.md @@ -7,6 +7,8 @@ * **Deprecation**: `FuelClient` constructor that takes `LocalCache` * **Replacement**: `FielClient` constructor without `LocalCache` +* **Deprecation**: `ignition` namespace +* **Replacement**: `gz` namespace ## Ignition Fuel Tools 4.X to 5.X From 24153beaf04a314f6f14c271c57143f501045735 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:13:35 -0700 Subject: [PATCH 04/25] Implement deprecation trick Signed-off-by: methylDragon --- include/ignition/fuel_tools/config.hh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh index 4686efa4..6cd9a355 100644 --- a/include/ignition/fuel_tools/config.hh +++ b/include/ignition/fuel_tools/config.hh @@ -15,4 +15,14 @@ * */ +#ifndef IGNITION_FUEL_TOOLS__CONFIG_HH_ +#define IGNITION_FUEL_TOOLS__CONFIG_HH_ + #include + +namespace [[deprecated("Use gz namespace.")]] ignition +{ + using namespace gz; +} + +#endif From f1617d465e705ee59ed7bc146ad53e7b991e2153 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:14:31 -0700 Subject: [PATCH 05/25] Add deprecation test Signed-off-by: methylDragon --- test/integration/deprecated_TEST.cc | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 test/integration/deprecated_TEST.cc diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc new file mode 100644 index 00000000..5d7efe60 --- /dev/null +++ b/test/integration/deprecated_TEST.cc @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + +#include + +#include +#include + +IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION + +///////////////////////////////////////////////// +// Make sure the ignition namespace still works +TEST(Deprecated, IgnitionNamespace) +{ + ignition::fuel_tools::Model model; +} + +IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION From 32ea67cfddbf58d8e31810c021b5fdc76d04d9ac Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 17 May 2022 23:14:59 -0700 Subject: [PATCH 06/25] Include config.hh Signed-off-by: methylDragon --- include/ignition/fuel_tools/ClientConfig.hh | 1 + include/ignition/fuel_tools/CollectionIdentifier.hh | 1 + include/ignition/fuel_tools/Export.hh | 1 + include/ignition/fuel_tools/FuelClient.hh | 1 + include/ignition/fuel_tools/Helpers.hh | 1 + include/ignition/fuel_tools/Interface.hh | 1 + include/ignition/fuel_tools/JSONParser.hh | 1 + include/ignition/fuel_tools/Model.hh | 1 + include/ignition/fuel_tools/ModelIdentifier.hh | 1 + include/ignition/fuel_tools/ModelIter.hh | 1 + include/ignition/fuel_tools/RestClient.hh | 1 + include/ignition/fuel_tools/Result.hh | 1 + include/ignition/fuel_tools/WorldIdentifier.hh | 1 + include/ignition/fuel_tools/WorldIter.hh | 1 + include/ignition/fuel_tools/Zip.hh | 1 + 15 files changed, 15 insertions(+) diff --git a/include/ignition/fuel_tools/ClientConfig.hh b/include/ignition/fuel_tools/ClientConfig.hh index cd592511..61c4c834 100644 --- a/include/ignition/fuel_tools/ClientConfig.hh +++ b/include/ignition/fuel_tools/ClientConfig.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/CollectionIdentifier.hh b/include/ignition/fuel_tools/CollectionIdentifier.hh index 51a8d5e3..d1190876 100644 --- a/include/ignition/fuel_tools/CollectionIdentifier.hh +++ b/include/ignition/fuel_tools/CollectionIdentifier.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Export.hh b/include/ignition/fuel_tools/Export.hh index 738feae6..2d32dfcc 100644 --- a/include/ignition/fuel_tools/Export.hh +++ b/include/ignition/fuel_tools/Export.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/FuelClient.hh b/include/ignition/fuel_tools/FuelClient.hh index 3183b9c2..d2bcb4e2 100644 --- a/include/ignition/fuel_tools/FuelClient.hh +++ b/include/ignition/fuel_tools/FuelClient.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Helpers.hh b/include/ignition/fuel_tools/Helpers.hh index 3dfd898a..654835d9 100644 --- a/include/ignition/fuel_tools/Helpers.hh +++ b/include/ignition/fuel_tools/Helpers.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Interface.hh b/include/ignition/fuel_tools/Interface.hh index e03289eb..e96f09a7 100644 --- a/include/ignition/fuel_tools/Interface.hh +++ b/include/ignition/fuel_tools/Interface.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/JSONParser.hh b/include/ignition/fuel_tools/JSONParser.hh index 9ad65797..91b74a06 100644 --- a/include/ignition/fuel_tools/JSONParser.hh +++ b/include/ignition/fuel_tools/JSONParser.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Model.hh b/include/ignition/fuel_tools/Model.hh index 631cbba1..4027323f 100644 --- a/include/ignition/fuel_tools/Model.hh +++ b/include/ignition/fuel_tools/Model.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/ModelIdentifier.hh b/include/ignition/fuel_tools/ModelIdentifier.hh index 73eadb50..23845149 100644 --- a/include/ignition/fuel_tools/ModelIdentifier.hh +++ b/include/ignition/fuel_tools/ModelIdentifier.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/ModelIter.hh b/include/ignition/fuel_tools/ModelIter.hh index 5786b1b6..05a757a2 100644 --- a/include/ignition/fuel_tools/ModelIter.hh +++ b/include/ignition/fuel_tools/ModelIter.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/RestClient.hh b/include/ignition/fuel_tools/RestClient.hh index 5f81d857..4daf0e1a 100644 --- a/include/ignition/fuel_tools/RestClient.hh +++ b/include/ignition/fuel_tools/RestClient.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Result.hh b/include/ignition/fuel_tools/Result.hh index f9f76166..e7c87e8c 100644 --- a/include/ignition/fuel_tools/Result.hh +++ b/include/ignition/fuel_tools/Result.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/WorldIdentifier.hh b/include/ignition/fuel_tools/WorldIdentifier.hh index f04159c3..497775ee 100644 --- a/include/ignition/fuel_tools/WorldIdentifier.hh +++ b/include/ignition/fuel_tools/WorldIdentifier.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/WorldIter.hh b/include/ignition/fuel_tools/WorldIter.hh index e57f3307..d2862468 100644 --- a/include/ignition/fuel_tools/WorldIter.hh +++ b/include/ignition/fuel_tools/WorldIter.hh @@ -16,3 +16,4 @@ */ #include +#include diff --git a/include/ignition/fuel_tools/Zip.hh b/include/ignition/fuel_tools/Zip.hh index 022f8cb8..21168112 100644 --- a/include/ignition/fuel_tools/Zip.hh +++ b/include/ignition/fuel_tools/Zip.hh @@ -16,3 +16,4 @@ */ #include +#include From 09863fa02b6d6f4f73d13a91cd1b1ecf3bec794d Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 13:50:13 -0700 Subject: [PATCH 07/25] Use pragma deprecation message instead Signed-off-by: methylDragon --- include/ignition/fuel_tools/config.hh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh index 6cd9a355..35bfcb27 100644 --- a/include/ignition/fuel_tools/config.hh +++ b/include/ignition/fuel_tools/config.hh @@ -20,8 +20,11 @@ #include -namespace [[deprecated("Use gz namespace.")]] ignition +namespace ignition { + #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION + #pragma message("ignition namespace is deprecated! Use gz instead!") + #endif using namespace gz; } From 7ba6c40a6e1b412c9606039e8a284a76e3d74208 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 15:33:04 -0700 Subject: [PATCH 08/25] Ticktock config macros Signed-off-by: methylDragon --- include/gz/fuel_tools/config.hh.in | 36 +++++++++++++++++++++------ include/ignition/fuel_tools/config.hh | 11 ++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/include/gz/fuel_tools/config.hh.in b/include/gz/fuel_tools/config.hh.in index b7c2a388..a9af1779 100644 --- a/include/gz/fuel_tools/config.hh.in +++ b/include/gz/fuel_tools/config.hh.in @@ -1,17 +1,39 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + /* Config.hh. Generated by CMake for @PROJECT_NAME@. */ +#ifndef GZ_FUEL_TOOLS_CONFIG_HH_ +#define GZ_FUEL_TOOLS_CONFIG_HH_ + /* Version number */ -#define IGNITION_FUEL_TOOLS_MAJOR_VERSION ${PROJECT_VERSION_MAJOR} -#define IGNITION_FUEL_TOOLS_MINOR_VERSION ${PROJECT_VERSION_MINOR} -#define IGNITION_FUEL_TOOLS_PATCH_VERSION ${PROJECT_VERSION_PATCH} +#define GZ_FUEL_TOOLS_MAJOR_VERSION ${PROJECT_VERSION_MAJOR} +#define GZ_FUEL_TOOLS_MINOR_VERSION ${PROJECT_VERSION_MINOR} +#define GZ_FUEL_TOOLS_PATCH_VERSION ${PROJECT_VERSION_PATCH} -#define IGNITION_FUEL_TOOLS_VERSION "${PROJECT_VERSION}" -#define IGNITION_FUEL_TOOLS_VERSION_FULL "${PROJECT_VERSION_FULL}" +#define GZ_FUEL_TOOLS_VERSION "${PROJECT_VERSION}" +#define GZ_FUEL_TOOLS_VERSION_FULL "${PROJECT_VERSION_FULL}" -#define IGNITION_FUEL_TOOLS_VERSION_HEADER "${PROJECT_NAME_LOWER}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" +#define GZ_FUEL_TOOLS_VERSION_HEADER "Gz Fuel Tools, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" -#define IGNITION_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/" +#define GZ_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/" #cmakedefine BUILD_TYPE_PROFILE 1 #cmakedefine BUILD_TYPE_DEBUG 1 #cmakedefine BUILD_TYPE_RELEASE 1 + +#endif diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh index 35bfcb27..b5b83f8d 100644 --- a/include/ignition/fuel_tools/config.hh +++ b/include/ignition/fuel_tools/config.hh @@ -20,6 +20,17 @@ #include +#define IGNITION_FUEL_TOOLS_MAJOR_VERSION GZ_FUEL_TOOLS_MAJOR_VERSION +#define IGNITION_FUEL_TOOLS_MINOR_VERSION GZ_FUEL_TOOLS_MINOR_VERSION +#define IGNITION_FUEL_TOOLS_PATCH_VERSION GZ_FUEL_TOOLS_PATCH_VERSION + +#define IGNITION_FUEL_TOOLS_VERSION GZ_FUEL_TOOLS_VERSION +#define IGNITION_FUEL_TOOLS_VERSION_FULL GZ_FUEL_TOOLS_VERSION_FULL + +#define IGNITION_FUEL_TOOLS_VERSION_HEADER GZ_FUEL_TOOLS_VERSION_HEADER + +#define IGNITION_FUEL_INITIAL_CONFIG_PATH GZ_FUEL_INITIAL_CONFIG_PATH + namespace ignition { #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION From 2b9e7990bad6d99602b490f3dcafd0cea4618b14 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 18:03:23 -0700 Subject: [PATCH 09/25] Migrate includes to gz Signed-off-by: methylDragon --- example/details.cc | 2 +- example/download.cc | 4 ++-- example/list.cc | 2 +- src/ClientConfig.cc | 10 +++++----- src/ClientConfig_TEST.cc | 8 ++++---- src/CollectionIdentifier.cc | 6 +++--- src/CollectionIdentifier_TEST.cc | 6 +++--- src/FuelClient.cc | 26 +++++++++++++------------- src/FuelClient_TEST.cc | 16 ++++++++-------- src/Helpers.cc | 6 +++--- src/Helpers_TEST.cc | 4 ++-- src/Interface.cc | 10 +++++----- src/Interface_TEST.cc | 12 ++++++------ src/JSONParser.cc | 6 +++--- src/JSONParser_TEST.cc | 8 ++++---- src/LocalCache.cc | 18 +++++++++--------- src/LocalCache.hh | 8 ++++---- src/LocalCache_TEST.cc | 10 +++++----- src/Model.cc | 6 +++--- src/ModelIdentifier.cc | 10 +++++----- src/ModelIdentifier_TEST.cc | 6 +++--- src/ModelIter.cc | 16 ++++++++-------- src/ModelIterPrivate.hh | 8 ++++---- src/ModelIter_TEST.cc | 4 ++-- src/ModelPrivate.hh | 4 ++-- src/Model_TEST.cc | 2 +- src/RestClient.cc | 4 ++-- src/RestClient_TEST.cc | 2 +- src/Result.cc | 2 +- src/Result_TEST.cc | 2 +- src/WorldIdentifier.cc | 10 +++++----- src/WorldIdentifier_TEST.cc | 6 +++--- src/WorldIter.cc | 12 ++++++------ src/WorldIterPrivate.hh | 6 +++--- src/WorldIter_TEST.cc | 4 ++-- src/Zip.cc | 6 +++--- src/Zip_TEST.cc | 6 +++--- src/ign.cc | 28 ++++++++++++++-------------- src/ign.hh | 2 +- src/ign_TEST.cc | 4 ++-- src/ign_src_TEST.cc | 4 ++-- test/integration/deprecated_TEST.cc | 6 ++---- test/integration/zip.cc | 6 +++--- test/test_config.h.in | 2 +- 44 files changed, 164 insertions(+), 166 deletions(-) diff --git a/example/details.cc b/example/details.cc index 266b859f..34bc9562 100644 --- a/example/details.cc +++ b/example/details.cc @@ -19,7 +19,7 @@ #include -#include +#include DEFINE_bool(h, false, "Show help"); diff --git a/example/download.cc b/example/download.cc index 4f7553f9..2cc75c04 100644 --- a/example/download.cc +++ b/example/download.cc @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include DEFINE_bool(h, false, "Show help"); diff --git a/example/list.cc b/example/list.cc index ac109d75..e978595a 100644 --- a/example/list.cc +++ b/example/list.cc @@ -19,7 +19,7 @@ #include -#include +#include DEFINE_bool(h, false, "Show help"); diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 70635d01..0de165a8 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -21,12 +21,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/config.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/config.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 5e41ccaa..c5a3c7f9 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -18,10 +18,10 @@ #include #include #include -#include -#include -#include -#include "ignition/fuel_tools/ClientConfig.hh" +#include +#include +#include +#include "gz/fuel_tools/ClientConfig.hh" #include "test_config.h" using namespace gz; diff --git a/src/CollectionIdentifier.cc b/src/CollectionIdentifier.cc index b7bb0997..73fc4dc6 100644 --- a/src/CollectionIdentifier.cc +++ b/src/CollectionIdentifier.cc @@ -19,10 +19,10 @@ #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/CollectionIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/CollectionIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc index 71f4248c..b0c85179 100644 --- a/src/CollectionIdentifier_TEST.cc +++ b/src/CollectionIdentifier_TEST.cc @@ -17,10 +17,10 @@ #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/CollectionIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/CollectionIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/FuelClient.cc b/src/FuelClient.cc index d5c6e07d..5e06c426 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -19,7 +19,7 @@ #pragma warning(push, 0) #endif #include -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -32,20 +32,20 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/CollectionIdentifier.hh" -#include "ignition/fuel_tools/FuelClient.hh" -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/JSONParser.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" -#include "ignition/fuel_tools/RestClient.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/CollectionIdentifier.hh" +#include "gz/fuel_tools/FuelClient.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/JSONParser.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" #include "LocalCache.hh" #include "ModelIterPrivate.hh" diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index a5aaf874..bdeeee47 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -17,14 +17,14 @@ #include #include -#include -#include -#include - -#include "ignition/fuel_tools/FuelClient.hh" -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/Result.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include +#include +#include + +#include "gz/fuel_tools/FuelClient.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/Result.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" #include "test_config.h" diff --git a/src/Helpers.cc b/src/Helpers.cc index 33a61a1b..b8dfc395 100644 --- a/src/Helpers.cc +++ b/src/Helpers.cc @@ -14,10 +14,10 @@ * limitations under the License. * */ -#include -#include +#include +#include -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index 98dc3109..454bbff8 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -16,8 +16,8 @@ */ #include -#include -#include "ignition/fuel_tools/Helpers.hh" +#include +#include "gz/fuel_tools/Helpers.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/Interface.cc b/src/Interface.cc index f8cced8b..cdf90bcb 100644 --- a/src/Interface.cc +++ b/src/Interface.cc @@ -19,15 +19,15 @@ #pragma warning(push, 0) #endif #include -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include "ignition/common/Console.hh" -#include "ignition/fuel_tools/Interface.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include +#include "gz/common/Console.hh" +#include "gz/fuel_tools/Interface.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" namespace gz { diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index dacac16a..d820afee 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -16,12 +16,12 @@ */ #include -#include -#include -#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/FuelClient.hh" -#include "ignition/fuel_tools/Interface.hh" +#include +#include +#include +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/FuelClient.hh" +#include "gz/fuel_tools/Interface.hh" #include "test_config.h" diff --git a/src/JSONParser.cc b/src/JSONParser.cc index 2233c621..22a91185 100644 --- a/src/JSONParser.cc +++ b/src/JSONParser.cc @@ -18,10 +18,10 @@ #include #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/JSONParser.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/JSONParser.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/JSONParser_TEST.cc b/src/JSONParser_TEST.cc index 3b7c06be..ed325b01 100644 --- a/src/JSONParser_TEST.cc +++ b/src/JSONParser_TEST.cc @@ -22,10 +22,10 @@ #include #include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/JSONParser.hh" -#include "ignition/fuel_tools/ModelIter.hh" -#include "ignition/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/JSONParser.hh" +#include "gz/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/WorldIter.hh" #include "ModelIterPrivate.hh" #include "WorldIterPrivate.hh" diff --git a/src/LocalCache.cc b/src/LocalCache.cc index f2e6aedb..b4627373 100644 --- a/src/LocalCache.cc +++ b/src/LocalCache.cc @@ -28,15 +28,15 @@ #include #include #include -#include -#include -#include -#include -#include - -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/Zip.hh" +#include +#include +#include +#include +#include + +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Zip.hh" #include "ModelPrivate.hh" #include "ModelIterPrivate.hh" diff --git a/src/LocalCache.hh b/src/LocalCache.hh index 280318df..80df3257 100644 --- a/src/LocalCache.hh +++ b/src/LocalCache.hh @@ -21,10 +21,10 @@ #include #include -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/Model.hh" -#include "ignition/fuel_tools/ModelIter.hh" -#include "ignition/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Model.hh" +#include "gz/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/WorldIter.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc index c698e1c0..4c2b64b0 100644 --- a/src/LocalCache_TEST.cc +++ b/src/LocalCache_TEST.cc @@ -20,12 +20,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" #include "LocalCache.hh" #include "test_config.h" diff --git a/src/Model.cc b/src/Model.cc index 068a3c02..5d760fdb 100644 --- a/src/Model.cc +++ b/src/Model.cc @@ -18,9 +18,9 @@ #include #include -#include "ignition/fuel_tools/Model.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" -#include "ignition/fuel_tools/Result.hh" +#include "gz/fuel_tools/Model.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/Result.hh" #include "ModelPrivate.hh" diff --git a/src/ModelIdentifier.cc b/src/ModelIdentifier.cc index acc729f9..6b2b5175 100644 --- a/src/ModelIdentifier.cc +++ b/src/ModelIdentifier.cc @@ -19,12 +19,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index dd00c8e2..f316af09 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -17,10 +17,10 @@ #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/ModelIter.cc b/src/ModelIter.cc index 71ff6796..c0cd3fdc 100644 --- a/src/ModelIter.cc +++ b/src/ModelIter.cc @@ -19,14 +19,14 @@ #include #include #include -#include - -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/JSONParser.hh" -#include "ignition/fuel_tools/Model.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" -#include "ignition/fuel_tools/ModelIter.hh" -#include "ignition/fuel_tools/RestClient.hh" +#include + +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/JSONParser.hh" +#include "gz/fuel_tools/Model.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/RestClient.hh" #include "ModelIterPrivate.hh" #include "ModelPrivate.hh" diff --git a/src/ModelIterPrivate.hh b/src/ModelIterPrivate.hh index 234e9323..2bacd409 100644 --- a/src/ModelIterPrivate.hh +++ b/src/ModelIterPrivate.hh @@ -21,10 +21,10 @@ #include #include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/Model.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" -#include "ignition/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/Model.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/RestClient.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/src/ModelIter_TEST.cc b/src/ModelIter_TEST.cc index 3664734c..d2e46c10 100644 --- a/src/ModelIter_TEST.cc +++ b/src/ModelIter_TEST.cc @@ -19,8 +19,8 @@ #include #include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/ModelIter.hh" #include "ModelIterPrivate.hh" #include "ModelPrivate.hh" diff --git a/src/ModelPrivate.hh b/src/ModelPrivate.hh index 0dfd5f08..34259a75 100644 --- a/src/ModelPrivate.hh +++ b/src/ModelPrivate.hh @@ -20,8 +20,8 @@ #include -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/src/Model_TEST.cc b/src/Model_TEST.cc index ac44e174..620341d3 100644 --- a/src/Model_TEST.cc +++ b/src/Model_TEST.cc @@ -16,7 +16,7 @@ */ #include -#include "ignition/fuel_tools/Model.hh" +#include "gz/fuel_tools/Model.hh" namespace ignft = gz::fuel_tools; using namespace gz; diff --git a/src/RestClient.cc b/src/RestClient.cc index 860c5ef5..b439ae80 100644 --- a/src/RestClient.cc +++ b/src/RestClient.cc @@ -26,9 +26,9 @@ #include #include -#include +#include -#include "ignition/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/RestClient.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/RestClient_TEST.cc b/src/RestClient_TEST.cc index 9c53454d..d64dc7a5 100644 --- a/src/RestClient_TEST.cc +++ b/src/RestClient_TEST.cc @@ -17,7 +17,7 @@ #include #include -#include "ignition/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/RestClient.hh" #include "test_config.h" ///////////////////////////////////////////////// diff --git a/src/Result.cc b/src/Result.cc index 809b2075..0ccfd59d 100644 --- a/src/Result.cc +++ b/src/Result.cc @@ -15,7 +15,7 @@ * */ -#include "ignition/fuel_tools/Result.hh" +#include "gz/fuel_tools/Result.hh" namespace ignft = gz::fuel_tools; using namespace gz; diff --git a/src/Result_TEST.cc b/src/Result_TEST.cc index dcc45aa9..42bb8ff3 100644 --- a/src/Result_TEST.cc +++ b/src/Result_TEST.cc @@ -16,7 +16,7 @@ */ #include -#include "ignition/fuel_tools/Result.hh" +#include "gz/fuel_tools/Result.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/WorldIdentifier.cc b/src/WorldIdentifier.cc index e25f9201..38697476 100644 --- a/src/WorldIdentifier.cc +++ b/src/WorldIdentifier.cc @@ -19,12 +19,12 @@ #include #include -#include -#include +#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 87e4e69d..54c583c2 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -17,10 +17,10 @@ #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/WorldIter.cc b/src/WorldIter.cc index 180793da..980f34a4 100644 --- a/src/WorldIter.cc +++ b/src/WorldIter.cc @@ -19,13 +19,13 @@ #include #include #include -#include +#include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/JSONParser.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" -#include "ignition/fuel_tools/WorldIter.hh" -#include "ignition/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/JSONParser.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/RestClient.hh" #include "WorldIterPrivate.hh" diff --git a/src/WorldIterPrivate.hh b/src/WorldIterPrivate.hh index 7a2f3c59..51f7a81f 100644 --- a/src/WorldIterPrivate.hh +++ b/src/WorldIterPrivate.hh @@ -21,9 +21,9 @@ #include #include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" -#include "ignition/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/RestClient.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/src/WorldIter_TEST.cc b/src/WorldIter_TEST.cc index 98d581f0..e527e0a9 100644 --- a/src/WorldIter_TEST.cc +++ b/src/WorldIter_TEST.cc @@ -19,8 +19,8 @@ #include #include -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/WorldIter.hh" #include "WorldIterPrivate.hh" diff --git a/src/Zip.cc b/src/Zip.cc index 87bcb40c..48e4880a 100644 --- a/src/Zip.cc +++ b/src/Zip.cc @@ -22,10 +22,10 @@ #include #include -#include -#include +#include +#include -#include "ignition/fuel_tools/Zip.hh" +#include "gz/fuel_tools/Zip.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/Zip_TEST.cc b/src/Zip_TEST.cc index f11264a9..3b471c0f 100644 --- a/src/Zip_TEST.cc +++ b/src/Zip_TEST.cc @@ -138,9 +138,9 @@ bool createNewEmptyFile(const std::string &_filename) #endif #include -#include -#include -#include "ignition/fuel_tools/Zip.hh" +#include +#include +#include "gz/fuel_tools/Zip.hh" using namespace gz; using namespace fuel_tools; diff --git a/src/ign.cc b/src/ign.cc index d739441e..a6aab3f8 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -23,7 +23,7 @@ #pragma warning(push, 0) #endif #include -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -34,7 +34,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -56,19 +56,19 @@ #include #include -#include -#include -#include -#include - -#include "ignition/fuel_tools/ClientConfig.hh" -#include "ignition/fuel_tools/CollectionIdentifier.hh" -#include "ignition/fuel_tools/config.hh" -#include "ignition/fuel_tools/FuelClient.hh" -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/Result.hh" +#include +#include +#include +#include + +#include "gz/fuel_tools/ClientConfig.hh" +#include "gz/fuel_tools/CollectionIdentifier.hh" +#include "gz/fuel_tools/config.hh" +#include "gz/fuel_tools/FuelClient.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Result.hh" #include "ign.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" ////////////////////////////////////////////////// /// \brief Print resources in a human readable manner diff --git a/src/ign.hh b/src/ign.hh index ff830fe6..3e281309 100644 --- a/src/ign.hh +++ b/src/ign.hh @@ -18,7 +18,7 @@ #ifndef GZ_FUELTOOLS_GZ_HH_ #define GZ_FUELTOOLS_GZ_HH_ -#include "ignition/fuel_tools/Export.hh" +#include "gz/fuel_tools/Export.hh" /// \brief External hook to read the library version. /// \return C-string representing the version. Ex.: 0.1.2 diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index c2f958cf..4c66791e 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -20,9 +20,9 @@ #include #include -#include +#include -#include "ignition/fuel_tools/config.hh" +#include "gz/fuel_tools/config.hh" #include "test_config.h" ///////////////////////////////////////////////// diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 9ef61878..97fb914d 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include "ign.hh" #include "test_config.h" diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc index 5d7efe60..12a0cadc 100644 --- a/test/integration/deprecated_TEST.cc +++ b/test/integration/deprecated_TEST.cc @@ -17,16 +17,14 @@ #include +#define SUPPRESS_IGNITION_HEADER_DEPRECATION + #include #include -IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - ///////////////////////////////////////////////// // Make sure the ignition namespace still works TEST(Deprecated, IgnitionNamespace) { ignition::fuel_tools::Model model; } - -IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION diff --git a/test/integration/zip.cc b/test/integration/zip.cc index 85969caf..3820bee7 100644 --- a/test/integration/zip.cc +++ b/test/integration/zip.cc @@ -17,10 +17,10 @@ #include -#include -#include +#include +#include -#include "ignition/fuel_tools/Zip.hh" +#include "gz/fuel_tools/Zip.hh" #include "test_config.h" using namespace gz; diff --git a/test/test_config.h.in b/test/test_config.h.in index 7c0e858e..44971116 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -42,7 +42,7 @@ #endif #include "gtest/gtest.h" -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" #ifdef _MSC_VER # define popen _popen From 5e294ac900d13cd3bfeb874b22ed4fda60001f59 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 18:03:41 -0700 Subject: [PATCH 10/25] Mention gz headers in migration Signed-off-by: methylDragon --- Migration.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Migration.md b/Migration.md index f584c526..70b939e2 100644 --- a/Migration.md +++ b/Migration.md @@ -1,14 +1,20 @@ +## Ignition Fuel Tools 7.X to 8.X + +### Deprecations + +* **Deprecation**: `ignition` namespace +* **Replacement**: `gz` namespace +* **Deprecation**: `ignition/...` headers +* **Replacement**: `gz/...` headers + ## Ignition Fuel Tools 5.X to 6.X ### Deprecations * **Deprecation**: `FuelClient::DeleteModel` -* **Replacement**: `FielClient::DeleteUrl` - +* **Replacement**: `FuelClient::DeleteUrl` * **Deprecation**: `FuelClient` constructor that takes `LocalCache` -* **Replacement**: `FielClient` constructor without `LocalCache` -* **Deprecation**: `ignition` namespace -* **Replacement**: `gz` namespace +* **Replacement**: `FuelClient` constructor without `LocalCache` ## Ignition Fuel Tools 4.X to 5.X From bdd67062ef70a0485b3a9ca0568485964933a16c Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 23:32:16 -0700 Subject: [PATCH 11/25] Update config.hh Signed-off-by: methylDragon --- include/gz/fuel_tools/config.hh.in | 6 +----- include/ignition/fuel_tools/config.hh | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/gz/fuel_tools/config.hh.in b/include/gz/fuel_tools/config.hh.in index a9af1779..6b6183eb 100644 --- a/include/gz/fuel_tools/config.hh.in +++ b/include/gz/fuel_tools/config.hh.in @@ -28,12 +28,8 @@ #define GZ_FUEL_TOOLS_VERSION "${PROJECT_VERSION}" #define GZ_FUEL_TOOLS_VERSION_FULL "${PROJECT_VERSION_FULL}" -#define GZ_FUEL_TOOLS_VERSION_HEADER "Gz Fuel Tools, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" +#define GZ_FUEL_TOOLS_VERSION_HEADER "Gazebo Fuel Tools, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #define GZ_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/" -#cmakedefine BUILD_TYPE_PROFILE 1 -#cmakedefine BUILD_TYPE_DEBUG 1 -#cmakedefine BUILD_TYPE_RELEASE 1 - #endif diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh index b5b83f8d..9b866308 100644 --- a/include/ignition/fuel_tools/config.hh +++ b/include/ignition/fuel_tools/config.hh @@ -31,6 +31,10 @@ #define IGNITION_FUEL_INITIAL_CONFIG_PATH GZ_FUEL_INITIAL_CONFIG_PATH +namespace gz +{ +} + namespace ignition { #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION From 39dd741662cc7413bdbae84738cc39c0cee084a1 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 23:32:34 -0700 Subject: [PATCH 12/25] Migrate Export.hh macros and deprecated test Signed-off-by: methylDragon --- include/gz/fuel_tools/ClientConfig.hh | 4 ++-- include/gz/fuel_tools/CollectionIdentifier.hh | 2 +- include/gz/fuel_tools/FuelClient.hh | 2 +- include/gz/fuel_tools/Helpers.hh | 2 +- include/gz/fuel_tools/Interface.hh | 6 ++--- include/gz/fuel_tools/JSONParser.hh | 2 +- include/gz/fuel_tools/Model.hh | 2 +- include/gz/fuel_tools/ModelIdentifier.hh | 2 +- include/gz/fuel_tools/ModelIter.hh | 2 +- include/gz/fuel_tools/RestClient.hh | 4 ++-- include/gz/fuel_tools/Result.hh | 2 +- include/gz/fuel_tools/WorldIdentifier.hh | 2 +- include/gz/fuel_tools/WorldIter.hh | 2 +- include/gz/fuel_tools/Zip.hh | 2 +- src/LocalCache.hh | 2 +- src/ModelIterPrivate.hh | 10 ++++----- src/ModelPrivate.hh | 2 +- src/WorldIterPrivate.hh | 8 +++---- src/ign.cc | 22 +++++++++---------- src/ign.hh | 22 +++++++++---------- test/integration/deprecated_TEST.cc | 2 ++ 21 files changed, 53 insertions(+), 51 deletions(-) diff --git a/include/gz/fuel_tools/ClientConfig.hh b/include/gz/fuel_tools/ClientConfig.hh index 0ded161f..3124345d 100644 --- a/include/gz/fuel_tools/ClientConfig.hh +++ b/include/gz/fuel_tools/ClientConfig.hh @@ -44,7 +44,7 @@ namespace gz class ClientConfigPrivate; /// \brief Describes options needed for a server. - class IGNITION_FUEL_TOOLS_VISIBLE ServerConfig + class GZ_FUEL_TOOLS_VISIBLE ServerConfig { /// \brief Constructor. public: ServerConfig(); @@ -106,7 +106,7 @@ namespace gz /// \brief High level interface to ignition fuel. /// - class IGNITION_FUEL_TOOLS_VISIBLE ClientConfig + class GZ_FUEL_TOOLS_VISIBLE ClientConfig { /// \brief Constructor. public: ClientConfig(); diff --git a/include/gz/fuel_tools/CollectionIdentifier.hh b/include/gz/fuel_tools/CollectionIdentifier.hh index 39061164..5269734e 100644 --- a/include/gz/fuel_tools/CollectionIdentifier.hh +++ b/include/gz/fuel_tools/CollectionIdentifier.hh @@ -39,7 +39,7 @@ namespace gz class ServerConfig; /// \brief Defines how to identify a collection - class IGNITION_FUEL_TOOLS_VISIBLE CollectionIdentifier + class GZ_FUEL_TOOLS_VISIBLE CollectionIdentifier { /// \brief Constructor. public: CollectionIdentifier(); diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh index f1249900..37de223a 100644 --- a/include/gz/fuel_tools/FuelClient.hh +++ b/include/gz/fuel_tools/FuelClient.hh @@ -49,7 +49,7 @@ namespace gz class ServerConfig; /// \brief High level interface to ignition fuel - class IGNITION_FUEL_TOOLS_VISIBLE FuelClient + class GZ_FUEL_TOOLS_VISIBLE FuelClient { /// \brief Default constructor. public: FuelClient(); diff --git a/include/gz/fuel_tools/Helpers.hh b/include/gz/fuel_tools/Helpers.hh index 63c3e210..5027a349 100644 --- a/include/gz/fuel_tools/Helpers.hh +++ b/include/gz/fuel_tools/Helpers.hh @@ -43,7 +43,7 @@ namespace fuel_tools /// It strips the scheme and authority's `//` prefix. /// \param[in] _uri URI to convert. /// \return String suitable to use in file paths -IGNITION_FUEL_TOOLS_VISIBLE +GZ_FUEL_TOOLS_VISIBLE std::string uriToPath(const gz::common::URI &_uri); } } diff --git a/include/gz/fuel_tools/Interface.hh b/include/gz/fuel_tools/Interface.hh index 9dae74f7..c38e6eeb 100644 --- a/include/gz/fuel_tools/Interface.hh +++ b/include/gz/fuel_tools/Interface.hh @@ -27,7 +27,7 @@ namespace gz /// fuel tools. This will place the asset in ~/.ignition/fuel. /// \param[in] _uri URI to the asset. /// \return Path to the downloaded asset. Empty on error. - IGNITION_FUEL_TOOLS_VISIBLE std::string fetchResource( + GZ_FUEL_TOOLS_VISIBLE std::string fetchResource( const std::string &_uri); /// \brief Download the specified resource using the ClientConfig @@ -35,7 +35,7 @@ namespace gz /// \param[in] _uri URI to the asset. /// \param[in] _client Custom FuelClient configuration. /// \return Path to the downloaded asset. Empty on error. - IGNITION_FUEL_TOOLS_VISIBLE std::string fetchResourceWithClient( + GZ_FUEL_TOOLS_VISIBLE std::string fetchResourceWithClient( const std::string &_uri, gz::fuel_tools::FuelClient &_client); /// \brief Get the SDF file path for a model or world based on a directory @@ -56,7 +56,7 @@ namespace gz /// \param[in] _path Filesystem path to a Fuel model or world directory. /// \return Full path to the model or world SDF file, or empty string if /// the SDF file coult not be determined. - IGNITION_FUEL_TOOLS_VISIBLE std::string sdfFromPath( + GZ_FUEL_TOOLS_VISIBLE std::string sdfFromPath( const std::string &_path); } } diff --git a/include/gz/fuel_tools/JSONParser.hh b/include/gz/fuel_tools/JSONParser.hh index 4235a323..86f71e22 100644 --- a/include/gz/fuel_tools/JSONParser.hh +++ b/include/gz/fuel_tools/JSONParser.hh @@ -40,7 +40,7 @@ namespace gz class ServerConfig; /// \brief A helper class for making REST requests. - class IGNITION_FUEL_TOOLS_VISIBLE JSONParser + class GZ_FUEL_TOOLS_VISIBLE JSONParser { /// \brief Parse a model JSON string and return a model identifier /// \param[in] _json JSON string containing a model. diff --git a/include/gz/fuel_tools/Model.hh b/include/gz/fuel_tools/Model.hh index 8c2e3018..9f918a3a 100644 --- a/include/gz/fuel_tools/Model.hh +++ b/include/gz/fuel_tools/Model.hh @@ -64,7 +64,7 @@ namespace gz class ModelIterTest; /// \brief Defines how to identify a model. - class IGNITION_FUEL_TOOLS_VISIBLE Model + class GZ_FUEL_TOOLS_VISIBLE Model { friend IterIds; friend IterRESTIds; diff --git a/include/gz/fuel_tools/ModelIdentifier.hh b/include/gz/fuel_tools/ModelIdentifier.hh index dafa7004..6be52ade 100644 --- a/include/gz/fuel_tools/ModelIdentifier.hh +++ b/include/gz/fuel_tools/ModelIdentifier.hh @@ -42,7 +42,7 @@ namespace gz class ServerConfig; /// \brief Defines how to identify a model - class IGNITION_FUEL_TOOLS_VISIBLE ModelIdentifier + class GZ_FUEL_TOOLS_VISIBLE ModelIdentifier { /// \brief Constructor. public: ModelIdentifier(); diff --git a/include/gz/fuel_tools/ModelIter.hh b/include/gz/fuel_tools/ModelIter.hh index a3a8f7d8..e623293e 100644 --- a/include/gz/fuel_tools/ModelIter.hh +++ b/include/gz/fuel_tools/ModelIter.hh @@ -40,7 +40,7 @@ namespace gz class ModelIterFactory; /// \brief class for iterating through models - class IGNITION_FUEL_TOOLS_VISIBLE ModelIter + class GZ_FUEL_TOOLS_VISIBLE ModelIter { friend ModelIterFactory; diff --git a/include/gz/fuel_tools/RestClient.hh b/include/gz/fuel_tools/RestClient.hh index 0bb3971b..ad63625a 100644 --- a/include/gz/fuel_tools/RestClient.hh +++ b/include/gz/fuel_tools/RestClient.hh @@ -38,7 +38,7 @@ namespace gz namespace fuel_tools { /// \brief Stores a response to a RESTful request - struct IGNITION_FUEL_TOOLS_VISIBLE RestResponse + struct GZ_FUEL_TOOLS_VISIBLE RestResponse { /// \brief The returned status code. E.g.: 200 // cppcheck-suppress unusedStructMember @@ -79,7 +79,7 @@ namespace gz }; /// \brief A helper class for making REST requests. - class IGNITION_FUEL_TOOLS_VISIBLE Rest + class GZ_FUEL_TOOLS_VISIBLE Rest { /// \brief Default constructor. public: Rest() = default; diff --git a/include/gz/fuel_tools/Result.hh b/include/gz/fuel_tools/Result.hh index e154b403..54c084e2 100644 --- a/include/gz/fuel_tools/Result.hh +++ b/include/gz/fuel_tools/Result.hh @@ -87,7 +87,7 @@ namespace gz }; /// \brief Class describing a result of an operation. - class IGNITION_FUEL_TOOLS_VISIBLE Result + class GZ_FUEL_TOOLS_VISIBLE Result { /// \brief Default constructor public: Result(); diff --git a/include/gz/fuel_tools/WorldIdentifier.hh b/include/gz/fuel_tools/WorldIdentifier.hh index 3911b970..d4579248 100644 --- a/include/gz/fuel_tools/WorldIdentifier.hh +++ b/include/gz/fuel_tools/WorldIdentifier.hh @@ -39,7 +39,7 @@ namespace gz class ServerConfig; /// \brief Defines how to identify a world - class IGNITION_FUEL_TOOLS_VISIBLE WorldIdentifier + class GZ_FUEL_TOOLS_VISIBLE WorldIdentifier { /// \brief Constructor. public: WorldIdentifier(); diff --git a/include/gz/fuel_tools/WorldIter.hh b/include/gz/fuel_tools/WorldIter.hh index c5d55ab1..95bd9aa3 100644 --- a/include/gz/fuel_tools/WorldIter.hh +++ b/include/gz/fuel_tools/WorldIter.hh @@ -39,7 +39,7 @@ namespace gz class WorldIterFactory; /// \brief class for iterating through worlds - class IGNITION_FUEL_TOOLS_VISIBLE WorldIter + class GZ_FUEL_TOOLS_VISIBLE WorldIter { friend WorldIterFactory; diff --git a/include/gz/fuel_tools/Zip.hh b/include/gz/fuel_tools/Zip.hh index 50209a34..63eb795e 100644 --- a/include/gz/fuel_tools/Zip.hh +++ b/include/gz/fuel_tools/Zip.hh @@ -28,7 +28,7 @@ namespace gz namespace fuel_tools { /// \brief A helper class for making REST requests. - class IGNITION_FUEL_TOOLS_VISIBLE Zip + class GZ_FUEL_TOOLS_VISIBLE Zip { /// \brief Compress a file or directory /// \param[in] _src Path to file or directory to compress diff --git a/src/LocalCache.hh b/src/LocalCache.hh index 80df3257..aff4ac1b 100644 --- a/src/LocalCache.hh +++ b/src/LocalCache.hh @@ -43,7 +43,7 @@ namespace gz class ModelIdentifier; /// \brief Class for managing stuff in the local cache - class IGNITION_FUEL_TOOLS_VISIBLE LocalCache + class GZ_FUEL_TOOLS_VISIBLE LocalCache { /// \brief Constructor /// \param[in] _config The configuration for the client diff --git a/src/ModelIterPrivate.hh b/src/ModelIterPrivate.hh index 2bacd409..0b58d933 100644 --- a/src/ModelIterPrivate.hh +++ b/src/ModelIterPrivate.hh @@ -41,7 +41,7 @@ namespace gz class ModelIter; /// \brief Private class, do not include or instantiate - class IGNITION_FUEL_TOOLS_VISIBLE ModelIterFactory + class GZ_FUEL_TOOLS_VISIBLE ModelIterFactory { /// \brief Create a model iterator from a vector of model identifiers /// \param[in] _ids Model identifiers @@ -67,7 +67,7 @@ namespace gz }; /// \brief Private class, do not include or instantiate - class IGNITION_FUEL_TOOLS_VISIBLE ModelIterPrivate + class GZ_FUEL_TOOLS_VISIBLE ModelIterPrivate { /// \brief Destructor public: virtual ~ModelIterPrivate(); @@ -85,7 +85,7 @@ namespace gz /// \brief class for iterating through model ids where all are known /// in advance - class IGNITION_FUEL_TOOLS_VISIBLE IterIds : public ModelIterPrivate + class GZ_FUEL_TOOLS_VISIBLE IterIds : public ModelIterPrivate { /// \brief Constructor public: explicit IterIds(std::vector _ids); @@ -108,7 +108,7 @@ namespace gz /// \brief class for iterating through model ids where all are known /// in advance - class IGNITION_FUEL_TOOLS_VISIBLE IterModels: public ModelIterPrivate + class GZ_FUEL_TOOLS_VISIBLE IterModels: public ModelIterPrivate { /// \brief Constructor public: explicit IterModels(std::vector _models); @@ -130,7 +130,7 @@ namespace gz }; /// \brief class for iterating through model ids from a rest API - class IGNITION_FUEL_TOOLS_VISIBLE IterRestIds: public ModelIterPrivate + class GZ_FUEL_TOOLS_VISIBLE IterRestIds: public ModelIterPrivate { /// \brief constructor public: IterRestIds(const Rest &_rest, diff --git a/src/ModelPrivate.hh b/src/ModelPrivate.hh index 34259a75..6c8c656b 100644 --- a/src/ModelPrivate.hh +++ b/src/ModelPrivate.hh @@ -35,7 +35,7 @@ namespace gz namespace fuel_tools { /// \brief Private class, do not use - class IGNITION_FUEL_TOOLS_VISIBLE ModelPrivate + class GZ_FUEL_TOOLS_VISIBLE ModelPrivate { /// \brief How this model is ID'd public: ModelIdentifier id; diff --git a/src/WorldIterPrivate.hh b/src/WorldIterPrivate.hh index 51f7a81f..c2f42ff8 100644 --- a/src/WorldIterPrivate.hh +++ b/src/WorldIterPrivate.hh @@ -40,7 +40,7 @@ namespace gz class WorldIter; /// \brief Private class, do not include or instantiate - class IGNITION_FUEL_TOOLS_VISIBLE WorldIterFactory + class GZ_FUEL_TOOLS_VISIBLE WorldIterFactory { /// \brief Create a world iterator from a vector of world identifiers /// \param[in] _ids World identifiers @@ -62,7 +62,7 @@ namespace gz }; /// \brief Private class, do not include or instantiate - class IGNITION_FUEL_TOOLS_VISIBLE WorldIterPrivate + class GZ_FUEL_TOOLS_VISIBLE WorldIterPrivate { /// \brief Destructor public: virtual ~WorldIterPrivate(); @@ -79,7 +79,7 @@ namespace gz }; /// \brief Class for iterating through world ids - class IGNITION_FUEL_TOOLS_VISIBLE WorldIterIds : public WorldIterPrivate + class GZ_FUEL_TOOLS_VISIBLE WorldIterIds : public WorldIterPrivate { /// \brief Constructor /// \param[in] _ids Vector of ids @@ -102,7 +102,7 @@ namespace gz }; /// \brief class for iterating through world ids from a rest API - class IGNITION_FUEL_TOOLS_VISIBLE WorldIterRestIds: public WorldIterPrivate + class GZ_FUEL_TOOLS_VISIBLE WorldIterRestIds: public WorldIterPrivate { /// \brief Constructor /// \param[in] _rest REST client diff --git a/src/ign.cc b/src/ign.cc index a6aab3f8..b5ba9d52 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -285,13 +285,13 @@ extern "C" bool getOwnerWorlds( } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE char *ignitionVersion() +extern "C" GZ_FUEL_TOOLS_VISIBLE char *ignitionVersion() { return strdup(IGNITION_FUEL_TOOLS_VERSION_FULL); } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels(const char *_url, +extern "C" GZ_FUEL_TOOLS_VISIBLE int listModels(const char *_url, const char *_owner, const char *_raw, const char *_configFile) { std::string urlStr{_url}; @@ -381,7 +381,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels(const char *_url, } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, +extern "C" GZ_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, const char *_owner, const char *_raw, const char *_configFile) { std::string urlStr{_url}; @@ -471,7 +471,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, +extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, const char *_configFile, const char *_header, const char *_type, int _jobs) { // Add signal handler for SIGTERM and SIGINT. Ctrl-C doesn't work without this @@ -655,13 +655,13 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE void cmdVerbosity(const char *_verbosity) +extern "C" GZ_FUEL_TOOLS_VISIBLE void cmdVerbosity(const char *_verbosity) { gz::common::Console::SetVerbosity(std::atoi(_verbosity)); } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, +extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, const char *_url, const char *_header, const char *_private, const char *_owner) { @@ -737,7 +737,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int deleteUrl( +extern "C" GZ_FUEL_TOOLS_VISIBLE int deleteUrl( const char *_url, const char *_header) { gz::fuel_tools::ClientConfig conf; @@ -779,7 +779,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int deleteUrl( } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) +extern "C" GZ_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) { gz::msgs::FuelMetadata meta; @@ -799,7 +799,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path) +extern "C" GZ_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path) { gz::msgs::FuelMetadata meta; @@ -823,7 +823,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path) } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( +extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( const char *_url, const char *_header, const char *_private, const char *_path) { @@ -900,7 +900,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( } ////////////////////////////////////////////////// -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int update( +extern "C" GZ_FUEL_TOOLS_VISIBLE int update( const char *_onlyModels, const char *_onlyWorlds, const char *_header) { // Add signal handler for SIGTERM and SIGINT. Ctrl-C doesn't work without this diff --git a/src/ign.hh b/src/ign.hh index 3e281309..27b5b678 100644 --- a/src/ign.hh +++ b/src/ign.hh @@ -22,11 +22,11 @@ /// \brief External hook to read the library version. /// \return C-string representing the version. Ex.: 0.1.2 -extern "C" IGNITION_FUEL_TOOLS_VISIBLE char *ignitionVersion(); +extern "C" GZ_FUEL_TOOLS_VISIBLE char *ignitionVersion(); /// \brief Set verbosity level /// \param[in] _verbosity 0 to 4 -extern "C" IGNITION_FUEL_TOOLS_VISIBLE void cmdVerbosity( +extern "C" GZ_FUEL_TOOLS_VISIBLE void cmdVerbosity( const char *_verbosity); /// \brief External hook to execute 'ign fuel list -t model' from the command @@ -36,7 +36,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE void cmdVerbosity( /// \param[in] _raw 'true' for machine readable output. /// \param[in] _configFile Path to a YAML configuration file. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels( +extern "C" GZ_FUEL_TOOLS_VISIBLE int listModels( const char *_url = nullptr, const char *_owner = "", const char *_raw = "false", const char *_configFile = nullptr); @@ -47,7 +47,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listModels( /// \param[in] _raw 'true' for machine readable output. /// \param[in] _configFile Path to a YAML configuration file. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds( +extern "C" GZ_FUEL_TOOLS_VISIBLE int listWorlds( const char *_url = nullptr, const char *_owner = "", const char *_raw = "false", const char *_configFile = nullptr); @@ -59,7 +59,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int listWorlds( /// \param[in] _type Type of resource to download from collection /// \param[in] _jobs Number of parallel jobs for downloading collections. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl( +extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl( const char *_url = nullptr, const char *_configFile = nullptr, const char *_header = nullptr, const char *_type = nullptr, int _jobs = 1); @@ -78,7 +78,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int downloadUrl( /// \param[in] _owner Upload the resource to the provided owner, or nullptr /// to upload to the account specified by the token in the header. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, +extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, const char *_url, const char *_header = nullptr, const char *_private = nullptr, const char *_owner = nullptr); @@ -92,14 +92,14 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path, /// \param[in] _url Resource URL. /// \param[in] _header An HTTP header. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int deleteUrl( +extern "C" GZ_FUEL_TOOLS_VISIBLE int deleteUrl( const char *_url, const char *_header = nullptr); /// \brief External hook to execute 'ign fuel meta --config2pbtxt path' /// from the command line. /// \param[in] _path Resource path. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt( +extern "C" GZ_FUEL_TOOLS_VISIBLE int config2Pbtxt( const char *_path = nullptr); @@ -107,7 +107,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int config2Pbtxt( /// from the command line. /// \param[in] _path Resource path. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path); +extern "C" GZ_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path); /// \brief External hook to execute 'ign fuel edit [options]' from the command /// line. @@ -122,7 +122,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path); /// public /// \param[in] _path Resource path. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( +extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( const char *_url, const char *_header = nullptr, const char *_private = nullptr, const char *_path = nullptr); @@ -133,7 +133,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int editUrl( /// \param[in] _onlyWorlds "1" to only update worlds. /// \param[in] _header An HTTP header. /// \return 1 if successful, 0 if not. -extern "C" IGNITION_FUEL_TOOLS_VISIBLE int update( +extern "C" GZ_FUEL_TOOLS_VISIBLE int update( const char *_onlyModels = nullptr, const char *_onlyWorlds = nullptr, const char *_header = nullptr); diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc index 12a0cadc..c2e7408c 100644 --- a/test/integration/deprecated_TEST.cc +++ b/test/integration/deprecated_TEST.cc @@ -28,3 +28,5 @@ TEST(Deprecated, IgnitionNamespace) { ignition::fuel_tools::Model model; } + +#undef SUPPRESS_IGNITION_HEADER_DEPRECATION From 7886d7b73eec7847bb408a685a23bfb19a0dd1c5 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 20 May 2022 00:52:05 -0700 Subject: [PATCH 13/25] Migrate more macros and test_config.h Signed-off-by: methylDragon --- .github/ci/after_make.sh | 2 +- README.md | 8 ++++---- example/configure.bat | 2 +- src/ClientConfig.cc | 4 ++-- src/ClientConfig_TEST.cc | 2 +- src/ign.cc | 16 ++++++++-------- src/ign_TEST.cc | 2 +- test/test_config.h.in | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh index b740068d..ec12f469 100644 --- a/.github/ci/after_make.sh +++ b/.github/ci/after_make.sh @@ -6,7 +6,7 @@ set -x make install # So ign-tools finds fuel-tools -export IGN_CONFIG_PATH=/usr/local/share/ignition +export GZ_CONFIG_PATH=/usr/local/share/ignition export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH # Compile example diff --git a/README.md b/README.md index b3fbb606..31b642f5 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ interacting with Ignition Fuel servers. See the [installation tutorial](https://ignitionrobotics.org/api/fuel_tools/5.0/install.html). -Make sure `IGN_CONFIG_PATH` is set to the right install location so that `ign fuel` will work. +Make sure `GZ_CONFIG_PATH` is set to the right install location so that `ign fuel` will work. Default is `/usr/local/share/ignition`. ## Examples @@ -169,10 +169,10 @@ In the event that the installation is a mix of Debian and from source, command line tools from `ign-tools` may not work correctly. A workaround for a single package is to define the environment variable -`IGN_CONFIG_PATH` to point to the location of the Ignition library installation, +`GZ_CONFIG_PATH` to point to the location of the Ignition library installation, where the YAML file for the package is found, such as ``` -export IGN_CONFIG_PATH=/usr/local/share/ignition +export GZ_CONFIG_PATH=/usr/local/share/ignition ``` However, that environment variable only takes a single path, which means if the @@ -187,7 +187,7 @@ ln -s /usr/local/share/ignition/fuel4.yaml . ln -s /usr/local/share/ignition/transport7.yaml . ln -s /usr/local/share/ignition/transportlog7.yaml . ... -export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs +export GZ_CONFIG_PATH=$HOME/.ignition/tools/configs ``` This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/8). diff --git a/example/configure.bat b/example/configure.bat index 1ecb8f38..655c5405 100644 --- a/example/configure.bat +++ b/example/configure.bat @@ -10,7 +10,7 @@ @set IGN_FUEL-TOOLS_PATH=%cd%\..\..\build\install\%build_type% cmake -G "NMake Makefiles"^ - -DCMAKE_PREFIX_PATH="%IGN_PATH_PATH%\lib\cmake\ignition-fuel-tools0;"^ + -DCMAKE_PREFIX_PATH="%GZ_PATH%\lib\cmake\ignition-fuel-tools0;"^ -DCMAKE_INSTALL_PREFIX="install"^ -DCMAKE_BUILD_TYPE=%build_type%^ .. diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 0de165a8..b57eec46 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -53,7 +53,7 @@ class gz::fuel_tools::ClientConfigPrivate this->cacheLocation = ""; this->configPath = ""; this->userAgent = - "IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL; + "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; } /// \brief A list of servers. @@ -67,7 +67,7 @@ class gz::fuel_tools::ClientConfigPrivate /// \brief Name of the user agent. public: std::string userAgent = - "IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL; + "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; }; ////////////////////////////////////////////////// diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index c5a3c7f9..b3d7fb6a 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -278,7 +278,7 @@ TEST(ClientConfig, EmptyCachePathConfiguration) TEST(ClientConfig, UserAgent) { ClientConfig config; - EXPECT_EQ("IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL, + EXPECT_EQ("IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL, config.UserAgent()); config.SetUserAgent("my_user_agent"); diff --git a/src/ign.cc b/src/ign.cc index b5ba9d52..c93b695f 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -287,7 +287,7 @@ extern "C" bool getOwnerWorlds( ////////////////////////////////////////////////// extern "C" GZ_FUEL_TOOLS_VISIBLE char *ignitionVersion() { - return strdup(IGNITION_FUEL_TOOLS_VERSION_FULL); + return strdup(GZ_FUEL_TOOLS_VERSION_FULL); } ////////////////////////////////////////////////// @@ -324,7 +324,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int listModels(const char *_url, conf.AddServer(serverConf); } - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); // Filter gz::fuel_tools::ModelIdentifier modelId; @@ -414,7 +414,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url, conf.AddServer(serverConf); } - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); // Filter gz::fuel_tools::WorldIdentifier worldId; @@ -499,7 +499,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, conf.LoadConfig(_configFile); } - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); gz::fuel_tools::FuelClient client(conf); gz::fuel_tools::ModelIdentifier model; @@ -673,7 +673,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, }); gz::fuel_tools::ClientConfig conf; - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); gz::fuel_tools::FuelClient client(conf); gz::fuel_tools::ModelIdentifier model; @@ -741,7 +741,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int deleteUrl( const char *_url, const char *_header) { gz::fuel_tools::ClientConfig conf; - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); gz::fuel_tools::FuelClient client(conf); // Store header information @@ -828,7 +828,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( const char *_path) { gz::fuel_tools::ClientConfig conf; - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); gz::fuel_tools::FuelClient client(conf); // Store header information @@ -928,7 +928,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int update( // Client gz::fuel_tools::ClientConfig conf; - conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL); + conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL); gz::fuel_tools::FuelClient client(conf); diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index 4c66791e..7b32adb7 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -47,7 +47,7 @@ std::string custom_exec_str(std::string _cmd) return result; } -auto g_version = std::string(strdup(IGNITION_FUEL_TOOLS_VERSION_FULL)); +auto g_version = std::string(strdup(GZ_FUEL_TOOLS_VERSION_FULL)); auto g_listCmd = "ign fuel list -v 4 --force-version " + g_version; diff --git a/test/test_config.h.in b/test/test_config.h.in index 44971116..5865f0f9 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -20,8 +20,8 @@ #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}" #define PROJECT_BINARY_PATH "${PROJECT_BINARY_DIR}" -#define IGNITION_FUEL_TOOLS_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src" -#define IGNITION_FUEL_TOOLS_VERSION_FULL "@PROJECT_VERSION_FULL@" +#define GZ_FUEL_TOOLS_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src" +#define GZ_FUEL_TOOLS_VERSION_FULL "@PROJECT_VERSION_FULL@" #define TEST_PATH "${PROJECT_SOURCE_DIR}/test" #include From 4ffd59e85476648d93f70a0f7cf89232f5691049 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 20 May 2022 03:41:36 -0700 Subject: [PATCH 14/25] Migrate github links Signed-off-by: methylDragon --- Changelog.md | 222 +++++++++++++++++----------------- INSTALL_WINDOWS.md | 2 +- Migration.md | 20 +-- NEWS | 2 +- README.md | 10 +- doc/header.html | 2 +- example/README.md | 2 +- src/ClientConfig_TEST.cc | 2 +- src/FuelClient_TEST.cc | 14 +-- src/Interface_TEST.cc | 2 +- src/Zip_TEST.cc | 2 +- src/ign_TEST.cc | 14 +-- src/ign_src_TEST.cc | 24 ++-- tutorials/01_installation.md | 8 +- tutorials/02_configuration.md | 12 +- tutorials/04_cpp_api.md | 24 ++-- 16 files changed, 181 insertions(+), 181 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8f2de5ae..20fb703c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,11 +7,11 @@ ### Ignition Fuel Tools 7.0.0 (2021-09-28) 1. Depend on ign-msgs8 - * [Pull request #182](https://github.com/ignitionrobotics/ign-fuel-tools/pull/182) + * [Pull request #182](https://github.com/gazebosim/gz-fuel-tools/pull/182) 1. Infrastructure - * [Pull request #184](https://github.com/ignitionrobotics/ign-fuel-tools/pull/184) - * [Pull request #181](https://github.com/ignitionrobotics/ign-fuel-tools/pull/181) + * [Pull request #184](https://github.com/gazebosim/gz-fuel-tools/pull/184) + * [Pull request #181](https://github.com/gazebosim/gz-fuel-tools/pull/181) ## Ignition Fuel Tools 6.x @@ -41,83 +41,83 @@ ### Ignition Fuel Tools 6.1.0 (2021-10-15) 1. Detect ign instead of using cmake module to check for ignition-tools - * [Pull request #191](https://github.com/ignitionrobotics/ign-fuel-tools/pull/191) + * [Pull request #191](https://github.com/gazebosim/gz-fuel-tools/pull/191) 1. Added fuel update command - * [Pull request #185](https://github.com/ignitionrobotics/ign-fuel-tools/pull/185) + * [Pull request #185](https://github.com/gazebosim/gz-fuel-tools/pull/185) 1. Fixed windows download - * [Pull request #178](https://github.com/ignitionrobotics/ign-fuel-tools/pull/178) + * [Pull request #178](https://github.com/gazebosim/gz-fuel-tools/pull/178) 1. Owner upload - * [Pull request #179](https://github.com/ignitionrobotics/ign-fuel-tools/pull/179) + * [Pull request #179](https://github.com/gazebosim/gz-fuel-tools/pull/179) 1. Infrastructure - * [Pull request #187](https://github.com/ignitionrobotics/ign-fuel-tools/pull/187) - * [Pull request #196](https://github.com/ignitionrobotics/ign-fuel-tools/pull/196) + * [Pull request #187](https://github.com/gazebosim/gz-fuel-tools/pull/187) + * [Pull request #196](https://github.com/gazebosim/gz-fuel-tools/pull/196) ### Ignition Fuel Tools 6.0.0 (2021-03-30) 1. Depend on ign-common4 - * [Pull request #163](https://github.com/ignitionrobotics/ign-fuel-tools/pull/163) + * [Pull request #163](https://github.com/gazebosim/gz-fuel-tools/pull/163) 1. Depend on ign-msgs7 - * [Pull request #158](https://github.com/ignitionrobotics/ign-fuel-tools/pull/158) + * [Pull request #158](https://github.com/gazebosim/gz-fuel-tools/pull/158) 1. Unset DELETE method on Windows - * [Pull request #161](https://github.com/ignitionrobotics/ign-fuel-tools/pull/161) + * [Pull request #161](https://github.com/gazebosim/gz-fuel-tools/pull/161) 1. Edifice deprecations - * [Pull request #159](https://github.com/ignitionrobotics/ign-fuel-tools/pull/159) + * [Pull request #159](https://github.com/gazebosim/gz-fuel-tools/pull/159) 1. Include windows instructions in examples README.md - * [Pull request #176](https://github.com/ignitionrobotics/ign-fuel-tools/pull/176) + * [Pull request #176](https://github.com/gazebosim/gz-fuel-tools/pull/176) ## Ignition Fuel Tools 5.x ### Ignition Fuel Tools 5.2.0 (2021-12-20) 1. FuelClient.cc: include `` - * [Pull request #213](https://github.com/ignitionrobotics/ign-fuel-tools/pull/213) + * [Pull request #213](https://github.com/gazebosim/gz-fuel-tools/pull/213) 1. APIs for retrieving models in parallel - * [Pull request #199](https://github.com/ignitionrobotics/ign-fuel-tools/pull/199) + * [Pull request #199](https://github.com/gazebosim/gz-fuel-tools/pull/199) 1. Detect `ign` instead of using cmake module to check for ignition-tools - * [Pull request #191](https://github.com/ignitionrobotics/ign-fuel-tools/pull/191) + * [Pull request #191](https://github.com/gazebosim/gz-fuel-tools/pull/191) 1. Added `ign fuel update` command - * [Pull request #185](https://github.com/ignitionrobotics/ign-fuel-tools/pull/185) + * [Pull request #185](https://github.com/gazebosim/gz-fuel-tools/pull/185) 1. Fixed Windows download and CI - * [Pull request #178](https://github.com/ignitionrobotics/ign-fuel-tools/pull/178) - * [Pull request #164](https://github.com/ignitionrobotics/ign-fuel-tools/pull/164) + * [Pull request #178](https://github.com/gazebosim/gz-fuel-tools/pull/178) + * [Pull request #164](https://github.com/gazebosim/gz-fuel-tools/pull/164) 1. Choose which owner to upload to - * [Pull request #179](https://github.com/ignitionrobotics/ign-fuel-tools/pull/179) + * [Pull request #179](https://github.com/gazebosim/gz-fuel-tools/pull/179) 1. Included private-token to `config.yaml` - * [Pull request #156](https://github.com/ignitionrobotics/ign-fuel-tools/pull/156) + * [Pull request #156](https://github.com/gazebosim/gz-fuel-tools/pull/156) 1. Add Windows Installation instructions - * [Pull request #162](https://github.com/ignitionrobotics/ign-fuel-tools/pull/162) + * [Pull request #162](https://github.com/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://github.com/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://github.com/gazebosim/gz-fuel-tools/pull/149) 1. Infrastructure - * [Pull request #187](https://github.com/ignitionrobotics/ign-fuel-tools/pull/187) - * [Pull request #170](https://github.com/ignitionrobotics/ign-fuel-tools/pull/170) - * [Pull request #167](https://github.com/ignitionrobotics/ign-fuel-tools/pull/167) - * [Pull request #165](https://github.com/ignitionrobotics/ign-fuel-tools/pull/165) + * [Pull request #187](https://github.com/gazebosim/gz-fuel-tools/pull/187) + * [Pull request #170](https://github.com/gazebosim/gz-fuel-tools/pull/170) + * [Pull request #167](https://github.com/gazebosim/gz-fuel-tools/pull/167) + * [Pull request #165](https://github.com/gazebosim/gz-fuel-tools/pull/165) ### Ignition Fuel Tools 5.1.1 (2020-12-18) 1. Fix light map URI in materials - * [Pull request 146](https://github.com/ignitionrobotics/ign-fuel-tools/pull/146) + * [Pull request 146](https://github.com/gazebosim/gz-fuel-tools/pull/146) ### Ignition Fuel Tools 5.1.0 (2020-12-09) @@ -126,98 +126,98 @@ ### Ignition Fuel Tools 5.0.0 (2020-09-28) 1. Added support for annotation parsing during model creation. - * [Pull request 95](https://github.com/ignitionrobotics/ign-fuel-tools/pull/95) + * [Pull request 95](https://github.com/gazebosim/gz-fuel-tools/pull/95) 1. Removed repeated installation instructions. - * [Pull request 101](https://github.com/ignitionrobotics/ign-fuel-tools/pull/101) + * [Pull request 101](https://github.com/gazebosim/gz-fuel-tools/pull/101) 1. Update codeowners. - * [Pull request 108](https://github.com/ignitionrobotics/ign-fuel-tools/pull/108) + * [Pull request 108](https://github.com/gazebosim/gz-fuel-tools/pull/108) 1. Hide Private headers and LocalCache.hh - * [Pull request 109](https://github.com/ignitionrobotics/ign-fuel-tools/pull/109) + * [Pull request 109](https://github.com/gazebosim/gz-fuel-tools/pull/109) 1. Fixed test - Download world 2 - * [Pull request 110](https://github.com/ignitionrobotics/ign-fuel-tools/pull/110) + * [Pull request 110](https://github.com/gazebosim/gz-fuel-tools/pull/110) ### Ignition Fuel Tools 4.X.X (202X-XX-XX) ### 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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/gazebosim/gz-fuel-tools/pull/65) 1. All changes up to and including Ignition Fuel Tools 3.3.0 are included. ### Ignition Fuel Tools 4.1.0 (2020-02-27) 1. Resource deletion CLI. - * [BitBucket pull request 119](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/119) + * [BitBucket pull request 119](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/119) 1. Fetch files - * [BitBucket pull request 123](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/123) + * [BitBucket pull request 123](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/123) 1. README and tutorial updates: - * [BitBucket pull request 113](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/113) - * [BitBucket pull request 114](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/114) - * [BitBucket pull request 115](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/115) + * [BitBucket pull request 113](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/113) + * [BitBucket pull request 114](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/114) + * [BitBucket pull request 115](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/115) ### Ignition Fuel Tools 4.0.0 (2019-12-10) 1. Model upload CLI, resource metadata CLI, depend on ign-msgs5. - * [BitBucket pull request 108](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/108) + * [BitBucket pull request 108](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/108) ## Ignition Fuel Tools 3.x @@ -226,84 +226,84 @@ ### 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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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://github.com/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) + * [BitBucket pull request 102](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/102) 1. Use `${YAML_TARGET}` instead of `YAML::YAML` imported target. - * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/103) + * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/103) 1. Convert emissive map file path. - * [BitBucket pull request 105](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/105) + * [BitBucket pull request 105](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/105) 1. Fix windows build with `popen` and `pclose` macros. - * [BitBucket pull request 109](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/109) + * [BitBucket pull request 109](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/109) 1. Remove std::experimental for filesystem (support for VS2019). - * [BitBucket pull request 120](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/120) + * [BitBucket pull request 120](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/120) ### Ignition Fuel Tools 3.2.1 (2019-08-12) 1. Support actors - * [BitBucket pull request 101](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/101) + * [BitBucket pull request 101](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/101) ### Ignition Fuel Tools 3.2.0 (2019-06-14) 1. FuelClient::DownloadModel accepts HTTP headers, and the `ign fuel download` command can accept a single HTTP header. - * [BitBucket pull request 100](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/100) + * [BitBucket pull request 100](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/100) ### Ignition Fuel Tools 3.1.0 (2019-05-xx) 1. Fix PBR material URI - * [BitBucket pull request 95](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/95) - * [BitBucket pull request 96](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/96) + * [BitBucket pull request 95](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/95) + * [BitBucket pull request 96](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/96) ### Ignition Fuel Tools 3.0.0 (2018-02-28) @@ -311,80 +311,80 @@ fuel-tools to use ign-cmake2, sets api.ignitionfuel.org as the default server, fixes codecheck errors, removes old deprecations, and parses model.config files using tinyxml2. - * [BitBucket pull request 82](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/82) - * [BitBucket pull request 83](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/83) - * [BitBucket pull request 84](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/84) - * [BitBucket pull request 85](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/85) - * [BitBucket pull request 87](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/87) - * [BitBucket pull request 88](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/88) - * [BitBucket pull request 89](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/89) + * [BitBucket pull request 82](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/82) + * [BitBucket pull request 83](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/83) + * [BitBucket pull request 84](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/84) + * [BitBucket pull request 85](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/85) + * [BitBucket pull request 87](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/87) + * [BitBucket pull request 88](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/88) + * [BitBucket pull request 89](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/89) ## Ignition Fuel Tools 1.x ### Ignition Fuel Tools 1.x.x (20xx-xx-xx) 1. Use `${YAML_TARGET}` instead of `YAML::YAML` imported target. - * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/103) + * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/103) ### Ignition Fuel Tools 1.2.0 (2018-05-30) 1. Get cached model resource file - * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/63) + * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/63) 1. Add some AsString functions - * [BitBucket pull request 54](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/54) + * [BitBucket pull request 54](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/54) 1. Change cache directory structure and use it - * [BitBucket pull request 57](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/57) - * [BitBucket pull request 71](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/71) - * [BitBucket pull request 73](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/73) + * [BitBucket pull request 57](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/57) + * [BitBucket pull request 71](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/71) + * [BitBucket pull request 73](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/73) 1. Client return only relevant cached models - * [BitBucket pull request 62](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/62) + * [BitBucket pull request 62](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/62) 1. Model version support - * [BitBucket pull request 65](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/65) + * [BitBucket pull request 65](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/65) 1. Remove server API version from model unique name - * [BitBucket pull request 47](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/47) + * [BitBucket pull request 47](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/47) 1. Client handle unique names and get server info from config - * [BitBucket pull request 55](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/55) + * [BitBucket pull request 55](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/55) 1. Changed model list to use headers for paging instead of iterating until a 404 is hit. Also added a mechanism to set the user agent - * [BitBucket pull request 46](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/46) - * [BitBucket pull request 61](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/61) + * [BitBucket pull request 46](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/46) + * [BitBucket pull request 61](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/61) 1. FuelClient: Don't use ServerConfig if there's ModelId - * [BitBucket pull request 56](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/56) + * [BitBucket pull request 56](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/56) 1. List models from command line - * [BitBucket pull request 43](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/43) - * [BitBucket pull request 48](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/48) - * [BitBucket pull request 44](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/44) - * [BitBucket pull request 45](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/45) + * [BitBucket pull request 43](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/43) + * [BitBucket pull request 48](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/48) + * [BitBucket pull request 44](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/44) + * [BitBucket pull request 45](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/45) 1. Get cached model resource file - * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/63) + * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/63) 1. Added const constructors for ModelIter and Model - * [BitBucket pull request 42](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/42) + * [BitBucket pull request 42](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/42) 1. Use common::URI for server URL - * [BitBucket pull request 59](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/59) + * [BitBucket pull request 59](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/59) 1. Remove server local name - * [BitBucket pull request 58](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/58) + * [BitBucket pull request 58](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/58) 1. Encode url path before downloading models - * [BitBucket pull request 41](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/41) + * [BitBucket pull request 41](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/41) 1. Download model from command line - * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/68) + * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/68) 1. Backport code style changes - * [BitBucket pull request 69](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/69) - * [BitBucket pull request 67](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/67) + * [BitBucket pull request 69](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/69) + * [BitBucket pull request 67](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/67) ### Ignition Fuel Tools 1.0.0 (2018-01-25) diff --git a/INSTALL_WINDOWS.md b/INSTALL_WINDOWS.md index 67ce29ce..cd802b04 100644 --- a/INSTALL_WINDOWS.md +++ b/INSTALL_WINDOWS.md @@ -27,7 +27,7 @@ need to [disable the Windows firewall](http://windows.microsoft.com/en-us/window 1. Clone Ignition Fuel-Tools: - git clone https://github.com/ignitionrobotics/ign-fuel-tools + git clone https://github.com/gazebosim/gz-fuel-tools cd ign-fuel-tools mkdir build diff --git a/Migration.md b/Migration.md index 70b939e2..32a56ba4 100644 --- a/Migration.md +++ b/Migration.md @@ -35,37 +35,37 @@ ### Modifications 1. Renamed the REST class to Rest. - * [BitBucket pull request #53](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/53) + * [BitBucket pull request #53](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/53) 1. All setters (functions that set class variables) have been prefixed with `Set` and existing functions deprecated. Acronyms within class and function names have been changed from all-caps (e.g URL) to camel-case (eg. Url). - * [BitBucket pull request #49](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/49) - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51) - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) + * [BitBucket pull request #49](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/49) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) 1. Deprecated `env` function. Please use `igition::common::env`. - * [BitBucket pull request #50](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/50) + * [BitBucket pull request #50](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/50) 1. Deprecated the `ModelIdentifier::Category` functions. The Category concept does not exist on fuelserver. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) 1. Deprecated the accessor `ModelIdentifier::Likes` for `ModelIdentifier::LikeCount`, and the mutator `ModelIdentifier::Likes` for `ModelIdentifier::SetLikeCount`. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) 1. Deprecated the accessor `ModelIdentifier::Downloads` for `ModelIdentifier::DownloadCount`, and the mutator `ModelIdentifier::Downloads` for `ModelIdentifier::SetDownloadCount`. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) 1. ResultTypes have moved from a plain `enum` inside the `Result` class to an `enum class ResultType` outside the `Result` class scope. - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) 1. `ResultType Result::Type() const` now returns an `enum class` instead of a plain `enum`. This should not affect you unless you have been mapping `ResultType` to an `int`. - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) ## Ignition Fuel Tools 1.2 to 1.X diff --git a/NEWS b/NEWS index d4615e07..22e35d2f 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -http://bitbucket.org/ignitionrobotics/ign-rndf \ No newline at end of file +http://bitbucket.org/gazebosim/gz-rndf \ No newline at end of file diff --git a/README.md b/README.md index 31b642f5..b540e9fd 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ **Maintainer:** nate AT openrobotics DOT org -[![GitHub open issues](https://img.shields.io/github/issues-raw/ignitionrobotics/ign-fuel-tools.svg)](https://github.com/ignitionrobotics/ign-fuel-tools/issues) -[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/ignitionrobotics/ign-fuel-tools.svg)](https://github.com/ignitionrobotics/ign-fuel-tools/pulls) +[![GitHub open issues](https://img.shields.io/github/issues-raw/gazebosim/gz-fuel-tools.svg)](https://github.com/gazebosim/gz-fuel-tools/issues) +[![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/gazebosim/gz-fuel-tools.svg)](https://github.com/gazebosim/gz-fuel-tools/pulls) [![Discourse topics](https://img.shields.io/discourse/https/community.gazebosim.org/topics.svg)](https://community.gazebosim.org) [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](https://www.apache.org/licenses/LICENSE-2.0) Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-fuel-tools) +Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools) Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-windows7-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-windows7-amd64) @@ -17,7 +17,7 @@ Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/ico Ignition Fuel Tools is composed by a client library and command line tools for interacting with Ignition Fuel servers. - [http://github.com/ignitionrobotics/ign-fuel-tools](http://github.com/ignitionrobotics/ign-fuel-tools) + [http://github.com/gazebosim/gz-fuel-tools](http://github.com/gazebosim/gz-fuel-tools) # Building and installing @@ -190,4 +190,4 @@ ln -s /usr/local/share/ignition/transportlog7.yaml . export GZ_CONFIG_PATH=$HOME/.ignition/tools/configs ``` -This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/8). +This issue is tracked [here](https://github.com/gazebosim/gz-tools/issues/8). diff --git a/doc/header.html b/doc/header.html index 7315a851..d58b024d 100644 --- a/doc/header.html +++ b/doc/header.html @@ -50,7 +50,7 @@

API Reference

launchIgnition Website + href="https://github.com/gazebosim/gz-fuel-tools/issues/new"> warningReport Issues diff --git a/example/README.md b/example/README.md index 94773d75..7867f6ca 100644 --- a/example/README.md +++ b/example/README.md @@ -22,7 +22,7 @@ conda install gflags --channel conda-forge After installing Ignition Fuel tools, from source or from binaries, build with: ``` -git clone https://github.com/ignitionrobotics/ign-fuel-tools/ +git clone https://github.com/gazebosim/gz-fuel-tools/ cd ign-fuel-tools/example mkdir build cd build diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index b3d7fb6a..6286b864 100644 --- a/src/ClientConfig_TEST.cc +++ b/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) diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index bdeeee47..e74287b1 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -398,7 +398,7 @@ TEST_F(FuelClientTest, ParseModelFileURL) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(FuelClientTest, DownloadModel) { // Configure to use binary path as cache @@ -597,7 +597,7 @@ TEST_F(FuelClientTest, DownloadModel) ///////////////////////////////////////////////// // Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 +// https://github.com/gazebosim/gz-fuel-tools/issues/106 TEST_F(FuelClientTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelDependencies)) { // Configure to use binary path as cache @@ -671,7 +671,7 @@ TEST_F(FuelClientTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelDependencies)) ///////////////////////////////////////////////// // Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 +// https://github.com/gazebosim/gz-fuel-tools/issues/106 TEST_F(FuelClientTest, CachedModel) { // Configure to use binary path as cache and populate it @@ -1062,7 +1062,7 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) ////////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(FuelClientTest, DownloadWorld) { // Configure to use binary path as cache @@ -1140,7 +1140,7 @@ TEST_F(FuelClientTest, DownloadWorld) ///////////////////////////////////////////////// // Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 +// https://github.com/gazebosim/gz-fuel-tools/issues/106 TEST_F(FuelClientTest, CachedWorld) { // Configure to use binary path as cache and populate it @@ -1330,7 +1330,7 @@ TEST_F(FuelClientTest, WorldDetails) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(FuelClientTest, Models) { ClientConfig config; @@ -1364,7 +1364,7 @@ TEST_F(FuelClientTest, Models) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(FuelClientTest, Worlds) { ClientConfig config; diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index d820afee..39a83e7e 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -38,7 +38,7 @@ using namespace gz::fuel_tools; ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST(Interface, FetchResources) { common::Console::SetVerbosity(4); diff --git a/src/Zip_TEST.cc b/src/Zip_TEST.cc index 3b471c0f..52635899 100644 --- a/src/Zip_TEST.cc +++ b/src/Zip_TEST.cc @@ -16,7 +16,7 @@ */ // All these helper functions have been copied from -// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc +// https://github.com/gazebosim/gz-common/raw/ign-common3/src/Filesystem_TEST.cc #ifndef _WIN32 #include diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index 7b32adb7..b2dcbb92 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -52,7 +52,7 @@ auto g_version = std::string(strdup(GZ_FUEL_TOOLS_VERSION_FULL)); auto g_listCmd = "ign fuel list -v 4 --force-version " + g_version; ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Versions)) { auto output = custom_exec_str("ign fuel --versions"); @@ -60,7 +60,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Versions)) } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Help)) { auto output = custom_exec_str("ign fuel --force-version " + g_version + @@ -75,7 +75,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Help)) } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ListFail)) { auto output = custom_exec_str(g_listCmd); @@ -94,7 +94,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ListFail)) } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListConfigServerUgly)) { @@ -105,7 +105,7 @@ TEST(CmdLine, } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListCustomServerPretty)) { @@ -124,7 +124,7 @@ TEST(CmdLine, } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListConfigServerUgly)) { auto output = custom_exec_str(g_listCmd + @@ -135,7 +135,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListConfigServerUgly)) } ///////////////////////////////////////////////// -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113 +// https://github.com/gazebosim/gz-fuel-tools/issues/113 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListCustomServerPretty)) { diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 97fb914d..841cb373 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -90,7 +90,7 @@ TEST_F(CmdLine, ModelListFail) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelListConfigServerUgly) { EXPECT_TRUE(listModels("", "", "true")); @@ -103,7 +103,7 @@ TEST_F(CmdLine, ModelListConfigServerUgly) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelListConfigServerPretty) { EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org")); @@ -125,7 +125,7 @@ TEST_F(CmdLine, ModelListConfigServerPretty) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelListConfigServerPrettyOwner) { EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org", @@ -173,7 +173,7 @@ TEST_F(CmdLine, ModelDownloadWrongUrl) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelDownloadUnversioned) { // Download @@ -199,7 +199,7 @@ TEST_F(CmdLine, ModelDownloadUnversioned) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, DownloadConfigCache) { unsetenv("IGN_FUEL_CACHE_PATH"); @@ -251,7 +251,7 @@ TEST_F(CmdLine, WorldListFail) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, WorldListConfigServerUgly) { EXPECT_TRUE(listWorlds( @@ -266,7 +266,7 @@ TEST_F(CmdLine, WorldListConfigServerUgly) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, WorldListConfigServerPretty) { EXPECT_TRUE(listWorlds("https://staging-fuel.gazebosim.org")); @@ -311,7 +311,7 @@ TEST_F(CmdLine, WorldListCustomServerPrettyOwner) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, WorldDownloadBadUrl) { EXPECT_FALSE(downloadUrl("fake_url")); @@ -334,7 +334,7 @@ TEST_F(CmdLine, WorldDownloadWrongUrl) ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, WorldDownloadUnversioned) { // Download @@ -368,7 +368,7 @@ INSTANTIATE_TEST_CASE_P(CollectionTest, DownloadCollectionTest, ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_P(DownloadCollectionTest, AllItems) { // Download @@ -431,7 +431,7 @@ TEST_P(DownloadCollectionTest, AllItems) ///////////////////////////////////////////////// /// Download only models // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_P(DownloadCollectionTest, Models) { // Download @@ -482,7 +482,7 @@ TEST_P(DownloadCollectionTest, Models) ///////////////////////////////////////////////// /// Download only worlds // Protocol "https" not supported or disabled in libcurl for Windows -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105 +// https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_P(DownloadCollectionTest, Worlds) { // Download diff --git a/tutorials/01_installation.md b/tutorials/01_installation.md index e86a2b68..0307d3fe 100644 --- a/tutorials/01_installation.md +++ b/tutorials/01_installation.md @@ -96,7 +96,7 @@ sudo apt-get install git cmake pkg-config python ruby-ronn libignition-cmake3-de Clone the repository into a directory and go into it: ``` -git clone https://github.com/ignitionrobotics/ign-fuel-tools /tmp/ign-fuel-tools +git clone https://github.com/gazebosim/gz-fuel-tools /tmp/ign-fuel-tools cd /tmp/ign-fuel-tools ``` @@ -168,7 +168,7 @@ sudo make uninstall 1. Clone the repository ``` - git clone https://github.com/ignitionrobotics/ign-fuel-tools -b ign-fuel-tools<#> + git clone https://github.com/gazebosim/gz-fuel-tools -b ign-fuel-tools<#> ``` Be sure to replace `<#>` with a number value, such as 1 or 2, depending on which version you need. @@ -193,7 +193,7 @@ sudo make uninstall #### Prerequisites -First, follow the [ign-cmake](https://github.com/ignitionrobotics/ign-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. +First, follow the [ign-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. Navigate to ``condabin`` if necessary to use the ``conda`` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of ``condabin`` in Anaconda Prompt, ``where conda``). @@ -230,7 +230,7 @@ conda install libignition-cmake<#> libignition-common<#> libignition-msgs<#> lib 2. Navigate to where you would like to build the library, and clone the repository. ``` # Optionally, append `-b ign-fuel-tools#` (replace # with a number) to check out a specific version - git clone https://github.com/ignitionrobotics/ign-fuel-tools.git + git clone https://github.com/gazebosim/gz-fuel-tools.git ``` 3. Configure and build diff --git a/tutorials/02_configuration.md b/tutorials/02_configuration.md index d30ef590..829adc3c 100644 --- a/tutorials/02_configuration.md +++ b/tutorials/02_configuration.md @@ -65,26 +65,26 @@ Download the file `download.cc` and save it under `/tmp/conf_tutorial`: ```bash # Ubuntu and MacOS -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc # Windows ## CMD -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc -o download.cc +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc -o download.cc ## PowerShell -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc -o download.cc +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc -o download.cc ``` Also, download `CMakeLists.txt` for compiling the example: ```bash # Ubuntu and MacOS -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt # Windows ## CMD -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt ## PowerShell -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt ``` Install a dependency: diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 8f1d1506..3df81883 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -18,22 +18,22 @@ Download the files `list.cc`, `details.cc`, `download.cc`, ```bash # Ubuntu or MacOS -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/list.cc -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/details.cc -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc -wget https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/list.cc +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/details.cc +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc +wget https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt # Windows ## CMD -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/list.cc -o list.cc -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/details.cc -o details.cc -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc -o download.cc -curl -sk https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/list.cc -o list.cc +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/details.cc -o details.cc +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc -o download.cc +curl -sk https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt ## PowerShell -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/list.cc -o list.cc -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/details.cc -o details.cc -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/download.cc -o download.cc -curl https://github.com/ignitionrobotics/ign-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/list.cc -o list.cc +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/details.cc -o details.cc +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/download.cc -o download.cc +curl https://github.com/gazebosim/gz-fuel-tools/raw/main/example/CMakeLists.txt -o CMakeLists.txt ``` Let's start by compiling the examples: From aff111e29a9117f55aab8e2dc218c2df758e304e Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 20 May 2022 04:15:37 -0700 Subject: [PATCH 15/25] Migrate user-facing Ignition to Gazebo Signed-off-by: methylDragon --- CONTRIBUTING.md | 2 +- Changelog.md | 66 ++++++++++++++--------------- INSTALL_WINDOWS.md | 4 +- Migration.md | 14 +++--- README.md | 6 +-- api.md.in | 2 +- doc/header.html | 2 +- doc/ignition.in | 4 +- doc/tutorials.in | 4 +- example/CMakeLists.txt | 2 +- example/README.md | 4 +- include/gz/fuel_tools/FuelClient.hh | 6 +-- src/FuelClient.cc | 10 ++--- src/cmd/cmdfuel.rb.in | 4 +- tutorials/01_installation.md | 20 ++++----- tutorials/02_configuration.md | 6 +-- tutorials/04_cpp_api.md | 4 +- tutorials/index.md | 10 ++--- 18 files changed, 85 insertions(+), 85 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 147239ce..606c4a55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). diff --git a/Changelog.md b/Changelog.md index 20fb703c..cce0c3df 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,10 +1,10 @@ -## Ignition Fuel Tools 8.x +## Gazebo Fuel Tools 8.x -### Ignition Fuel Tools 8.0.0 (202X-XX-XX) +### Gazebo Fuel Tools 8.0.0 (202X-XX-XX) -## Ignition Fuel Tools 7.x +## Gazebo Fuel Tools 7.x -### Ignition Fuel Tools 7.0.0 (2021-09-28) +### Gazebo Fuel Tools 7.0.0 (2021-09-28) 1. Depend on ign-msgs8 * [Pull request #182](https://github.com/gazebosim/gz-fuel-tools/pull/182) @@ -13,7 +13,7 @@ * [Pull request #184](https://github.com/gazebosim/gz-fuel-tools/pull/184) * [Pull request #181](https://github.com/gazebosim/gz-fuel-tools/pull/181) -## Ignition Fuel Tools 6.x +## Gazebo Fuel Tools 6.x ### Ignition Fuel Tools 6.2.0 (2022-03-25) @@ -56,7 +56,7 @@ * [Pull request #187](https://github.com/gazebosim/gz-fuel-tools/pull/187) * [Pull request #196](https://github.com/gazebosim/gz-fuel-tools/pull/196) -### Ignition Fuel Tools 6.0.0 (2021-03-30) +### Gazebo Fuel Tools 6.0.0 (2021-03-30) 1. Depend on ign-common4 * [Pull request #163](https://github.com/gazebosim/gz-fuel-tools/pull/163) @@ -73,9 +73,9 @@ 1. Include windows instructions in examples README.md * [Pull request #176](https://github.com/gazebosim/gz-fuel-tools/pull/176) -## Ignition Fuel Tools 5.x +## Gazebo Fuel Tools 5.x -### Ignition Fuel Tools 5.2.0 (2021-12-20) +### Gazebo Fuel Tools 5.2.0 (2021-12-20) 1. FuelClient.cc: include `` * [Pull request #213](https://github.com/gazebosim/gz-fuel-tools/pull/213) @@ -114,16 +114,16 @@ * [Pull request #167](https://github.com/gazebosim/gz-fuel-tools/pull/167) * [Pull request #165](https://github.com/gazebosim/gz-fuel-tools/pull/165) -### Ignition Fuel Tools 5.1.1 (2020-12-18) +### Gazebo Fuel Tools 5.1.1 (2020-12-18) 1. Fix light map URI in materials * [Pull request 146](https://github.com/gazebosim/gz-fuel-tools/pull/146) -### Ignition Fuel Tools 5.1.0 (2020-12-09) +### Gazebo Fuel Tools 5.1.0 (2020-12-09) 1. Includes all changes up to version 4.3.0. -### Ignition Fuel Tools 5.0.0 (2020-09-28) +### Gazebo Fuel Tools 5.0.0 (2020-09-28) 1. Added support for annotation parsing during model creation. * [Pull request 95](https://github.com/gazebosim/gz-fuel-tools/pull/95) @@ -140,9 +140,9 @@ 1. Fixed test - Download world 2 * [Pull request 110](https://github.com/gazebosim/gz-fuel-tools/pull/110) -### Ignition Fuel Tools 4.X.X (202X-XX-XX) +### Gazebo Fuel Tools 4.X.X (202X-XX-XX) -### Ignition Fuel Tools 4.4.0 (2021-06-17) +### Gazebo Fuel Tools 4.4.0 (2021-06-17) 1. Remove `tools/code_check` and update codecov * [Pull request #187](https://github.com/gazebosim/gz-fuel-tools/pull/187) @@ -171,7 +171,7 @@ 1. Set keep alive on * [Pull request #141](https://github.com/gazebosim/gz-fuel-tools/pull/141) -### Ignition Fuel Tools 4.3.0 (2020-12-01) +### Gazebo Fuel Tools 4.3.0 (2020-12-01) 1. Improve fork experience. * [Pull request 126](https://github.com/gazebosim/gz-fuel-tools/pull/126) @@ -181,12 +181,12 @@ 1. Includes all changes up to version 3.5.0. -### Ignition Fuel Tools 4.2.1 (2020-08-26) +### Gazebo 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/gazebosim/gz-fuel-tools/pull/116) -### Ignition Fuel Tools 4.2.0 (2020-08-26) +### Gazebo 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. @@ -199,9 +199,9 @@ 1. Alphabetical listing of subcommands. * [Pull request 65](https://github.com/gazebosim/gz-fuel-tools/pull/65) -1. All changes up to and including Ignition Fuel Tools 3.3.0 are included. +1. All changes up to and including Gazebo Fuel Tools 3.3.0 are included. -### Ignition Fuel Tools 4.1.0 (2020-02-27) +### Gazebo Fuel Tools 4.1.0 (2020-02-27) 1. Resource deletion CLI. * [BitBucket pull request 119](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/119) @@ -214,16 +214,16 @@ * [BitBucket pull request 114](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/114) * [BitBucket pull request 115](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/115) -### Ignition Fuel Tools 4.0.0 (2019-12-10) +### Gazebo Fuel Tools 4.0.0 (2019-12-10) 1. Model upload CLI, resource metadata CLI, depend on ign-msgs5. * [BitBucket pull request 108](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/108) -## Ignition Fuel Tools 3.x +## Gazebo Fuel Tools 3.x -### Ignition Fuel Tools 3.x.x (20xx-xx-xx) +### Gazebo Fuel Tools 3.x.x (20xx-xx-xx) -### Ignition Fuel Tools 3.5.0 (2020-11-30) +### Gazebo Fuel Tools 3.5.0 (2020-11-30) 1. Fix windows build. * [Pull request 107](https://github.com/gazebosim/gz-fuel-tools/pull/107) @@ -237,7 +237,7 @@ 1. Use lowercase resource and owner names when storing assets on disk. * [Pull request 130](https://github.com/gazebosim/gz-fuel-tools/pull/130) -### Ignition Fuel Tools 3.4.0 (2020-08-19) +### Gazebo Fuel Tools 3.4.0 (2020-08-19) 1. Modernize github actions by updating to the new style. * [Pull request 94](https://github.com/gazebosim/gz-fuel-tools/pull/94) @@ -251,7 +251,7 @@ 1. Fix windows build.t * [Pull request 103](https://github.com/gazebosim/gz-fuel-tools/pull/013) -### Ignition Fuel Tools 3.3.0 (2020-07-29) +### Gazebo Fuel Tools 3.3.0 (2020-07-29) 1. openrobotics to OpenRobotics * [Pull request 75](https://github.com/gazebosim/gz-fuel-tools/pull/75) @@ -268,7 +268,7 @@ 1. Convert model:// to Fuel URLs instead of absolute paths * [Pull request 85](https://github.com/gazebosim/gz-fuel-tools/pull/85) -### Ignition Fuel Tools 3.2.2 (2020-05-18) +### Gazebo Fuel Tools 3.2.2 (2020-05-18) 1. Fix URL encodings in RestClient. * [Pull request 70](https://github.com/gazebosim/gz-fuel-tools/pull/70) @@ -288,24 +288,24 @@ 1. Remove std::experimental for filesystem (support for VS2019). * [BitBucket pull request 120](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/120) -### Ignition Fuel Tools 3.2.1 (2019-08-12) +### Gazebo Fuel Tools 3.2.1 (2019-08-12) 1. Support actors * [BitBucket pull request 101](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/101) -### Ignition Fuel Tools 3.2.0 (2019-06-14) +### Gazebo Fuel Tools 3.2.0 (2019-06-14) 1. FuelClient::DownloadModel accepts HTTP headers, and the `ign fuel download` command can accept a single HTTP header. * [BitBucket pull request 100](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/100) -### Ignition Fuel Tools 3.1.0 (2019-05-xx) +### Gazebo Fuel Tools 3.1.0 (2019-05-xx) 1. Fix PBR material URI * [BitBucket pull request 95](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/95) * [BitBucket pull request 96](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/96) -### Ignition Fuel Tools 3.0.0 (2018-02-28) +### Gazebo Fuel Tools 3.0.0 (2018-02-28) 1. Integration with ign-gazebo. The following set of pull requests update fuel-tools to use ign-cmake2, sets api.ignitionfuel.org as the default @@ -319,14 +319,14 @@ * [BitBucket pull request 88](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/88) * [BitBucket pull request 89](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/89) -## Ignition Fuel Tools 1.x +## Gazebo Fuel Tools 1.x -### Ignition Fuel Tools 1.x.x (20xx-xx-xx) +### Gazebo Fuel Tools 1.x.x (20xx-xx-xx) 1. Use `${YAML_TARGET}` instead of `YAML::YAML` imported target. * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/103) -### Ignition Fuel Tools 1.2.0 (2018-05-30) +### Gazebo Fuel Tools 1.2.0 (2018-05-30) 1. Get cached model resource file * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/63) @@ -387,4 +387,4 @@ * [BitBucket pull request 69](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/69) * [BitBucket pull request 67](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/67) -### Ignition Fuel Tools 1.0.0 (2018-01-25) +### Gazebo Fuel Tools 1.0.0 (2018-01-25) diff --git a/INSTALL_WINDOWS.md b/INSTALL_WINDOWS.md index cd802b04..ef6bfb53 100644 --- a/INSTALL_WINDOWS.md +++ b/INSTALL_WINDOWS.md @@ -25,7 +25,7 @@ need to [disable the Windows firewall](http://windows.microsoft.com/en-us/window "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 -1. Clone Ignition Fuel-Tools: +1. Clone Gazebo Fuel-Tools: git clone https://github.com/gazebosim/gz-fuel-tools cd ign-fuel-tools @@ -38,7 +38,7 @@ need to [disable the Windows firewall](http://windows.microsoft.com/en-us/window nmake install - You should now have an installation of Ignition Fuel-Tools in ign-ws/ign-fuel-tools/build/install. + You should now have an installation of Gazebo Fuel-Tools in ign-ws/ign-fuel-tools/build/install. ## Run tests diff --git a/Migration.md b/Migration.md index 32a56ba4..219dd931 100644 --- a/Migration.md +++ b/Migration.md @@ -1,4 +1,4 @@ -## Ignition Fuel Tools 7.X to 8.X +## Gazebo Fuel Tools 7.X to 8.X ### Deprecations @@ -7,7 +7,7 @@ * **Deprecation**: `ignition/...` headers * **Replacement**: `gz/...` headers -## Ignition Fuel Tools 5.X to 6.X +## Gazebo Fuel Tools 5.X to 6.X ### Deprecations @@ -16,21 +16,21 @@ * **Deprecation**: `FuelClient` constructor that takes `LocalCache` * **Replacement**: `FuelClient` constructor without `LocalCache` -## Ignition Fuel Tools 4.X to 5.X +## Gazebo Fuel Tools 4.X to 5.X ### Deprecations * **Deprecation**: `LocalCache` * **Replacement**: None -## Ignition Fuel Tools 3.X to 4.X +## Gazebo Fuel Tools 3.X to 4.X ### Modifications 1. `FuelClient::UploadModel` takes 2 more arguments now. 1. `RestClient::Request`'s `_form` argument is now an `std::multimap` instead of `std::map`. -## Ignition Fuel Tools 1.X to 2.X +## Gazebo Fuel Tools 1.X to 2.X ### Modifications @@ -67,13 +67,13 @@ been mapping `ResultType` to an `int`. * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) -## Ignition Fuel Tools 1.2 to 1.X +## Gazebo Fuel Tools 1.2 to 1.X ### Modifications -## Ignition Fuel Tools 1.0 to 1.2 +## Gazebo Fuel Tools 1.0 to 1.2 ### Modifications diff --git a/README.md b/README.md index b540e9fd..98532cdd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Ignition Fuel Tools: Classes and tools for interacting with Ignition Fuel +# Gazebo Fuel Tools: Classes and tools for interacting with Gazebo Fuel **Maintainer:** nate AT openrobotics DOT org @@ -14,8 +14,8 @@ Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_fuel-tools-ci-main-windows7-amd64)](https://build.osrfoundation.org/job/ignition_fuel-tools-ci-main-windows7-amd64) -Ignition Fuel Tools is composed by a client library and command line tools for -interacting with Ignition Fuel servers. +Gazebo Fuel Tools is composed by a client library and command line tools for +interacting with Gazebo Fuel servers. [http://github.com/gazebosim/gz-fuel-tools](http://github.com/gazebosim/gz-fuel-tools) diff --git a/api.md.in b/api.md.in index d25ca916..4201e054 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ ## Ignition @IGN_DESIGNATION_CAP@ -Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries +Ignition @IGN_DESIGNATION_CAP@ is a component in Gazebo Robotics, a set of libraries designed to rapidly develop robot and simulation applications. ## License diff --git a/doc/header.html b/doc/header.html index d58b024d..e7f54c25 100644 --- a/doc/header.html +++ b/doc/header.html @@ -48,7 +48,7 @@

API Reference

launchIgnition Website + role="presentation">launchGazebo Website &_id, std::vector &_dependencies); - /// \brief Download a world from Ignition Fuel. This will override an + /// \brief Download a world from Gazebo Fuel. This will override an /// existing local copy of the world. /// \param[out] _id The world identifier, with local path updated. /// \return Result of the download operation public: Result DownloadWorld(WorldIdentifier &_id); - /// \brief Download a world from Ignition Fuel. This will override an + /// \brief Download a world from Gazebo Fuel. This will override an /// existing local copy of the world. /// \param[out] _id The world identifier, with local path updated. /// \param[in] _headers Headers to set on the HTTP request. diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 5e06c426..4120cbf2 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -207,19 +207,19 @@ class gz::fuel_tools::FuelClientPrivate /// \brief Local Cache public: std::shared_ptr cache; - /// \brief Regex to parse Ignition Fuel model URLs. + /// \brief Regex to parse Gazebo Fuel model URLs. public: std::unique_ptr urlModelRegex; - /// \brief Regex to parse Ignition Fuel world URLs. + /// \brief Regex to parse Gazebo Fuel world URLs. public: std::unique_ptr urlWorldRegex; - /// \brief Regex to parse Ignition Fuel model file URLs. + /// \brief Regex to parse Gazebo Fuel model file URLs. public: std::unique_ptr urlModelFileRegex; - /// \brief Regex to parse Ignition Fuel world file URLs. + /// \brief Regex to parse Gazebo Fuel world file URLs. public: std::unique_ptr urlWorldFileRegex; - /// \brief Regex to parse Ignition Fuel Collection URLs. + /// \brief Regex to parse Gazebo Fuel Collection URLs. public: std::unique_ptr urlCollectionRegex; /// \brief The set of licenses where the key is the name of the license diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in index 60d118a6..caeece60 100755 --- a/src/cmd/cmdfuel.rb.in +++ b/src/cmd/cmdfuel.rb.in @@ -45,7 +45,7 @@ COMMON_OPTIONS = " The following information is in regards to user authentication via \n"\ " the --header command line option. \n"\ " \n"\ - " Two types of credentials are supported on Ignition Fuel, Private \n"\ + " Two types of credentials are supported on Gazebo Fuel, Private \n"\ " Token and JSON Web Token(JWT). The Private Token method is prefered. \n"\ " Private tokens can be created through your user settings on \n"\ " https://app.ignitionrobotics.org. Example usage: \n"\ @@ -188,7 +188,7 @@ SUBCOMMANDS = { } # -# Class for the Ignition Fuel command line tools. +# Class for the Gazebo Fuel command line tools. # class Cmd diff --git a/tutorials/01_installation.md b/tutorials/01_installation.md index 0307d3fe..27a23cdf 100644 --- a/tutorials/01_installation.md +++ b/tutorials/01_installation.md @@ -4,7 +4,7 @@ Next Tutorial: \ref configuration ## Overview -Instructions to install Ignition Fuel Tools on all the platforms supported. +Instructions to install Gazebo Fuel Tools on all the platforms supported. ## Binary Install @@ -21,7 +21,7 @@ Setup keys: wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - ``` -Install Ignition Fuel Tools: +Install Gazebo Fuel Tools: ``` sudo apt-get update sudo apt-get install libignition-fuel-tools<#>-dev @@ -32,9 +32,9 @@ which version you need. ### Mac OS X -Ignition Fuel Tools and several of its dependencies can be compiled on OS +Gazebo Fuel Tools and several of its dependencies can be compiled on OS X with [Homebrew](http://brew.sh/) using the [osrf/simulation -tap](https://github.com/osrf/homebrew-simulation). Ignition Fuel Tools can +tap](https://github.com/osrf/homebrew-simulation). Gazebo Fuel Tools can be installed on Mac OS X 10.11 (El Capitan) or higher. Installation on older versions requires changing the default standard library and rebuilding dependencies due to the use of c++11. For @@ -77,7 +77,7 @@ which version you need. ### Ubuntu Linux -For compiling the latest version of Ignition Fuel Tools you will need an +For compiling the latest version of Gazebo Fuel Tools you will need an Ubuntu distribution equal to 16.04 (Xenial) or newer. Make sure you have removed the Ubuntu pre-compiled binaries before @@ -107,7 +107,7 @@ mkdir build cd build ``` -Configure Ignition Fuel Tools (choose either method a or b below): +Configure Gazebo Fuel Tools (choose either method a or b below): * A. Release mode: This will generate optimized code, but will not have debug symbols. Use this mode if you don't need to use GDB. ``` @@ -120,7 +120,7 @@ Configure Ignition Fuel Tools (choose either method a or b below): cmake -DCMAKE_INSTALL_PREFIX=/home/$USER/local ../ ``` -* B. Debug mode: This will generate code with debug symbols. Ignition Fuel Tools will run slower, but you'll be able to use GDB. +* B. Debug mode: This will generate code with debug symbols. Gazebo Fuel Tools will run slower, but you'll be able to use GDB. ``` cmake -DCMAKE_BUILD_TYPE=Debug ../ ``` @@ -137,12 +137,12 @@ look something like: -- Install prefix: /home/$USER/local ``` -Build Ignition Fuel Tools: +Build Gazebo Fuel Tools: ``` make -j4 ``` -Install Ignition Fuel Tools: +Install Gazebo Fuel Tools: ``` sudo make install ``` @@ -155,7 +155,7 @@ echo "export LD_LIBRARY_PATH=/local/lib:$LD_LIBRARY_PATH" >> ~/.ba #### Uninstalling Source Install -If you need to uninstall Ignition Fuel Tools or switch back to a +If you need to uninstall Gazebo Fuel Tools or switch back to a Debian-based install when you currently have installed the library from source, navigate to your source code directory's build folders and run `make uninstall`: diff --git a/tutorials/02_configuration.md b/tutorials/02_configuration.md index 829adc3c..b7eaea94 100644 --- a/tutorials/02_configuration.md +++ b/tutorials/02_configuration.md @@ -4,11 +4,11 @@ Next Tutorial: \ref cmdline ## Overview -Some aspects of Ignition Fuel Tools can be configured according to the needs of +Some aspects of Gazebo Fuel Tools can be configured according to the needs of the library users. This configuration can be done via a YAML configuration file or programatically. -Ignition Fuel Tools accepts a YAML file with the following syntax: +Gazebo Fuel Tools accepts a YAML file with the following syntax: ```yaml --- @@ -36,7 +36,7 @@ downloaded. If not used, all assets are stored under `$HOME/.ignition/fuel`. ## Custom configuration file path -Ignition Fuel's default configuration file is stored under +Gazebo Fuel's default configuration file is stored under `$HOME/.ignition/fuel/config.yaml`, but it is possible to load a configuration file from a custom path programmatically. Let's see how. diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 3df81883..773ec13d 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -2,8 +2,8 @@ ## Overview -Ignition Fuel Tools lets you perform a set of operations over the resources -hosted in any Ignition Fuel server. These operations allow you to list all +Gazebo Fuel Tools lets you perform a set of operations over the resources +hosted in any Gazebo Fuel server. These operations allow you to list all resources of a particular server, get the details of a resource or download it. We're going to run a few examples, so let's start by creating a directory for diff --git a/tutorials/index.md b/tutorials/index.md index ae10209d..e1d3ce96 100644 --- a/tutorials/index.md +++ b/tutorials/index.md @@ -1,18 +1,18 @@ # Introduction -Ignition Fuel Tools provides both a command line tool and a C++ API which allow -interacting with Ignition Fuel web servers such as +Gazebo Fuel Tools provides both a command line tool and a C++ API which allow +interacting with Gazebo Fuel web servers such as [https://app.ignitionrobotics.org](https://app.ignitionrobotics.org) and their hosted simulation resources. ## Simulation resources -The Ignition Fuel web server hosts several resource types relevant to robotics +The Gazebo Fuel web server hosts several resource types relevant to robotics simulation, such as models and worlds. ### Models -A common asset stored in an Ignition Fuel server is a model. A model represents +A common asset stored in an Gazebo Fuel server is a model. A model represents an object in simulation. A model has a name and a description of its visual and physical properties. Models can be as simple as a sphere or complicated as a highly articulated humanoid robot. See the full model specification @@ -20,7 +20,7 @@ highly articulated humanoid robot. See the full model specification ### Worlds -Among the resources hosted at Ignition Fuel there are "worlds", which describe a +Among the resources hosted at Gazebo Fuel there are "worlds", which describe a everything inside a simulation, from the robots to the scene properties, lights, physics properties, etc. You can see the full world description here. From b35d6d3af84018db65802803afe052721019f58f Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 20 May 2022 05:40:53 -0700 Subject: [PATCH 16/25] Migrate gz-common logging calls Signed-off-by: methylDragon --- src/ClientConfig.cc | 24 ++++++------ src/FuelClient.cc | 92 ++++++++++++++++++++++----------------------- src/JSONParser.cc | 28 +++++++------- src/LocalCache.cc | 34 ++++++++--------- src/RestClient.cc | 8 ++-- src/Zip.cc | 28 +++++++------- src/ign.cc | 22 +++++------ 7 files changed, 118 insertions(+), 118 deletions(-) diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index b57eec46..96ec73bf 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -206,7 +206,7 @@ ClientConfig::ClientConfig() : dataPtr(new ClientConfigPrivate) { if (!gz::common::isDirectory(ignFuelPath)) { - ignerr << "[" << ignFuelPath << "] is not a directory" << std::endl; + gzerr << "[" << ignFuelPath << "] is not a directory" << std::endl; return; } this->SetCacheLocation(ignFuelPath); @@ -245,7 +245,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) // Sanity check: Verify that the configuration file exists. if (!gz::common::exists(_file)) { - ignerr << "Unable to find configuration file [" << _file<< "]" << std::endl; + gzerr << "Unable to find configuration file [" << _file<< "]" << std::endl; return false; } @@ -253,7 +253,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) FILE *fh = fopen(_file.c_str(), "r"); if (!fh) { - ignerr << "Failed to open configuration file [" + gzerr << "Failed to open configuration file [" << _file << "]" << std::endl; return false; } @@ -264,7 +264,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) yaml_parser_t parser; if (!yaml_parser_initialize(&parser)) { - ignerr << "Failed to initialize YAML parser" << std::endl; + gzerr << "Failed to initialize YAML parser" << std::endl; fclose(fh); return false; } @@ -284,7 +284,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) { if (!yaml_parser_parse(&parser, &event)) { - ignerr << "Parser error [" << parser.error << "]" << std::endl; + gzerr << "Parser error [" << parser.error << "]" << std::endl; res = false; break; } @@ -316,7 +316,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) { if (cacheLocationConfig.empty()) { - ignerr << "[path] parameter is required for a cache" << std::endl; + gzerr << "[path] parameter is required for a cache" << std::endl; res = false; } } @@ -332,11 +332,11 @@ bool ClientConfig::LoadConfig(const std::string &_file) { if (!privateToken.empty()) { - ignmsg << "Set private token for " << serverURL << " server." + gzmsg << "Set private token for " << serverURL << " server." << std::endl; savedServer.SetApiKey(privateToken); } - ignwarn << "URL [" << serverURL << "] already exists. " + gzwarn << "URL [" << serverURL << "] already exists. " << "Ignoring server" << std::endl; repeated = true; break; @@ -349,7 +349,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) newServer.SetUrl(common::URI(serverURL)); if (!privateToken.empty()) { - ignmsg << "Set private token for " << serverURL << " server." + gzmsg << "Set private token for " << serverURL << " server." << std::endl; newServer.SetApiKey(privateToken); } @@ -358,7 +358,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) } else { - ignerr << "[url] parameter is required for a server" + gzerr << "[url] parameter is required for a server" << std::endl; res = false; } @@ -403,7 +403,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) break; default: { - ignerr << "Unknown event type [" << event.type << "]" << std::endl; + gzerr << "Unknown event type [" << event.type << "]" << std::endl; res = false; } } @@ -426,7 +426,7 @@ bool ClientConfig::LoadConfig(const std::string &_file) std::string ignFuelPath = ""; if (gz::common::env("IGN_FUEL_CACHE_PATH", ignFuelPath)) { - ignwarn << "IGN_FUEL_CACHE_PATH is set to [" << ignFuelPath << "]. The " + gzwarn << "IGN_FUEL_CACHE_PATH is set to [" << ignFuelPath << "]. The " << "path in the configuration file will be ignored" << std::endl; cacheLocation = ignFuelPath; } diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 4120cbf2..06ea618a 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -314,7 +314,7 @@ ModelIter FuelClient::Models(const ServerConfig &_server) const if (!iter) { // Return just the cached models - ignwarn << "Failed to fetch models from server, returning cached models." + gzwarn << "Failed to fetch models from server, returning cached models." << std::endl << _server.AsString() << std::endl; ModelIdentifier id; @@ -372,7 +372,7 @@ WorldIter FuelClient::Worlds(const ServerConfig &_server) const if (!iter) { // Return just the cached worlds - ignwarn << "Failed to fetch worlds from server, returning cached worlds." + gzwarn << "Failed to fetch worlds from server, returning cached worlds." << std::endl << _server.AsString() << std::endl; WorldIdentifier id; @@ -408,7 +408,7 @@ ModelIter FuelClient::Models(const ModelIdentifier &_id) const if (path.Str().empty()) return localIter; - ignmsg << _id.UniqueName() << " not found in cache, attempting download\n"; + gzmsg << _id.UniqueName() << " not found in cache, attempting download\n"; return ModelIterFactory::Create(this->dataPtr->rest, _id.Server(), path.Str()); @@ -430,7 +430,7 @@ WorldIter FuelClient::Worlds(const WorldIdentifier &_id) const if (localIter) return localIter; - ignmsg << _id.UniqueName() << " not found in cache, attempting download\n"; + gzmsg << _id.UniqueName() << " not found in cache, attempting download\n"; // Note: ign-fuel-server doesn't like URLs ending in / common::URIPath path; @@ -490,7 +490,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, categories = form.find("categories")->second; } - ignerr << "Failed to upload model." << std::endl + gzerr << "Failed to upload model." << std::endl << " Server: " << _id.Server().Url().Str() << std::endl << " Server API Version: " << _id.Server().Version() << std::endl << " Route: /models\n" @@ -570,7 +570,7 @@ Result FuelClient::DeleteUrl(const gz::common::URI &_uri, } else { - ignerr << "Unable to parse URI[" << _uri.Str() << "]\n"; + gzerr << "Unable to parse URI[" << _uri.Str() << "]\n"; return Result(ResultType::DELETE_ERROR); } @@ -580,7 +580,7 @@ Result FuelClient::DeleteUrl(const gz::common::URI &_uri, if (resp.statusCode != 200) { - ignerr << "Failed to delete resource." << std::endl + gzerr << "Failed to delete resource." << std::endl << " Server: " << server << std::endl << " API Version: " << version << std::endl << " Route: " << path.Str() << std::endl @@ -589,7 +589,7 @@ Result FuelClient::DeleteUrl(const gz::common::URI &_uri, } else { - ignmsg << "Deleted " << type << " [" << name << "]" << std::endl; + gzmsg << "Deleted " << type << " [" << name << "]" << std::endl; } return Result(ResultType::DELETE); @@ -630,7 +630,7 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, // Server config if (!_id.Server().Url().Valid() || _id.Server().Version().empty()) { - ignerr << "Can't download model, server configuration incomplete: " + gzerr << "Can't download model, server configuration incomplete: " << std::endl << _id.Server().AsString() << std::endl; return Result(ResultType::FETCH_ERROR); } @@ -640,7 +640,7 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, route = route / _id.Owner() / "models" / _id.Name() / _id.VersionStr() / (_id.Name() + ".zip"); - ignmsg << "Downloading model [" << _id.UniqueName() << "]" << std::endl; + gzmsg << "Downloading model [" << _id.UniqueName() << "]" << std::endl; std::vector headersIncludingServerConfig = _headers; AddServerConfigParametersToHeaders( @@ -653,7 +653,7 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, headersIncludingServerConfig, ""); if (resp.statusCode != 200) { - ignerr << "Failed to download model." << std::endl + gzerr << "Failed to download model." << std::endl << " Server: " << _id.Server().Url().Str() << std::endl << " Route: " << route.Str() << std::endl << " REST response code: " << resp.statusCode << std::endl; @@ -671,14 +671,14 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, } catch(std::invalid_argument &) { - ignwarn << "Failed to convert X-Ign-Resource-Version header value [" + gzwarn << "Failed to convert X-Ign-Resource-Version header value [" << resp.headers["X-Ign-Resource-Version"] << "] to integer. Hardcoding version 1." << std::endl; } } else { - ignwarn << "Missing X-Ign-Resource-Version in REST response headers." + gzwarn << "Missing X-Ign-Resource-Version in REST response headers." << " Hardcoding version 1." << std::endl; } newId.SetVersion(version); @@ -744,7 +744,7 @@ Result FuelClient::ModelDependencies(const ModelIdentifier &_id, // [model://model_name], which is valid, but not something that we // can fetch from Fuel. In that case, warn the user so they have // a chance to update their specified dependencies. - ignwarn << "Error resolving URL for dependency [" << + gzwarn << "Error resolving URL for dependency [" << meta.dependencies(i).uri() << "] of model [" << _id.UniqueName() <<"]: Skipping" << std::endl; } else { @@ -803,7 +803,7 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, // Server config if (!_id.Server().Url().Valid() || _id.Server().Version().empty()) { - ignerr << "Can't download world, server configuration incomplete: " + gzerr << "Can't download world, server configuration incomplete: " << std::endl << _id.Server().AsString() << std::endl; return Result(ResultType::FETCH_ERROR); } @@ -813,7 +813,7 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, route = route / _id.Owner() / "worlds" / _id.Name() / _id.VersionStr() / (_id.Name() + ".zip"); - ignmsg << "Downloading world [" << _id.UniqueName() << "]" << std::endl; + gzmsg << "Downloading world [" << _id.UniqueName() << "]" << std::endl; std::vector headersIncludingServerConfig = _headers; AddServerConfigParametersToHeaders( @@ -827,7 +827,7 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, headersIncludingServerConfig, ""); if (resp.statusCode != 200) { - ignerr << "Failed to download world." << std::endl + gzerr << "Failed to download world." << std::endl << " Server: " << _id.Server().Url().Str() << std::endl << " Route: " << route.Str() << std::endl << " REST response code: " << resp.statusCode << std::endl; @@ -845,14 +845,14 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, } catch(std::invalid_argument &) { - ignwarn << "Failed to convert X-Ign-Resource-Version header value [" + gzwarn << "Failed to convert X-Ign-Resource-Version header value [" << resp.headers["X-Ign-Resource-Version"] << "] to integer. Hardcoding version 1." << std::endl; } } else { - ignwarn << "Missing X-Ign-Resource-Version in REST response headers." + gzwarn << "Missing X-Ign-Resource-Version in REST response headers." << " Hardcoding version 1." << std::endl; } _id.SetVersion(version); @@ -941,7 +941,7 @@ std::vector FuelClient::DownloadModels( workers.push_back(std::thread(downloadWorker)); } - ignmsg << "Preparing to download " + gzmsg << "Preparing to download " << idsToDownload.size() << " models with " << _jobs << " worker threads\n"; @@ -961,7 +961,7 @@ std::vector FuelClient::DownloadModels( worker.join(); } - ignmsg << "Finished, downloaded " << result.size() << " models in total\n"; + gzmsg << "Finished, downloaded " << result.size() << " models in total\n"; return result; } @@ -978,7 +978,7 @@ Result FuelClient::DownloadWorlds( size_t itemCount = 0; const size_t totalItemCount = _ids.size(); - ignmsg << "Using " << _jobs << " jobs to download collection of " + gzmsg << "Using " << _jobs << " jobs to download collection of " << totalItemCount << " items" << std::endl; auto checkForFinishedTasks = [&itemCount, &totalItemCount, &tasks] { @@ -1000,12 +1000,12 @@ Result FuelClient::DownloadWorlds( } else { - ignerr << result.ReadableResult() << std::endl; + gzerr << result.ReadableResult() << std::endl; } } tasks.erase(finishedIt, tasks.end()); - ignmsg << "Downloaded: " << itemCount << " / " << totalItemCount + gzmsg << "Downloaded: " << itemCount << " / " << totalItemCount << std::endl; } }; @@ -1077,7 +1077,7 @@ bool FuelClient::ParseModelUrl(const common::URI &_modelUrl, { if (!apiVersion.empty() && s.Version() != _id.Server().Version()) { - ignwarn << "Requested server API version [" << apiVersion + gzwarn << "Requested server API version [" << apiVersion << "] for server [" << s.Url().Str() << "], but will use [" << s.Version() << "] as given in the config file." << std::endl; @@ -1089,7 +1089,7 @@ bool FuelClient::ParseModelUrl(const common::URI &_modelUrl, if (_id.Server().Version().empty()) { - ignwarn << "Server configuration is incomplete:" << std::endl + gzwarn << "Server configuration is incomplete:" << std::endl << _id.Server().AsString(); } @@ -1143,7 +1143,7 @@ bool FuelClient::ParseWorldUrl(const common::URI &_worldUrl, { if (!apiVersion.empty() && s.Version() != _id.Server().Version()) { - ignwarn << "Requested server API version [" << apiVersion + gzwarn << "Requested server API version [" << apiVersion << "] for server [" << s.Url().Str() << "], but will use [" << s.Version() << "] as given in the config file." << std::endl; @@ -1155,7 +1155,7 @@ bool FuelClient::ParseWorldUrl(const common::URI &_worldUrl, if (_id.Server().Version().empty()) { - ignwarn << "Server configuration is incomplete:" << std::endl + gzwarn << "Server configuration is incomplete:" << std::endl << _id.Server().AsString(); } @@ -1211,7 +1211,7 @@ bool FuelClient::ParseModelFileUrl(const common::URI &_fileUrl, { if (!apiVersion.empty() && s.Version() != _id.Server().Version()) { - ignwarn << "Requested server API version [" << apiVersion + gzwarn << "Requested server API version [" << apiVersion << "] for server [" << s.Url().Str() << "], but will use [" << s.Version() << "] as given in the config file." << std::endl; @@ -1223,7 +1223,7 @@ bool FuelClient::ParseModelFileUrl(const common::URI &_fileUrl, if (_id.Server().Version().empty()) { - ignwarn << "Server configuration is incomplete:" << std::endl + gzwarn << "Server configuration is incomplete:" << std::endl << _id.Server().AsString(); } @@ -1280,7 +1280,7 @@ bool FuelClient::ParseWorldFileUrl(const common::URI &_fileUrl, { if (!apiVersion.empty() && s.Version() != _id.Server().Version()) { - ignwarn << "Requested server API version [" << apiVersion + gzwarn << "Requested server API version [" << apiVersion << "] for server [" << s.Url().Str() << "], but will use [" << s.Version() << "] as given in the config file." << std::endl; @@ -1292,7 +1292,7 @@ bool FuelClient::ParseWorldFileUrl(const common::URI &_fileUrl, if (_id.Server().Version().empty()) { - ignwarn << "Server configuration is incomplete:" << std::endl + gzwarn << "Server configuration is incomplete:" << std::endl << _id.Server().AsString(); } @@ -1347,7 +1347,7 @@ bool FuelClient::ParseCollectionUrl(const common::URI &_url, { if (!apiVersion.empty() && s.Version() != _id.Server().Version()) { - ignwarn << "Requested server API version [" << apiVersion + gzwarn << "Requested server API version [" << apiVersion << "] for server [" << s.Url().Str() << "], but will use [" << s.Version() << "] as given in the config file." << std::endl; @@ -1359,7 +1359,7 @@ bool FuelClient::ParseCollectionUrl(const common::URI &_url, if (_id.Server().Version().empty()) { - ignwarn << "Server configuration is incomplete:" << std::endl + gzwarn << "Server configuration is incomplete:" << std::endl << _id.Server().AsString(); } @@ -1641,7 +1641,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, { if (!common::exists(_pathToModelDir)) { - ignerr << "The model path[" << _pathToModelDir << "] doesn't exist.\n"; + gzerr << "The model path[" << _pathToModelDir << "] doesn't exist.\n"; return false; } @@ -1675,13 +1675,13 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) { - ignerr << "Unable to convert model config[" << _pathToModelDir << "].\n"; + gzerr << "Unable to convert model config[" << _pathToModelDir << "].\n"; return false; } } else { - ignerr << "Provided model directory[" << _pathToModelDir + gzerr << "Provided model directory[" << _pathToModelDir << "] needs a metadata.pbtxt or a model.confg file."; return false; } @@ -1739,7 +1739,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, } validLicenseNames += " " + licenseIt->first; - ignerr << "Invalid license[" << meta.legal().license() << "].\n" + gzerr << "Invalid license[" << meta.legal().license() << "].\n" << " Valid licenses include:\n" << validLicenseNames << std::endl; @@ -1810,12 +1810,12 @@ void FuelClientPrivate::PopulateLicenses(const ServerConfig &_server) _server.Version(), "licenses", {}, {}, ""); if (resp.statusCode != 200) { - ignerr << "Failed to get license information from " + gzerr << "Failed to get license information from " << _server.Url().Str() << "/" << _server.Version() << std::endl; } else if (!JSONParser::ParseLicenses(resp.data, this->licenses)) { - ignerr << "Failed to parse license information[" << resp.data << "]\n"; + gzerr << "Failed to parse license information[" << resp.data << "]\n"; } } @@ -1841,19 +1841,19 @@ bool FuelClient::UpdateModels(const std::vector &_headers) if (!this->ModelDetails(id.second, cloudId, _headers)) { - ignerr << "Failed to fetch model details for model[" + gzerr << "Failed to fetch model details for model[" << id.second.Owner() << "/" << id.second.Name() << "]\n"; } else if (id.second.Version() < cloudId.Version()) { - ignmsg << "Updating model " << id.second.Owner() << "/" + gzmsg << "Updating model " << id.second.Owner() << "/" << id.second.Name() << " up to version " << cloudId.Version() << std::endl; this->DownloadModel(cloudId, _headers); } else { - ignmsg << "Model " << id.second.Owner() << "/" + gzmsg << "Model " << id.second.Owner() << "/" << id.second.Name() << " is up to date." << std::endl; } } @@ -1882,19 +1882,19 @@ bool FuelClient::UpdateWorlds(const std::vector &_headers) if (!this->WorldDetails(id.second, cloudId, _headers)) { - ignerr << "Failed to fetch world details for world[" + gzerr << "Failed to fetch world details for world[" << id.second.Owner() << "/" << id.second.Name() << "]\n"; } else if (id.second.Version() < cloudId.Version()) { - ignmsg << "Updating world " << id.second.Owner() << "/" + gzmsg << "Updating world " << id.second.Owner() << "/" << id.second.Name() << " up to version " << cloudId.Version() << std::endl; this->DownloadWorld(cloudId, _headers); } else { - ignmsg << "World " << id.second.Owner() << "/" + gzmsg << "World " << id.second.Owner() << "/" << id.second.Name() << " is up to date." << std::endl; } } diff --git a/src/JSONParser.cc b/src/JSONParser.cc index 22a91185..1b4307a7 100644 --- a/src/JSONParser.cc +++ b/src/JSONParser.cc @@ -69,7 +69,7 @@ bool ParseLicenseImpl(const Json::Value &_json, { if (!_json.isObject()) { - ignerr << "License isn't a json object!\n"; + gzerr << "License isn't a json object!\n"; return false; } @@ -87,7 +87,7 @@ bool ParseLicenseImpl(const Json::Value &_json, { std::string what = ": [" + std::string(error.what()) + "]"; #endif - ignerr << "Bad response from server" << what << "\n"; + gzerr << "Bad response from server" << what << "\n"; return false; } @@ -100,7 +100,7 @@ std::vector JSONParser::ParseTags(const Json::Value &_json) std::vector tags; if (!_json.isArray()) { - ignerr << "JSON tags are not an array\n"; + gzerr << "JSON tags are not an array\n"; return tags; } @@ -118,7 +118,7 @@ std::vector JSONParser::ParseTags(const Json::Value &_json) { std::string what = ": [" + std::string(error.what()) + "]"; #endif - ignerr << "Exception parsing tags" << what << "\n"; + gzerr << "Exception parsing tags" << what << "\n"; return std::vector(); } @@ -158,7 +158,7 @@ std::vector JSONParser::ParseModels(const std::string &_json, if (!models.isArray()) { - ignerr << "JSON response is not an array\n"; + gzerr << "JSON response is not an array\n"; } else { @@ -168,7 +168,7 @@ std::vector JSONParser::ParseModels(const std::string &_json, ModelIdentifier id; if (!ParseModelImpl(model, id)) { - ignerr << "Model isn't a json object!\n"; + gzerr << "Model isn't a json object!\n"; break; } @@ -190,7 +190,7 @@ bool JSONParser::ParseModelImpl( { if (!_json.isObject()) { - ignerr << "Model isn't a json object!\n"; + gzerr << "Model isn't a json object!\n"; return false; } @@ -230,7 +230,7 @@ bool JSONParser::ParseModelImpl( { std::string what = ": [" + std::string(error.what()) + "]"; #endif - ignerr << "Bad response from server" << what << "\n"; + gzerr << "Bad response from server" << what << "\n"; return false; } @@ -283,7 +283,7 @@ std::vector JSONParser::ParseWorlds(const std::string &_json, if (!worlds.isArray()) { - ignerr << "JSON response is not an array\n"; + gzerr << "JSON response is not an array\n"; } else { @@ -293,7 +293,7 @@ std::vector JSONParser::ParseWorlds(const std::string &_json, WorldIdentifier id; if (!ParseWorldImpl(world, id)) { - ignerr << "World isn't a json object!\n"; + gzerr << "World isn't a json object!\n"; break; } @@ -315,7 +315,7 @@ bool JSONParser::ParseWorldImpl( { if (!_json.isObject()) { - ignerr << "World isn't a json object!\n"; + gzerr << "World isn't a json object!\n"; return false; } @@ -335,7 +335,7 @@ bool JSONParser::ParseWorldImpl( { std::string what = ": [" + std::string(error.what()) + "]"; #endif - ignerr << "Bad response from server" << what << "\n"; + gzerr << "Bad response from server" << what << "\n"; return false; } @@ -365,7 +365,7 @@ bool JSONParser::ParseLicenses(const std::string &_json, if (!licenses.isArray()) { - ignerr << "JSON response is not an array.\n"; + gzerr << "JSON response is not an array.\n"; return false; } @@ -376,7 +376,7 @@ bool JSONParser::ParseLicenses(const std::string &_json, std::pair license; if (!ParseLicenseImpl(licenseJson, license)) { - ignerr << "License isn't a json object!\n"; + gzerr << "License isn't a json object!\n"; continue; } diff --git a/src/LocalCache.cc b/src/LocalCache.cc index b4627373..91e43cfc 100644 --- a/src/LocalCache.cc +++ b/src/LocalCache.cc @@ -102,7 +102,7 @@ std::vector LocalCachePrivate::ModelsInServer( std::vector models; if (!common::isDirectory(_path)) { - ignwarn << "Server directory does not exist [" << _path << "]\n"; + gzwarn << "Server directory does not exist [" << _path << "]\n"; return models; } @@ -162,7 +162,7 @@ std::vector LocalCachePrivate::WorldsInServer( std::vector worldIds; if (!common::isDirectory(_path)) { - ignwarn << "Server directory does not exist [" << _path << "]\n"; + gzwarn << "Server directory does not exist [" << _path << "]\n"; return worldIds; } @@ -381,7 +381,7 @@ bool LocalCache::SaveModel( if (_id.Server().Url().Str().empty() || _id.Owner().empty() || _id.Name().empty() || _id.Version() == 0) { - ignerr << "Incomplete model identifier, failed to save model." << std::endl + gzerr << "Incomplete model identifier, failed to save model." << std::endl << _id.AsString(); return false; } @@ -396,7 +396,7 @@ bool LocalCache::SaveModel( // Is it already in the cache? if (common::isDirectory(modelVersionedDir) && !_overwrite) { - ignerr << "Directory [" << modelVersionedDir << "] already exists" + gzerr << "Directory [" << modelVersionedDir << "] already exists" << std::endl; return false; } @@ -404,7 +404,7 @@ bool LocalCache::SaveModel( // Create the model directory. if (!common::createDirectories(modelVersionedDir)) { - ignerr << "Unable to create directory [" << modelVersionedDir << "]" + gzerr << "Unable to create directory [" << modelVersionedDir << "]" << std::endl; } @@ -419,7 +419,7 @@ bool LocalCache::SaveModel( if (!Zip::Extract(zipFile, modelVersionedDir)) { - ignerr << "Unable to unzip [" << zipFile << "]" << std::endl; + gzerr << "Unable to unzip [" << zipFile << "]" << std::endl; return false; } @@ -429,7 +429,7 @@ bool LocalCache::SaveModel( // Cleanup the zip file. if (!common::removeDirectoryOrFile(zipFile)) { - ignwarn << "Unable to remove [" << zipFile << "]" << std::endl; + gzwarn << "Unable to remove [" << zipFile << "]" << std::endl; } return true; @@ -446,7 +446,7 @@ bool LocalCachePrivate::FixPaths(const std::string &_modelVersionedDir, // Make sure the model config file exits. if (!common::exists(modelConfigPath)) { - ignerr << "model.config file does not exist in [" + gzerr << "model.config file does not exist in [" << _modelVersionedDir << ".\n"; return false; } @@ -456,7 +456,7 @@ bool LocalCachePrivate::FixPaths(const std::string &_modelVersionedDir, if (modelConfigDoc.LoadFile(modelConfigPath.c_str()) != tinyxml2::XML_SUCCESS) { - ignerr << "Unable to load model.config file[" << modelConfigPath << "]\n"; + gzerr << "Unable to load model.config file[" << modelConfigPath << "]\n"; return false; } @@ -477,7 +477,7 @@ bool LocalCachePrivate::FixPaths(const std::string &_modelVersionedDir, if (nullptr == versionAttribute) { version.Parse("0.0.1"); - ignwarn << " element missing version attribute, assuming version [" + gzwarn << " element missing version attribute, assuming version [" << version << "]" << std::endl; } else @@ -503,7 +503,7 @@ bool LocalCachePrivate::FixPaths(const std::string &_modelVersionedDir, if (modelSdfDoc.LoadFile(modelSdfFilePath.c_str()) != tinyxml2::XML_SUCCESS) { - ignerr << "Unable to load SDF file[" << modelSdfFilePath << "]\n"; + gzerr << "Unable to load SDF file[" << modelSdfFilePath << "]\n"; return false; } @@ -735,7 +735,7 @@ bool LocalCache::SaveWorld( if (!_id.Server().Url().Valid() || _id.Owner().empty() || _id.Name().empty() || _id.Version() == 0) { - ignerr << "Incomplete world identifier, failed to save world." << std::endl + gzerr << "Incomplete world identifier, failed to save world." << std::endl << _id.AsString(); return false; } @@ -748,7 +748,7 @@ bool LocalCache::SaveWorld( // Is it already in the cache? if (common::isDirectory(worldVersionedDir) && !_overwrite) { - ignerr << "Directory [" << worldVersionedDir << "] already exists" + gzerr << "Directory [" << worldVersionedDir << "] already exists" << std::endl; return false; } @@ -756,7 +756,7 @@ bool LocalCache::SaveWorld( // Create the world directory. if (!common::createDirectories(worldVersionedDir)) { - ignerr << "Unable to create directory [" << worldVersionedDir << "]" + gzerr << "Unable to create directory [" << worldVersionedDir << "]" << std::endl; } @@ -771,17 +771,17 @@ bool LocalCache::SaveWorld( if (!Zip::Extract(zipFile, worldVersionedDir)) { - ignerr << "Unable to unzip [" << zipFile << "]" << std::endl; + gzerr << "Unable to unzip [" << zipFile << "]" << std::endl; return false; } if (!common::removeDirectoryOrFile(zipFile)) { - ignwarn << "Unable to remove [" << zipFile << "]" << std::endl; + gzwarn << "Unable to remove [" << zipFile << "]" << std::endl; } _id.SetLocalPath(worldVersionedDir); - ignmsg << "Saved world at:" << std::endl + gzmsg << "Saved world at:" << std::endl << " " << worldVersionedDir << std::endl; return true; diff --git a/src/RestClient.cc b/src/RestClient.cc index b439ae80..6400d257 100644 --- a/src/RestClient.cc +++ b/src/RestClient.cc @@ -170,7 +170,7 @@ struct curl_httppost *BuildFormPost( } else { - ignwarn << "Unknown mime type for file[" << path + gzwarn << "Unknown mime type for file[" << path << "]. The mime type '" << contentType << "' will be used.\n"; } } @@ -243,7 +243,7 @@ RestResponse Rest::Request(HttpMethod _method, headers = curl_slist_append(headers, header.c_str()); if (!headers) { - ignerr << "[Rest::Request()]: Error processing header.\n [" + gzerr << "[Rest::Request()]: Error processing header.\n [" << header.c_str() << "]" << std::endl; // cleanup @@ -313,7 +313,7 @@ RestResponse Rest::Request(HttpMethod _method, } else { - ignerr << "Unsupported method" << std::endl; + gzerr << "Unsupported method" << std::endl; // Cleanup. curl_slist_free_all(headers); @@ -324,7 +324,7 @@ RestResponse Rest::Request(HttpMethod _method, CURLcode success = curl_easy_perform(curl); if (success != CURLE_OK) { - ignerr << "Error in REST request" << std::endl; + gzerr << "Error in REST request" << std::endl; size_t len = strlen(errbuf); fprintf(stderr, "\nlibcurl: (%d) ", success); if (len) diff --git a/src/Zip.cc b/src/Zip.cc index 48e4880a..306b5dff 100644 --- a/src/Zip.cc +++ b/src/Zip.cc @@ -39,7 +39,7 @@ bool CompressFile(zip *_archive, const std::string &_file, { if (zip_add_dir(_archive, _entry.c_str()) < 0) { - ignerr << "Error adding directory to zip: " << _file << std::endl; + gzerr << "Error adding directory to zip: " << _file << std::endl; return false; } @@ -52,7 +52,7 @@ bool CompressFile(zip *_archive, const std::string &_file, if (!CompressFile(_archive, file, entryName)) { - ignerr << "Error compressing file: " << file << std::endl; + gzerr << "Error compressing file: " << file << std::endl; } } } @@ -65,14 +65,14 @@ bool CompressFile(zip *_archive, const std::string &_file, zip_source* source = zip_source_file(_archive, _file.c_str(), 0, end); if (!source) { - ignerr << "Error adding file to zip: " << _file << std::endl; + gzerr << "Error adding file to zip: " << _file << std::endl; return false; } if (zip_add(_archive, _entry.c_str(), source) < 0) { - ignerr << "Error adding file to zip: " << _file << std::endl; + gzerr << "Error adding file to zip: " << _file << std::endl; zip_source_free(source); return false; } @@ -85,7 +85,7 @@ bool Zip::Compress(const std::string &_src, const std::string &_dst) { if (!gz::common::exists(_src)) { - ignerr << "Directory does not exist: " << _src << std::endl; + gzerr << "Directory does not exist: " << _src << std::endl; return false; } @@ -93,14 +93,14 @@ bool Zip::Compress(const std::string &_src, const std::string &_dst) zip *archive = zip_open(_dst.c_str(), ZIP_CREATE, &err); if (!archive) { - ignerr << "Error opening zip archive: '" << _dst << "'" << std::endl; + gzerr << "Error opening zip archive: '" << _dst << "'" << std::endl; return false; } std::string entry = gz::common::basename(_src); if (!CompressFile(archive, _src, entry)) { - ignerr << "Error compressing file: " << _src << std::endl; + gzerr << "Error compressing file: " << _src << std::endl; zip_close(archive); return false; } @@ -115,7 +115,7 @@ bool Zip::Extract(const std::string &_src, { if (!gz::common::exists(_src)) { - ignerr << "Source archive does not exist: " << _src << std::endl; + gzerr << "Source archive does not exist: " << _src << std::endl; return false; } @@ -123,7 +123,7 @@ bool Zip::Extract(const std::string &_src, zip *archive = zip_open(_src.c_str(), 0, &err); if (!archive) { - ignerr << "Error opening zip archive: '" << _src << "'" << std::endl; + gzerr << "Error opening zip archive: '" << _src << "'" << std::endl; return false; } @@ -132,7 +132,7 @@ bool Zip::Extract(const std::string &_src, struct zip_stat sb; if (zip_stat_index(archive, i, 0, &sb) != 0) { - ignerr << "Error get stats on archive index: " << i << std::endl; + gzerr << "Error get stats on archive index: " << i << std::endl; continue; } @@ -146,7 +146,7 @@ bool Zip::Extract(const std::string &_src, { if (!gz::common::createDirectories(dst)) { - ignerr << "Error creating directory [" << dst << "]. " + gzerr << "Error creating directory [" << dst << "]. " << "Do you have the right permissions?" << std::endl; return false; } @@ -157,7 +157,7 @@ bool Zip::Extract(const std::string &_src, zip_file * zf = zip_fopen_index(archive, i, 0); if (!zf) { - ignerr << "Error opening: " << sb.name << std::endl; + gzerr << "Error opening: " << sb.name << std::endl; continue; } @@ -167,7 +167,7 @@ bool Zip::Extract(const std::string &_src, int len = zip_fread(zf, buf, readSize); if (len < 0) - ignerr << "Error reading " << sb.name << std::endl; + gzerr << "Error reading " << sb.name << std::endl; else { file.write(buf, len); @@ -188,7 +188,7 @@ bool Zip::Extract(const std::string &_src, if (zip_close(archive) < 0) { - ignerr << "Error closing zip archive" << std::endl; + gzerr << "Error closing zip archive" << std::endl; return false; } diff --git a/src/ign.cc b/src/ign.cc index c93b695f..f18180ef 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -518,7 +518,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, if (model.Version() != 0) { - ignwarn << "Requested version [" << model.VersionStr() << "], but " + gzwarn << "Requested version [" << model.VersionStr() << "], but " << "currently only the model's latest (tip) version is supported." << std::endl; } @@ -553,7 +553,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, if (world.Version() != 0) { - ignwarn << "Requested version [" << world.VersionStr() << "], but " + gzwarn << "Requested version [" << world.VersionStr() << "], but " << "currently only the world's latest (tip) version is supported." << std::endl; } @@ -590,7 +590,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, } else { - ignerr << "Unknown resource type [" << _type << "] sepcified.\n"; + gzerr << "Unknown resource type [" << _type << "] sepcified.\n"; return false; } } @@ -606,7 +606,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, { modelIds.push_back(modelsIter->Identification()); } - ignmsg << "Found " << modelIds.size() << " models in collection [" + gzmsg << "Found " << modelIds.size() << " models in collection [" << collection.Name() << "]" << std::endl; } @@ -618,7 +618,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url, { worldIds.push_back(worldIter); } - ignmsg << "Found " << worldIds.size() << " worlds in collection [" + gzmsg << "Found " << worldIds.size() << " worlds in collection [" << collection.Name() << "]" << std::endl; } @@ -696,7 +696,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, if (!gz::common::exists(_path)) { - ignerr << "The model path[" << _path << "] doesn't exist.\n"; + gzerr << "The model path[" << _path << "] doesn't exist.\n"; return 0; } @@ -728,7 +728,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, { if (!client.UploadModel(*dirIter, model, headers, privateBool, _owner)) { - ignerr << "Failed to upload model[" << *dirIter << "]\n"; + gzerr << "Failed to upload model[" << *dirIter << "]\n"; } } ++dirIter; @@ -789,7 +789,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int config2Pbtxt(const char *_path) if (!gz::msgs::ConvertFuelMetadata(inputStr, meta)) { - ignerr << "Unable to convert model config[" << _path << "].\n"; + gzerr << "Unable to convert model config[" << _path << "].\n"; return 0; } @@ -853,7 +853,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( { if (!gz::common::exists(_path)) { - ignerr << "The model path[" << _path << "] doesn't exist.\n"; + gzerr << "The model path[" << _path << "] doesn't exist.\n"; return 0; } modelPath = _path; @@ -872,7 +872,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( gz::fuel_tools::ModelIdentifier details; if (!client.ModelDetails(model, details, headers)) { - ignerr << "Failed to fetch model details for model[" + gzerr << "Failed to fetch model details for model[" << model.Name() << "]\n"; return 0; } @@ -884,7 +884,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl( if (!client.PatchModel(details, headers, modelPath)) { - ignerr << "Failed to patch model[" << model.Name() << "].\n"; + gzerr << "Failed to patch model[" << model.Name() << "].\n"; return 0; } } From 3a55ad25c8ac12189c77ee18d381dcf9b1b33c36 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Sun, 22 May 2022 15:20:43 -0700 Subject: [PATCH 17/25] Include config.hh in recursive directories and .hh Signed-off-by: methylDragon --- include/ignition/fuel_tools.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ignition/fuel_tools.hh b/include/ignition/fuel_tools.hh index 79509917..ffffce19 100644 --- a/include/ignition/fuel_tools.hh +++ b/include/ignition/fuel_tools.hh @@ -16,3 +16,4 @@ */ #include +#include From 83df1853456c08bbf9d49a97fa13b88cb2b3a5f1 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 23 May 2022 16:21:36 -0700 Subject: [PATCH 18/25] `Gazebo Robotics` -> `Gazebo` Signed-off-by: methylDragon --- CONTRIBUTING.md | 2 +- api.md.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 606c4a55..5481460b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Gazebo Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo contributing guide](https://ignitionrobotics.org/docs/all/contributing). diff --git a/api.md.in b/api.md.in index 4201e054..e73693e3 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ ## Ignition @IGN_DESIGNATION_CAP@ -Ignition @IGN_DESIGNATION_CAP@ is a component in Gazebo Robotics, a set of libraries +Ignition @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries designed to rapidly develop robot and simulation applications. ## License From 5e6ba102a2afd962c0854d3f2ab2c480ef8323b3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 23 May 2022 16:26:42 -0700 Subject: [PATCH 19/25] `ignitionrobotics` -> `gazebosim` Signed-off-by: methylDragon --- CONTRIBUTING.md | 2 +- README.md | 32 +++---- conf/config.yaml | 2 +- doc/header.html | 8 +- doc/tutorials-header.html | 6 +- example/download.cc | 2 +- include/gz/fuel_tools/FuelClient.hh | 14 ++-- src/ClientConfig.cc | 2 +- src/ClientConfig_TEST.cc | 10 +-- src/CollectionIdentifier_TEST.cc | 6 +- src/FuelClient.cc | 8 +- src/FuelClient_TEST.cc | 126 ++++++++++++++-------------- src/Interface_TEST.cc | 66 +++++++-------- src/JSONParser_TEST.cc | 2 +- src/ModelIdentifier_TEST.cc | 6 +- src/ModelIter_TEST.cc | 4 +- src/WorldIdentifier_TEST.cc | 10 +-- src/WorldIter_TEST.cc | 2 +- src/cmd/cmdfuel.rb.in | 20 ++--- src/ign.hh | 4 +- src/ign_TEST.cc | 4 +- src/ign_src_TEST.cc | 94 ++++++++++----------- tutorials/02_configuration.md | 6 +- tutorials/03_command_line.md | 30 +++---- tutorials/04_cpp_api.md | 4 +- tutorials/index.md | 2 +- 26 files changed, 236 insertions(+), 236 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5481460b..a1c121ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Gazebo contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing). diff --git a/README.md b/README.md index 98532cdd..d942f443 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ interacting with Gazebo Fuel servers. # Building and installing -See the [installation tutorial](https://ignitionrobotics.org/api/fuel_tools/5.0/install.html). +See the [installation tutorial](https://gazebosim.org/api/fuel_tools/5.0/install.html). Make sure `GZ_CONFIG_PATH` is set to the right install location so that `ign fuel` will work. Default is `/usr/local/share/ignition`. @@ -33,26 +33,26 @@ 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** ``` -$ ign fuel download -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance -v 4 +$ ign fuel download -u https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance -v 4 Downloading model: Name: Ambulance Owner: OpenRobotics Server: - URL: https://fuel.ignitionrobotics.org + URL: https://fuel.gazebosim.org Version: 1.0 Download succeeded. @@ -60,7 +60,7 @@ Download succeeded. **C++ Get List models** ``` - // Create a client (uses https://fuel.ignitionrobotics.org by default) + // Create a client (uses https://fuel.gazebosim.org by default) gz::fuel_tools::ClientConfig conf; gz::fuel_tools::FuelClient client(conf); gz::fuel_tools::ModelIter iter = client.Models(); @@ -73,7 +73,7 @@ Download succeeded. **Upload a model** Create an account on -[https://app.ignitionrobotics.org/](https://app.ignitionrobotics.org/) and log +[https://app.gazebosim.org/](https://app.gazebosim.org/) and log in. While logged in, obtain the JWT token of the account from the browser. @@ -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 diff --git a/conf/config.yaml b/conf/config.yaml index aed27fc4..75cfa7bf 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -3,7 +3,7 @@ servers: - name: osrf - url: https://fuel.ignitionrobotics.org + url: https://fuel.gazebosim.org # - # name: another_server diff --git a/doc/header.html b/doc/header.html index e7f54c25..556b0456 100644 --- a/doc/header.html +++ b/doc/header.html @@ -6,14 +6,14 @@ $projectname: $title - + - + @@ -21,7 +21,7 @@
- +

$projectname

API Reference

@@ -46,7 +46,7 @@

API Reference

insert_drive_fileFiles + href="http://gazebosim.org"> launchGazebo Website $projectname: $title - + - + @@ -23,7 +23,7 @@
- + $projectname Tutorials
diff --git a/example/download.cc b/example/download.cc index 2cc75c04..c03074af 100644 --- a/example/download.cc +++ b/example/download.cc @@ -38,7 +38,7 @@ int main(int argc, char **argv) usage += " Usage:\n ./download \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"; diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh index 2e571e85..6ecdf6f8 100644 --- a/include/gz/fuel_tools/FuelClient.hh +++ b/include/gz/fuel_tools/FuelClient.hh @@ -195,7 +195,7 @@ namespace gz /// \brief Remove a resource, such as a model or world, from Gazebo 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, @@ -257,7 +257,7 @@ namespace gz /// \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, @@ -266,7 +266,7 @@ namespace gz /// \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, @@ -296,7 +296,7 @@ namespace gz /// \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, @@ -304,13 +304,13 @@ namespace gz /// \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, @@ -318,7 +318,7 @@ namespace gz /// \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); diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 96ec73bf..21858e55 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -83,7 +83,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 = ""; diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 6286b864..a141b1c6 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -98,7 +98,7 @@ TEST(ClientConfig, CustomDefaultConfiguration) { ClientConfig config; ASSERT_EQ(1u, config.Servers().size()); - EXPECT_EQ("https://fuel.ignitionrobotics.org", + EXPECT_EQ("https://fuel.gazebosim.org", config.Servers().front().Url().Str()); std::string defaultCacheLocation = gz::common::joinPaths( @@ -135,7 +135,7 @@ TEST(ClientConfig, CustomConfiguration) EXPECT_TRUE(config.LoadConfig(testPath)); ASSERT_EQ(3u, config.Servers().size()); - EXPECT_EQ("https://fuel.ignitionrobotics.org", + EXPECT_EQ("https://fuel.gazebosim.org", config.Servers().front().Url().Str()); EXPECT_EQ("https://api.ignitionfuel.org", config.Servers()[1].Url().Str()); @@ -162,10 +162,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 @@ -313,7 +313,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); } { diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc index b0c85179..9961d1f9 100644 --- a/src/CollectionIdentifier_TEST.cc +++ b/src/CollectionIdentifier_TEST.cc @@ -122,9 +122,9 @@ TEST(CollectionIdentifier, AsString) std::string str = "Name: \n"\ "Owner: \n"\ - "Unique name: https://fuel.ignitionrobotics.org/collections/\n" + "Unique name: https://fuel.gazebosim.org/collections/\n" "Server:\n" - " URL: https://fuel.ignitionrobotics.org\n" + " URL: https://fuel.gazebosim.org\n" " Version: 1.0\n" " API key: \n"; EXPECT_EQ(str, id.AsString()); @@ -150,7 +150,7 @@ TEST(CollectionIdentifier, AsPrettyString) CollectionIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 06ea618a..cbaaa27a 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -58,7 +58,7 @@ using namespace fuel_tools; class gz::fuel_tools::FuelClientPrivate { /// \brief A model URL, - /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer/2 + /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer/2 /// Where the API version and the model version are optional. public: const std::string kModelUrlRegexStr{ // Method @@ -79,7 +79,7 @@ class gz::fuel_tools::FuelClientPrivate "/?"}; /// \brief A world URL, - /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/1 + /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/1 /// Where the API version and the world version are optional. public: const std::string kWorldUrlRegexStr{ // Method @@ -151,7 +151,7 @@ class gz::fuel_tools::FuelClientPrivate /// \brief A collection URL, /// E.g.: - /// https://fuel.ignitionrobotics.org/1.0/OpenRobotics/collections/TestColl + /// https://fuel.gazebosim.org/1.0/OpenRobotics/collections/TestColl /// Where the API version is optional public: const std::string kCollectionUrlRegexStr{ // Method @@ -501,7 +501,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, << " 1. Is the Server URL correct? Try entering it on a browser.\n" << " 2. Do the categories exist? If you are using the Fuel server," << " then you can get the complete list at" - << " https://fuel.ignitionrobotics.org/1.0/categories.\n" + << " https://fuel.gazebosim.org/1.0/categories.\n" << " 3. If the owner is specified, make sure you have correct\n" << " permissions." << std::endl; return Result(ResultType::FETCH_ERROR); diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index e74287b1..9327f00c 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -164,10 +164,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/1.0/german/models/Cardboard Box/4"}; + "https://fuel.gazebosim.org/1.0/german/models/Cardboard Box/4"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -184,10 +184,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/5.0/german/models/Cardboard Box/6/"}; + "https://fuel.gazebosim.org/5.0/german/models/Cardboard Box/6/"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -201,10 +201,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/german/models/Cardboard Box"}; + "https://fuel.gazebosim.org/german/models/Cardboard Box"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -220,10 +220,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/tip"}; + "https://fuel.gazebosim.org/german/models/Cardboard Box/tip"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -255,28 +255,28 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/banana"}; + "https://fuel.gazebosim.org/german/models/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/banana/german/models/Cardboard Box"}; + "https://fuel.gazebosim.org/banana/german/models/Cardboard Box"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/99/german/models/Cardboard Box"}; + "https://fuel.gazebosim.org/99/german/models/Cardboard Box"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.ignitionrobotics.org/2/2/german/models" + "https://fuel.gazebosim.org/2/2/german/models" "/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } @@ -291,11 +291,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/" + "https://fuel.gazebosim.org/1.0/OpenRobotics/models/" "Cordless Drill/tip/files/meshes/cordless_drill.dae"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "cordless drill"); @@ -310,11 +310,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Pine Tree/tip/" + "https://fuel.gazebosim.org/1.0/openrobotics/models/Pine Tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -329,11 +329,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/5.0/OpenRobotics/models/Pine Tree/tip/" + "https://fuel.gazebosim.org/5.0/OpenRobotics/models/Pine Tree/tip/" "files/model.sdf"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -346,11 +346,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/OpenRobotics/models/pine tree/tip/" + "https://fuel.gazebosim.org/OpenRobotics/models/pine tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "openrobotics"); @@ -366,11 +366,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/openrobotics/models/Pine Tree/tip/" + "https://fuel.gazebosim.org/openrobotics/models/Pine Tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -416,7 +416,7 @@ TEST_F(FuelClientTest, DownloadModel) { // Unversioned URL should get the latest available version common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"}; + "https://fuel.gazebosim.org/1.0/chapulina/models/Test box"}; // Check it is not cached std::string cachedPath; @@ -432,7 +432,7 @@ TEST_F(FuelClientTest, DownloadModel) // Check it was downloaded to `2` auto modelPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "models", "test box"); + "fuel.gazebosim.org", "chapulina", "models", "test box"); EXPECT_EQ(path, common::joinPaths(modelPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(modelPath, "2"))); @@ -454,7 +454,7 @@ TEST_F(FuelClientTest, DownloadModel) { // Unversioned URL should get the latest available version common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/iche033/models/Rescue Randy"}; + "https://fuel.gazebosim.org/1.0/iche033/models/Rescue Randy"}; // Check it is not cached std::string cachedPath; @@ -470,7 +470,7 @@ TEST_F(FuelClientTest, DownloadModel) // Check it was downloaded to `2` auto modelPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "iche033", "models", "rescue randy"); + "fuel.gazebosim.org", "iche033", "models", "rescue randy"); EXPECT_EQ(path, common::joinPaths(modelPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(modelPath, "2"))); @@ -507,9 +507,9 @@ TEST_F(FuelClientTest, DownloadModel) // Download model with a dependency specified within its `metadata.pbtxt` { common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_1"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_1"}; common::URI depUrl{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_1"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_1"}; // Check it is not cached std::string cachedPath; @@ -542,9 +542,9 @@ TEST_F(FuelClientTest, DownloadModel) // Download model with a dependency specified within its `model.config` { common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_2"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_2"}; common::URI depUrl{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_2"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_2"}; // Check it is not cached std::string cachedPath; @@ -577,7 +577,7 @@ TEST_F(FuelClientTest, DownloadModel) // Try using nonexistent URL { std::string url{ - "https://fuel.ignitionrobotics.org/1.0/chapulina/models/" + "https://fuel.gazebosim.org/1.0/chapulina/models/" "Inexistent model"}; std::string path; Result result = client.DownloadModel(common::URI(url), path); @@ -614,9 +614,9 @@ TEST_F(FuelClientTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelDependencies)) // Download model with a dependency specified within its `metadata.pbtxt` { common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_1"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_1"}; common::URI depUrl{ - "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_1"}; + "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_1"}; ModelIdentifier id; ModelIdentifier depId; @@ -811,10 +811,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/german/worlds/Cardboard Box"}; + "https://fuel.gazebosim.org/1.0/german/worlds/Cardboard Box"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -830,10 +830,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/german/worlds/Cardboard Box/4"}; + "https://fuel.gazebosim.org/1.0/german/worlds/Cardboard Box/4"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -849,10 +849,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/5.0/german/worlds/Cardboard Box/6"}; + "https://fuel.gazebosim.org/5.0/german/worlds/Cardboard Box/6"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -866,10 +866,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box"}; + "https://fuel.gazebosim.org/german/worlds/Cardboard Box"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "german"); @@ -887,10 +887,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/tip/"}; + "https://fuel.gazebosim.org/german/worlds/Cardboard Box/tip/"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -919,28 +919,28 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/banana"}; + "https://fuel.gazebosim.org/german/worlds/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/banana/german/worlds/Cardboard Box"}; + "https://fuel.gazebosim.org/banana/german/worlds/Cardboard Box"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/99/german/worlds/Cardboard Box"}; + "https://fuel.gazebosim.org/99/german/worlds/Cardboard Box"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/2/2/german/worlds/Cardboard Box" + "https://fuel.gazebosim.org/2/2/german/worlds/Cardboard Box" "/banana"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } @@ -955,11 +955,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -974,11 +974,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty sky/tip/" + "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty sky/tip/" "files/empty_sky.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty sky"); @@ -993,11 +993,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/5.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.gazebosim.org/5.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -1010,11 +1010,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty sky/tip/" + "https://fuel.gazebosim.org/OpenRobotics/worlds/Empty sky/tip/" "files/empty_sky.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "openrobotics"); @@ -1030,11 +1030,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -1072,7 +1072,7 @@ TEST_F(FuelClientTest, DownloadWorld) ServerConfig server; server.SetUrl(gz::common::URI( - "https://fuel.ignitionrobotics.org")); + "https://fuel.gazebosim.org")); ClientConfig config; config.AddServer(server); @@ -1085,7 +1085,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Download world from URL { // Unversioned URL should get the latest available version - common::URI url{"https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" + common::URI url{"https://fuel.gazebosim.org/1.0/OpenRobotics/" "worlds/Test world"}; // Check it is not cached @@ -1102,7 +1102,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Check it was downloaded to `1` auto worldPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"); + "fuel.gazebosim.org", "openrobotics", "worlds", "test world"); EXPECT_EQ(path, common::joinPaths(worldPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(worldPath, "2"))); @@ -1121,7 +1121,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Try using nonexistent URL { common::URI url{ - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Bad world"}; + "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Bad world"}; std::string path; auto result = client.DownloadWorld(url, path); EXPECT_FALSE(result); @@ -1350,7 +1350,7 @@ TEST_F(FuelClientTest, Models) } { - // Uses fuel.ignitionrobotics.org by default + // Uses fuel.gazebosim.org by default ModelIter iter = client.Models(serverConfig); EXPECT_TRUE(iter); } @@ -1384,7 +1384,7 @@ TEST_F(FuelClientTest, Worlds) } { - // Uses fuel.ignitionrobotics.org by default + // Uses fuel.gazebosim.org by default WorldIter iter = client.Worlds(serverConfig); EXPECT_TRUE(iter); } diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index 39a83e7e..c56387a6 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -60,7 +60,7 @@ TEST(Interface, FetchResources) { // Check it's not cached common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"}; + "https://fuel.gazebosim.org/1.0/chapulina/models/Test box"}; { Result res = client.CachedModel(modelUrl, cachedPath); EXPECT_FALSE(res) << "Cached Path: " << cachedPath; @@ -72,25 +72,25 @@ TEST(Interface, FetchResources) std::string sdfPath = sdfFromPath(path); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", + "fuel.gazebosim.org", "chapulina", "models", "test box", "2", "model.sdf"), sdfPath); // Check it was downloaded to `2` EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2")); + "fuel.gazebosim.org", "chapulina", "models", "test box", "2")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "models", "test box", "2"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "models", "test box", "2", "model.sdf"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "models", "test box", "2", "model.config"))); // Check it wasn't downloaded to model root directory EXPECT_FALSE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "models", "Test box", "model.config"))); // Check it is cached @@ -99,7 +99,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"), + "fuel.gazebosim.org", "chapulina", "models", "test box", "2"), cachedPath); } } @@ -108,9 +108,9 @@ TEST(Interface, FetchResources) { // Check neither file nor its model are cached common::URI modelUrl{ - "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/"}; + "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/"}; common::URI modelFileUrl{ - "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/files" + "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/files" "/meshes/bus.obj"}; { @@ -129,25 +129,25 @@ TEST(Interface, FetchResources) // Check entire model was downloaded to `1` EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1"))); EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", + "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "meshes", "bus.obj")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "model.sdf"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "model.config"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "meshes/bus.obj"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "meshes/bus.mtl"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "materials", "textures", "bus.png"))); @@ -157,14 +157,14 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1"), + "fuel.gazebosim.org", "openrobotics", "models", "bus", "1"), cachedPath); } { std::string sdfFile = sdfFromPath(cachedPath); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", + "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "model.sdf"), sdfFile); } @@ -174,7 +174,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", + "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", "meshes", "bus.obj"), cachedPath); } } @@ -183,7 +183,7 @@ TEST(Interface, FetchResources) { // Check it's not cached common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/1.0/openrobotics/worlds/Test world"}; + "https://fuel.gazebosim.org/1.0/openrobotics/worlds/Test world"}; { Result res = client.CachedWorld(worldUrl, cachedPath); EXPECT_FALSE(res) << "Cached Path: " << cachedPath; @@ -197,13 +197,13 @@ TEST(Interface, FetchResources) // Check it was downloaded to `1` EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "worlds", + "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2")); EXPECT_TRUE(common::exists(common::joinPaths("test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", + "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::exists(common::joinPaths("test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", + "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // Check it is cached @@ -212,7 +212,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", + "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2"), cachedPath); } } @@ -221,9 +221,9 @@ TEST(Interface, FetchResources) { // Check neither file nor its world are cached common::URI worldUrl{ - "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/"}; + "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/"}; common::URI worldFileUrl{ - "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/" + "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/" "files/thumbnails/1.png"}; { @@ -242,13 +242,13 @@ TEST(Interface, FetchResources) // Check entire world was downloaded to `1` EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2"))); EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", + "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", "thumbnails", "1.png")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.ignitionrobotics.org", + common::joinPaths("test_cache", "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", "test.world"))); // Check world is cached @@ -257,14 +257,14 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2"), + "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2"), cachedPath); } { std::string sdfFile = sdfFromPath(cachedPath); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", + "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", "test.sdf"), sdfFile); } @@ -274,7 +274,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", + "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", "thumbnails", "1.png"), cachedPath); } } diff --git a/src/JSONParser_TEST.cc b/src/JSONParser_TEST.cc index ed325b01..4876695f 100644 --- a/src/JSONParser_TEST.cc +++ b/src/JSONParser_TEST.cc @@ -176,7 +176,7 @@ TEST(JSONParser, ParseLicenses) std::stringstream tmpJsonStr; // This is the exact return value from - // https://fuel.ignitionrobotics.org/1.0/licenses as of April 29th, 2020. + // https://fuel.gazebosim.org/1.0/licenses as of April 29th, 2020. tmpJsonStr << R"tmpJsonStr([{ "ID": 1, "CreatedAt": "2017-12-19T20:32:48Z", diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index f316af09..9e16d9c8 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -152,7 +152,7 @@ TEST(ModelIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: https://fuel.ignitionrobotics.org/models/\n" + "Unique name: https://fuel.gazebosim.org/models/\n" "Description: \n" "File size: 0\n" "Upload date: 0\n" @@ -163,7 +163,7 @@ TEST(ModelIdentifier, AsString) "License image URL: \n" "Tags: \n" "Server:\n" - " URL: https://fuel.ignitionrobotics.org\n" + " URL: https://fuel.gazebosim.org\n" " Version: 1.0\n" " API key: \n"; EXPECT_EQ(str, id.AsString()); @@ -200,7 +200,7 @@ TEST(ModelIdentifier, AsPrettyString) ModelIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/ModelIter_TEST.cc b/src/ModelIter_TEST.cc index d2e46c10..a60aa52b 100644 --- a/src/ModelIter_TEST.cc +++ b/src/ModelIter_TEST.cc @@ -46,7 +46,7 @@ namespace gz public: static ModelIter ModelIterThreeModelIds() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(common::URI("https://ignitionrobotics.org")); + srv.SetUrl(common::URI("https://gazebosim.org")); std::vector ids; for (int i = 0; i < 3; i++) @@ -68,7 +68,7 @@ namespace gz public: static ModelIter ModelIterThreeModels() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(common::URI("https://ignitionrobotics.org")); + srv.SetUrl(common::URI("https://gazebosim.org")); std::vector models; for (int i = 0; i < 3; i++) diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 54c583c2..76fe5f7a 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -120,10 +120,10 @@ TEST(WorldIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: fuel.ignitionrobotics.org/worlds/\n" + "Unique name: fuel.gazebosim.org/worlds/\n" "Local path: \n" "Server:\n" - " URL: https://fuel.ignitionrobotics.org\n" + " URL: https://fuel.gazebosim.org\n" " Version: 1.0\n" " API key: \n"; #else @@ -131,10 +131,10 @@ TEST(WorldIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: fuel.ignitionrobotics.org\\worlds\\\n" + "Unique name: fuel.gazebosim.org\\worlds\\\n" "Local path: \n" "Server:\n" - " URL: https://fuel.ignitionrobotics.org\n" + " URL: https://fuel.gazebosim.org\n" " Version: 1.0\n" " API key: \n"; #endif @@ -164,7 +164,7 @@ TEST(WorldIdentifier, AsPrettyString) WorldIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/WorldIter_TEST.cc b/src/WorldIter_TEST.cc index e527e0a9..b20b897a 100644 --- a/src/WorldIter_TEST.cc +++ b/src/WorldIter_TEST.cc @@ -45,7 +45,7 @@ namespace gz public: static WorldIter WorldIterThreeWorldIds() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(gz::common::URI("https://ignitionrobotics.org")); + srv.SetUrl(gz::common::URI("https://gazebosim.org")); std::vector ids; for (int i = 0; i < 3; i++) diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in index caeece60..9eaf5bd7 100755 --- a/src/cmd/cmdfuel.rb.in +++ b/src/cmd/cmdfuel.rb.in @@ -48,7 +48,7 @@ COMMON_OPTIONS = " Two types of credentials are supported on Gazebo Fuel, Private \n"\ " Token and JSON Web Token(JWT). The Private Token method is prefered. \n"\ " Private tokens can be created through your user settings on \n"\ - " https://app.ignitionrobotics.org. Example usage: \n"\ + " https://app.gazebosim.org. Example usage: \n"\ " 1. Private token method: \n"\ " --header 'Private-Token: ' \n"\ " 2. JWT method: \n"\ @@ -88,7 +88,7 @@ SUBCOMMANDS = { "Available Options: \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.ignitionrobotics.org. \n"\ + " https://fuel.gazebosim.org. \n"\ " --header arg Set an HTTP header, such as \n"\ " --header 'Private-Token: '. \n" + COMMON_OPTIONS, @@ -100,7 +100,7 @@ SUBCOMMANDS = { " \n"\ "Available Options: \n"\ " -u [--url] arg Full resource URL, such as: \n"\ - " https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance\n"\ + " https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance\n"\ " --header arg Set an HTTP header, such as \n"\ " --header 'Private-Token: '. \n"\ " -j [--jobs] arg Number of parallel downloads (default: 1, \n"\ @@ -120,7 +120,7 @@ SUBCOMMANDS = { " -m [--model] arg Path to directory containing the model. \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.ignitionrobotics.org. \n"\ + " https://fuel.gazebosim.org. \n"\ " -p [--private] Use this argument to make the model private. \n"\ " -b [--public] Use this argument to make the model public. \n"\ " --header arg Set an HTTP header, such as \n"\ @@ -137,7 +137,7 @@ SUBCOMMANDS = { " -o [--owner] arg Return only resources for given owner. \n"\ " -u [--url] arg URL of a server the resource comes from, \n"\ " if unspecified, it will be \n"\ - " https://fuel.ignitionrobotics.org. \n"\ + " https://fuel.gazebosim.org. \n"\ " -r [--raw] Machine-friendly output. \n" + COMMON_OPTIONS, @@ -163,7 +163,7 @@ SUBCOMMANDS = { " multiple models each in a subdirectory. \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.ignitionrobotics.org. \n"\ + " https://fuel.gazebosim.org. \n"\ " -o [--owner] arg Upload to the given owner, which can be an. \n"\ " organization. Default behavior is to upload \n"\ " to the user account associated with the \n"\ @@ -287,12 +287,12 @@ class Cmd case options['subcommand'] when 'delete' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end when 'download' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end @@ -333,12 +333,12 @@ class Cmd exit(-1) end if options['url'] == '' - puts "Missing URL (e.g. --url https://fuel.ignitionrobotics.org)." + puts "Missing URL (e.g. --url https://fuel.gazebosim.org)." exit(-1) end when 'edit' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end end diff --git a/src/ign.hh b/src/ign.hh index 27b5b678..d19d52d3 100644 --- a/src/ign.hh +++ b/src/ign.hh @@ -87,7 +87,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, /// /// Example usage, including a private access token which is required: /// -/// `ign fuel delete -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` // NOLINT +/// `ign fuel delete -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` // NOLINT /// /// \param[in] _url Resource URL. /// \param[in] _header An HTTP header. @@ -114,7 +114,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path); /// /// Example usage, including a private access token which is required: /// -/// `ign fuel edit -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` --public // NOLINT +/// `ign fuel edit -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` --public // NOLINT /// /// \param[in] _url Resource URL. /// \param[in] _header An HTTP header. diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index b2dcbb92..daa50805 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -99,7 +99,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListConfigServerUgly)) { auto output = custom_exec_str(g_listCmd + " -t model --raw"); - EXPECT_NE(output.find("https://fuel.ignitionrobotics.org/1.0/"), + EXPECT_NE(output.find("https://fuel.gazebosim.org/1.0/"), std::string::npos) << output; EXPECT_EQ(output.find("owners"), std::string::npos) << output; } @@ -117,7 +117,7 @@ TEST(CmdLine, EXPECT_NE(output.find("owners"), std::string::npos) << output; EXPECT_NE(output.find("models"), std::string::npos) << output; - EXPECT_EQ(output.find("https://fuel.ignitionrobotics.org"), std::string::npos) + EXPECT_EQ(output.find("https://fuel.gazebosim.org"), std::string::npos) << output; EXPECT_EQ(output.find("https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) << output; diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 841cb373..1abbcc4f 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -95,7 +95,7 @@ TEST_F(CmdLine, ModelListConfigServerUgly) { EXPECT_TRUE(listModels("", "", "true")); - EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), + EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find("owners"), std::string::npos) << this->stdOutBuffer.str(); @@ -116,7 +116,7 @@ TEST_F(CmdLine, ModelListConfigServerPretty) EXPECT_NE(this->stdOutBuffer.str().find("models"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) @@ -143,7 +143,7 @@ TEST_F(CmdLine, ModelListConfigServerPrettyOwner) EXPECT_EQ(this->stdOutBuffer.str().find("20 models"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) @@ -178,7 +178,7 @@ TEST_F(CmdLine, ModelDownloadUnversioned) { // Download EXPECT_TRUE(downloadUrl( - "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box")); + "https://fuel.gazebosim.org/1.0/chapulina/models/Test box")); // Check output EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"), @@ -187,13 +187,13 @@ TEST_F(CmdLine, ModelDownloadUnversioned) // Check files EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "chapulina", "models", "test box"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "chapulina", "models", "test box", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "chapulina", "models", "test box", "2", "model.sdf"))); } @@ -212,7 +212,7 @@ TEST_F(CmdLine, DownloadConfigCache) ofs << "---" << std::endl << "servers:" << std::endl << " -" << std::endl - << " url: https://fuel.ignitionrobotics.org" << std::endl + << " url: https://fuel.gazebosim.org" << std::endl << "" << std::endl << "cache:" << std::endl << " path: " << this->testCachePath << std::endl @@ -222,7 +222,7 @@ TEST_F(CmdLine, DownloadConfigCache) // Download EXPECT_TRUE(downloadUrl( - "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box", + "https://fuel.gazebosim.org/1.0/chapulina/models/Test box", testPath.c_str())); // Check output @@ -232,7 +232,7 @@ TEST_F(CmdLine, DownloadConfigCache) // Check files auto modelPath = common::joinPaths(this->testCachePath, - "fuel.ignitionrobotics.org", "chapulina", "models", "test box"); + "fuel.gazebosim.org", "chapulina", "models", "test box"); EXPECT_TRUE(common::isDirectory(modelPath)); EXPECT_TRUE(common::isDirectory(common::joinPaths(modelPath, "2"))); EXPECT_TRUE(common::isFile(common::joinPaths(modelPath, "2", @@ -279,7 +279,7 @@ TEST_F(CmdLine, WorldListConfigServerPretty) EXPECT_NE(this->stdOutBuffer.str().find("worlds"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) @@ -302,7 +302,7 @@ TEST_F(CmdLine, WorldListCustomServerPrettyOwner) EXPECT_EQ(this->stdOutBuffer.str().find("20 worlds"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) @@ -339,7 +339,7 @@ TEST_F(CmdLine, WorldDownloadUnversioned) { // Download EXPECT_TRUE(downloadUrl( - "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Test world")); + "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Test world")); // Check output EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"), @@ -348,13 +348,13 @@ TEST_F(CmdLine, WorldDownloadUnversioned) // Check files EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2", "test.world"))); } @@ -373,7 +373,7 @@ TEST_P(DownloadCollectionTest, AllItems) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, nullptr, GetParam())); @@ -385,46 +385,46 @@ TEST_P(DownloadCollectionTest, AllItems) // Check files // Model: Backpack EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); } @@ -436,7 +436,7 @@ TEST_P(DownloadCollectionTest, Models) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, "model", GetParam())); @@ -448,34 +448,34 @@ TEST_P(DownloadCollectionTest, Models) // Check files // Model: Backpack EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world"))); // World: Test World 2 EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world2"))); } @@ -487,7 +487,7 @@ TEST_P(DownloadCollectionTest, Worlds) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, "world", GetParam())); @@ -499,33 +499,33 @@ TEST_P(DownloadCollectionTest, Worlds) // Check files // Model: Backpack EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "backpack"))); // Model: TEAMBASE EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "models", "teambase"))); // World: Test World EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", + common::joinPaths(this->testCachePath, "fuel.gazebosim.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); } diff --git a/tutorials/02_configuration.md b/tutorials/02_configuration.md index b7eaea94..1638c133 100644 --- a/tutorials/02_configuration.md +++ b/tutorials/02_configuration.md @@ -15,7 +15,7 @@ Gazebo Fuel Tools accepts a YAML file with the following syntax: # The list of servers. servers: - - url: https://fuel.ignitionrobotics.org + url: https://fuel.gazebosim.org private-token: # - @@ -47,7 +47,7 @@ Create a file `/tmp/my_config.yaml` with the following content: # The list of servers. servers: - - url: https://fuel.ignitionrobotics.org + url: https://fuel.gazebosim.org # Where are the assets stored in disk. cache: @@ -121,7 +121,7 @@ And now the fun part, execute it: ``` Verify that you have the model in -`/tmp/ignition/fuel/fuel.ignitionrobotics.org/caguero/models/Beer`, +`/tmp/ignition/fuel/fuel.gazebosim.org/caguero/models/Beer`, as you configured in your YAML file. ## Walkthrough diff --git a/tutorials/03_command_line.md b/tutorials/03_command_line.md index 4e938d73..54567f73 100644 --- a/tutorials/03_command_line.md +++ b/tutorials/03_command_line.md @@ -18,9 +18,9 @@ type, such as `model` or `world` as follows: You should see a list such as: ``` -Fetching world list from https://fuel.ignitionrobotics.org... +Fetching world list from https://fuel.gazebosim.org... Received world list (took 350ms). -https://fuel.ignitionrobotics.org +https://fuel.gazebosim.org ├── OpenRobotics │ ├── Empty │ └── Shapes @@ -30,7 +30,7 @@ https://fuel.ignitionrobotics.org By default, Fuel will list resources from all the servers listed in your `config.yaml` file. See the -[configuration tutorial](https://ignitionrobotics.org/tutorials/fuel_tools/1.0/md__data_ignition_ign-fuel-tools_tutorials_02_configuration.html) +[configuration tutorial](https://gazebosim.org/tutorials/fuel_tools/1.0/md__data_ignition_ign-fuel-tools_tutorials_02_configuration.html) for more details. > **Tip**: If you want to see resources from a different Fuel server, add it to @@ -50,9 +50,9 @@ a way that's easier for scripts to parse. For example, try: And you'll get a list of the world URLs similar to the one below: ``` -https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty -https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Shapes -https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Shapes%20copy +https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty +https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Shapes +https://fuel.gazebosim.org/1.0/chapulina/worlds/Shapes%20copy ``` ### By owner @@ -70,7 +70,7 @@ computer. We use the `ign fuel download` tool for this. We learned above how to get resource URLs. Now we can use these URLs to download them. For example, try: -`ign fuel download -v 4 -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty` +`ign fuel download -v 4 -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty` Note that we passed the `-v 4` option so we get a verbose output. You should see something like: @@ -79,12 +79,12 @@ Downloading world: Name: Empty Owner: OpenRobotics Server: - URL: https://fuel.ignitionrobotics.org + URL: https://fuel.gazebosim.org Version: 1.0 -[Msg] Downloading world [fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty] +[Msg] Downloading world [fuel.gazebosim.org/OpenRobotics/worlds/Empty] [Msg] Saved world at: - /home/louise/.ignition/fuel/fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty/1 + /home/louise/.ignition/fuel/fuel.gazebosim.org/OpenRobotics/worlds/Empty/1 Download succeeded. ``` @@ -96,14 +96,14 @@ If the model is privated you can create a config file with your token. For examp # The list of servers. servers: - - url: https://fuel.ignitionrobotics.org + url: https://fuel.gazebosim.org private-token: ``` Then try to download the model: ```bash -ign fuel download -v 4 -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty -c /tmp/my_config.yaml +ign fuel download -v 4 -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty -c /tmp/my_config.yaml ``` Worlds downloaded with the tool get conveniently organized into the same @@ -113,7 +113,7 @@ directory, which we call the "local cache". The path is broken down as follows: > **Tip**: You can change the local cache path in `config.yaml`. -> **Tip**: You can also use other tools such as `wget` to download a zipped file of a world, just add `.zip` to the end of the URL, for example: `wget https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty.zip`. +> **Tip**: You can also use other tools such as `wget` to download a zipped file of a world, just add `.zip` to the end of the URL, for example: `wget https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty.zip`. ## Edit resources @@ -138,11 +138,11 @@ access. Use the `-p` option to make a resources private. For example: ``` -ign fuel edit -p -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' +ign fuel edit -p -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' ``` Use the `-b` option to make a resource public. For example: ``` -ign fuel edit -b -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' +ign fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' ``` diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 773ec13d..51ccef5d 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -73,7 +73,7 @@ You should see the name of the server followed by its list of models. Here's an example: ``` -[https://fuel.ignitionrobotics.org] +[https://fuel.gazebosim.org] Beer Wastebasket @@ -150,7 +150,7 @@ License name: Creative Commons - Attribution License URL: http://creativecommons.org/licenses/by/4.0 License image URL: https://i.creativecommons.org/l/by/4.0/88x31.png Server: - URL: https://fuel.ignitionrobotics.org + URL: https://fuel.gazebosim.org Version: 1.0 ``` diff --git a/tutorials/index.md b/tutorials/index.md index e1d3ce96..71112f20 100644 --- a/tutorials/index.md +++ b/tutorials/index.md @@ -2,7 +2,7 @@ Gazebo Fuel Tools provides both a command line tool and a C++ API which allow interacting with Gazebo Fuel web servers such as -[https://app.ignitionrobotics.org](https://app.ignitionrobotics.org) and their hosted +[https://app.gazebosim.org](https://app.gazebosim.org) and their hosted simulation resources. ## Simulation resources From f16560269fbb8676954737a9619d8579786db78d Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 23 May 2022 16:36:56 -0700 Subject: [PATCH 20/25] Revert migration for fuel.ignitionrobotics.org Signed-off-by: methylDragon --- README.md | 28 +++---- conf/config.yaml | 2 +- example/download.cc | 2 +- include/gz/fuel_tools/FuelClient.hh | 14 ++-- src/ClientConfig.cc | 2 +- src/ClientConfig_TEST.cc | 10 +-- src/CollectionIdentifier_TEST.cc | 6 +- src/FuelClient.cc | 8 +- src/FuelClient_TEST.cc | 126 ++++++++++++++-------------- src/Interface_TEST.cc | 66 +++++++-------- src/JSONParser_TEST.cc | 2 +- src/ModelIdentifier_TEST.cc | 6 +- src/WorldIdentifier_TEST.cc | 10 +-- src/cmd/cmdfuel.rb.in | 18 ++-- src/ign.hh | 4 +- src/ign_TEST.cc | 18 ++-- src/ign_src_TEST.cc | 122 +++++++++++++-------------- tutorials/02_configuration.md | 6 +- tutorials/03_command_line.md | 28 +++---- tutorials/04_cpp_api.md | 4 +- 20 files changed, 241 insertions(+), 241 deletions(-) diff --git a/README.md b/README.md index d942f443..8e58bbf9 100644 --- a/README.md +++ b/README.md @@ -33,26 +33,26 @@ 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.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 +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 ``` **Download a model** ``` -$ ign fuel download -u https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance -v 4 +$ ign fuel download -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance -v 4 Downloading model: Name: Ambulance Owner: OpenRobotics Server: - URL: https://fuel.gazebosim.org + URL: https://fuel.ignitionrobotics.org Version: 1.0 Download succeeded. @@ -60,7 +60,7 @@ Download succeeded. **C++ Get List models** ``` - // Create a client (uses https://fuel.gazebosim.org by default) + // Create a client (uses https://fuel.ignitionrobotics.org by default) gz::fuel_tools::ClientConfig conf; gz::fuel_tools::FuelClient client(conf); gz::fuel_tools::ModelIter iter = client.Models(); @@ -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.gazebosim.org/alice/am1 +/home/developer/.ignition/fuel/fuel.ignitionrobotics.org/alice/am1 ``` ## Dependencies diff --git a/conf/config.yaml b/conf/config.yaml index 75cfa7bf..aed27fc4 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -3,7 +3,7 @@ servers: - name: osrf - url: https://fuel.gazebosim.org + url: https://fuel.ignitionrobotics.org # - # name: another_server diff --git a/example/download.cc b/example/download.cc index c03074af..2cc75c04 100644 --- a/example/download.cc +++ b/example/download.cc @@ -38,7 +38,7 @@ int main(int argc, char **argv) usage += " Usage:\n ./download \n\n"; usage += " Examples:\n" "\t ./download -t model -o OpenRobotics -n Beer\n" - "\t ./download -s https://fuel.gazebosim.org -t world " + "\t ./download -s https://fuel.ignitionrobotics.org -t world " "-o OpenRobotics" " -n Empty\n" "\t ./download -c /tmp/my_config.yaml -t model -o caguero -n Beer\n"; diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh index 6ecdf6f8..2e571e85 100644 --- a/include/gz/fuel_tools/FuelClient.hh +++ b/include/gz/fuel_tools/FuelClient.hh @@ -195,7 +195,7 @@ namespace gz /// \brief Remove a resource, such as a model or world, from Gazebo Fuel /// \param[in] _uri The full URI of the resource, e.g: - /// https://fuel.gazebosim.org/1.0/openrobotcs/model/my_model + /// https://fuel.ignitionrobotics.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, @@ -257,7 +257,7 @@ namespace gz /// \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.gazebosim.org/1.0/caguero/models/Beer + /// E.g.: https://fuel.ignitionrobotics.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, @@ -266,7 +266,7 @@ namespace gz /// \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.gazebosim.org/1.0/OpenRobotics/worlds/Empty + /// E.g.: https://fuel.ignitionrobotics.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, @@ -296,7 +296,7 @@ namespace gz /// \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.gazebosim.org/1.0/caguero/models/Beer + /// E.g.: https://fuel.ignitionrobotics.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, @@ -304,13 +304,13 @@ namespace gz /// \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.gazebosim.org/1.0/caguero/models/Beer + /// E.g.: https://fuel.ignitionrobotics.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.gazebosim.org/1.0/OpenRobotics/worlds/Empty + /// E.g.: https://fuel.ignitionrobotics.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, @@ -318,7 +318,7 @@ namespace gz /// \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.gazebosim.org/1.0/OpenRobotics/worlds/Empty + /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty /// \return True if the world exists in the cache, false otherwise. public: bool CachedWorld(const common::URI &_worldUrl); diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 21858e55..96ec73bf 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -83,7 +83,7 @@ class gz::fuel_tools::ServerConfigPrivate } /// \brief URL to reach server - public: common::URI url{"https://fuel.gazebosim.org"}; + public: common::URI url{"https://fuel.ignitionrobotics.org"}; /// \brief A key to auth with the server public: std::string key = ""; diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index a141b1c6..6286b864 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -98,7 +98,7 @@ TEST(ClientConfig, CustomDefaultConfiguration) { ClientConfig config; ASSERT_EQ(1u, config.Servers().size()); - EXPECT_EQ("https://fuel.gazebosim.org", + EXPECT_EQ("https://fuel.ignitionrobotics.org", config.Servers().front().Url().Str()); std::string defaultCacheLocation = gz::common::joinPaths( @@ -135,7 +135,7 @@ TEST(ClientConfig, CustomConfiguration) EXPECT_TRUE(config.LoadConfig(testPath)); ASSERT_EQ(3u, config.Servers().size()); - EXPECT_EQ("https://fuel.gazebosim.org", + EXPECT_EQ("https://fuel.ignitionrobotics.org", config.Servers().front().Url().Str()); EXPECT_EQ("https://api.ignitionfuel.org", config.Servers()[1].Url().Str()); @@ -162,10 +162,10 @@ TEST(ClientConfig, RepeatedServerConfiguration) << "# The list of servers." << std::endl << "servers:" << std::endl << " -" << std::endl - << " url: https://fuel.gazebosim.org" << std::endl + << " url: https://fuel.ignitionrobotics.org" << std::endl << "" << std::endl << " -" << std::endl - << " url: https://fuel.gazebosim.org" << std::endl + << " url: https://fuel.ignitionrobotics.org" << std::endl << "" << std::endl << "# Where are the assets stored in disk." << std::endl << "cache:" << std::endl @@ -313,7 +313,7 @@ TEST(ClientConfig, AsString) #else EXPECT_NE(str.find(".ignition\\fuel"), std::string::npos); #endif - EXPECT_NE(str.find("https://fuel.gazebosim.org"), std::string::npos); + EXPECT_NE(str.find("https://fuel.ignitionrobotics.org"), std::string::npos); } { diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc index 9961d1f9..b0c85179 100644 --- a/src/CollectionIdentifier_TEST.cc +++ b/src/CollectionIdentifier_TEST.cc @@ -122,9 +122,9 @@ TEST(CollectionIdentifier, AsString) std::string str = "Name: \n"\ "Owner: \n"\ - "Unique name: https://fuel.gazebosim.org/collections/\n" + "Unique name: https://fuel.ignitionrobotics.org/collections/\n" "Server:\n" - " URL: https://fuel.gazebosim.org\n" + " URL: https://fuel.ignitionrobotics.org\n" " Version: 1.0\n" " API key: \n"; EXPECT_EQ(str, id.AsString()); @@ -150,7 +150,7 @@ TEST(CollectionIdentifier, AsPrettyString) CollectionIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/FuelClient.cc b/src/FuelClient.cc index cbaaa27a..06ea618a 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -58,7 +58,7 @@ using namespace fuel_tools; class gz::fuel_tools::FuelClientPrivate { /// \brief A model URL, - /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer/2 + /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer/2 /// Where the API version and the model version are optional. public: const std::string kModelUrlRegexStr{ // Method @@ -79,7 +79,7 @@ class gz::fuel_tools::FuelClientPrivate "/?"}; /// \brief A world URL, - /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/1 + /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/1 /// Where the API version and the world version are optional. public: const std::string kWorldUrlRegexStr{ // Method @@ -151,7 +151,7 @@ class gz::fuel_tools::FuelClientPrivate /// \brief A collection URL, /// E.g.: - /// https://fuel.gazebosim.org/1.0/OpenRobotics/collections/TestColl + /// https://fuel.ignitionrobotics.org/1.0/OpenRobotics/collections/TestColl /// Where the API version is optional public: const std::string kCollectionUrlRegexStr{ // Method @@ -501,7 +501,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, << " 1. Is the Server URL correct? Try entering it on a browser.\n" << " 2. Do the categories exist? If you are using the Fuel server," << " then you can get the complete list at" - << " https://fuel.gazebosim.org/1.0/categories.\n" + << " https://fuel.ignitionrobotics.org/1.0/categories.\n" << " 3. If the owner is specified, make sure you have correct\n" << " permissions." << std::endl; return Result(ResultType::FETCH_ERROR); diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index 9327f00c..e74287b1 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -164,10 +164,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/1.0/german/models/Cardboard Box/4"}; + "https://fuel.ignitionrobotics.org/1.0/german/models/Cardboard Box/4"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -184,10 +184,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/5.0/german/models/Cardboard Box/6/"}; + "https://fuel.ignitionrobotics.org/5.0/german/models/Cardboard Box/6/"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -201,10 +201,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/german/models/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/german/models/Cardboard Box"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -220,10 +220,10 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client(config); ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/german/models/Cardboard Box/tip"}; + "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/tip"}; EXPECT_TRUE(client.ParseModelUrl(gz::common::URI(url), id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -255,28 +255,28 @@ TEST_F(FuelClientTest, ParseModelURL) FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/german/models/Cardboard Box/banana"}; + "https://fuel.ignitionrobotics.org/german/models/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/banana/german/models/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/banana/german/models/Cardboard Box"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/99/german/models/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/99/german/models/Cardboard Box"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } { FuelClient client; ModelIdentifier id; const std::string url{ - "https://fuel.gazebosim.org/2/2/german/models" + "https://fuel.ignitionrobotics.org/2/2/german/models" "/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseModelUrl(gz::common::URI(url), id)); } @@ -291,11 +291,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.gazebosim.org/1.0/OpenRobotics/models/" + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/" "Cordless Drill/tip/files/meshes/cordless_drill.dae"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "cordless drill"); @@ -310,11 +310,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.gazebosim.org/1.0/openrobotics/models/Pine Tree/tip/" + "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Pine Tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -329,11 +329,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.gazebosim.org/5.0/OpenRobotics/models/Pine Tree/tip/" + "https://fuel.ignitionrobotics.org/5.0/OpenRobotics/models/Pine Tree/tip/" "files/model.sdf"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -346,11 +346,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.gazebosim.org/OpenRobotics/models/pine tree/tip/" + "https://fuel.ignitionrobotics.org/OpenRobotics/models/pine tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "openrobotics"); @@ -366,11 +366,11 @@ TEST_F(FuelClientTest, ParseModelFileURL) ModelIdentifier id; std::string filePath; const common::URI modelUrl{ - "https://fuel.gazebosim.org/openrobotics/models/Pine Tree/tip/" + "https://fuel.ignitionrobotics.org/openrobotics/models/Pine Tree/tip/" "files/materials/scripts/pine_tree.material"}; EXPECT_TRUE(client.ParseModelFileUrl(modelUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "pine tree"); @@ -416,7 +416,7 @@ TEST_F(FuelClientTest, DownloadModel) { // Unversioned URL should get the latest available version common::URI url{ - "https://fuel.gazebosim.org/1.0/chapulina/models/Test box"}; + "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"}; // Check it is not cached std::string cachedPath; @@ -432,7 +432,7 @@ TEST_F(FuelClientTest, DownloadModel) // Check it was downloaded to `2` auto modelPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "models", "test box"); + "fuel.ignitionrobotics.org", "chapulina", "models", "test box"); EXPECT_EQ(path, common::joinPaths(modelPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(modelPath, "2"))); @@ -454,7 +454,7 @@ TEST_F(FuelClientTest, DownloadModel) { // Unversioned URL should get the latest available version common::URI url{ - "https://fuel.gazebosim.org/1.0/iche033/models/Rescue Randy"}; + "https://fuel.ignitionrobotics.org/1.0/iche033/models/Rescue Randy"}; // Check it is not cached std::string cachedPath; @@ -470,7 +470,7 @@ TEST_F(FuelClientTest, DownloadModel) // Check it was downloaded to `2` auto modelPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "iche033", "models", "rescue randy"); + "fuel.ignitionrobotics.org", "iche033", "models", "rescue randy"); EXPECT_EQ(path, common::joinPaths(modelPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(modelPath, "2"))); @@ -507,9 +507,9 @@ TEST_F(FuelClientTest, DownloadModel) // Download model with a dependency specified within its `metadata.pbtxt` { common::URI url{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_1"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_1"}; common::URI depUrl{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_1"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_1"}; // Check it is not cached std::string cachedPath; @@ -542,9 +542,9 @@ TEST_F(FuelClientTest, DownloadModel) // Download model with a dependency specified within its `model.config` { common::URI url{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_2"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_2"}; common::URI depUrl{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_2"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_2"}; // Check it is not cached std::string cachedPath; @@ -577,7 +577,7 @@ TEST_F(FuelClientTest, DownloadModel) // Try using nonexistent URL { std::string url{ - "https://fuel.gazebosim.org/1.0/chapulina/models/" + "https://fuel.ignitionrobotics.org/1.0/chapulina/models/" "Inexistent model"}; std::string path; Result result = client.DownloadModel(common::URI(url), path); @@ -614,9 +614,9 @@ TEST_F(FuelClientTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelDependencies)) // Download model with a dependency specified within its `metadata.pbtxt` { common::URI url{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_red_1"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_red_1"}; common::URI depUrl{ - "https://fuel.gazebosim.org/1.0/JShep1/models/hatchback_1"}; + "https://fuel.ignitionrobotics.org/1.0/JShep1/models/hatchback_1"}; ModelIdentifier id; ModelIdentifier depId; @@ -811,10 +811,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/1.0/german/worlds/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/1.0/german/worlds/Cardboard Box"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -830,10 +830,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/1.0/german/worlds/Cardboard Box/4"}; + "https://fuel.ignitionrobotics.org/1.0/german/worlds/Cardboard Box/4"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -849,10 +849,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/5.0/german/worlds/Cardboard Box/6"}; + "https://fuel.ignitionrobotics.org/5.0/german/worlds/Cardboard Box/6"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -866,10 +866,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/german/worlds/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "german"); @@ -887,10 +887,10 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/german/worlds/Cardboard Box/tip/"}; + "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/tip/"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "german"); EXPECT_EQ(id.Name(), "cardboard box"); @@ -919,28 +919,28 @@ TEST_F(FuelClientTest, ParseWorldUrl) FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/german/worlds/Cardboard Box/banana"}; + "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/banana"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/banana/german/worlds/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/banana/german/worlds/Cardboard Box"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/99/german/worlds/Cardboard Box"}; + "https://fuel.ignitionrobotics.org/99/german/worlds/Cardboard Box"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } { FuelClient client; WorldIdentifier id; const common::URI url{ - "https://fuel.gazebosim.org/2/2/german/worlds/Cardboard Box" + "https://fuel.ignitionrobotics.org/2/2/german/worlds/Cardboard Box" "/banana"}; EXPECT_FALSE(client.ParseWorldUrl(url, id)); } @@ -955,11 +955,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -974,11 +974,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty sky/tip/" + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty sky/tip/" "files/empty_sky.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty sky"); @@ -993,11 +993,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.gazebosim.org/5.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.ignitionrobotics.org/5.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -1010,11 +1010,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.gazebosim.org/OpenRobotics/worlds/Empty sky/tip/" + "https://fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty sky/tip/" "files/empty_sky.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_FALSE(id.Server().Version().empty()); EXPECT_EQ("1.0", id.Server().Version()); EXPECT_EQ(id.Owner(), "openrobotics"); @@ -1030,11 +1030,11 @@ TEST_F(FuelClientTest, ParseWorldFileUrl) WorldIdentifier id; std::string filePath; const common::URI worldUrl{ - "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/tip/" + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/tip/" "files/test.world"}; EXPECT_TRUE(client.ParseWorldFileUrl(worldUrl, id, filePath)); - EXPECT_EQ(id.Server().Url().Str(), "https://fuel.gazebosim.org"); + EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); EXPECT_EQ(id.Server().Version(), "1.0"); EXPECT_EQ(id.Owner(), "openrobotics"); EXPECT_EQ(id.Name(), "empty"); @@ -1072,7 +1072,7 @@ TEST_F(FuelClientTest, DownloadWorld) ServerConfig server; server.SetUrl(gz::common::URI( - "https://fuel.gazebosim.org")); + "https://fuel.ignitionrobotics.org")); ClientConfig config; config.AddServer(server); @@ -1085,7 +1085,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Download world from URL { // Unversioned URL should get the latest available version - common::URI url{"https://fuel.gazebosim.org/1.0/OpenRobotics/" + common::URI url{"https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" "worlds/Test world"}; // Check it is not cached @@ -1102,7 +1102,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Check it was downloaded to `1` auto worldPath = common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "worlds", "test world"); + "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"); EXPECT_EQ(path, common::joinPaths(worldPath, "2")); EXPECT_TRUE(common::exists(common::joinPaths(worldPath, "2"))); @@ -1121,7 +1121,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Try using nonexistent URL { common::URI url{ - "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Bad world"}; + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Bad world"}; std::string path; auto result = client.DownloadWorld(url, path); EXPECT_FALSE(result); @@ -1350,7 +1350,7 @@ TEST_F(FuelClientTest, Models) } { - // Uses fuel.gazebosim.org by default + // Uses fuel.ignitionrobotics.org by default ModelIter iter = client.Models(serverConfig); EXPECT_TRUE(iter); } @@ -1384,7 +1384,7 @@ TEST_F(FuelClientTest, Worlds) } { - // Uses fuel.gazebosim.org by default + // Uses fuel.ignitionrobotics.org by default WorldIter iter = client.Worlds(serverConfig); EXPECT_TRUE(iter); } diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index c56387a6..39a83e7e 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -60,7 +60,7 @@ TEST(Interface, FetchResources) { // Check it's not cached common::URI modelUrl{ - "https://fuel.gazebosim.org/1.0/chapulina/models/Test box"}; + "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"}; { Result res = client.CachedModel(modelUrl, cachedPath); EXPECT_FALSE(res) << "Cached Path: " << cachedPath; @@ -72,25 +72,25 @@ TEST(Interface, FetchResources) std::string sdfPath = sdfFromPath(path); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "models", "test box", "2", + "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", "model.sdf"), sdfPath); // Check it was downloaded to `2` EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "models", "test box", "2")); + "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", "model.sdf"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", "model.config"))); // Check it wasn't downloaded to model root directory EXPECT_FALSE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "models", "Test box", "model.config"))); // Check it is cached @@ -99,7 +99,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "models", "test box", "2"), + "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"), cachedPath); } } @@ -108,9 +108,9 @@ TEST(Interface, FetchResources) { // Check neither file nor its model are cached common::URI modelUrl{ - "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/"}; + "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/"}; common::URI modelFileUrl{ - "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/files" + "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/files" "/meshes/bus.obj"}; { @@ -129,25 +129,25 @@ TEST(Interface, FetchResources) // Check entire model was downloaded to `1` EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1"))); EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "models", "bus", + "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "meshes", "bus.obj")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "model.sdf"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "model.config"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "meshes/bus.obj"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "meshes/bus.mtl"))); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "materials", "textures", "bus.png"))); @@ -157,14 +157,14 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "models", "bus", "1"), + "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1"), cachedPath); } { std::string sdfFile = sdfFromPath(cachedPath); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "models", "bus", + "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "model.sdf"), sdfFile); } @@ -174,7 +174,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "models", "bus", "1", + "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1", "meshes", "bus.obj"), cachedPath); } } @@ -183,7 +183,7 @@ TEST(Interface, FetchResources) { // Check it's not cached common::URI worldUrl{ - "https://fuel.gazebosim.org/1.0/openrobotics/worlds/Test world"}; + "https://fuel.ignitionrobotics.org/1.0/openrobotics/worlds/Test world"}; { Result res = client.CachedWorld(worldUrl, cachedPath); EXPECT_FALSE(res) << "Cached Path: " << cachedPath; @@ -197,13 +197,13 @@ TEST(Interface, FetchResources) // Check it was downloaded to `1` EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "worlds", + "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2")); EXPECT_TRUE(common::exists(common::joinPaths("test_cache", - "fuel.gazebosim.org", "openrobotics", "worlds", "test world", + "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::exists(common::joinPaths("test_cache", - "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2", + "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // Check it is cached @@ -212,7 +212,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "openrobotics", "worlds", "test world", + "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"), cachedPath); } } @@ -221,9 +221,9 @@ TEST(Interface, FetchResources) { // Check neither file nor its world are cached common::URI worldUrl{ - "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/"}; + "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/"}; common::URI worldFileUrl{ - "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/" + "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/" "files/thumbnails/1.png"}; { @@ -242,13 +242,13 @@ TEST(Interface, FetchResources) // Check entire world was downloaded to `1` EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2"))); EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", + "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", "thumbnails", "1.png")); EXPECT_TRUE(common::exists( - common::joinPaths("test_cache", "fuel.gazebosim.org", + common::joinPaths("test_cache", "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", "test.world"))); // Check world is cached @@ -257,14 +257,14 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2"), + "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2"), cachedPath); } { std::string sdfFile = sdfFromPath(cachedPath); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "worlds", "test world", + "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", "test.sdf"), sdfFile); } @@ -274,7 +274,7 @@ TEST(Interface, FetchResources) EXPECT_TRUE(res); EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type()); EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache", - "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2", + "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2", "thumbnails", "1.png"), cachedPath); } } diff --git a/src/JSONParser_TEST.cc b/src/JSONParser_TEST.cc index 4876695f..ed325b01 100644 --- a/src/JSONParser_TEST.cc +++ b/src/JSONParser_TEST.cc @@ -176,7 +176,7 @@ TEST(JSONParser, ParseLicenses) std::stringstream tmpJsonStr; // This is the exact return value from - // https://fuel.gazebosim.org/1.0/licenses as of April 29th, 2020. + // https://fuel.ignitionrobotics.org/1.0/licenses as of April 29th, 2020. tmpJsonStr << R"tmpJsonStr([{ "ID": 1, "CreatedAt": "2017-12-19T20:32:48Z", diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index 9e16d9c8..f316af09 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -152,7 +152,7 @@ TEST(ModelIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: https://fuel.gazebosim.org/models/\n" + "Unique name: https://fuel.ignitionrobotics.org/models/\n" "Description: \n" "File size: 0\n" "Upload date: 0\n" @@ -163,7 +163,7 @@ TEST(ModelIdentifier, AsString) "License image URL: \n" "Tags: \n" "Server:\n" - " URL: https://fuel.gazebosim.org\n" + " URL: https://fuel.ignitionrobotics.org\n" " Version: 1.0\n" " API key: \n"; EXPECT_EQ(str, id.AsString()); @@ -200,7 +200,7 @@ TEST(ModelIdentifier, AsPrettyString) ModelIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 76fe5f7a..54c583c2 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -120,10 +120,10 @@ TEST(WorldIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: fuel.gazebosim.org/worlds/\n" + "Unique name: fuel.ignitionrobotics.org/worlds/\n" "Local path: \n" "Server:\n" - " URL: https://fuel.gazebosim.org\n" + " URL: https://fuel.ignitionrobotics.org\n" " Version: 1.0\n" " API key: \n"; #else @@ -131,10 +131,10 @@ TEST(WorldIdentifier, AsString) "Name: \n"\ "Owner: \n"\ "Version: tip\n"\ - "Unique name: fuel.gazebosim.org\\worlds\\\n" + "Unique name: fuel.ignitionrobotics.org\\worlds\\\n" "Local path: \n" "Server:\n" - " URL: https://fuel.gazebosim.org\n" + " URL: https://fuel.ignitionrobotics.org\n" " Version: 1.0\n" " API key: \n"; #endif @@ -164,7 +164,7 @@ TEST(WorldIdentifier, AsPrettyString) WorldIdentifier id; std::string str = "\x1B[96m\x1B[1mServer:\x1B[0m\n " - "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" + "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org" "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; EXPECT_EQ(str, id.AsPrettyString()); } diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in index 9eaf5bd7..57b1317d 100755 --- a/src/cmd/cmdfuel.rb.in +++ b/src/cmd/cmdfuel.rb.in @@ -88,7 +88,7 @@ SUBCOMMANDS = { "Available Options: \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.gazebosim.org. \n"\ + " https://fuel.ignitionrobotics.org. \n"\ " --header arg Set an HTTP header, such as \n"\ " --header 'Private-Token: '. \n" + COMMON_OPTIONS, @@ -100,7 +100,7 @@ SUBCOMMANDS = { " \n"\ "Available Options: \n"\ " -u [--url] arg Full resource URL, such as: \n"\ - " https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance\n"\ + " https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance\n"\ " --header arg Set an HTTP header, such as \n"\ " --header 'Private-Token: '. \n"\ " -j [--jobs] arg Number of parallel downloads (default: 1, \n"\ @@ -120,7 +120,7 @@ SUBCOMMANDS = { " -m [--model] arg Path to directory containing the model. \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.gazebosim.org. \n"\ + " https://fuel.ignitionrobotics.org. \n"\ " -p [--private] Use this argument to make the model private. \n"\ " -b [--public] Use this argument to make the model public. \n"\ " --header arg Set an HTTP header, such as \n"\ @@ -137,7 +137,7 @@ SUBCOMMANDS = { " -o [--owner] arg Return only resources for given owner. \n"\ " -u [--url] arg URL of a server the resource comes from, \n"\ " if unspecified, it will be \n"\ - " https://fuel.gazebosim.org. \n"\ + " https://fuel.ignitionrobotics.org. \n"\ " -r [--raw] Machine-friendly output. \n" + COMMON_OPTIONS, @@ -163,7 +163,7 @@ SUBCOMMANDS = { " multiple models each in a subdirectory. \n"\ " -u [--url] arg URL of the server that should receive \n"\ " the model. If unspecified, the server will be\n"\ - " https://fuel.gazebosim.org. \n"\ + " https://fuel.ignitionrobotics.org. \n"\ " -o [--owner] arg Upload to the given owner, which can be an. \n"\ " organization. Default behavior is to upload \n"\ " to the user account associated with the \n"\ @@ -287,12 +287,12 @@ class Cmd case options['subcommand'] when 'delete' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end when 'download' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end @@ -333,12 +333,12 @@ class Cmd exit(-1) end if options['url'] == '' - puts "Missing URL (e.g. --url https://fuel.gazebosim.org)." + puts "Missing URL (e.g. --url https://fuel.ignitionrobotics.org)." exit(-1) end when 'edit' if options['url'] == '' - puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)." + puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)." exit(-1) end end diff --git a/src/ign.hh b/src/ign.hh index d19d52d3..27b5b678 100644 --- a/src/ign.hh +++ b/src/ign.hh @@ -87,7 +87,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path, /// /// Example usage, including a private access token which is required: /// -/// `ign fuel delete -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` // NOLINT +/// `ign fuel delete -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` // NOLINT /// /// \param[in] _url Resource URL. /// \param[in] _header An HTTP header. @@ -114,7 +114,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path); /// /// Example usage, including a private access token which is required: /// -/// `ign fuel edit -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` --public // NOLINT +/// `ign fuel edit -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: "` --public // NOLINT /// /// \param[in] _url Resource URL. /// \param[in] _header An HTTP header. diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index daa50805..7278c084 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -99,7 +99,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListConfigServerUgly)) { auto output = custom_exec_str(g_listCmd + " -t model --raw"); - EXPECT_NE(output.find("https://fuel.gazebosim.org/1.0/"), + EXPECT_NE(output.find("https://fuel.ignitionrobotics.org/1.0/"), std::string::npos) << output; EXPECT_EQ(output.find("owners"), std::string::npos) << output; } @@ -110,16 +110,16 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListCustomServerPretty)) { auto output = custom_exec_str( - g_listCmd + " -t model -u https://staging-fuel.gazebosim.org"); + g_listCmd + " -t model -u https://staging-fuel.ignitionrobotics.org"); - EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"), + EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"), std::string::npos) << output; EXPECT_NE(output.find("owners"), std::string::npos) << output; EXPECT_NE(output.find("models"), std::string::npos) << output; - EXPECT_EQ(output.find("https://fuel.gazebosim.org"), std::string::npos) + EXPECT_EQ(output.find("https://fuel.ignitionrobotics.org"), std::string::npos) << output; - EXPECT_EQ(output.find("https://staging-fuel.gazebosim.org/1.0/"), + EXPECT_EQ(output.find("https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos) << output; } @@ -128,8 +128,8 @@ TEST(CmdLine, TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListConfigServerUgly)) { auto output = custom_exec_str(g_listCmd + - " -t world --raw -u https://staging-fuel.gazebosim.org"); - EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"), + " -t world --raw -u https://staging-fuel.ignitionrobotics.org"); + EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"), std::string::npos) << output; EXPECT_EQ(output.find("owners"), std::string::npos) << output; } @@ -140,9 +140,9 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListCustomServerPretty)) { auto output = custom_exec_str( - g_listCmd + " -t world -u https://staging-fuel.gazebosim.org"); + g_listCmd + " -t world -u https://staging-fuel.ignitionrobotics.org"); - EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"), + EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"), std::string::npos) << output; EXPECT_NE(output.find("owners"), std::string::npos) << output; EXPECT_NE(output.find("worlds"), std::string::npos) << output; diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 1abbcc4f..2dd59ef2 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -95,7 +95,7 @@ TEST_F(CmdLine, ModelListConfigServerUgly) { EXPECT_TRUE(listModels("", "", "true")); - EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), + EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find("owners"), std::string::npos) << this->stdOutBuffer.str(); @@ -106,20 +106,20 @@ TEST_F(CmdLine, ModelListConfigServerUgly) // https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelListConfigServerPretty) { - EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org")); + EXPECT_TRUE(listModels("https://staging-fuel.ignitionrobotics.org")); EXPECT_NE(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org"), + "https://staging-fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("owners"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("models"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos) << this->stdOutBuffer.str(); } @@ -128,11 +128,11 @@ TEST_F(CmdLine, ModelListConfigServerPretty) // https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, ModelListConfigServerPrettyOwner) { - EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org", + EXPECT_TRUE(listModels("https://staging-fuel.ignitionrobotics.org", "openrobotics")); EXPECT_NE(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org"), + "https://staging-fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("1 owners"), std::string::npos) << this->stdOutBuffer.str(); @@ -143,10 +143,10 @@ TEST_F(CmdLine, ModelListConfigServerPrettyOwner) EXPECT_EQ(this->stdOutBuffer.str().find("20 models"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos) << this->stdOutBuffer.str(); } @@ -178,7 +178,7 @@ TEST_F(CmdLine, ModelDownloadUnversioned) { // Download EXPECT_TRUE(downloadUrl( - "https://fuel.gazebosim.org/1.0/chapulina/models/Test box")); + "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box")); // Check output EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"), @@ -187,13 +187,13 @@ TEST_F(CmdLine, ModelDownloadUnversioned) // Check files EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", "model.sdf"))); } @@ -212,7 +212,7 @@ TEST_F(CmdLine, DownloadConfigCache) ofs << "---" << std::endl << "servers:" << std::endl << " -" << std::endl - << " url: https://fuel.gazebosim.org" << std::endl + << " url: https://fuel.ignitionrobotics.org" << std::endl << "" << std::endl << "cache:" << std::endl << " path: " << this->testCachePath << std::endl @@ -222,7 +222,7 @@ TEST_F(CmdLine, DownloadConfigCache) // Download EXPECT_TRUE(downloadUrl( - "https://fuel.gazebosim.org/1.0/chapulina/models/Test box", + "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box", testPath.c_str())); // Check output @@ -232,7 +232,7 @@ TEST_F(CmdLine, DownloadConfigCache) // Check files auto modelPath = common::joinPaths(this->testCachePath, - "fuel.gazebosim.org", "chapulina", "models", "test box"); + "fuel.ignitionrobotics.org", "chapulina", "models", "test box"); EXPECT_TRUE(common::isDirectory(modelPath)); EXPECT_TRUE(common::isDirectory(common::joinPaths(modelPath, "2"))); EXPECT_TRUE(common::isFile(common::joinPaths(modelPath, "2", @@ -255,10 +255,10 @@ TEST_F(CmdLine, WorldListFail) TEST_F(CmdLine, WorldListConfigServerUgly) { EXPECT_TRUE(listWorlds( - "https://staging-fuel.gazebosim.org", "", "true")); + "https://staging-fuel.ignitionrobotics.org", "", "true")); EXPECT_NE(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org"), + "https://staging-fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find("owners"), std::string::npos) << this->stdOutBuffer.str(); @@ -269,31 +269,31 @@ TEST_F(CmdLine, WorldListConfigServerUgly) // https://github.com/gazebosim/gz-fuel-tools/issues/105 TEST_F(CmdLine, WorldListConfigServerPretty) { - EXPECT_TRUE(listWorlds("https://staging-fuel.gazebosim.org")); + EXPECT_TRUE(listWorlds("https://staging-fuel.ignitionrobotics.org")); EXPECT_NE(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("owners"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("worlds"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos) << this->stdOutBuffer.str(); } ///////////////////////////////////////////////// TEST_F(CmdLine, WorldListCustomServerPrettyOwner) { - EXPECT_TRUE(listWorlds("https://staging-fuel.gazebosim.org", + EXPECT_TRUE(listWorlds("https://staging-fuel.ignitionrobotics.org", "openrobotics")); EXPECT_NE(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_NE(this->stdOutBuffer.str().find("worlds"), std::string::npos) << this->stdOutBuffer.str(); @@ -302,10 +302,10 @@ TEST_F(CmdLine, WorldListCustomServerPrettyOwner) EXPECT_EQ(this->stdOutBuffer.str().find("20 worlds"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"), + EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"), std::string::npos) << this->stdOutBuffer.str(); EXPECT_EQ(this->stdOutBuffer.str().find( - "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos) + "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos) << this->stdOutBuffer.str(); } @@ -339,7 +339,7 @@ TEST_F(CmdLine, WorldDownloadUnversioned) { // Download EXPECT_TRUE(downloadUrl( - "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Test world")); + "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Test world")); // Check output EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"), @@ -348,13 +348,13 @@ TEST_F(CmdLine, WorldDownloadUnversioned) // Check files EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); } @@ -373,7 +373,7 @@ TEST_P(DownloadCollectionTest, AllItems) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, nullptr, GetParam())); @@ -385,46 +385,46 @@ TEST_P(DownloadCollectionTest, AllItems) // Check files // Model: Backpack EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); } @@ -436,7 +436,7 @@ TEST_P(DownloadCollectionTest, Models) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, "model", GetParam())); @@ -448,34 +448,34 @@ TEST_P(DownloadCollectionTest, Models) // Check files // Model: Backpack EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); // World: Test World 2 EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world2"))); } @@ -487,7 +487,7 @@ TEST_P(DownloadCollectionTest, Worlds) { // Download EXPECT_TRUE( - downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/" + downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/" "collections/TestCollection", nullptr, nullptr, "world", GetParam())); @@ -499,33 +499,33 @@ TEST_P(DownloadCollectionTest, Worlds) // Check files // Model: Backpack EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); // Model: TEAMBASE EXPECT_FALSE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); // World: Test World EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2"))); EXPECT_TRUE(common::isDirectory( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2"))); EXPECT_TRUE(common::isFile( - common::joinPaths(this->testCachePath, "fuel.gazebosim.org", + common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); } diff --git a/tutorials/02_configuration.md b/tutorials/02_configuration.md index 1638c133..b7eaea94 100644 --- a/tutorials/02_configuration.md +++ b/tutorials/02_configuration.md @@ -15,7 +15,7 @@ Gazebo Fuel Tools accepts a YAML file with the following syntax: # The list of servers. servers: - - url: https://fuel.gazebosim.org + url: https://fuel.ignitionrobotics.org private-token: # - @@ -47,7 +47,7 @@ Create a file `/tmp/my_config.yaml` with the following content: # The list of servers. servers: - - url: https://fuel.gazebosim.org + url: https://fuel.ignitionrobotics.org # Where are the assets stored in disk. cache: @@ -121,7 +121,7 @@ And now the fun part, execute it: ``` Verify that you have the model in -`/tmp/ignition/fuel/fuel.gazebosim.org/caguero/models/Beer`, +`/tmp/ignition/fuel/fuel.ignitionrobotics.org/caguero/models/Beer`, as you configured in your YAML file. ## Walkthrough diff --git a/tutorials/03_command_line.md b/tutorials/03_command_line.md index 54567f73..97620ff5 100644 --- a/tutorials/03_command_line.md +++ b/tutorials/03_command_line.md @@ -18,9 +18,9 @@ type, such as `model` or `world` as follows: You should see a list such as: ``` -Fetching world list from https://fuel.gazebosim.org... +Fetching world list from https://fuel.ignitionrobotics.org... Received world list (took 350ms). -https://fuel.gazebosim.org +https://fuel.ignitionrobotics.org ├── OpenRobotics │ ├── Empty │ └── Shapes @@ -50,9 +50,9 @@ a way that's easier for scripts to parse. For example, try: And you'll get a list of the world URLs similar to the one below: ``` -https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty -https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Shapes -https://fuel.gazebosim.org/1.0/chapulina/worlds/Shapes%20copy +https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty +https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Shapes +https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Shapes%20copy ``` ### By owner @@ -70,7 +70,7 @@ computer. We use the `ign fuel download` tool for this. We learned above how to get resource URLs. Now we can use these URLs to download them. For example, try: -`ign fuel download -v 4 -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty` +`ign fuel download -v 4 -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty` Note that we passed the `-v 4` option so we get a verbose output. You should see something like: @@ -79,12 +79,12 @@ Downloading world: Name: Empty Owner: OpenRobotics Server: - URL: https://fuel.gazebosim.org + URL: https://fuel.ignitionrobotics.org Version: 1.0 -[Msg] Downloading world [fuel.gazebosim.org/OpenRobotics/worlds/Empty] +[Msg] Downloading world [fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty] [Msg] Saved world at: - /home/louise/.ignition/fuel/fuel.gazebosim.org/OpenRobotics/worlds/Empty/1 + /home/louise/.ignition/fuel/fuel.ignitionrobotics.org/OpenRobotics/worlds/Empty/1 Download succeeded. ``` @@ -96,14 +96,14 @@ If the model is privated you can create a config file with your token. For examp # The list of servers. servers: - - url: https://fuel.gazebosim.org + url: https://fuel.ignitionrobotics.org private-token: ``` Then try to download the model: ```bash -ign fuel download -v 4 -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty -c /tmp/my_config.yaml +ign fuel download -v 4 -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty -c /tmp/my_config.yaml ``` Worlds downloaded with the tool get conveniently organized into the same @@ -113,7 +113,7 @@ directory, which we call the "local cache". The path is broken down as follows: > **Tip**: You can change the local cache path in `config.yaml`. -> **Tip**: You can also use other tools such as `wget` to download a zipped file of a world, just add `.zip` to the end of the URL, for example: `wget https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty.zip`. +> **Tip**: You can also use other tools such as `wget` to download a zipped file of a world, just add `.zip` to the end of the URL, for example: `wget https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty.zip`. ## Edit resources @@ -138,11 +138,11 @@ access. Use the `-p` option to make a resources private. For example: ``` -ign fuel edit -p -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' +ign fuel edit -p -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' ``` Use the `-b` option to make a resource public. For example: ``` -ign fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' +ign fuel edit -b -u https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty --header 'Private-token: YOUR_TOKEN' ``` diff --git a/tutorials/04_cpp_api.md b/tutorials/04_cpp_api.md index 51ccef5d..773ec13d 100644 --- a/tutorials/04_cpp_api.md +++ b/tutorials/04_cpp_api.md @@ -73,7 +73,7 @@ You should see the name of the server followed by its list of models. Here's an example: ``` -[https://fuel.gazebosim.org] +[https://fuel.ignitionrobotics.org] Beer Wastebasket @@ -150,7 +150,7 @@ License name: Creative Commons - Attribution License URL: http://creativecommons.org/licenses/by/4.0 License image URL: https://i.creativecommons.org/l/by/4.0/88x31.png Server: - URL: https://fuel.gazebosim.org + URL: https://fuel.ignitionrobotics.org Version: 1.0 ``` From acc1d3745b1b6742e2f013fe33c2f85958d84d01 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 23 May 2022 17:13:46 -0700 Subject: [PATCH 21/25] Rollback osrf-migration.github.io migrations Signed-off-by: methylDragon --- Changelog.md | 94 ++++++++++++++++++++++++++-------------------------- Migration.md | 20 +++++------ 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Changelog.md b/Changelog.md index cce0c3df..df0e5851 100644 --- a/Changelog.md +++ b/Changelog.md @@ -204,20 +204,20 @@ ### Gazebo Fuel Tools 4.1.0 (2020-02-27) 1. Resource deletion CLI. - * [BitBucket pull request 119](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/119) + * [BitBucket pull request 119](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/119) 1. Fetch files - * [BitBucket pull request 123](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/123) + * [BitBucket pull request 123](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/123) 1. README and tutorial updates: - * [BitBucket pull request 113](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/113) - * [BitBucket pull request 114](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/114) - * [BitBucket pull request 115](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/115) + * [BitBucket pull request 113](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/113) + * [BitBucket pull request 114](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/114) + * [BitBucket pull request 115](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/115) ### Gazebo Fuel Tools 4.0.0 (2019-12-10) 1. Model upload CLI, resource metadata CLI, depend on ign-msgs5. - * [BitBucket pull request 108](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/108) + * [BitBucket pull request 108](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/108) ## Gazebo Fuel Tools 3.x @@ -274,36 +274,36 @@ * [Pull request 70](https://github.com/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/#!/gazebosim/gz-fuel-tools/pull-requests/102) + * [BitBucket pull request 102](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/102) 1. Use `${YAML_TARGET}` instead of `YAML::YAML` imported target. - * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/103) + * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/103) 1. Convert emissive map file path. - * [BitBucket pull request 105](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/105) + * [BitBucket pull request 105](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/105) 1. Fix windows build with `popen` and `pclose` macros. - * [BitBucket pull request 109](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/109) + * [BitBucket pull request 109](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/109) 1. Remove std::experimental for filesystem (support for VS2019). - * [BitBucket pull request 120](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/120) + * [BitBucket pull request 120](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/120) ### Gazebo Fuel Tools 3.2.1 (2019-08-12) 1. Support actors - * [BitBucket pull request 101](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/101) + * [BitBucket pull request 101](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/101) ### Gazebo Fuel Tools 3.2.0 (2019-06-14) 1. FuelClient::DownloadModel accepts HTTP headers, and the `ign fuel download` command can accept a single HTTP header. - * [BitBucket pull request 100](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/100) + * [BitBucket pull request 100](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/100) ### Gazebo Fuel Tools 3.1.0 (2019-05-xx) 1. Fix PBR material URI - * [BitBucket pull request 95](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/95) - * [BitBucket pull request 96](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/96) + * [BitBucket pull request 95](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/95) + * [BitBucket pull request 96](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/96) ### Gazebo Fuel Tools 3.0.0 (2018-02-28) @@ -311,80 +311,80 @@ fuel-tools to use ign-cmake2, sets api.ignitionfuel.org as the default server, fixes codecheck errors, removes old deprecations, and parses model.config files using tinyxml2. - * [BitBucket pull request 82](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/82) - * [BitBucket pull request 83](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/83) - * [BitBucket pull request 84](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/84) - * [BitBucket pull request 85](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/85) - * [BitBucket pull request 87](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/87) - * [BitBucket pull request 88](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/88) - * [BitBucket pull request 89](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/89) + * [BitBucket pull request 82](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/82) + * [BitBucket pull request 83](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/83) + * [BitBucket pull request 84](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/84) + * [BitBucket pull request 85](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/85) + * [BitBucket pull request 87](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/87) + * [BitBucket pull request 88](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/88) + * [BitBucket pull request 89](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/89) ## Gazebo Fuel Tools 1.x ### Gazebo Fuel Tools 1.x.x (20xx-xx-xx) 1. Use `${YAML_TARGET}` instead of `YAML::YAML` imported target. - * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/103) + * [BitBucket pull request 103](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/103) ### Gazebo Fuel Tools 1.2.0 (2018-05-30) 1. Get cached model resource file - * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/63) + * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/63) 1. Add some AsString functions - * [BitBucket pull request 54](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/54) + * [BitBucket pull request 54](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/54) 1. Change cache directory structure and use it - * [BitBucket pull request 57](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/57) - * [BitBucket pull request 71](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/71) - * [BitBucket pull request 73](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/73) + * [BitBucket pull request 57](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/57) + * [BitBucket pull request 71](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/71) + * [BitBucket pull request 73](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/73) 1. Client return only relevant cached models - * [BitBucket pull request 62](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/62) + * [BitBucket pull request 62](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/62) 1. Model version support - * [BitBucket pull request 65](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/65) + * [BitBucket pull request 65](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/65) 1. Remove server API version from model unique name - * [BitBucket pull request 47](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/47) + * [BitBucket pull request 47](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/47) 1. Client handle unique names and get server info from config - * [BitBucket pull request 55](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/55) + * [BitBucket pull request 55](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/55) 1. Changed model list to use headers for paging instead of iterating until a 404 is hit. Also added a mechanism to set the user agent - * [BitBucket pull request 46](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/46) - * [BitBucket pull request 61](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/61) + * [BitBucket pull request 46](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/46) + * [BitBucket pull request 61](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/61) 1. FuelClient: Don't use ServerConfig if there's ModelId - * [BitBucket pull request 56](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/56) + * [BitBucket pull request 56](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/56) 1. List models from command line - * [BitBucket pull request 43](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/43) - * [BitBucket pull request 48](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/48) - * [BitBucket pull request 44](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/44) - * [BitBucket pull request 45](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/45) + * [BitBucket pull request 43](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/43) + * [BitBucket pull request 48](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/48) + * [BitBucket pull request 44](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/44) + * [BitBucket pull request 45](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/45) 1. Get cached model resource file - * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/63) + * [BitBucket pull request 63](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/63) 1. Added const constructors for ModelIter and Model - * [BitBucket pull request 42](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/42) + * [BitBucket pull request 42](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/42) 1. Use common::URI for server URL - * [BitBucket pull request 59](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/59) + * [BitBucket pull request 59](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/59) 1. Remove server local name - * [BitBucket pull request 58](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/58) + * [BitBucket pull request 58](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/58) 1. Encode url path before downloading models - * [BitBucket pull request 41](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/41) + * [BitBucket pull request 41](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/41) 1. Download model from command line - * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/68) + * [BitBucket pull request 68](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/68) 1. Backport code style changes - * [BitBucket pull request 69](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/69) - * [BitBucket pull request 67](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/67) + * [BitBucket pull request 69](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/69) + * [BitBucket pull request 67](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/67) ### Gazebo Fuel Tools 1.0.0 (2018-01-25) diff --git a/Migration.md b/Migration.md index 219dd931..c0425956 100644 --- a/Migration.md +++ b/Migration.md @@ -35,37 +35,37 @@ ### Modifications 1. Renamed the REST class to Rest. - * [BitBucket pull request #53](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/53) + * [BitBucket pull request #53](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/53) 1. All setters (functions that set class variables) have been prefixed with `Set` and existing functions deprecated. Acronyms within class and function names have been changed from all-caps (e.g URL) to camel-case (eg. Url). - * [BitBucket pull request #49](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/49) - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51) - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) + * [BitBucket pull request #49](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/49) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) 1. Deprecated `env` function. Please use `igition::common::env`. - * [BitBucket pull request #50](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/50) + * [BitBucket pull request #50](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/50) 1. Deprecated the `ModelIdentifier::Category` functions. The Category concept does not exist on fuelserver. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) 1. Deprecated the accessor `ModelIdentifier::Likes` for `ModelIdentifier::LikeCount`, and the mutator `ModelIdentifier::Likes` for `ModelIdentifier::SetLikeCount`. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) 1. Deprecated the accessor `ModelIdentifier::Downloads` for `ModelIdentifier::DownloadCount`, and the mutator `ModelIdentifier::Downloads` for `ModelIdentifier::SetDownloadCount`. - * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/52) + * [BitBucket pull request #52](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/52) 1. ResultTypes have moved from a plain `enum` inside the `Result` class to an `enum class ResultType` outside the `Result` class scope. - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) 1. `ResultType Result::Type() const` now returns an `enum class` instead of a plain `enum`. This should not affect you unless you have been mapping `ResultType` to an `int`. - * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) + * [BitBucket pull request #51](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/51/update-result-style/diff#chg-include/ignition/fuel_tools/Result.hh) ## Gazebo Fuel Tools 1.2 to 1.X From c540e70dc8a7df277fc76c9a782878bebf8d3eb0 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 25 May 2022 13:54:55 -0700 Subject: [PATCH 22/25] Revert URL changes in code Signed-off-by: methylDragon --- src/ModelIter_TEST.cc | 4 ++-- src/WorldIter_TEST.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ModelIter_TEST.cc b/src/ModelIter_TEST.cc index a60aa52b..d2e46c10 100644 --- a/src/ModelIter_TEST.cc +++ b/src/ModelIter_TEST.cc @@ -46,7 +46,7 @@ namespace gz public: static ModelIter ModelIterThreeModelIds() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(common::URI("https://gazebosim.org")); + srv.SetUrl(common::URI("https://ignitionrobotics.org")); std::vector ids; for (int i = 0; i < 3; i++) @@ -68,7 +68,7 @@ namespace gz public: static ModelIter ModelIterThreeModels() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(common::URI("https://gazebosim.org")); + srv.SetUrl(common::URI("https://ignitionrobotics.org")); std::vector models; for (int i = 0; i < 3; i++) diff --git a/src/WorldIter_TEST.cc b/src/WorldIter_TEST.cc index b20b897a..e527e0a9 100644 --- a/src/WorldIter_TEST.cc +++ b/src/WorldIter_TEST.cc @@ -45,7 +45,7 @@ namespace gz public: static WorldIter WorldIterThreeWorldIds() { gz::fuel_tools::ServerConfig srv; - srv.SetUrl(gz::common::URI("https://gazebosim.org")); + srv.SetUrl(gz::common::URI("https://ignitionrobotics.org")); std::vector ids; for (int i = 0; i < 3; i++) From f3d46db1b04823d8d7a84e273d384b9a7d513d0a Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 25 May 2022 14:02:09 -0700 Subject: [PATCH 23/25] Wording changes Signed-off-by: methylDragon --- tutorials/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/index.md b/tutorials/index.md index 71112f20..b904fa21 100644 --- a/tutorials/index.md +++ b/tutorials/index.md @@ -12,7 +12,7 @@ simulation, such as models and worlds. ### Models -A common asset stored in an Gazebo Fuel server is a model. A model represents +A common asset stored in a Gazebo Fuel server is a model. A model represents an object in simulation. A model has a name and a description of its visual and physical properties. Models can be as simple as a sphere or complicated as a highly articulated humanoid robot. See the full model specification From 989bbe0b094da6f12585cbbaa77418f98c734691 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 25 May 2022 15:56:33 -0700 Subject: [PATCH 24/25] Migrate `igndbg` -> `gzdbg` Signed-off-by: methylDragon --- src/ClientConfig_TEST.cc | 8 ++++---- src/FuelClient.cc | 6 +++--- src/FuelClient_TEST.cc | 4 ++-- src/LocalCache.cc | 2 +- src/LocalCache_TEST.cc | 8 ++++---- src/ModelIdentifier_TEST.cc | 4 ++-- src/ModelIter.cc | 2 +- src/WorldIdentifier_TEST.cc | 4 ++-- src/WorldIter.cc | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 6286b864..d1f3ef4f 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -306,7 +306,7 @@ TEST(ClientConfig, AsString) ClientConfig client; std::string str = client.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; #ifndef _WIN32 EXPECT_NE(str.find(".ignition/fuel"), std::string::npos); @@ -337,7 +337,7 @@ TEST(ClientConfig, AsString) srv.SetApiKey("ABCD"); auto str = srv.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); EXPECT_EQ(str.find("local_name"), std::string::npos); @@ -354,7 +354,7 @@ TEST(ClientConfig, AsString) client.AddServer(srv); auto str = client.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("cache/location"), std::string::npos); EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); @@ -380,7 +380,7 @@ TEST(ClientConfig, AsPrettyString) srv.SetApiKey("ABCD"); auto str = srv.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); EXPECT_EQ(str.find("local_name"), std::string::npos); diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 06ea618a..a38a5670 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -920,7 +920,7 @@ std::vector FuelClient::DownloadModels( if (!dependencies.empty()) { std::lock_guard lock(idsMutex); - igndbg << "Adding " << dependencies.size() + gzdbg << "Adding " << dependencies.size() << " model dependencies to queue from " << id.Name() << "\n"; for (auto dep : dependencies) { @@ -1653,7 +1653,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, { std::string filePath = common::joinPaths(_pathToModelDir, "metadata.pbtxt"); - igndbg << "Parsing " << filePath << std::endl; + gzdbg << "Parsing " << filePath << std::endl; // Read the pbtxt file. std::ifstream inputFile(filePath); @@ -1667,7 +1667,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, { std::string filePath = common::joinPaths(_pathToModelDir, "model.config"); - igndbg << "Parsing " << filePath << std::endl; + gzdbg << "Parsing " << filePath << std::endl; std::ifstream inputFile(filePath); std::string inputStr((std::istreambuf_iterator(inputFile)), diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index e74287b1..0354d0b4 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -45,7 +45,7 @@ using namespace gz::fuel_tools; /// Taken from LocalCache_TEST void createLocalModel(ClientConfig &_conf) { - igndbg << "Creating local model in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating local model in [" << common::cwd() << "]" << std::endl; auto modelPath = common::joinPaths( "test_cache", "localhost:8007", "alice", "models", "My Model"); @@ -100,7 +100,7 @@ void createLocalModel(ClientConfig &_conf) /// Taken from LocalCache_TEST void createLocalWorld(ClientConfig &_conf) { - igndbg << "Creating local world in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating local world in [" << common::cwd() << "]" << std::endl; auto worldPath = common::joinPaths( "test_cache", "localhost:8007", "banana", "worlds", "My World"); diff --git a/src/LocalCache.cc b/src/LocalCache.cc index 91e43cfc..69609f2f 100644 --- a/src/LocalCache.cc +++ b/src/LocalCache.cc @@ -601,7 +601,7 @@ void LocalCachePrivate::FixPathsInUri(tinyxml2::XMLElement *_elem, // On Blueprint and Citadel, just warn the user // From Dome, use the name on the URI (resourceName) and assume the same // owner - igndbg << "Model [" << _id.Name() + gzdbg << "Model [" << _id.Name() << "] loading resource from another model, named [" << resourceName << "]. On Blueprint (ign-fuel-tools 3) and Citadel " << "(ign-fuel-tools 4), [" << resourceName << "] is ignored. " diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc index 4c2b64b0..41b2a801 100644 --- a/src/LocalCache_TEST.cc +++ b/src/LocalCache_TEST.cc @@ -44,7 +44,7 @@ using namespace fuel_tools; /// \brief Creates a directory structure in the build directory with 6 models void createLocal6Models(ClientConfig &_conf) { - igndbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -96,7 +96,7 @@ void createLocal6Models(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 3 models void createLocal3Models(ClientConfig &_conf) { - igndbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -130,7 +130,7 @@ void createLocal3Models(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 6 worlds void createLocal6Worlds(ClientConfig &_conf) { - igndbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -182,7 +182,7 @@ void createLocal6Worlds(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 3 worlds void createLocal3Worlds(ClientConfig &_conf) { - igndbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index f316af09..85e28f6d 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -183,7 +183,7 @@ TEST(ModelIdentifier, AsString) id.SetUploadDate(d2); auto str = id.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); @@ -219,7 +219,7 @@ TEST(ModelIdentifier, AsPrettyString) id.SetUploadDate(d2); auto str = id.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); diff --git a/src/ModelIter.cc b/src/ModelIter.cc index c0cd3fdc..8829899b 100644 --- a/src/ModelIter.cc +++ b/src/ModelIter.cc @@ -199,7 +199,7 @@ IterRestIds::IterRestIds(const Rest &_rest, const ServerConfig &_config, ptr->id.SetServer(this->config); this->model = Model(ptr); - igndbg << "Got response [" << resp.data << "]\n"; + gzdbg << "Got response [" << resp.data << "]\n"; } ////////////////////////////////////////////////// diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 54c583c2..0a9c3571 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -148,7 +148,7 @@ TEST(WorldIdentifier, AsString) id.SetVersionStr("55"); auto str = id.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); @@ -176,7 +176,7 @@ TEST(WorldIdentifier, AsPrettyString) id.SetVersionStr("55"); auto str = id.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); diff --git a/src/WorldIter.cc b/src/WorldIter.cc index 980f34a4..904e5ac2 100644 --- a/src/WorldIter.cc +++ b/src/WorldIter.cc @@ -166,7 +166,7 @@ WorldIterRestIds::WorldIterRestIds(const Rest &_rest, this->worldId = *(this->idIter); this->worldId.SetServer(this->config); - igndbg << "Got response [" << resp.data << "]\n"; + gzdbg << "Got response [" << resp.data << "]\n"; } ////////////////////////////////////////////////// From 214227dd8eedc01b607261091b2a7acceebb1568 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 25 May 2022 16:57:02 -0700 Subject: [PATCH 25/25] Post-rebase `gzerr`, `gzdbg`, `Gazebo Fuel Tools` migration Signed-off-by: methylDragon --- Changelog.md | 4 ++-- src/Zip.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index df0e5851..43435340 100644 --- a/Changelog.md +++ b/Changelog.md @@ -15,7 +15,7 @@ ## Gazebo Fuel Tools 6.x -### Ignition Fuel Tools 6.2.0 (2022-03-25) +### Gazebo Fuel Tools 6.2.0 (2022-03-25) 1. Fix trailing slashes in failing tests * [Pull request #237](https://github.com/ignitionrobotics/ign-fuel-tools/pull/237) @@ -38,7 +38,7 @@ 1. APIs for retrieving models in parallel * [Pull request #199](https://github.com/ignitionrobotics/ign-fuel-tools/pull/199) -### Ignition Fuel Tools 6.1.0 (2021-10-15) +### Gazebo Fuel Tools 6.1.0 (2021-10-15) 1. Detect ign instead of using cmake module to check for ignition-tools * [Pull request #191](https://github.com/gazebosim/gz-fuel-tools/pull/191) diff --git a/src/Zip.cc b/src/Zip.cc index 306b5dff..2ff3ab72 100644 --- a/src/Zip.cc +++ b/src/Zip.cc @@ -173,11 +173,11 @@ bool Zip::Extract(const std::string &_src, file.write(buf, len); if (file.fail()) { - ignerr << "Failed to write file [" << dst << "]" << std::endl; + gzerr << "Failed to write file [" << dst << "]" << std::endl; } else { - igndbg << "Created file [" << dst << "]" << std::endl; + gzdbg << "Created file [" << dst << "]" << std::endl; } }