faastruby 0.4.18 → 0.5.0

data/lib/faastruby/cli/commands/workspace/destroy.rb

@@ -1,15 +1,17 @@
 module FaaStRuby
   module Command
     module Workspace
-      class Destroy < WorkspaceBaseCommand
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      class Destroy < BaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
           parse_options
-          FaaStRuby::Credentials.load_for(@workspace_name)
-          @options['credentials_file'] ||= FaaStRuby.credentials_file
+          load_credentials
         end
 
         def run
@@ -18,9 +20,11 @@ module FaaStRuby
           workspace = FaaStRuby::Workspace.new(name: @workspace_name)
           spinner = spin("Destroying...")
           workspace.destroy
-          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          if workspace.errors.any?
+            spinner.stop(" Failed :(")
+            FaaStRuby::CLI.error(workspace.errors)
+          end
           spinner.stop("Done!")
-          FaaStRuby::Credentials.remove(@workspace_name, @options['credentials_file'])
           puts "Workspace '#{@workspace_name}' was deleted from the server"
         end
 
@@ -43,11 +47,14 @@ module FaaStRuby
         end
 
         def self.help
-          "destroy-workspace".light_cyan + " WORKSPACE_NAME [-y, --yes]"
+          "destroy-workspace WORKSPACE_NAME [ARGS]"
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          puts "\nUsage: faastruby #{self.class.help}"
+          puts %(
+-y,--yes    # Don't prompt for confirmation
+          )
         end
 
         def parse_options

data/lib/faastruby/cli/commands/workspace/list.rb

@@ -1,36 +1,45 @@
+require 'tty-table'
 module FaaStRuby
   module Command
     module Workspace
-      class List < WorkspaceBaseCommand
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      class List < BaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
-          FaaStRuby::Credentials.load_for(@workspace_name)
+          load_credentials
         end
 
         def run
           workspace = FaaStRuby::Workspace.new(name: @workspace_name).fetch
           FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          if workspace.runners_max
+            puts "Allocated Runners: #{workspace.runners_max} (disabled)" if workspace&.runners_max == 0
+            puts "Allocated Runners: #{workspace.runners_max}" if workspace&.runners_max > 0
+          end
           print_functions_table(workspace.functions)
         end
 
         def print_functions_table(functions)
           no_functions unless functions.any?
-          rows = functions.map do |function_name|
-            [function_name, "#{FaaStRuby.api_host}/#{@workspace_name}/#{function_name}"]
+          rows = functions.map do |hash|
+            [hash['name'], hash['endpoint']]
           end
           table = TTY::Table.new(['FUNCTION','ENDPOINT'], rows)
           puts table.render(:basic)
         end
 
         def self.help
-          "list-workspace".light_cyan + " WORKSPACE_NAME"
+          "list-workspace WORKSPACE_NAME"
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          puts "\n# List the contents of a cloud workspace."
+          puts "\nUsage: faastruby #{self.class.help}\n\n"
         end
 
         private

data/lib/faastruby/cli/commands/workspace/migrate.rb

