faastruby 0.5.24 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e8d511a386cfc4cf3ed084c04c10398ad7d93c298a3bd202f2690ae9f72a7d
-  data.tar.gz: 4ce5ed8f21a33e3c648fe60f13f41b3938b31f02122952d1b66765cf7dd861aa
+  metadata.gz: f99fdbecd66b6624e2939182c800e9d226b5f81005e22c6b5e74d809bf9374b6
+  data.tar.gz: d633dbe4d532d078b3e6bbc5c86e603f90adbc683fbbcf46be2e1b27dea549f4
 SHA512:
-  metadata.gz: dd373b632709eee2ac1283ca11454dc5572258a7ca8e7f2b32376f7e473b3d2fd4640e384ee24051f22f3a67bf91e098b195655ae3b01ed4985c24474468cbd0
-  data.tar.gz: 4999518623a9c3d4409e4a93c963cb9a83860e24fe814b28c1b93593d67134dcf4f06e9c93dfe3108bec2dd1ae2292bb779d635f4ab5315781ee91f878ed6f4a
+  metadata.gz: 6cad5eec44d08743aed44a7e72fae5d3e6024e152a3472436c92c5f55e34ecc98834efce7b994cae255ff976742eea755df7a2c28810b5a1ae72b24921b46a80
+  data.tar.gz: 477f8ceeac2e2cbf2a1b414aec44a16ba2482c83994a2e11768ce6de8199a3a6426069cee361c47dfa67fc4dfef225c5b537227aa1bfc1d75606a7ec0982e3a3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.25 - Apr 25 2019
+- Refactor API call and post-response processing in Workspace class
+- Prompt user to confirm password as part of the signup process
+- Fix bug preventing signups
+
 ## 0.5.24 - Apr 17 2019
 - Add experimental support for Opal
 - Add new project configuration keys: `opal_dir` and `opal_js_destination`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.24)
+    faastruby (0.5.25)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.7)
       listen (~> 3.1)
@@ -114,7 +114,7 @@ GEM
     strings-ansi (0.1.0)
     thor (0.20.3)
     tilt (2.0.9)
-    tmuxinator (0.15.0)
+    tmuxinator (0.16.0)
       erubis (~> 2.6)
       thor (~> 0.19, >= 0.15.0)
       xdg (~> 2.2, >= 2.2.3)
@@ -131,7 +131,7 @@ GEM
       tty-screen (~> 0.6.4)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     unicode-display_width (1.5.0)
     unicode_utils (1.4.0)
     webmock (3.4.2)

data/LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2018-2019, Paulo Arruda <paulo at faastruby dot io>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of faastRuby, the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/faastruby/api.rb

@@ -134,7 +134,7 @@ module FaaStRuby
       end
     end
 
-    def delele_file(workspace_name:, relative_path:)
+    def delete_file(workspace_name:, relative_path:)
       url = "#{@api_url}/workspaces/#{workspace_name}/static/sync"
       payload = {
          relative_path: relative_path

data/lib/faastruby/cli/commands/account/base_command.rb

@@ -1,11 +1,59 @@
 module FaaStRuby
   module Command
     module Account
-      PASSWORD_REGEX = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,50}$/
-      EMAIL_REGEX = /\A[a-z0-9\-\.+]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
       require 'faastruby/user'
       require 'faastruby/cli/new_credentials'
+
+      PASSWORD_REGEX = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,50}$/
+      EMAIL_REGEX = /\A[a-z0-9\-\.+]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
+
       class AccountBaseCommand < BaseCommand
+        def password_is_confirmed?(password, password_confirmation)
+          return false if password.nil?
+
+          password == password_confirmation
+        end
+
+        def password_is_valid?(password)
+          password.match(PASSWORD_REGEX)
+        end
+
+        def prompt(command:, label:, secure: true)
+          puts ""
+          puts "#{command}"
+          print label
+
+          if secure
+            STDIN.noecho(&:gets).chomp
+          else
+            STDIN.gets.chomp
+          end
+        end
+
+        def prompt_for_password
+          password = prompt(command: "\nNow type in a password. It must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &",
+                            label: "Password: ")
+
+          until password_is_valid?(password) do
+            password = prompt(command: "\nYour password must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &\nPlease try again.".red,
+                              label: "Password: ")
+          end
+
+          password
+        end
+
+        def prompt_to_confirm_password(password)
+          password_confirmation = prompt(command: "\nNow type that password again",
+                                         label: "Confirm password: ")
+            
+          until password_is_confirmed?(password, password_confirmation)
+            print "\n\nHmm... those passwords did not match. Let's try again".red
+
+            password = prompt_for_password
+            password_confirmation = prompt(command: "\nNow type that password again",
+                                           label: "Confirm password: ")
+          end
+        end
       end
     end
   end

data/lib/faastruby/cli/commands/account/confirm.rb

@@ -14,6 +14,7 @@ module FaaStRuby
         def run
           user = User.new(email: @options['email'])
           user.send_confirmation_code
+          error(errors: user.errors) if user.errors.any?
           puts "\nYou should have received an email with a confirmation token."
           puts "If you didn't receive an email:"
           puts "- Make sure you sign up with the correct email address"
@@ -22,16 +23,18 @@ module FaaStRuby
           user.confirmation_token = STDIN.gets.chomp
           spinner = spin("Confirming your account...")
           user.confirm_account!
