skp 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d44afe64d8c5f5d293a774165b9b074630d0c2f6e3bc038555f8021fd69e536
-  data.tar.gz: 15fb0856802f26b770335525fa177c9ea79e74363d2468294df2a6c5c0aab8a0
+  metadata.gz: e59f732ddf9f7bc738d978f6ab29c3a13b5d25ef993750a8d45a4978da0f0d83
+  data.tar.gz: d1a46873ecc1d37fa3d4723a0d647f69b3b4b24a514dfd7f859c81ece23e9a92
 SHA512:
-  metadata.gz: eda534dda4f487e7c035e87ab7ccf1559dc99f148ee7224b18373a4afac9de560c4957423dce3b556c877bfed2fcaee21c1faafc13363d2b0b348f803a1a2f13
-  data.tar.gz: f6c5de67929e38beeb8a7964573bbf32822e8f9a6d189c60d185087f720b23ffae840f99f83f856b50b1dac9405c6fc45e1121325c6f8547621a980a766a20b1
+  metadata.gz: 0c63bf7e646d623d65970ae8295f6096526d968657a526b4891137e44506679ba5456386d27795170e8aa8e66615d45b55d78c6de258c98ad3544287d38b2a7b
+  data.tar.gz: 105be466eda2b9e4edfbf1431a4fd8e4ac03b3f0ead00f0f194a7d7280fcca90550a966315144d980b74dc20344b75194ee6f30cc4368ef587e226aa50894f62

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    skp (1.0.0)
-      cli-ui
+    skp (1.0.2)
+      cli-ui (~> 2.1.0)
       excon
       thor
       thor-hollaback
@@ -11,42 +11,55 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    cli-ui (1.5.1)
-    excon (0.87.0)
-    hollaback (0.1.0)
-    minitest (5.14.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    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)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rubocop (1.20.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+      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.11.0)
-    standard (1.3.0)
-      rubocop (= 1.20.0)
-      rubocop-performance (= 1.11.5)
-    thor (1.1.0)
-    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 (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
+  aarch64-linux
   x86_64-darwin-17
 
 DEPENDENCIES
@@ -60,4 +73,4 @@ DEPENDENCIES
   thor-hollaback
 
 BUNDLED WITH
-   2.2.22
+   2.2.33

data/HISTORY.md

@@ -1,3 +1,11 @@
+## 1.0.1
+
+* Strip whitespace from key entry
+
+## 1.0.0
+
+* Release version
+
 ## 0.0.2
 
 * Should list correctly for production

data/lib/skp/cli/bannerlord.rb

@@ -23,7 +23,7 @@ module SKP
         %(
           ,---.o    |     |    o         o
           `---..,---|,---.|__/ .,---.    .,---.
-              |||   ||---'|  \ ||   |    ||   |
+              |||   ||---'|   ||   |    ||   |
           `---'``---'`---'`   ```---|    ``   '
                                     |
           ,---.               |    o
@@ -38,7 +38,7 @@ module SKP
       +hmNMMMMMm/`  -ymMMNh/
       sMMMMMMMMMy   +MMMMMMMMy   ,---.o    |     |    o         o
       yMMMMMMMMMMy` yMMMMMMMMN   `---..,---|,---.|__/ .,---.    .,---.
-       `dMMMMMMMMMMm:-dMMMMMMm:      |||   ||---'|  \ ||   |    ||   |
+       `dMMMMMMMMMMm:-dMMMMMMm:      |||   ||---'|   ||   |    ||   |
         `sNMMMMMMMMMMs.:+sso:`   `---'``---'`---'`   ```---|    ``   '
           :dMMMMMMMMMMm/                                   |
       :oss+:.sNMMMMMMMMMMy`      ,---.               |    o

data/lib/skp/cli/key.rb

@@ -9,7 +9,7 @@ module SKP
       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/skp/cli.rb

@@ -47,7 +47,7 @@ module SKP
 
       client.directory_setup((ans == "my home directory (~/.skp)"))
 
-      key = ::CLI::UI::Prompt.ask("Your Purchase Key: ")
+      key = ::CLI::UI::Prompt.ask("Your Purchase Key: ").strip
 
       unless client.setup(key)
         say "That is not a valid key. Please try again."
@@ -262,7 +262,7 @@ module SKP
 
     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/skp/client.rb

@@ -31,19 +31,17 @@ module SKP
     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

data/lib/skp/client_data.rb

@@ -18,7 +18,7 @@ module SKP
       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 SKP data at #{filestore_location} is not writable. \
         # Check your file permissions."
@@ -62,11 +62,9 @@ module SKP
 
     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/skp/gateway.rb

@@ -31,7 +31,8 @@ module SKP
         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))
+          finished = (remaining_bytes.to_f / total_bytes.to_f)
+          bar.tick(set_percent: (1 - finished).round(2))
         end
         response = Excon.get(content["url"], response_block: streamer)
         unless response.status == 200

data/lib/skp/version.rb

@@ -1,3 +1,3 @@
 module SKP
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/skp.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Nate Berkopec
@@ -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.2.26
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: A CLI for Sidekiq in Practice.