@@ -0,0 +1,93 @@
+require 'tty-table'
+module FaaStRuby
+  module Command
+    module Workspace
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      require 'oj'
+      require 'fileutils'
+      class Migrate < BaseCommand
+        def initialize(args)
+          @args = args
+          @failed = []
+          @migrated = []
+          help
+          load_credentials
+        end
+
+        def run
+          file1 = File.expand_path('~/.faastruby')
+          file2 = File.expand_path('~/.faastruby.tor1')
+          if !File.file?(file1) && !File.file?(file2)
+            puts "Nothing to migrate."
+            exit 0
+          end
+          old_credential_files = [file1, file2]
+
+          puts "@@@ WARNING @@@ WARNING @@@ WARNING @@@ WARNING @@@ ".red
+          puts "This is going to migrate all your legacy credentials into your new account. This process is REQUIRED, but irreversible."
+          email = NewCredentials::CredentialsFile.new.get['email']
+          puts "You are currently logged in as '#{email}'."
+          print "Continue? [y/N] "
+          response = STDIN.gets.chomp
+          FaaStRuby::CLI.error("Exiting", color: nil) unless response == 'y'
+          old_credential_files.each do |file|
+            next unless File.file?(file)
+            FileUtils.cp(file, "#{file}.backup_before_migration") unless File.file?("#{file}.backup_before_migration")
+            workspaces = Oj.load(File.read(file))
+            workspaces.each do |workspace_name, credentials|
+              migrate(workspace_name, credentials)
+            end
+            remove_migrated(file)
+            backup_file(file)
+          end
+          notify_failed
+        end
+
+        def remove_migrated(file)
+          credentials = Oj.load(File.read(file))
+          @migrated.each do |workspace_name|
+            credentials.delete(workspace_name)
+          end
+          File.write(file, JSON.pretty_generate(credentials))
+        end
+
+        def backup_file(file)
+          FileUtils.mv(file, "#{file}.bkp")
+        end
+
+        def notify_failed
+          return unless @failed.any?
+          puts "\nThe following workspaces failed to be migrated: #{@failed.join(', ').red}"
+          puts "Please come over to our Slack and we will assist you with this migration."
+          puts "Click the following link to join our Slack: https://faastruby.io/slack\n\n"
+        end
+
+        def migrate(workspace_name, credentials)
+          spinner = spin("Migrating workspace '#{workspace_name}'...")
+          api = API.new
+          response = api.migrate_to_account(workspace_name: workspace_name, api_key: credentials['api_key'], api_secret: credentials['api_secret'])
+          if response.code > 299
+            @failed << workspace_name
+            spinner.stop(" Failed :(".red)
+            return false
+          end
+          @migrated << workspace_name
+          spinner.stop(" Done!".green)
+          return true
+        end
+
+        def self.help
+          "migrate-workspaces"
+        end
+
+        def usage
+          puts "\n# Migrate legacy workspace credentials to your new FaaStRuby account."
+          puts "# You must have an account and be logged in to perform the migration."
+          puts "\nUsage: faastruby #{self.class.help}\n\n"
+        end
+
+      end
+    end
+  end
+end

data/lib/faastruby/cli/commands/workspace/rm.rb

