rpw 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b744148f7441c89e4b754ec0b19105e0bfbdb8e9b97e0196d0d6c0ff51266c
-  data.tar.gz: 8eac7fc7584553d6af5e2c250520ff05844e9243882baceeb133f163cee2901e
+  metadata.gz: 83a9031c1e6053a268195bd32096243b33f75328cf27ca79ecd646b4de2b9ed3
+  data.tar.gz: 221242a7821edbdbd66e42b6a56a1eb807789e82bc903a61421a6c5d27189b2b
 SHA512:
-  metadata.gz: e20a592d2777d2fbd325cae566fe4e49ed9d07eb496c6da31d1dd70010d08baf08827095c4ffec842e7a9cfeb886d755afd632bedf6e9b671fd3d32fd062382e
-  data.tar.gz: 0b8360255ef4fd5fba85bf982236e44b0f07050a9d45c1f557e047b82d5dd91a243f2c4be96c8202953a3e993c09ecfaec4de9f803c803f038456e952d18cc08
+  metadata.gz: 57b5addc24163780426263bed53f08ee9bf71358d1509940d08e6e5d8a4d3b1b0e01010249318e7cd22fdabece0ed66fceea7ea98796d3db2fd1100aa28ff5ff
+  data.tar.gz: 02f3b22fcaad4f7d4098b6a5ca49cc577dcab04639fae3fe1019fea073ff0c0b54c918bdc4630ea6429650eef89647d77c6be2aa0d7265414c21236888f61d99

data/.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-20.04, macos-10.15, windows-2019 ]
-        ruby: [ 2.3, 2.6, 2.7, head ]
+        ruby: [ 2.6, 2.7, head ]
 
     steps:
       - name: repo checkout
@@ -33,7 +33,7 @@ jobs:
 
       - name: bundle install
         run:   |
-          bundle install --jobs 4 --retry 3
+          gem install bundler && bundle install --jobs 4 --retry 3
 
       - name: standardrb 
         run: bundle exec standardrb 

data/.gitignore

@@ -3,4 +3,5 @@ bundle
 .rpw_key
 .rpw_info
 smoketest
-scripts
+scripts
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rpw (1.0.0)
+    rpw (1.4.0)
+      cli-ui
       excon
       thor
       thor-hollaback
@@ -10,7 +11,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    excon (0.78.0)
+    cli-ui (1.5.1)
+    excon (0.81.0)
     hollaback (0.1.0)
     minitest (5.14.2)
     parallel (1.20.0)
@@ -38,7 +40,7 @@ GEM
     standard (0.9.0)
       rubocop (= 1.2.0)
       rubocop-performance (= 1.8.1)
-    thor (1.0.1)
+    thor (1.1.0)
     thor-hollaback (0.2.0)
       hollaback (~> 0.1.0)
       thor (>= 0.19.1)
@@ -54,4 +56,4 @@ DEPENDENCIES
   standard
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/HISTORY.md

@@ -1,3 +1,28 @@
+## 1.4.0
+
+* Add `--quizzes` option to `rpw show`, to see quizzes
+
+## 1.3.1
+
+* Removed tar verbose mode
+
+## 1.3.0
+
+* Added suggested schedules to README
+
+## 1.2.0
+
+* Actual release version!
+* Greatly streamlined commands
+
+## 1.1.0
+
+* sick colors
+
+## 1.0.1
+
+* Pre-launch bugfix
+
 ## 1.0.0
 
 * First release!

data/lib/rpw/README.md

@@ -1,6 +1,6 @@
 ## Installation Requirements
 
-This client assumes you're using Ruby 2.3 or later.
+This client assumes you're using Ruby 2.6 or later.
 
 This client assumes you have `tar` installed and available on your PATH.
 
