From e3669b813584af80ba4a7465ab778b54211bffd2 Mon Sep 17 00:00:00 2001
From: endorphant <endorphant@tilde.town>
Date: Mon, 4 Dec 2017 20:29:28 -0500
Subject: [PATCH] fussing with user-facing update text

---
 changelog.txt           |  4 +---
 setup.py                |  2 +-
 ttbp/config/__init__.py |  2 +-
 ttbp/gopher.py          |  1 -
 ttbp/ttbp.py            | 44 +++++++++++++++++++++++++++++++++++------
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 9ea9f65..fba30fe 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -9,7 +9,6 @@ TO-DO:
 		-and make a couple more custom stylesheets
 	-replying to entries??
 		-direct mail to author
-	-paginate entry/neighbor list
 	-make a nicer entry view wrapper
 		-maybe with a box? and a nicer feed view?
 
@@ -20,12 +19,11 @@ TO-DO:
 		-shortcut to most recent feels, writing entry, seeing own entry
 	-#hashtags
 	-rainbow menu selection
-	-break out hardcoded globals into config files
 
 ------
 
 CHANGELOG:
-ver 0.9.3
+ver 0.9.3 (by ~vilmibm)
 	-packaging
 	-easier to contribute to
 
diff --git a/setup.py b/setup.py
index 7ffc3dc..67807ba 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='ttbp',
-    version='0.9.3',
+    version='0.10.1',
     description='command line social blogging tool used on tilde.town',
     url='https://github.com/modgethanc/ttbp',
     author='~endorphant',
diff --git a/ttbp/config/__init__.py b/ttbp/config/__init__.py
index e363efe..078352b 100644
--- a/ttbp/config/__init__.py
+++ b/ttbp/config/__init__.py
@@ -81,6 +81,6 @@ __________________________________________________________
 |  ____ ____ ____ _    ____    ____ _  _ ____ _ _  _ ____  |
 |  |___ |___ |___ |    [__     |___ |\ | | __ | |\ | |___  |
 |  |    |___ |___ |___ ___]    |___ | \| |__] | | \| |___  |
-|                               ver 0.10.0 (almost stable) |
+|                            ver 0.10.0 (now with gophers) |
 |__________________________________________________________|
 '''.lstrip()
diff --git a/ttbp/gopher.py b/ttbp/gopher.py
index 9ad8092..933c660 100644
--- a/ttbp/gopher.py
+++ b/ttbp/gopher.py
@@ -47,7 +47,6 @@ def publish_gopher(gopher_path, entry_filenames):
     """This function (re)generates a user's list of feels posts in their gopher
     directory and their gophermap."""
     entry_filenames = entry_filenames[:]  # force a copy since this might be shared state in core.py
-    #entry_filenames.reverse()
     ttbp_gopher = os.path.join(
         os.path.expanduser('~/public_gopher'),
         gopher_path)
diff --git a/ttbp/ttbp.py b/ttbp/ttbp.py
index 941d2ab..c7e407e 100644
--- a/ttbp/ttbp.py
+++ b/ttbp/ttbp.py
@@ -49,7 +49,7 @@ from . import chatter
 from . import gopher
 from . import util
 
-__version__ = "0.9.3"
+__version__ = "0.10.1"
 __author__ = "endorphant <endorphant@tilde.town)"
 
 p = inflect.engine()
@@ -407,7 +407,7 @@ def setup():
 
     # gopher opt-in
     SETTINGS.update({'gopher': gopher.select_gopher()})
-    redraw('opting into gopher: ' + str(SETTINGS['gopher']))
+    #redraw('opting into gopher: ' + str(SETTINGS['gopher']))
     # TODO for now i'm hardcoding where people's gopher stuff is generated. if
     # there is demand for this to be configurable we can expose that.
     gopher.setup_gopher('feels')
@@ -664,6 +664,10 @@ def show_credits():
 ttbp was written by ~endorphant in python. the codebase is
 publicly available on github at https://github.com/modgethanc/ttbp
 
+other contributors:
+    ~vilmibm, packaging help and gopher support
+    ~sanqui, the bug swatter
+
 for the full changelog, see ~endorphant/projects/ttbp/changelog.txt
 
 if you have ideas for ttbp, you are welcome to contact me to discuss them;
@@ -1024,9 +1028,11 @@ def switch_build(ver):
         ver = ver[0:-1]
 
     # write user versionfile
+    '''
     print("\nswitching you over to the "+build+" version...\n")
     time.sleep(1)
     print("...")
+    '''
     versionFile = os.path.join(config.PATH, "version")
     open(versionFile, "w").write(ver)
     time.sleep(1)
@@ -1063,7 +1069,7 @@ def update_version():
 
     time.sleep(1)
     print("...")
-    time.sleep(2)
+    time.sleep(1)
 
     userVersion = ""
 
@@ -1113,6 +1119,21 @@ def update_version():
             ttbprc.write(json.dumps(SETTINGS, sort_keys=True, indent=2, separators=(',',':')))
             ttbprc.close()
 
+        # from earlier than 0.10.1
+
+        if int(userVersion.split(".")[1]) < 10:
+            #  select gopher
+            print("[ NEW FEATURE ]")
+            print("""
+    * thanks to help from ~vilmibm, ttbp now supports publishing to gopher!
+    * if you enable gopher publishing, feels will automatically publish to
+        gopher://tilde.town/1/~"""+config.USER+"""/feels
+
+            """)
+            SETTINGS.update({'gopher': gopher.select_gopher()})
+            print("opting into gopher: " + str(SETTINGS['gopher']))
+            gopher.setup_gopher('feels')
+
     # increment user versionfile
     open(versionFile, "w").write(__version__)
     print("""
@@ -1120,11 +1141,11 @@ you're all good to go, """+chatter.say("friend")+"""! please contact ~endorphant
 somehing strange happened to you during this update.
 """)
 
+    '''
     # TODO these conditionals will need to change if we increment the Y level
     # to 10.
 
     # show patch notes
-    #if userVersion != "0.9.0" and userVersion != "0.9.0b":
     if userVersion[0:5] < "0.9.0":
         # version 0.9.0 patch notes:
         print("""
@@ -1152,14 +1173,25 @@ ver 0.9.2 features:
         """)
     if userVersion[0:5] < "0.9.3":
         # version 0.9.3 patch notes
-        print()
         print("""
-        version 0.9.3 features:
+version 0.9.3 features:
         * ttbp is now packaged, making it easier to contribute to.
         * things should otherwise be the same!
         * check out https://github.com/modgethanc/ttbp if you'd like to contribute.
         * takes advantage of new /var/global
         """.lstrip())
+    #if userVersion[0:5] < "0.10.1":
+    # todo: write a better updating function
+    if 1:
+        # version 0.10.1 patch notes
+        print("""
+
+~[version 0.10.1 features]~
+        * thanks to help from ~vilmibm, ttbp now supports publishing to gopher!
+        * if you enable gopher publishing, feels will automatically publish to
+            gopher://tilde.town/1/~{user}/feels
+        """.lstrip())
+'''
 
 #####