@@ -0,0 +1,81 @@
+module FaaStRuby
+  module Command
+    module Workspace
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      class RM < BaseCommand
+        def initialize(args)
+          @args = args
+          help
+          @workspace_name, @relative_path = @args.shift.split(':')
+          validate_command
+          # FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
+          load_credentials
+        end
+
+        def run
+          # destination_url = "#{FaaStRuby.workspace_host_for(@workspace_name)}/#{@relative_path}"
+          spinner = say("[#{@relative_path}] Removing file from cloud workspace '#{@workspace_name}'...")
+          workspace = FaaStRuby::Workspace.new(name: @workspace_name)
+          workspace.delete_file(relative_path: @relative_path)
+          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          spinner.stop("Done!")
+          puts "* [#{@relative_path}] File removed from cloud workspace '#{@workspace_name}'.".green
+        end
+
+
+        def self.help
+          "rm WORKSPACE_NAME:/DESTINATION/PATH"
+        end
+
+        def usage
+          puts "\n# Remove static file from cloud workspace path '/DESTINATION/PATH'."
+          puts "\nUsage: faastruby #{self.class.help}\n\n"
+        end
+
+        private
+
+        def validate_command
+          validate_workspace_name
+          validate_relative_path
+        end
+
+        def validate_relative_path
+          @relative_path.sub!(/^\//, '')
+          FaaStRuby::CLI.error(["Invalid path: #{@relative_path}".red, "The path must have at least one character and can only contain letters, numbers, -, _, . and /."], color: nil) unless @relative_path&.match(/#{FUNCTION_NAME_REGEX}/)
+          true
+        end
+
+        def validate_workspace_name
+          FaaStRuby::CLI.error(["Invalid workspace name: #{@workspace_name}".red, "The workspace name must have between 3 and 15 characters, and can only have letters, numbers and dashes."], color: nil) unless @workspace_name&.match(/#{WORKSPACE_NAME_REGEX}/)
+          true
+        end
+
+
+        # def missing_args
+        #   FaaStRuby::CLI.error(["'#{@workspace_name}' is not a valid workspace name.".red, usage], color: nil) if @workspace_name =~ /^-.*/
+        #   @missing_args << "Missing argument: WORKSPACE_NAME".red unless @workspace_name
+        #   @missing_args << "Missing argument: -s SOURCE_FILE" unless @options['source']
+        #   @missing_args << "Missing argument: -d DESTINATION_PATH" unless @options['destination']
+        #   @missing_args << usage if @missing_args.any?
+        #   @missing_args
+        # end
+
+        # def parse_options(require_options: {})
+        #   @options = {}
+        #   while @args.any?
+        #     option = @args.shift
+        #     case option
+        #     when '-s', '--source'
+        #       @options['source'] = @args.shift
+        #     when '-d', '--destination'
+        #       @options['destination'] = @args.shift.gsub(/(^\/|\/$|\.\.|;|'|"|&|\\)/, '')
+        #     else
+        #       FaaStRuby::CLI.error("Unknown argument: #{option}")
+        #     end
+        #   end
+        # end
+      end
+    end
+  end
+end

data/lib/faastruby/cli/commands/workspace/update.rb

@@ -0,0 +1,62 @@
+module FaaStRuby
+  module Command
+    module Workspace
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      class Update < BaseCommand
+        def initialize(args)
+          @args = args
+          help
+          @missing_args = []
+          FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
+          @workspace_name = @args.shift
+          parse_options
+          load_credentials
+        end
+
+        def run(create_directory: true, exit_on_error: true)
+          spinner = spin("Updating the number of runners to #{@options['runners_max']}...")
+          workspace = FaaStRuby::Workspace.new(name: @workspace_name)
+          workspace.update_runners(@options['runners_max'])
+          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          spinner.stop("Done!")
+        end
+
+        def self.help
+          "update-workspace WORKSPACE_NAME ARGS"
+        end
+
+        def usage
+          puts "\nUsage: faastruby #{self.class.help}"
+          puts %(
+--runners N   # Assign N runners to the workspace.
+          )
+        end
+
+        private
+
+        def missing_args
+          if @args.empty?
+            @missing_args << "Missing argument: WORKSPACE_NAME".red
+            @missing_args << usage
+          end
+          FaaStRuby::CLI.error(["'#{@args.first}' is not a valid workspace name.".red, usage], color: nil) if @args.first =~ /^-.*/
+          @missing_args
+        end
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '--runners'
+              @options['runners_max'] = @args.shift
+            else
+              FaaStRuby::CLI.error("Unknown argument: #{option}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/faastruby/cli/credentials.rb

@@ -1,62 +1,63 @@
-require 'json'
-module FaaStRuby
-  class Credentials # TODO: change it to YAML?
-    def self.load_credentials_file(credentials_file = FaaStRuby.credentials_file)
-      return {} unless File.file?(credentials_file)
-      creds = Oj.load(File.read(credentials_file))
-      if creds.is_a?(Hash)
-        creds.delete_if{|workspace, credentials| credentials.nil?}
-        return creds
-      end
-      return {}
-    end
+# require 'json'
+# require 'colorize'
+# module FaaStRuby
+#   class Credentials # TODO: change it to YAML?
+#     def self.load_credentials_file(credentials_file = FaaStRuby.credentials_file)
+#       return {} unless File.file?(credentials_file)
+#       creds = Oj.load(File.read(credentials_file))
+#       if creds.is_a?(Hash)
+#         creds.delete_if{|workspace, credentials| credentials.nil?}
+#         return creds
+#       end
+#       return {}
+#     end
 
-    def self.add(workspace_name, new_credentials, credentials_file)
-      FaaStRuby::CLI.error("Error trying to save null credentials. You probably found a bug in the gem. Please report it at https://github.com/FaaStRuby/faastruby-cli/issues/new") unless new_credentials
-      credentials = load_credentials_file(credentials_file)
-      credentials.merge!({workspace_name => new_credentials})
-      save_file(credentials, credentials_file)
-    end
+#     def self.add(workspace_name, new_credentials, credentials_file)
+#       FaaStRuby::CLI.error("Error trying to save null credentials. You probably found a bug in the gem. Please report it at https://github.com/FaaStRuby/faastruby-cli/issues/new") unless new_credentials
+#       credentials = load_credentials_file(credentials_file)
+#       credentials.merge!({workspace_name => new_credentials})
+#       save_file(credentials, credentials_file)
+#     end
 
-    def self.remove(workspace_name, credentials_file)
-      credentials = load_credentials_file
-      credentials.delete_if{|k,v| k == workspace_name}
-      save_file(credentials, credentials_file)
-    end
+#     def self.remove(workspace_name, credentials_file)
+#       credentials = load_credentials_file
+#       credentials.delete_if{|k,v| k == workspace_name}
+#       save_file(credentials, credentials_file)
+#     end
 
-    def self.save_file(credentials, credentials_file)
-      if File.file?(credentials_file)
-        color = :yellow
-        symbol = '~'
-      else
-        color = :green
-        symbol = '+'
-      end
-      credentials.delete_if{|workspace, creds| creds.nil?}
-      File.open(credentials_file, 'w') {|f| f.write JSON.pretty_generate(credentials)}
-      puts "#{symbol} f #{credentials_file}".colorize(color)
-    end
+#     def self.save_file(credentials, credentials_file)
+#       if File.file?(credentials_file)
+#         color = :yellow
+#         symbol = '~'
+#       else
+#         color = :green
+#         symbol = '+'
+#       end
+#       credentials.delete_if{|workspace, creds| creds.nil?}
+#       File.open(credentials_file, 'w') {|f| f.write JSON.pretty_generate(credentials)}
+#       puts "#{symbol} f #{credentials_file}".colorize(color)
+#     end
 
-    def self.load_for(workspace_name, cred_file = FaaStRuby.credentials_file, exit_on_error: true)
-      credentials = load_from_env(workspace_name) || load_credentials_file(cred_file)
-      error_msg = "Could not find credentials for '#{workspace_name}' in '#{cred_file}'"
-      if exit_on_error && !credentials[workspace_name]
-        FaaStRuby::CLI.error(error_msg)
-      elsif !credentials[workspace_name]
-        puts error_msg
-        return false
-      end
-      FaaStRuby.configure do |config|
-        config.api_key = credentials[workspace_name]['api_key']
-        config.api_secret = credentials[workspace_name]['api_secret']
-      end
-      return true
-    end
+#     def self.load_for(workspace_name, cred_file = FaaStRuby.credentials_file, exit_on_error: true)
+#       credentials = load_from_env(workspace_name) || load_credentials_file(cred_file)
+#       error_msg = "Could not find credentials for '#{workspace_name}' in '#{cred_file}'"
+#       if exit_on_error && !credentials[workspace_name]
+#         FaaStRuby::CLI.error(error_msg)
+#       elsif !credentials[workspace_name]
+#         puts error_msg
+#         return false
+#       end
+#       FaaStRuby.configure do |config|
+#         config.api_key = credentials[workspace_name]['api_key']
+#         config.api_secret = credentials[workspace_name]['api_secret']
+#       end
+#       return true
+#     end
 
-    def self.load_from_env(workspace_name)
-      return nil unless ENV['FAASTRUBY_API_KEY'] && ENV['FAASTRUBY_API_SECRET']
-      puts "#{"WARNING:".red} Using credentials from env vars FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET"
-      {workspace_name => {'api_key' => ENV['FAASTRUBY_API_KEY'], 'api_secret' => ENV['FAASTRUBY_API_SECRET']}}
-    end
-  end
-end
+#     def self.load_from_env(workspace_name)
+#       return nil unless ENV['FAASTRUBY_API_KEY'] && ENV['FAASTRUBY_API_SECRET']
+#       puts "#{"WARNING:".red} Using credentials from env vars FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET"
+#       {workspace_name => {'api_key' => ENV['FAASTRUBY_API_KEY'], 'api_secret' => ENV['FAASTRUBY_API_SECRET']}}
+#     end
+#   end
+# end