Bump version to 1.0.0

d-led · d-led · commit c4a3259befc2 · 2025-11-01T14:20:14.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 project(
     influxdb-cpp-rest
-    VERSION 1.0.1
+    VERSION 1.0.0
     LANGUAGES CXX
     DESCRIPTION "A C++ client library for InfluxDB using C++ REST SDK"
 )
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class InfluxdbCppRestConan(ConanFile):
     name = "influxdb-cpp-rest"
-    version = "1.0.1"
+    version = "1.0.0"
     license = "MPL-2.0"
     author = "Dmitry Ledentsov"
     url = "https://github.com/d-led/influxdb-cpp-rest"
diff --git a/scripts/push-latest-version.sh b/scripts/push-latest-version.sh
@@ -2,19 +2,23 @@
 set -euo pipefail
 
 # Script to push the latest version tag to remote
-# Usage: ./scripts/push-latest-version.sh [remote] [--dry-run]
+# Usage: ./scripts/push-latest-version.sh [remote] [--dry-run] [-y|--yes]
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 
 # Parse arguments
 REMOTE="origin"
 DRY_RUN=false
+YES=false
 for arg in "$@"; do
     case "$arg" in
         --dry-run)
             DRY_RUN=true
             ;;
+        -y|--yes)
+            YES=true
+            ;;
         *)
             if [ "$REMOTE" = "origin" ] && [[ ! "$arg" =~ ^-- ]]; then
                 REMOTE="$arg"
