rpw 0.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d147256fce52a088acb2caa0043222c16dfc73e09292006929e1b9d40372d70a
-  data.tar.gz: 211b34b2aff01a30220d65ad12120a240042634c2f815d91e2e4e72023a9fbf7
+  metadata.gz: c4c79a03ffb13bfdd6fd37581cdca30aa3a69712608add26105f51b130b15fcb
+  data.tar.gz: '05079633b4d192a7654dea1f82972ecb735ea634de59c5e83bde843eec73ef42'
 SHA512:
-  metadata.gz: d2985f855f66246dd289959e287985011ae11e828a2daeb90c4f3e49a45e99b5ee05ba9b0fa67596c9067ec492cf40f548ecc5649e2c6769c6e366d74f402fb8
-  data.tar.gz: ef3be513985a20e01a16249fd2b71e2a026875327fcfe101a83e8da0d05751b7ccd594fd7f984b046f669fa7b49552969967d922d48d00f29767add9906f7d01
+  metadata.gz: f81567fe95bda4102cc1109e8f643043ee9dcb58d0fc81c1c9faee34ff91fcc3ba3d7265f718c473a19eafbdcf852801c6bea803ddf49c7ad74280f8a85cd3dc
+  data.tar.gz: 66fb292f109656d91d97166733ba21f095d0c7f1cfd06a82e580ab87c8b4bb2d28b03eb95dcb02c32ca5eb4a7e2d379a04afa5b9ae419511c927ea9755c1f877

data/.github/workflows/test.yml

@@ -0,0 +1,109 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: >-
+      ${{ matrix.os }} ${{ matrix.ruby }}
+    env:
+      CI: true
+      TESTOPTS: -v
+
+    runs-on: ${{ matrix.os }}
+    if: |
+      !(   contains(github.event.pull_request.title,  '[ci skip]')
+        || contains(github.event.pull_request.title,  '[skip ci]')
+        || contains(github.event.head_commit.message, '[ci skip]')
+        || contains(github.event.head_commit.message, '[skip ci]'))
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ ubuntu-20.04, macos-10.15, windows-2019 ]
+        ruby: [ 2.6, 2.7, head ]
+
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby
+        uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: bundle install
+        run:   |
+          gem install bundler && bundle install --jobs 4 --retry 3
+
+      - name: standardrb 
+        run: bundle exec standardrb 
+
+      - name: test
+        run: bundle exec rake test
+
+  build-live:
+    services:
+      postgres:
+        image: postgres:alpine
+        env:
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    name: Test against a live server
+    env:
+      CI: true
+      TESTOPTS: -v 
+      LIVE_SERVER: true
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby
+        uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: 2.7.2
+
+      - name: bundle install
+        run:   |
+          bundle install --jobs 4 --retry 3
+
+      - uses: actions/checkout@master
+        with:
+          repository: speedshop/licensor
+          path: server 
+
+      - name: nuke server ruby requirement 
+        run: grep -v "^ruby" Gemfile > temp && mv -f temp Gemfile
+        working-directory: ./server
+
+      - name: bundle install the server
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle exec rails db:setup
+        working-directory: ./server
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+
+      - name: start the server 
+        run: rails server &
+        working-directory: ./server
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+
+      - name: wait for server 
+        run: |
+          until $(curl --output /dev/null --silent --head --fail http://localhost:3000); do
+            printf '.'
+            sleep 1
+          done
+
+      - name: test
+        run: bundle exec rake test

data/.gitignore

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

data/Gemfile.lock

@@ -1,51 +1,49 @@
 PATH
   remote: .
   specs:
-    rpw (0.0.5)
+    rpw (1.2.0)
+      cli-ui
+      excon
       thor
       thor-hollaback
-      typhoeus
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.13.1)
+    cli-ui (1.4.0)
+    excon (0.78.0)
     hollaback (0.1.0)
     minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.0)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rubocop (0.92.0)
+    rubocop (1.2.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+    rubocop-ast (1.1.1)
       parser (>= 2.7.1.5)
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.10.1)
-    standard (0.7)
-      rubocop (= 0.92)
+    standard (0.9.0)
+      rubocop (= 1.2.0)
       rubocop-performance (= 1.8.1)
     thor (1.0.1)
     thor-hollaback (0.2.0)
       hollaback (~> 0.1.0)
       thor (>= 0.19.1)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/HISTORY.md

@@ -1,3 +1,25 @@
+## 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!
+
+## 0.0.6
+
+* more bugfixes from beta testers
+* CI
+
 ## 0.0.5
 
 * more bugfixes from beta testers

data/exe/rpw

@@ -1,247 +1,5 @@
 #!/usr/bin/env ruby
 
