rpw 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e52497c6e3760c9aa301c8eeae51459c46458625a809847f83a0d660d104754
-  data.tar.gz: 01aac30eece6c29a294baa6e6859ff3de5afe52cd33c5113527351430169d4b0
+  metadata.gz: 85f7ecbb1ff145d56d6d27f243874ddbf53be414c548e7df75cd13b9c1db7b8a
+  data.tar.gz: 320b387e6ad20327f502a0aba06130edf84238e8f91d661c84a293bf12395bb5
 SHA512:
-  metadata.gz: c86fdd2626b6d1e49a9c67c51e5476453799ae1a42013056f20064b59cf151e2779a28f5c6ebc7d0ee700f8cf3a1085f64370fa2282290e9eb80aa359433aa29
-  data.tar.gz: 74368f4f9e457c67ea43358c0e5fcb253bd38fa8487f5cd3fdd6b683a396b765ca0125d29366318536076fdd553020cc2d9349ca0548b15eeb772974de459bf5
+  metadata.gz: fd511967c1060335a16b0e1ce1b71ffe3eb1096967b536522fbe9b10dfcdb7923a2fef3cd9542fb02d32a04eb399616c26be553f40479c13c5b5db332e79cd84
+  data.tar.gz: 7acaf0763ed13cf8c2ab27ddf028394ecc27c2d39010ede0ce29c0e04340b0c6057bb3dc15d2dd6282dec17415e7d003db67a5085e0291d06878c2ba8b33872e

data/.gitignore

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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rpw (1.3.0)
-      cli-ui
+    rpw (1.4.1)
+      cli-ui (~> 2.1.0)
       excon
       thor
       thor-hollaback
@@ -10,41 +10,53 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    cli-ui (1.4.0)
-    excon (0.78.0)
-    hollaback (0.1.0)
-    minitest (5.14.2)
-    parallel (1.20.0)
-    parser (2.7.2.0)
+    ast (2.4.2)
+    cli-ui (2.1.0)
+    excon (0.99.0)
+    hollaback (0.1.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.0.0)
+    minitest (5.18.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rubocop (1.2.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 1.0.1)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
-    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)
+    ruby-progressbar (1.13.0)
+    standard (1.28.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.0.1)
+    standard-custom (1.0.0)
+      lint_roller (~> 1.0)
+    standard-performance (1.0.1)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.16.0)
+    thor (1.2.1)
+    thor-hollaback (0.2.1)
+      hollaback (~> 0.1)
       thor (>= 0.19.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -56,4 +68,4 @@ DEPENDENCIES
   standard
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/HISTORY.md

@@ -1,3 +1,11 @@
+## 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
@@ -7,11 +15,11 @@
 * Actual release version!
 * Greatly streamlined commands
 
-## 1.1.0 
+## 1.1.0
 
 * sick colors
 
-## 1.0.1 
+## 1.0.1
 
 * Pre-launch bugfix
 

data/lib/rpw/cli/key.rb

@@ -9,7 +9,7 @@ module RPW
       if client.register_email(email)
         say "Key registered with #{email}. You should receive a Slack invite soon."
       else
-        say "Key has already been registered. If you believe this is in error,"\
+        say "Key has already been registered. If you believe this is in error," \
           " please email support@speedshop.co"
       end
     end

data/lib/rpw/cli.rb

@@ -155,11 +155,12 @@ module RPW
 
     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| l["title"] == "Quiz" }.map { |l| "  " * l["indent"] + l["title"] }
+        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"]
@@ -254,7 +255,7 @@ module RPW
 
     def warn_if_already_started
       return unless client.setup?
-      exit(0) unless ::CLI::UI.confirm "You have already started the workshop. Continuing "\
+      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
 

data/lib/rpw/client.rb

@@ -31,19 +31,17 @@ module RPW
     end
 
     def list
-      @list ||= begin
-        if client_data["content_cache_generated"] &&
-            client_data["content_cache_generated"] >= Time.now - 60 * 60
+      @list ||= if client_data["content_cache_generated"] &&
+          client_data["content_cache_generated"] >= Time.now - 60 * 60
 
+        client_data["content_cache"]
+      else
+        begin
+          client_data["content_cache"] = gateway.list_content
+          client_data["content_cache_generated"] = Time.now
           client_data["content_cache"]
-        else
-          begin
-            client_data["content_cache"] = gateway.list_content
-            client_data["content_cache_generated"] = Time.now
-            client_data["content_cache"]
-          rescue
-            client_data["content_cache"] || (raise Error.new("No internet connection"))
-          end
+        rescue
+          client_data["content_cache"] || (raise Error.new("No internet connection"))
         end
       end
     end
@@ -152,7 +150,7 @@ module RPW
 
     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

@@ -18,7 +18,7 @@ module RPW
       data[key] = value
 
       begin
-        File.open(filestore_location, "w") { |f| f.write(YAML.dump(data)) }
+        File.write(filestore_location, YAML.dump(data))
       rescue
         # raise Error, "The RPW data at #{filestore_location} is not writable. \
         # Check your file permissions."
@@ -62,11 +62,9 @@ module RPW
 
     def data
       @data ||= begin
-        begin
-          YAML.safe_load(File.read(filestore_location), permitted_classes: [Time]) || {}
-        rescue Errno::ENOENT
-          {}
-        end
+        YAML.safe_load(File.read(filestore_location), permitted_classes: [Time]) || {}
+      rescue Errno::ENOENT
+        {}
       end
     end
   end

data/lib/rpw/version.rb

@@ -1,3 +1,3 @@
 module RPW
-  VERSION = "1.3.0"
+  VERSION = "1.4.1"
 end

data/rpw.gemspec

@@ -27,5 +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"
+  spec.add_dependency "cli-ui", "~> 2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpw
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Nate Berkopec
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -56,16 +56,16 @@ dependencies:
   name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 description:
 email:
 - nate@speedshop.co
@@ -119,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.3.20
 signing_key:
 specification_version: 4
 summary: A CLI for the Rails Performance Workshop.