Merge pull request #240 from jacebrowning/update-demo

Update demo to reflect README example
jacebrowning · Dec 23, 2020 · b8466e8 · b8466e8
2 parents f22873f + d7e8165
commit b8466e8
Show file tree

Hide file tree

Showing 7 changed files with 399 additions and 406 deletions.
diff --git a/Makefile b/Makefile
@@ -25,35 +25,40 @@ watch: install .clean-test ## Continuously run all CI tasks when files chanage
 
 .PHONY: demo
 demo: install
-	poetry run gitman install --force  # some scripts have intentional errors
+	@ echo gitman update
+	@ poetry run gitman update
 ifdef RECORDING_DELAY
 	@ sleep $(RECORDING_DELAY)
 	@ sleep $(RECORDING_DELAY)
 	@ clear
 	@ sleep $(RECORDING_DELAY)
 endif
-	poetry run gitman update --force  # some scripts have intentional errors
+	@ echo gitman list
+	@ poetry run gitman list
 ifdef RECORDING_DELAY
 	@ sleep $(RECORDING_DELAY)
 	@ sleep $(RECORDING_DELAY)
 	@ clear
 	@ sleep $(RECORDING_DELAY)
 endif
-	poetry run gitman list
+	@ echo gitman lock
+	@ poetry run gitman lock
 ifdef RECORDING_DELAY
 	@ sleep $(RECORDING_DELAY)
 	@ sleep $(RECORDING_DELAY)
 	@ clear
 	@ sleep $(RECORDING_DELAY)
 endif
-	poetry run gitman lock
+	@ echo gitman install
+	@ poetry run gitman install
 ifdef RECORDING_DELAY
 	@ sleep $(RECORDING_DELAY)
 	@ sleep $(RECORDING_DELAY)
 	@ clear
 	@ sleep $(RECORDING_DELAY)
 endif
-	poetry run gitman uninstall
+	@ echo gitman uninstall
+	@ poetry run gitman uninstall
 ifdef RECORDING_DELAY
 	@ sleep $(RECORDING_DELAY)
 	@ sleep $(RECORDING_DELAY)
@@ -176,7 +181,7 @@ docs/demo.gif: docs/demo.cast
 	asciicast2gif $< $@
 docs/demo.cast: Makefile
 	resize -s 61 127
-	poetry run asciinema rec $@ --overwrite --command "make demo RECORDING_DELAY=1" --title "GitMan Demo"
+	poetry run asciinema rec $@ --overwrite --command "make demo CI=true RECORDING_DELAY=1" --title "GitMan Demo"
 	poetry run asciinema upload $@
 
 .PHONY: mkdocs-serve

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 GitMan is a language-agnostic dependency manager using Git. It aims to serve as a submodules replacement and provides advanced options for managing versions of nested Git repositories.
 
-[![Demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)](https://asciinema.org/a/s0JI6iQsXpTgn1ztEpdHWHpNW)
+[![Demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)](https://asciinema.org/a/y3VenEKfLreczVpaLPbnU6AEQ)
 
 [![Unix Build Status](https://img.shields.io/travis/jacebrowning/gitman/master.svg?label=unix)](https://travis-ci.org/jacebrowning/gitman)
 [![Windows Build Status](https://img.shields.io/appveyor/ci/jacebrowning/gitman/master.svg?label=window)](https://ci.appveyor.com/project/jacebrowning/gitman)

diff --git a/docs/demo.cast b/docs/demo.cast
diff --git a/docs/demo.gif b/docs/demo.gif
diff --git a/gitman.yml b/gitman.yml
@@ -44,7 +44,7 @@ sources_locked:
     repo: https://github.com/jacebrowning/gitman-demo
     sparse_paths:
       -
-    rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+    rev: dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0
     link:
     scripts:
       - cat .noserc
@@ -86,3 +86,4 @@ groups:
     members:
       - gitman 2
       - gitman_3
+default_group: ''
diff --git a/gitman/tests/test_models_config.py b/gitman/tests/test_models_config.py
@@ -50,7 +50,7 @@ def test_install_and_list(self):
 
         deps = list(config.get_dependencies())
         assert 7 == len(deps)
-        assert '1de84ca1d315f81b035cd7b0ecf87ca2025cdacd' == deps[0][2]
+        assert 'dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0' == deps[0][2]
         assert '050290bca3f14e13fd616604202b579853e7bfb0' == deps[1][2]
         assert 'fb693447579235391a45ca170959b5583c5042d8' == deps[2][2]
         # master branch always changes --------------------- deps[3][2]

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -831,7 +831,7 @@ def it_locks_previously_locked_dependencies_by_group_name(config):
             repo: https://github.com/jacebrowning/gitman-demo
             sparse_paths:
               -
-            rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+            rev: dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0
             link:
             scripts:
               -
@@ -1062,7 +1062,7 @@ def it_updates_the_log(config):
         expect(contents) == strip(
             """
         2012-01-14 12:00:01
-        tmp/deps/gitman_1: https://github.com/jacebrowning/gitman-demo @ 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+        tmp/deps/gitman_1: https://github.com/jacebrowning/gitman-demo @ dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0
         tmp/deps/gitman_1/gitman_sources/gdm_3: https://github.com/jacebrowning/gdm-demo @ 050290bca3f14e13fd616604202b579853e7bfb0
         tmp/deps/gitman_1/gitman_sources/gdm_3/gitman_sources/gdm_3: https://github.com/jacebrowning/gdm-demo @ fb693447579235391a45ca170959b5583c5042d8
         tmp/deps/gitman_1/gitman_sources/gdm_3/gitman_sources/gdm_4: https://github.com/jacebrowning/gdm-demo @ 63ddfd82d308ddae72d31b61cb8942c898fa05b5
@@ -1105,7 +1105,7 @@ def it_records_all_versions_when_no_arguments(config):
             repo: https://github.com/jacebrowning/gitman-demo
             sparse_paths:
               -
-            rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+            rev: dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0
             link:
             scripts:
               -
@@ -1145,7 +1145,7 @@ def it_records_specified_dependencies(config):
             repo: https://github.com/jacebrowning/gitman-demo
             sparse_paths:
               -
-            rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+            rev: dfd561870c0eb6e814f8f6cd11f8f62f4ae88ea0
             link:
             scripts:
               -