Part 1 of pull request #82. Changes api.ignitionfuel.org to fuel.igni…

…tionrobotics.org and bumps major version

CMakeLists.txt

@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-fuel_tools2 VERSION 2.0.0)
+project(ignition-fuel_tools3 VERSION 3.0.0)
 
 #============================================================================
 # Find ignition-cmake
 #============================================================================
 # If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake0 REQUIRED)
+find_package(ignition-cmake2 REQUIRED)
 
 #============================================================================
 # Configure the project

README.md

@@ -113,7 +113,7 @@ sources:
     api_key: r1CJIKTadlpS1IWt9jivf2sqGJAkbvSQoIMIubrn
 
   osrf_public:
-    url: https://staging-api.ignitionfuel.org
+    url: https://staging-fuel.ignitionrobotics.org
     api_key: sdfpWzZZbdixQ3zZbzxQzG4WPRlMT6DgUthvsfZ7
 
   local:

conf/config.yaml

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

example/download.cc

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

include/ignition/fuel_tools/FuelClient.hh

@@ -203,7 +203,7 @@ namespace ignition
       /// common::URI.
       ///
       /// \param[in] _modelUrl The unique URL of the model to download.
-      /// E.g.: https://api.ignitionfuel.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 std::string &_modelUrl,
@@ -212,7 +212,7 @@ namespace ignition
       /// \brief Download a model from ignition fuel. This will override an
       /// existing local copy of the model.
       /// \param[in] _modelUrl The unique URL of the model to download.
-      /// E.g.: https://api.ignitionfuel.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,
@@ -221,23 +221,23 @@ namespace ignition
       /// \brief Download a world from ignition fuel. This will override an
       /// existing local copy of the world.
       /// \param[in] _worldUrl The unique URL of the world to download.
-      /// E.g.: https://api.ignitionfuel.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,
                                    std::string &_path);
 
       /// \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://api.ignitionfuel.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,
                                  std::string &_path);
 
       /// \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://api.ignitionfuel.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,

src/ClientConfig_TEST.cc

@@ -73,7 +73,7 @@ TEST(ClientConfig, CustomDefaultConfiguration)
   config.LoadConfig();
 
   ASSERT_EQ(1u, config.Servers().size());
-  EXPECT_EQ("https://api.ignitionfuel.org",
+  EXPECT_EQ("https://fuel.ignitionrobotics.org",
     config.Servers().front().Url().Str());
 
   std::string defaultCacheLocation = ignition::common::joinPaths(
@@ -96,7 +96,7 @@ TEST(ClientConfig, CustomConfiguration)
       << "# The list of servers."                 << std::endl
       << "servers:"                               << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://api.ignitionfuel.org"  << std::endl
+      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
       << ""                                       << std::endl
       << "  -"                                    << std::endl
       << "    url: https://myserver"              << std::endl
@@ -110,7 +110,7 @@ TEST(ClientConfig, CustomConfiguration)
   EXPECT_TRUE(config.LoadConfig());
 
   ASSERT_EQ(2u, config.Servers().size());
-  EXPECT_EQ("https://api.ignitionfuel.org",
+  EXPECT_EQ("https://fuel.ignitionrobotics.org",
     config.Servers().front().Url().Str());
   EXPECT_EQ("https://myserver",
     config.Servers().back().Url().Str());
@@ -136,10 +136,10 @@ TEST(ClientConfig, RepeatedServerConfiguration)
       << "# The list of servers."                 << std::endl
       << "servers:"                               << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://api.ignitionfuel.org"  << std::endl
+      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
       << ""                                       << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://api.ignitionfuel.org"  << std::endl
+      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
       << ""                                       << std::endl
       << "# Where are the assets stored in disk." << std::endl
       << "cache:"                                 << std::endl

src/FuelClient.cc

@@ -44,7 +44,7 @@ using namespace fuel_tools;
 class ignition::fuel_tools::FuelClientPrivate
 {
   /// \brief A model URL,
-  /// E.g.: https://api.ignitionfuel.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
@@ -63,7 +63,7 @@ class ignition::fuel_tools::FuelClientPrivate
     "([0-9]*|tip)"};
 
   /// \brief A world URL,
-  /// E.g.: https://api.ignitionfuel.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