-          if user.errors.any?
-            spinner.error
-            FaaStRuby::CLI.error(user.errors)
-          end
+          error(errors: user.errors) if user.errors.any?
           spinner.success
           user.save_credentials
           puts "Login successful!"
           migrate
         end
 
+        def error(spinner: nil, errors:)
+          spinner&.error
+          FaaStRuby::CLI.error(errors)
+        end
+
         def migrate
           old_credentials = File.expand_path("~/.faastruby.tor1")
           return unless File.file?(old_credentials)

data/lib/faastruby/cli/commands/account/signup.rb

@@ -11,28 +11,23 @@ module FaaStRuby
         end
 
         def run
-          puts "\nWelcome to FaaStRuby! Please enter your email address:"
-          print "Email: "
-          email = STDIN.gets.chomp
+          email = prompt(command: "Welcome to FaaStRuby! Please enter your email address.", label: "Email: ", secure: false)
+
           until email_is_valid?(email) do
-            puts "You entered an invalid email address. Please try again:".red
-            print "Email: "
-            email = STDIN.gets.chomp
-          end
-          puts "\nNow type in a password. It must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &"
-          print "Password: "
-          password = STDIN.noecho(&:gets).chomp
-          until password_is_valid?(password) do
-            puts "\nYour password must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &\nPlease try again:".red
-            print "Password: "
-            password = STDIN.noecho(&:gets).chomp
+            email = prompt(command: "\nYou entered an invalid email address. Please try again.".red, label: "Email: ", secure: false)
           end
+
+          password = prompt_for_password
+
+          prompt_to_confirm_password(password)
+
           spinner = spin("Creating your account...")
           user = User.create(email: email, password: password)
           if user.errors.any?
             spinner.error
             FaaStRuby::CLI.error(user.errors)
           end
+
           spinner.success
           exec("faastruby confirm-account --email #{email}")
           exit 0
@@ -42,10 +37,6 @@ module FaaStRuby
           email.match(EMAIL_REGEX)
         end
 
-        def password_is_valid?(password)
-          password.match(PASSWORD_REGEX)
-        end
-
         def self.help
           "signup"
         end
@@ -54,7 +45,6 @@ module FaaStRuby
           puts "Usage: faastruby #{self.class.help}"
         end
 
-
         def parse_options
           @options = {}
           while @args.any?

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.24'
+  VERSION = '0.5.25'
 end

data/lib/faastruby/workspace.rb

@@ -29,65 +29,61 @@ module FaaStRuby
     ##### Instance methods
     attr_accessor :name, :errors, :functions, :email, :object, :credentials, :updated_at, :created_at, :status_code, :provider, :runners_max, :runners_current, :static_metadata
 
-    def destroy
-      response = @api.destroy_workspace(@name)
+    def make_request
+      response = yield
       @status_code = response.code
       @errors += response.errors if response.errors.any?
+
+      response
+    end
+
+    def destroy
+      make_request { @api.destroy_workspace(@name) }
     end
 
     def deploy(package_file_name, root_to: false, catch_all: false, context: false)
-      response = @api.deploy(workspace_name: @name, package: package_file_name, root_to: root_to, catch_all: catch_all, context: context)
-      @status_code = response.code
-      @errors += response.errors if response.errors.any?
+      make_request { @api.deploy(workspace_name: @name, package: package_file_name, root_to: root_to, catch_all: catch_all, context: context) }
+
       self
     end
 
     def refresh_credentials
-      response = @api.refresh_credentials(@name)
-      @status_code = response.code
+      response = make_request { @api.refresh_credentials(@name) }
       @credentials = response.body[@name] unless response.body.nil?
-      @errors += response.errors if response.errors.any?
+
       self
     end
 
     def update_runners(value)
-      response = @api.update_runners(workspace_name: @name, runners_max: value)
+      response = make_request { @api.update_runners(workspace_name: @name, runners_max: value) }
       @runners_max = response.body['runners_max'].to_i if response.body['runners_max'] rescue nil
-      @status_code = response.code
-      @errors += response.errors if response.errors.any?
+
       self
     end
 
     def fetch
-      response = @api.get_workspace_info(@name)
-      @status_code = response.code
-      if response.errors.any?
-        @errors += response.errors
-      else
-        parse_attributes(response.body)
-      end
+      response = make_request { @api.get_workspace_info(@name) }
+      parse_attributes(response.body) unless response.errors.any?
+
       self
     end
 
     def upload_file(package_file_name, relative_path:)
-      response = @api.upload_file(workspace_name: @name, package: package_file_name, relative_path: relative_path)
-      @status_code = response.code
-      @errors += response.errors if response.errors.any?
+      make_request { @api.upload_file(workspace_name: @name, package: package_file_name, relative_path: relative_path) }
+
       self
     end
 
     def delete_file(relative_path:)
-      response = @api.delele_file(workspace_name: @name, relative_path: relative_path)
-      @status_code = response.code
-      @errors += response.errors if response.errors.any?
+      make_request { @api.delete_file(workspace_name: @name, relative_path: relative_path) }
+
       self
     end
 
     def static_metadata
-      response = @api.get_static_metadata(@name)
-      @status_code = response.code
-      @errors += response.errors if response.errors.any?
+      response = make_request { @api.get_static_metadata(@name) }
       @static_metadata = response.body['metadata']
+
       self
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.25
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -291,7 +291,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/console

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Paulo Arruda
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.