@@ -11,6 +11,11 @@ The way that the client opens files (using `open` or `xdg-open` depending on pla
 
 ## Slack Invite 
 
+The Slack channel is your best resource for questions about Rails Performance
+or other material in the workshop. Nate is almost always monitoring that channel.
+
+If you encounter a **bug or other software problem**, please email support@speedshop.co.
+
 If you purchased the Workshop yourself, you will receive a Slack channel invitation
 shortly. If you are attending the Workshop as part of a group and your license key
 was provided to you, you need to register your key to get an invite:
@@ -21,33 +26,30 @@ $ rpw key register [YOUR_EMAIL_ADDRESS]
 
 Please note you can only register your key once.
 
-The Slack channel is your best resource for questions about Rails Performance
-or other material in the workshop. Nate is almost always monitoring that channel.
-
-If you encounter a **bug or other software problem**, please email support@speedshop.co.
-
 ## Important Commands
 
 Here are some important commands for you to know:
 
 ```
-$ rpw lesson next     | Proceed to the next part of the workshop.
-$ rpw lesson complete | Mark current lesson as complete.
-$ rpw lesson list     | List all workshop lessons. Note each lesson is preceded with an ID.
-$ rpw lesson download | Download any or all lessons. Use the IDs from "list".
-$ rpw lesson show     | Show any particular workshop lesson. Use the IDs from "list".
-$ rpw progress        | Show where you're currently at in the workshop.
+$ rpw next     | Proceed to the next part of the workshop.
+$ rpw complete | Mark current lesson as complete.
+$ rpw list     | List all workshop lessons. Shows progress.
+$ rpw download | Download all lessons. Useful for offline access.
+$ rpw show     | Show any particular workshop lesson.
+$ rpw current  | Opens the current lesson.
 ```
 
-Generally, you'll just be doing a lot of `$ rpw lesson next`!
+Generally, you'll just be doing a lot of `$ rpw next`! It's basically the same thing as `$ rpw complete && rpw show`.
+
+#### --no-open
 
-By default, `$ rpw lesson next` will try to open the content it downloads. If you 
-either don't like this, or for some reason it doesn't work, use `$ rpw lesson next --no-open`.
+By default, `$ rpw next` (and `$ rpw show` and `$ rpw current`) will try to open the content it downloads. If you 
+either don't like this, or for some reason it doesn't work, use `$ rpw next --no-open`.
 
 ## Working Offline 
 
 By default, the course will download each piece of content as you progress through 
-the course. However, you can use `rpw lesson download all` to download all content
+the course. However, you can use `rpw download` to download all content
 at once, and complete the workshop entirely offline.
 
 Videos in this workshop are generally about 100MB each, which means the entire
@@ -55,4 +57,38 @@ course is about a 3 to 4GB download.
 
 ## Bugs and Support
 
-If you encounter any problems, please email support@speedshop.co for the fastest possible response.
+If you encounter any problems, please email support@speedshop.co for the fastest possible response.
+
+## Suggested Schedules
+
+I've found that self-directed learners are most effective when they set a schedule for themselves. These schedules will work if you are learning alone or in a group. 
+
+### 4-Week Schedule 
+
+This is my recommended schedule. It is designed so that you can do the workshop as "20% time", or as part of a larger performance "sprint".
+
+If you follow this schedule, you should be able to complete the workshop in about 4 weeks. I suggest leaving an entire day aside to complete your material for the week, e.g. Mondays. Tuesday through Friday should be used to complete exercises and PR Safaris.
+
+* **Week 1**: Modules 1 and 2
+* **Week 2**: Module 3 and 4
+* **Week 3**: Module 5
+* **Week 4**: Module 6 
+
+### 1-Week Intensive Schedule
+
+For those of you looking to immerse yourselves and only work on this workshop for 8 hours a day for 5 days, this schedule is suggested:
+
+* **Day 1**: Modules 1 and 2
+* **Day 2**: Module 3
+* **Day 3**: Module 4
+* **Day 4**: Module 5 
+* **Day 5**: Module 6
+
+### 80/20 Schedule
+
+Short on time? Here's the 20% of the course content that's the most important:
+
+* Module 1
+* Module 5
+
+If I had the time to go through a limited amount of the workshop content, I would concentrate exclusively on these two modules.

data/lib/rpw/cli.rb

@@ -4,20 +4,16 @@ require "rpw"
 require "rpw/cli/bannerlord"
 require "rpw/cli/sub_command_base"
 require "rpw/cli/key"
-require "rpw/cli/lesson"
-require "rpw/cli/progress"
+require "cli/ui"
+
+CLI::UI::StdoutRouter.enable
 
 module RPW
   class CLI < Thor
     class_before :check_version
-    class_before :check_setup
 
     desc "key register [EMAIL_ADDRESS]", "Change email registered w/Speedshop"
     subcommand "key", Key
-    desc "lesson [SUBCOMMAND]", "View and download lessons"
-    subcommand "lesson", Lesson
-    desc "progress [SUBCOMMAND]", "View and set progress"
-    subcommand "progress", Progress
 
     def self.exit_on_failure?
       true
@@ -28,7 +24,7 @@ module RPW
       warn_if_already_started
 
       print_banner
-      say "Welcome to the Rails Performance Workshop."
+      say "\u{1F48E} Welcome to the Rails Performance Workshop. \u{1F48E}"
       say ""
       say "This is rpw, the command line client for this workshop."
       say ""
@@ -36,27 +32,160 @@ module RPW
       say "working directory, so it's best to run this client from a new directory"
       say "that you'll use as your 'scratch space' for working on the Workshop."
       say ""
-      say "We will create a handful of new files and folders in the current directory."
-      return unless yes? "Is this OK? (y/N) (N will quit)"
-      puts ""
-      say "We'll also create a .rpw_info file at #{File.expand_path("~/.rpw")} to save your purchase key."
-      home_dir_ok = yes?("Is this OK? (y/N) (N will create it in the current directory)")
-      client.directory_setup(home_dir_ok)
 
-      key = ask("Your Purchase Key: ")
+      ans = ::CLI::UI.confirm "Create files and folders in this directory? (no will quit)"
+
+      exit(1) unless ans
+
+      say ""
+
+      ans = ::CLI::UI::Prompt.ask("Where should we save your course progress?",
+        options: [
+          "here",
+          "my home directory (~/.rpw)"
+        ])
+
+      client.directory_setup((ans == "my home directory (~/.rpw)"))
+
+      key = ::CLI::UI::Prompt.ask("Your Purchase Key: ")
 
       unless client.setup(key)
         say "That is not a valid key. Please try again."
         exit(0)
       end
 
-      puts ""
+      say ""
       say "Successfully authenticated with the RPW server and saved your key."
-      puts ""
+      say ""
       say "Setup complete!"
-      puts ""
-      say "To learn how to use this command-line client, consult ./README.md, which we just created."
-      say "Once you've read that and you're ready to get going: $ rpw lesson next"
+      say ""
+      say "To learn how to use this command-line client, consult ./README.md,"
+      say "which we just created."
+      say ""
+      say "Once you've read that and you're ready to get going: $ rpw next"
+    end
+
+    desc "next", "Proceed to the next lesson of the workshop"
+    option :"no-open", type: :boolean
+    def next
+      exit_with_no_key
+      content = client.next
+
+      if content.nil?
+        RPW::CLI.new.print_banner
+        say "Congratulations!"
+        say "You have completed the Rails Performance Workshop."
+        exit(0)
+      end
+
+      say "Proceeding to next lesson: #{content["title"]}"
+      client.download_and_extract(content)
+      client.complete(content["position"])
+      display_content(content, !options[:"no-open"])
+    end
+
+    desc "current", "Open the current lesson"
+    option :"no-open", type: :boolean
+    def current
+      exit_with_no_key
+      content = client.current
+      say "Opening: #{content["title"]}"
+      client.download_and_extract(content)
+      display_content(content, !options[:"no-open"])
+    end
+
+    desc "complete", "Mark the current lesson as complete"
+    def complete
+      say "Marked current lesson as complete"
+      client.complete(nil)
+    end
+
+    desc "list", "Show all available workshop lessons"
+    def list
+      ::CLI::UI::Frame.open("{{*}} {{bold:All Lessons}}", color: :green)
+
+      frame_open = false
+      client.list.each do |lesson|
+        if lesson["title"].start_with?("Section")
+          ::CLI::UI::Frame.close(nil) if frame_open
+          ::CLI::UI::Frame.open(lesson["title"])
+          frame_open = true
+          next
+        end
+
+        no_data = client.send(:client_data)["completed"].nil?
+        completed = client.send(:client_data)["completed"]&.include?(lesson["position"])
+
+        str = if no_data
+          ""
+        elsif completed
+          "\u{2705} "
+        else
+          "\u{274C} "
+        end
+
+        case lesson["style"]
+        when "video"
+          puts str + ::CLI::UI.fmt("{{red:#{lesson["title"]}}}")
+        when "quiz"
+          # puts ::CLI::UI.fmt "{{green:#{"  " + lesson["title"]}}}"
+        when "lab"
+          puts str + ::CLI::UI.fmt("{{yellow:#{"  " + lesson["title"]}}}")
+        when "text"
+          puts str + ::CLI::UI.fmt("{{magenta:#{"  " + lesson["title"]}}}")
+        else
+          puts str + ::CLI::UI.fmt("{{magenta:#{"  " + lesson["title"]}}}")
+        end
+      end
+
+      ::CLI::UI::Frame.close(nil)
+      ::CLI::UI::Frame.close(nil, color: :green)
+    end
+
+    desc "download", "Download all workshop contents"
+    def download
+      exit_with_no_key
+      total = client.list.size
+      client.list.each do |content|
+        current = client.list.index(content) + 1
+        puts "Downloading #{content["title"]} (#{current}/#{total})"
+        client.download_and_extract(content)
+      end
+    end
+
+    desc "show", "Show any individal workshop lesson"
+    option :"no-open", type: :boolean
+    option :quizzes, type: :boolean
+    def show
+      exit_with_no_key
+      title = ::CLI::UI::Prompt.ask(
+        "Which lesson would you like to view?",
+        options: client.list.reject { |l| !options[:quizzes] && l["title"] == "Quiz" }.map { |l| "  " * l["indent"] + l["title"] }
+      )
+      title.strip!
+      content_order = client.list.find { |l| l["title"] == title }["position"]
+      content = client.show(content_order)
+      client.download_and_extract(content)
+      display_content(content, !options[:"no-open"])
+    end
+
+    desc "set_progress", "Set current lesson to a particular lesson"
+    def set_progress
+      title = ::CLI::UI::Prompt.ask(
+        "Which lesson would you like to set your progress to? All prior lessons will be marked complete",
+        options: client.list.reject { |l| l["title"] == "Quiz" }.map { |l| "  " * l["indent"] + l["title"] }
+      )
+      title.strip!
+      content_order = client.list.find { |l| l["title"] == title }["position"]
+      content = client.set_progress(content_order, all_prior: true)
+      say "Setting current progress to #{content.last["title"]}"
+    end
+
+    desc "reset", "Erase all progress and start over"
+    def reset
+      return unless ::CLI::UI.confirm("Are you sure you want to erase all of your progress?", default: false)
+      say "Resetting progress."
+      client.set_progress(nil)
     end
 
     no_commands do
@@ -67,14 +196,67 @@ module RPW
 
     private
 
+    def exit_with_no_key
+      unless client.setup?
+        say "You have not yet set up the client. Run $ rpw start"
+        exit(1)
+      end
+      unless client.directories_ready?
+        say "You are not in your workshop scratch directory, or you have not yet"
+        say "set up the client. Change directory or run $ rpw start"
+        exit(1)
+      end
+    end
+
     def client
       @client ||= RPW::Client.new
     end
 
+    def display_content(content, open_after)
+      openable = false
+      case content["style"]
+      when "video"
+        location = "video/#{content["s3_key"]}"
+        openable = true
+      when "quiz"
+        Quiz.start(["give_quiz", "quiz/" + content["s3_key"]])
+      when "lab"
+        location = "lab/#{content["s3_key"][0..-8]}"
+        openable = true
+      when "text"
+        location = "text/#{content["s3_key"]}"
+        openable = true
+      when "cgrp"
+        say "The Complete Guide to Rails Performance has been downloaded and extracted to the ./cgrp directory."
+        say "All source code for the CGRP is in the src directory, PDF and other compiled formats are in the release directory."
+        say "You can check it out now, or to continue: $ rpw next "
+      end
+      if location
+        if openable && !open_after
+          say "Download complete. Open with: $ #{open_command} #{location}"
+        elsif open_after && openable
+          exec "#{open_command} #{location}"
+        end
+      end
+    end
+
+    require "rbconfig"
+    def open_command
+      host_os = RbConfig::CONFIG["host_os"]
+      case host_os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        "start"
+      when /darwin|mac os/
+        "open"
+      else
+        "xdg-open"
+      end
+    end
+
     def warn_if_already_started
       return unless client.setup?
-      exit(0) unless yes? "You have already started the workshop. Continuing "\
-        "this command will wipe all of your current progress. Continue? (y/N)"
+      exit(0) unless ::CLI::UI.confirm "You have already started the workshop. Continuing "\
+        "this command will wipe all of your current progress. Continue?", default: false
     end
 
     def check_version
@@ -83,12 +265,5 @@ module RPW
         say "WARNING: Please run `$ gem install rpw`"
       end
     end
-
-    def check_setup
-      unless client.setup? || current_command_chain == [:start]
-        say "WARNING: You do not have a purchase key set. Run `$ rpw start`"
-        exit(0)
-      end
-    end
   end
 end

data/lib/rpw/cli/key.rb

@@ -1,9 +1,11 @@
 module RPW
   class Key < SubCommandBase
-    class_before :exit_with_no_key
-
     desc "register [EMAIL_ADDRESS]", "Change email registered with Speedshop. One-time only."
     def register(email)
+      unless client.setup?
+        say "You have not yet set up the client. Run $ rpw start"
+        exit(1)
+      end
       if client.register_email(email)
         say "Key registered with #{email}. You should receive a Slack invite soon."
       else

data/lib/rpw/cli/quiz.rb

@@ -14,8 +14,8 @@ module RPW
     def question(data)
       puts data["prompt"]
       data["answer_choices"].each { |ac| puts ac }
-      provided_answer = ask("Your answer?")
-      answer_digest = Digest::MD5.hexdigest(data["prompt"] + provided_answer.upcase)
+      provided_answer = ::CLI::UI::Prompt.ask("Your answer?", options: %w[A B C D])
+      answer_digest = Digest::MD5.hexdigest(data["prompt"] + provided_answer)
       if answer_digest == data["answer_digest"]
         say "Correct!"
       else

data/lib/rpw/cli/sub_command_base.rb

@@ -13,18 +13,6 @@ module RPW
       def client
         @client ||= RPW::Client.new
       end
-
-      def exit_with_no_key
-        unless client.setup?
-          say "You have not yet set up the client. Run $ rpw start"
-          exit(1)
-        end
-        unless client.directories_ready?
-          say "You are not in your workshop scratch directory, or you have not yet"
-          say "set up the client. Change directory or run $ rpw start"
-          exit(1)
-        end
-      end
     end
   end
 end

data/lib/rpw/client.rb

@@ -25,6 +25,11 @@ module RPW
       list.sort_by { |c| c["position"] }.find { |c| c["position"] > current_position }
     end
 
+    def current
+      return list.first unless client_data["completed"]
+      list.sort_by { |c| c["position"] }.find { |c| c["position"] == current_position }
+    end
+
     def list
       @list ||= begin
         if client_data["content_cache_generated"] &&
@@ -44,8 +49,7 @@ module RPW
     end
 
     def show(content_pos)
-      content_pos = current_position if content_pos == :current
-      gateway.get_content_by_position(content_pos)
+      list.find { |l| l["position"] == content_pos }
     end
 
     def directory_setup(home_dir_ok = true)
@@ -76,22 +80,17 @@ module RPW
       end
     end
 
-    def progress
-      completed_lessons = client_data["completed"] || []
-      {
-        completed: completed_lessons.size,
-        total: list.size,
-        current_lesson: list.find { |c| c["position"] == current_position },
-        sections: chart_section_progress(list, completed_lessons)
-      }
-    end
-
-    def set_progress(pos)
+    def set_progress(pos, all_prior: false)
       client_data["completed"] = [] && return if pos.nil?
-      lesson = list.find { |l| l["position"] == pos }
-      raise Error.new("No such lesson - use the IDs in $ rpw lesson list") unless lesson
-      client_data["completed"] += [pos]
-      lesson
+      if all_prior
+        lessons = list.select { |l| l["position"] <= pos }
+        client_data["completed"] = lessons.map { |l| l["position"] }
+        lessons
+      else
+        lesson = list.find { |l| l["position"] == pos }
+        client_data["completed"] += [pos]
+        lesson
+      end
     end
 
     def latest_version?
@@ -132,9 +131,13 @@ module RPW
     end
 
     def complete(position)
-      reset_progress unless client_data["completed"]
-      # we actually have to put the _next_ lesson on the completed stack
-      set_progress(self.next["position"])
+      if client_data["completed"]
+        # we actually have to put the _next_ lesson on the completed stack
+        set_progress(self.next["position"])
+      else
+        client_data["completed"] = []
+        set_progress(position)
+      end
     end
 
     private
@@ -143,32 +146,13 @@ module RPW
       @current_position ||= client_data["completed"]&.last || 0
     end
 
-    def chart_section_progress(contents, completed)
-      contents.group_by { |c| c["position"] / 100 }
-        .each_with_object([]) do |(_, c), memo|
-          completed_str = c.map { |l|
-            if l["position"] == current_position
-              "O"
-            elsif completed.include?(l["position"])
-              "X"
-            else
-              "."
-            end
-          }.join
-          memo << {
-            title: c[0]["title"],
-            progress: completed_str
-          }
-        end
-    end
-
     def client_data
       @client_data ||= ClientData.new
     end
 
     def extract_content(content)
       folder = content["style"]
-      `tar -C #{folder} -xvzf #{folder}/#{content["s3_key"]}`
+      `tar -C #{folder} -xzf #{folder}/#{content["s3_key"]}`
     end
   end
 end

data/lib/rpw/client_data.rb

@@ -20,8 +20,8 @@ module RPW
       begin
         File.open(filestore_location, "w") { |f| f.write(YAML.dump(data)) }
       rescue
-        raise Error, "The RPW data at #{filestore_location} is not writable. \
-                      Check your file permissions."
+        # raise Error, "The RPW data at #{filestore_location} is not writable. \
+        # Check your file permissions."
       end
     end
 

data/lib/rpw/gateway.rb

@@ -16,16 +16,6 @@ module RPW
       Excon.get(domain + "/license", user: key).status == 200
     end
 
-    def get_content_by_position(position)
-      response = Excon.get(domain + "/contents/positional?position=#{position}", user: @key)
-      if response.status == 200
-        JSON.parse(response.body)
-      else
-        puts response.inspect
-        raise Error, "There was a problem fetching this content."
-      end
-    end
-
     def list_content
       response = Excon.get(domain + "/contents", user: @key)
       if response.status == 200
@@ -37,21 +27,21 @@ module RPW
     end
 
     def download_content(content, folder:)
-      puts "Downloading #{content["title"]}..."
-      downloaded_file = File.open("#{folder}/#{content["s3_key"]}.partial", "w")
-      streamer = lambda do |chunk, remaining_bytes, total_bytes|
-        downloaded_file.write(chunk)
-        print 13.chr
-        print "Remaining: #{(remaining_bytes.to_f / total_bytes * 100).round(2).to_s.rjust(8)}%" if remaining_bytes
-      end
-      response = Excon.get(content["url"], response_block: streamer)
-      unless response.status == 200
-        puts response.inspect
-        raise Error.new("Server problem: #{response.status}")
+      ::CLI::UI::Progress.progress do |bar|
+        downloaded_file = File.open("#{folder}/#{content["s3_key"]}.partial", "w")
+        streamer = lambda do |chunk, remaining_bytes, total_bytes|
+          downloaded_file.write(chunk)
+          bar.tick(set_percent: 1 - (remaining_bytes.to_f / total_bytes).round(2))
+        end
+        response = Excon.get(content["url"], response_block: streamer)
+        unless response.status == 200
+          puts response.inspect
+          raise Error.new("Server problem: #{response.status}")
+        end
+        downloaded_file.close
+        File.rename(downloaded_file, "#{folder}/#{content["s3_key"]}")
+        bar.tick(set_percent: 1)
       end
-      downloaded_file.close
-      print "\n"
-      File.rename(downloaded_file, "#{folder}/#{content["s3_key"]}")
     end
 
     def latest_version?

data/lib/rpw/version.rb

@@ -1,3 +1,3 @@
 module RPW
-  VERSION = "1.0.0"
+  VERSION = "1.4.0"
 end

data/rpw.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "thor-hollaback"
   spec.add_dependency "excon"
+  spec.add_dependency "cli-ui"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpw
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Nate Berkopec
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cli-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - nate@speedshop.co
@@ -76,8 +90,6 @@ files:
 - lib/rpw/cli.rb
 - lib/rpw/cli/bannerlord.rb
 - lib/rpw/cli/key.rb
-- lib/rpw/cli/lesson.rb
-- lib/rpw/cli/progress.rb
 - lib/rpw/cli/quiz.rb
 - lib/rpw/cli/sub_command_base.rb
 - lib/rpw/client.rb
@@ -107,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A CLI for the Rails Performance Workshop.

data/lib/rpw/cli/lesson.rb

@@ -1,101 +0,0 @@
-module RPW
-  class Lesson < SubCommandBase
-    class_before :exit_with_no_key
-
-    desc "next", "Proceed to the next lesson of the workshop"
-    option :"no-open"
-    def next
-      say "Proceeding to next lesson..."
-      content = client.next
-
-      if content.nil?
-        RPW::CLI.new.print_banner
-        say "Congratulations!"
-        say "You have completed the Rails Performance Workshop."
-        exit(0)
-      end
-
-      client.download_and_extract(content)
-      client.complete(content["position"])
-      display_content(content, !options[:"no-open"])
-    end
-
-    desc "complete", "Mark the current lesson as complete"
-    def complete
-      say "Marked current lesson as complete"
-      client.complete(nil)
-    end
-
-    desc "list", "Show all available workshop lessons"
-    def list
-      say "All available workshop lessons:"
-      say "Use [ID] for the show/download command"
-      say "[ID]: Lesson Name"
-      client.list.each do |lesson|
-        puts "[#{lesson["position"]}]:#{"  " * lesson["indent"]} #{lesson["title"]}"
-      end
-    end
-
-    desc "download [CONTENT | all]", "Download one or all workshop contents"
-    def download(content_pos)
-      to_download = if content_pos.downcase == "all"
-        client.list
-      else
-        [client.show(content_pos)]
-      end
-      to_download.each { |content| client.download_and_extract(content) }
-    end
-
-    desc "show [CONTENT]", "Show any workshop lesson, shows current lesson w/no arguments"
-    option :"no-open"
-    def show(content_order = :current)
-      content = client.show(content_order)
-      client.download_and_extract(content)
-      display_content(content, !options[:"no-open"])
-    end
-
-    private
-
-    def display_content(content, open_after)
-      say "Current Lesson: #{content["title"]}"
-      openable = false
-      case content["style"]
-      when "video"
-        location = "video/#{content["s3_key"]}"
-        openable = true
-      when "quiz"
-        Quiz.start(["give_quiz", "quiz/" + content["s3_key"]])
-      when "lab"
-        location = "lab/#{content["s3_key"][0..-8]}"
-        openable = true
-      when "text"
-        location = "text/#{content["s3_key"]}"
-        openable = true
-      when "cgrp"
-        say "The Complete Guide to Rails Performance has been downloaded and extracted to the ./cgrp directory."
-        say "All source code for the CGRP is in the src directory, PDF and other compiled formats are in the release directory."
-        say "You can check it out now, or to continue: $ rpw lesson next "
-      end
-      if location
-        if openable && !open_after
-          say "Download complete. Open with: $ #{open_command} #{location}"
-        elsif open_after && openable
-          exec "#{open_command} #{location}"
-        end
-      end
-    end
-
-    require "rbconfig"
-    def open_command
-      host_os = RbConfig::CONFIG["host_os"]
-      case host_os
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        "start"
-      when /darwin|mac os/
-        "open"
-      else
-        "xdg-open"
-      end
-    end
-  end
-end

data/lib/rpw/cli/progress.rb

@@ -1,34 +0,0 @@
-module RPW
-  class Progress < SubCommandBase
-    class_before :exit_with_no_key
-
-    desc "set [LESSON]", "Set current lesson to a particular lesson"
-    def set(pos)
-      lesson = client.set_progress(pos.to_i)
-      say "Set current progress to #{lesson["title"]}"
-    end
-
-    desc "reset", "Erase all progress and start over"
-    def reset
-      return unless yes? "Are you sure you want to reset your progress? (Y/N)"
-      say "Resetting progress."
-      client.set_progress(nil)
-    end
-
-    desc "show", "Show current workshop progress"
-    def show
-      data = client.progress
-      say "The Rails Performance Workshop"
-      say "You have completed #{data[:completed]} out of #{data[:total]} total sections."
-      say "Current lesson: #{data[:current_lesson]["title"]}" if data[:current_lesson]
-      say "Progress by Section (X == completed, O == current):"
-      data[:sections].each do |section|
-        say "#{section[:title]}: #{section[:progress]}"
-      end
-    end
-
-    private
-
-    default_task :show
-  end
-end