@@ -106,10 +110,14 @@ main() {
             echo "[DRY RUN] Tag ${LATEST_TAG} already exists on ${REMOTE}"
         else
             echo "Tag ${LATEST_TAG} already exists on ${REMOTE}"
-            read -p "Push anyway? (y/N) " -n 1 -r
-            echo
-            if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-                exit 0
+            if [ "$YES" = true ]; then
+                echo "Continuing anyway (--yes flag set)"
+            else
+                read -p "Push anyway? (y/N) " -n 1 -r
+                echo
+                if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+                    exit 0
+                fi
             fi
         fi
     else
@@ -127,14 +135,16 @@ main() {
         exit 0
     fi
     
-    # Confirm before pushing
-    echo ""
-    echo "About to push tag ${LATEST_TAG} to ${REMOTE}"
-    read -p "Continue? (y/N) " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        echo "Cancelled."
-        exit 0
+    # Confirm before pushing (unless --yes flag is set)
+    if [ "$YES" != true ]; then
+        echo ""
+        echo "About to push tag ${LATEST_TAG} to ${REMOTE}"
+        read -p "Continue? (y/N) " -n 1 -r
+        echo
+        if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+            echo "Cancelled."
+            exit 0
+        fi
     fi
     
     # Push the tag
diff --git a/scripts/tag-version.sh b/scripts/tag-version.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Script to bump and tag semantic versions
-# Usage: ./scripts/tag-version.sh [major|minor|patch|rc|release] [--dry-run]
+# Usage: ./scripts/tag-version.sh [major|minor|patch|rc|release] [--dry-run] [--push]
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
@@ -15,6 +15,18 @@ if [[ "${@}" =~ --dry-run ]]; then
     DRY_RUN=true
 fi
 
+# Check for push flag (defaults to false)
+PUSH=false
+if [[ "${@}" =~ --push ]]; then
+    PUSH=true
+fi
+
+# Check for yes/auto-confirm flag (defaults to false)
+YES=false
+if [[ "${@}" =~ -y ]] || [[ "${@}" =~ --yes ]]; then
+    YES=true
+fi
+
 # Get current version from conanfile.py
 get_current_version() {
     if [ -f "${CONANFILE}" ]; then
@@ -154,9 +166,17 @@ create_tag() {
             echo "  Warning: Tag ${tag} already exists"
         fi
         
-        # Check for uncommitted changes
-        if ! git diff-index --quiet HEAD --; then
-            echo "  Warning: Uncommitted changes detected"
+        # Check for uncommitted changes (excluding version files)
+        local git_root=$(git rev-parse --show-toplevel)
+        local conanfile_rel="${CONANFILE#${git_root}/}"
+        local cmakelists_rel="${CMAKELISTS#${git_root}/}"
+        local all_changed=$(git diff --name-only HEAD 2>/dev/null || true)
+        local all_staged=$(git diff --name-only --cached 2>/dev/null || true)
+        local other_changes=$(echo "$all_changed" | grep -v -E "^${conanfile_rel}$|^${cmakelists_rel}$" | grep -v '^$' || true)
+        local other_staged=$(echo "$all_staged" | grep -v -E "^${conanfile_rel}$|^${cmakelists_rel}$" | grep -v '^$' || true)
+        
+        if [ -n "$other_changes" ] || [ -n "$other_staged" ]; then
+            echo "  Warning: Uncommitted changes detected (excluding version files)"
             git status --short
         fi
         return
@@ -165,21 +185,46 @@ create_tag() {
     # Check if tag already exists
     if git rev-parse "${tag}" >/dev/null 2>&1; then
         echo "Warning: Tag ${tag} already exists" >&2
-        read -p "Continue anyway? (y/N) " -n 1 -r
-        echo
-        if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-            exit 1
+        if [ "$YES" != true ]; then
+            read -p "Continue anyway? (y/N) " -n 1 -r
+            echo
+            if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+                exit 1
+            fi
+        else
+            echo "Continuing anyway (--yes flag set)" >&2
         fi
     fi
     
-    # Check for uncommitted changes
-    if ! git diff-index --quiet HEAD --; then
-        echo "Warning: You have uncommitted changes" >&2
+    # Check for uncommitted changes (excluding version files that will be committed)
+    # Get paths relative to git root
+    local git_root=$(git rev-parse --show-toplevel)
+    local conanfile_rel="${CONANFILE#${git_root}/}"
+    local cmakelists_rel="${CMAKELISTS#${git_root}/}"
+    
+    # Get all changed files
+    local all_changed=$(git diff --name-only HEAD 2>/dev/null || true)
+    local all_staged=$(git diff --name-only --cached 2>/dev/null || true)
+    
+    # Filter out version files
+    local other_changes=$(echo "$all_changed" | grep -v -E "^${conanfile_rel}$|^${cmakelists_rel}$" || true)
+    local other_staged=$(echo "$all_staged" | grep -v -E "^${conanfile_rel}$|^${cmakelists_rel}$" || true)
+    
+    # Remove empty lines
+    other_changes=$(echo "$other_changes" | grep -v '^$' || true)
+    other_staged=$(echo "$other_staged" | grep -v '^$' || true)
+    
+    if [ -n "$other_changes" ] || [ -n "$other_staged" ]; then
+        echo "Warning: You have uncommitted changes (excluding version files)" >&2
         git status --short
-        read -p "Continue with tag anyway? (y/N) " -n 1 -r
-        echo
-        if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-            exit 1
+        if [ "$YES" != true ]; then
+            read -p "Continue with tag anyway? (y/N) " -n 1 -r
+            echo
+            if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+                exit 1
+            fi
+        else
+            echo "Continuing anyway (--yes flag set)" >&2
         fi
     fi
     
@@ -188,6 +233,52 @@ create_tag() {
     echo "Created git tag: ${tag}"
 }
 
+# Commit version changes
+commit_version_changes() {
+    local new_version="$1"
+    local commit_message="Bump version to ${new_version}"
+    
+    if [ "$DRY_RUN" = true ]; then
+        echo "[DRY RUN] Would commit version changes:"
+        echo "  Message: \"${commit_message}\""
+        git status --short
+        return 0
+    fi
+    
+    # Stage the version files
+    if [ -f "${CONANFILE}" ]; then
+        git add "${CONANFILE}"
+    fi
+    if [ -f "${CMAKELISTS}" ]; then
+        git add "${CMAKELISTS}"
+    fi
+    
+    # Check if there are staged changes
+    if ! git diff --staged --quiet; then
+        git commit -m "${commit_message}"
+        echo "✓ Committed version changes"
+        return 0
+    else
+        echo "No changes to commit"
+        return 0
+    fi
+}
+
+# Push git tag
+push_tag() {
+    local version="$1"
+    local tag="v${version}"
+    
+    if [ "$DRY_RUN" = true ]; then
+        echo "[DRY RUN] Would push git tag: ${tag}"
+        return
+    fi
+    
+    # Push the tag
+    git push origin "${tag}"
+    echo "Pushed git tag: ${tag}"
+}
+
 # Main execution
 main() {
     local bump_type=""
@@ -202,6 +293,12 @@ main() {
             --dry-run)
                 DRY_RUN=true
                 ;;
+            --push)
+                PUSH=true
+                ;;
+            -y|--yes)
+                YES=true
+                ;;
             major|minor|patch)
                 bump_type="$arg"
                 # Check if next argument is "rc"
@@ -231,7 +328,7 @@ main() {
     done
     
     if [ -z "$bump_type" ]; then
-        echo "Usage: $0 [major|minor|patch|rc|release] [rc] [--dry-run]" >&2
+        echo "Usage: $0 [major|minor|patch|rc|release] [rc] [--dry-run] [--push] [-y|--yes]" >&2
         echo "" >&2
         echo "Examples:" >&2
         echo "  $0 major          # 1.2.3 -> 2.0.0" >&2
@@ -245,6 +342,8 @@ main() {
         echo "" >&2
         echo "Options:" >&2
         echo "  --dry-run    Show what would change without making changes" >&2
+        echo "  --push       Push the git tag to remote after creating it" >&2
+        echo "  -y, --yes    Auto-confirm all prompts (skip interactive questions)" >&2
         exit 1
     fi
     
@@ -290,27 +389,59 @@ main() {
     # Update all version files
     update_version_files "$NEW_VERSION"
     
+    # Commit version changes
+    commit_version_changes "$NEW_VERSION"
+    
     if [ "$DRY_RUN" = true ]; then
         echo ""
         create_tag "$NEW_VERSION"
+        if [ "$PUSH" = true ]; then
+            push_tag "$NEW_VERSION"
+        fi
         echo ""
         echo "=== DRY RUN COMPLETE ==="
         echo "Run without --dry-run to apply changes."
         exit 0
     fi
     
     # Create git tag
-    read -p "Create git tag v${NEW_VERSION}? (y/N) " -n 1 -r
-    echo
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
+    if [ "$YES" = true ]; then
+        # Auto-confirm, skip prompt
         create_tag "$NEW_VERSION"
-        echo ""
-        echo "✓ Version bumped to ${NEW_VERSION}"
-        echo "✓ Git tag v${NEW_VERSION} created"
-        echo ""
-        echo "To push the tag: git push origin v${NEW_VERSION}"
+        
+        # Push tag if --push flag was set
+        if [ "$PUSH" = true ]; then
+            echo ""
+            push_tag "$NEW_VERSION"
+            echo ""
+            echo "✓ Version bumped to ${NEW_VERSION}"
+            echo "✓ Git tag v${NEW_VERSION} created and pushed"
+        else
+            echo ""
+            echo "✓ Version bumped to ${NEW_VERSION}"
+            echo "✓ Git tag v${NEW_VERSION} created"
+        fi
     else
-        echo "Tag creation cancelled. Version updated in files only."
+        read -p "Create git tag v${NEW_VERSION}? (y/N) " -n 1 -r
+        echo
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            create_tag "$NEW_VERSION"
+            
+            # Push tag if --push flag was set
+            if [ "$PUSH" = true ]; then
+                echo ""
+                push_tag "$NEW_VERSION"
+                echo ""
+                echo "✓ Version bumped to ${NEW_VERSION}"
+                echo "✓ Git tag v${NEW_VERSION} created and pushed"
+            else
+                echo ""
+                echo "✓ Version bumped to ${NEW_VERSION}"
+                echo "✓ Git tag v${NEW_VERSION} created"
+            fi
+        else
+            echo "Tag creation cancelled. Version updated in files only."
+        fi
     fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)`
`2`	`2`
`3`	`3`	`project(`
`4`	`4`	`influxdb-cpp-rest`
`5`		`- VERSION 1.0.1`
	`5`	`+ VERSION 1.0.0`
`6`	`6`	`LANGUAGES CXX`
`7`	`7`	`DESCRIPTION "A C++ client library for InfluxDB using C++ REST SDK"`
`8`	`8`	`)`