-require "thor"
-require "thor/hollaback"
-require_relative "../lib/rpw"
-
-module RPW
-  class SubCommandBase < Thor
-    def self.banner(command, namespace = nil, subcommand = false)
-      "#{basename} #{subcommand_prefix} #{command.usage}"
-    end
-
-    def self.subcommand_prefix
-      name.gsub(%r{.*::}, "").gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
-    end
-
-    no_commands do
-      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
-
-  class Key < SubCommandBase
-    desc "register [EMAIL_ADDRESS]", "Change email registered with Speedshop. One-time only."
-    def register(email)
-      client.register_email(email)
-      say "License registered. You should receive a Slack invite soon."
-    end
-  end
-
-  class Lesson < SubCommandBase
-    class_before :exit_with_no_key
-
-    desc "next", "Proceed to the next lesson of the workshop"
-    option :open
-    def next
-      say "Proceeding to next lesson..."
-      client.next(options[:open])
-    end
-
-    desc "complete", "Mark the current lesson as complete"
-
-    def complete
-      say "Marked current lesson as complete"
-      client.complete
-    end
-
-    desc "list", "Show all available workshop lessons"
-
-    def list
-      say "All available workshop lessons:"
-      client.list.each do |lesson|
-        puts "#{"  " * lesson["indent"]}[#{lesson["position"]}]: #{lesson["title"]}"
-      end
-    end
-
-    desc "download [CONTENT | all]", "Download one or all workshop contents"
-
-    def download(content)
-      client.download(content)
-    end
-
-    desc "show [CONTENT]", "Show any workshop lesson, shows current lesson w/no arguments"
-    option :open
-    def show(content = :current)
-      client.show(content, options[:open])
-    end
-  end
-
-  class Progress < SubCommandBase
-    class_before :exit_with_no_key
-
-    desc "set [LESSON]", "Set current lesson to a particular lesson"
-
-    def set(lesson)
-      client.set_progress(lesson)
-    end
-
-    desc "reset", "Erase all progress and start over"
-
-    def reset
-      yes? "Are you sure you want to reset your progress? (Y/N)"
-      client.reset_progress
-    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"]}"
-      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
-
-  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
-    end
-
-    desc "start", "Tutorial and onboarding"
-
-    def start
-      warn_if_already_started
-
-      print_banner
-      say "Welcome to the Rails Performance Workshop."
-      say ""
-      say "This is rpw, the command line client for this workshop."
-      say ""
-      say "This client will download files from the internet into the current"
-      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: ")
-
-      client.setup(key)
-      puts ""
-      say "Successfully authenticated with the RPW server and saved your key."
-      puts ""
-      say "Setup complete!"
-      puts ""
-      say "To learn how to use this command-line client, consult README.md."
-      say "Remember to ask on Slack for help if you get stuck or encounter bugs."
-      say "Once you're ready to get going: $ rpw lesson next"
-    end
-
-    no_commands do
-      def print_banner
-        puts r
-        if `tput cols 80`.to_i < 80
-          puts small_banner
-        else
-          puts banner
-        end
-        puts reset
-      end
-    end
-
-    private
-
-    def client
-      @client ||= RPW::Client.new
-    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)"
-    end
-
-    def check_version
-      unless client.latest_version?
-        say "#{r}WARNING: You are running an old version of rpw."
-        say "WARNING: Please run `$ gem install rpw`#{reset}"
-      end
-    end
-
-    def check_setup
-      unless client.setup? || current_command_chain == [:start]
-        say "#{r}WARNING: You do not have a purchase key set. Run `$ rpw start`#{reset}"
-      end
-    end
-
-    def r
-      "\e[31m"
-    end
-
-    def reset
-      "\e[0m"
-    end
-
-    def small_banner
-      %(
-   _____ _          _____     _ _
-  |_   _| |_ ___   | __  |___|_| |___
-    | | |   | -_|  |    -| .'| | |_ -|
-    |_| |_|_|___|  |__|__|__,|_|_|___|
-   _____         ___
-  |  _  |___ ___|  _|___ ___ _____ ___ ___ ___ ___
-  |   __| -_|  _|  _| . |  _|     | .'|   |  _| -_|
-  |__|  |___|_| |_| |___|_| |_|_|_|__,|_|_|___|___|
-   _ _ _         _       _
-  | | | |___ ___| |_ ___| |_ ___ ___
-  | | | | . |  _| '_|_ -|   | . | . |
-  |_____|___|_| |_,_|___|_|_|___|  _|
-                                |_|
-        #{reset})
-    end
-
-    def banner
-      %(
-                                _____ _          _____     _ _
-     +hmNMMMMMm/`  -ymMMNh/    |_   _| |_ ___   | __  |___|_| |___
-     sMMMMMMMMMy   +MMMMMMMMy    | | |   | -_|  |    -| .'| | |_ -|
-     yMMMMMMMMMMy` yMMMMMMMMN    |_| |_|_|___|  |__|__|__,|_|_|___|
-     `dMMMMMMMMMMm:-dMMMMMMm:   _____         ___
-      `sNMMMMMMMMMMs.:+sso:`   |  _  |___ ___|  _|___ ___ _____ ___ ___ ___ ___
-        :dMMMMMMMMMMm/         |   __| -_|  _|  _| . |  _|     | .'|   |  _| -_|
-   `:oss+:.sNMMMMMMMMMMy`      |__|  |___|_| |_| |___|_| |_|_|_|__,|_|_|___|___|
-   /mMMMMMMd-:mMMMMMMMMMMd.     _ _ _         _       _
-   NMMMMMMMMy `hMMMMMMMMMMh    | | | |___ ___| |_ ___| |_ ___ ___
-   yMMMMMMMM+  `dMMMMMMMMMy    | | | | . |  _| '_|_ -|   | . | . |
-   /hNMMmy-  `/mMMMMMNmy/      |_____|___|_| |_,_|___|_|_|___|  _|
-                                                             |_|
-        #{reset})
-    end
-  end
-end
+require_relative "../lib/rpw/cli"
 
 RPW::CLI.start(ARGV)