5 ➡️ 6

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Dec 23, 2020 · ea61567 · ea61567
2 parents f8c62dd + c0ec7e9
commit ea61567
Show file tree

Hide file tree

Showing 17 changed files with 599 additions and 282 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,15 @@
 ## Ignition Fuel Tools 5.x
 
-### Ignition Fuel Tools 5.x.x
+### Ignition Fuel Tools 5.X.X (20XX-XX-XX)
+
+### 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)
+
+### Ignition 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)
 
@@ -19,6 +28,16 @@
 1. Fixed test - Download world 2
     * [Pull request 110](https://github.com/ignitionrobotics/ign-fuel-tools/pull/110)
 
+### 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)
+
+1. Download dependencies.
+    * [Pull request 123](https://github.com/ignitionrobotics/ign-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.
@@ -61,6 +80,34 @@
 
 ### Ignition Fuel Tools 3.x.x (20xx-xx-xx)
 
+### 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)
+
+1. Resolve updated codecheck issues.
+    * [Pull request 129](https://github.com/ignitionrobotics/ign-fuel-tools/pull/129)
+
+1. Update Backpack model to fix tests.
+    * [Pull request 132](https://github.com/ignitionrobotics/ign-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)
+
+### 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)
+
+1. Fix test worlds.
+    * [Pull request 100](https://github.com/ignitionrobotics/ign-fuel-tools/pull/100)
+
+1. Add capability for downloading collections.
+    * [Pull request 98](https://github.com/ignitionrobotics/ign-fuel-tools/pull/98)
+
+1. Fix windows build.t
+    * [Pull request 103](https://github.com/ignitionrobotics/ign-fuel-tools/pull/013)
+
 ### Ignition Fuel Tools 3.3.0 (2020-07-29)
 
 1. openrobotics to OpenRobotics

diff --git a/include/ignition/fuel_tools/FuelClient.hh b/include/ignition/fuel_tools/FuelClient.hh
@@ -348,6 +348,24 @@ namespace ignition
                   const ignition::fuel_tools::ModelIdentifier &_model,
                   const std::vector<std::string> &_headers);
 
+      /// \brief Update a model using a PATCH request.
+      ///
+      /// Model fields that are patched by this function:
+      ///   * private
+      ///   * Model files contained in _pathToModelDir.
+      ///   * Description, tags, license, and other attributes found in the
+      ///     metadata.pbtxt or model.config file.
+      ///
+      /// \param[in] _model The model to patch. The contents of this model
+      ///            will be sent in the PATCH request.
+      /// \param[in] _headers Headers to set on the HTTP request.
+      /// \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 std::vector<std::string> &_headers,
+                  const std::string &_pathToModelDir);
+
       /// \brief Parse Collection identifer from URL.
       /// \param[in] _url The unique URL of a collection. It may also be a
       /// unique name, which is a URL without the server version.

diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc
@@ -52,7 +52,7 @@ std::string homePath()
 #ifndef _WIN32
   ignition::common::env("HOME", homePath);
 #else
-  ignition::common::env("HOMEPATH", homePath);
+  ignition::common::env("USERPROFILE", homePath);
 #endif
 
   return homePath;

diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc
@@ -145,7 +145,7 @@ TEST(CollectionIdentifier, AsString)
     std::string str =
         "Name: \n"\
         "Owner: \n"\
-        "Unique name: https://fuel.ignitionrobotics.org\\\\collections\\\n"
+        "Unique name: https://fuel.ignitionrobotics.org\\collections\n"
         "Server:\n"
         "  URL: https://fuel.ignitionrobotics.org\n"
         "  Version: 1.0\n"