making-with-code-cli 1.3.0__tar.gz → 2.0.0__tar.gz

{making_with_code_cli-1.3.0 → making_with_code_cli-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: making-with-code-cli
-Version: 1.3.0
+Version: 2.0.0
 Summary: Courseware for Making With Code
 Home-page: https://github.com/cproctor/making-with-code-courseware
 License: MIT

{making_with_code_cli-1.3.0 → making_with_code_cli-2.0.0}/making_with_code_cli/setup/__init__.py

@@ -29,7 +29,6 @@ from making_with_code_cli.setup.tasks import (
     choose_course,
     choose_editor,
     MWCShellConfig,
-    InstallCurl,
     InstallHomebrew,
     InstallXCode,
     WriteShellConfig,
@@ -85,8 +84,6 @@ def setup(ctx, config, debug):
 
     task_classes = [
         MWCShellConfig,
-        InstallCurl,
-        InstallHomebrew,
         InstallXCode,
         InstallPoetry,
         WriteShellConfig,
@@ -106,7 +103,7 @@ def setup(ctx, config, debug):
         except Exception as e:
             errors.append(task)
             click.echo(error('-' * 80))
-            click.echo(error(f"{task.task_description} failed"))
+            click.echo(error(f"{task.description} failed"))
             if debug:
                 click.echo(debug_fmt(traceback.format_exc(), preformatted=True))
     if errors:

{making_with_code_cli-1.3.0 → making_with_code_cli-2.0.0}/making_with_code_cli/setup/tasks.py

@@ -51,14 +51,11 @@ class PlatformNotSupported(Exception):
 class Platform(Flag):
     MAC = auto()
     UBUNTU = auto()
-    REPLIT = auto()
     SUPPORTED = MAC | UBUNTU | REPLIT
     UNSUPPORTED = 0
 
     @classmethod
     def detect(cls):
-        if os.environ.get('REPL_ID'):
-            return cls.REPLIT
         system_name = platform.system()
         if system_name == "Darwin":
             return cls.MAC
@@ -79,9 +76,7 @@ class Platform(Flag):
             else:
                 return "brew install "
         elif platform == cls.UBUNTU:
-            return "sudo apt install "
-        elif platform == cls.REPLIT:
-            return "nix-env -iA nixpkgs."
+            return "brew install "
         else:
             raise cls.NotSupported()
 
@@ -268,21 +263,6 @@ class MWCShellConfig(SetupTask):
             fh.write(f'export PATH="$PATH:{mwcpath}"\n')
             fh.write(f"source {get_mwc_rc_path()}\n")
 
-class InstallHomebrew(SetupTask):
-    description = "Install homebrew"
-    platform = Platform.MAC
-
-    def is_complete(self):
-        return self.executable_on_path("brew")
-
-    def run_task(self):
-        click.echo(address("Installing homebrew... (this may take a while)"))
-        cmd = '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'
-        run(cmd, shell=True, check=True)
-        with platform_rc_file().open('a') as fh:
-            fh.write('\nPATH="/usr/local/bin:$PATH"\n')
-        sys.path.append("/usr/local/bin")
-
 class InstallXCode(SetupTask):
     description = "Install XCode"
     platform = Platform.MAC
@@ -305,15 +285,13 @@ class InstallPoetry(SetupTask):
         return self.executable_on_path("poetry")
 
     def run_task(self):
-        shell = get_shell_name()
         click.echo(address("Installing poetry..."))
-        run("curl -sSL https://install.python-poetry.org | python3 -", shell=True, check=True)
+        run("pipx install poetry", shell=True, check=True)
         click.echo(address("Installing poetry tab completions..."))
+        shell = get_shell_name()
         try:
             if shell == "bash":
-                tab_completion_dir = Path("/etc/bash_completion.d")
-                tab_completion_dir.mkdir(exist_ok=True)
-                run("poetry completions bash > /etc/bash_completion.d/poetry", shell=True, check=True)
+                run("poetry completions bash > ~/.bash_completion", shell=True, check=True)
             if shell == "zsh":
                 tab_completion_dir = Path("~/.zfunc")
                 tab_completion_dir.mkdir(exist_ok=True)
@@ -341,13 +319,15 @@ class WriteShellConfig(SetupTask):
         f = ""
         shell = get_shell_name()
         f += "# Making With Code RC File\n\n" 
-        f += "## Add Poetry to $PATH\n"
-        f += 'export PATH="$HOME/.local/bin:$PATH"\n\n'
         if Platform.detect() == Platform.MAC:
             if self.settings['editor'] == "subl":
                 f += "## Add subl to $PATH\n"
                 subldir = "/Applications/Sublime Text.app/Contents/SharedSupport/bin"
                 f += f'export PATH="{subldir}:$PATH"\n\n'
+        shell = get_shell_name()
+        if shell == "zsh": 
+            f += "fpath+=~/.zfunc\n"
+            f += "autoload -Uz compinit && compinit\n"
         return f
 
 class InstallPackage(SetupTask):
@@ -384,10 +364,6 @@ class InstallPackage(SetupTask):
         self.debug_log(f"Running: {package_manager}{package_name}")
         run(f"{package_manager}{package_name}", shell=True, check=True)
 
-class InstallCurl(InstallPackage):
-    platform = Platform.UBUNTU
-    executable_name = apt_name = "curl"
-
 class InstallGit(InstallPackage):
     platform = Platform.MAC | Platform.UBUNTU
     executable_name = brew_name = apt_name = "git"

{making_with_code_cli-1.3.0 → making_with_code_cli-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "making-with-code-cli"
-version = "1.3.0"
+version = "2.0.0"
 description = "Courseware for Making With Code"
 authors = ["Chris Proctor <chris@chrisproctor.net>"]
 license = "MIT"