faastruby 0.4.18 → 0.5.0

data/lib/faastruby/cli.rb

@@ -1,17 +1,11 @@
-require 'tty-spinner'
-require 'yaml'
-require 'tty-table'
-require 'zip'
 require 'colorize'
-require 'faastruby/cli/commands'
-require 'faastruby/cli/package'
-require 'faastruby/cli/template'
-require 'erb'
 
 module FaaStRuby
+  FUNCTION_NAME_REGEX = '[a-zA-Z\-_0-9\/\.]{1,}'
+  WORKSPACE_NAME_REGEX = '[a-zA-Z0-im9_]{1}[a-zA-Z0-9\-]{1,}[a-zA-Z0-9_]{1}'
   FAASTRUBY_YAML = 'faastruby.yml'
   SPINNER_FORMAT = :spin_2
-  SUPPORTED_RUNTIMES = ['ruby:2.5.3', 'ruby:2.6.0', 'ruby:2.6.1', 'crystal:0.27.0', 'crystal:0.27.2']
+
   class CLI
     def self.error(message, color: :red)
       message.each {|m| STDERR.puts m.colorize(color)} if message.is_a?(Array)
@@ -21,14 +15,22 @@ module FaaStRuby
 
     def self.run(command, args)
       if command.nil?
+        require 'faastruby/cli/commands/help'
         FaaStRuby::Command::Help.new(args).run
         return
       end
-      start_server(args) if command == 'server'
+      check_ruby_version
+      start_server(args) if command == 'local'
+      start_tmuxinator if command == 'mux'
       # check_version
       check_region
+      require 'faastruby/cli/commands'
+      # require 'faastruby/cli/package'
+      # require 'faastruby/cli/template'
       error("Unknown command: #{command}") unless FaaStRuby::Command::COMMANDS.has_key?(command)
-      FaaStRuby::Command::COMMANDS[command].new(args).run
+
+      const = FaaStRuby::Command::COMMANDS[command].call
+      const.new(args).run
     end
 
     # def self.check_version
@@ -42,13 +44,38 @@ module FaaStRuby
     #   end
     # end
 
+    def self.check_ruby_version
+      require 'faastruby/supported_runtimes'
+      error("Unsupported Ruby version: #{RUBY_VERSION}\nSupported Ruby versions are: #{SUPPORTED_RUBY.join(", ")}") unless SUPPORTED_RUBY.include?(RUBY_VERSION)
+    end
+
     def self.check_region
       ENV['FAASTRUBY_REGION'] ||= DEFAULT_REGION
       error(["No such region: #{ENV['FAASTRUBY_REGION']}".red, "Valid regions are:  #{FaaStRuby::REGIONS.join(' | ')}"], color: nil) unless FaaStRuby::REGIONS.include?(ENV['FAASTRUBY_REGION'])
     end
 
     def self.start_server(args)
-      exec("faastruby-server #{args.join(' ')}")
+      parsed = []
+      parsed << 'FAASTRUBY_PROJECT_SYNC_ENABLED=true' if args.delete('--sync')
+      parsed << 'DEBUG=true' if args.delete('--debug')
+      args.each_with_index do |arg, i|
+        if ['--env', '-e'].include?(arg)
+          args.delete_at(i)
+          parsed << "FAASTRUBY_PROJECT_DEPLOY_ENVIRONMENT=#{args.delete_at(i)}"
+        end
+      end
+      server_dir = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/lib/faastruby/server"
+      config_ru = "#{server_dir}/config.ru"
+      puma_config = "#{server_dir}/puma.rb"
+      exec "#{parsed.join(' ')} puma -C #{puma_config} #{args.join(' ')} #{config_ru}"
+    end
+    def self.start_tmuxinator
+      if system("tmux -V > /dev/null")
+        project_name = YAML.load(File.read("project.yml"))['name']
+        exec("tmuxinator start #{project_name} -p tmuxinator.yml")
+      else
+        error("To use 'faastruby mux' you need to have 'tmux' installed.", color: nil)
+      end
     end
   end
 end

data/lib/faastruby/cli/base_command.rb

@@ -0,0 +1,66 @@
+require 'tty-spinner'
+require 'yaml'
+module FaaStRuby
+  module Command
+    class BaseCommand
+      def self.spin(message)
+        spinner = TTY::Spinner.new(":spinner #{message}", format: SPINNER_FORMAT)
+        spinner.auto_spin
+        spinner
+      end
+
+      def write_file(path, content, mode = 'w', print_base_dir: false, extra_content: nil)
+        base_dir = print_base_dir ? "#{print_base_dir}/" : ""
+        File.open(path, mode) do |f|
+          f.write(content)
+          f.write(extra_content) if extra_content
+        end
+        message = "#{mode == 'w' ? '+' : '~'} f #{base_dir}#{path}"
+        puts message.green if mode == 'w'
+        puts message.yellow if mode == 'w+' || mode == 'a'
+      end
+
+      def say(message, quiet: false)
+        return puts "\n#{message}" if quiet
+        spin(message)
+      end
+
+      def load_credentials
+        @credentials_file = NewCredentials::CredentialsFile.new
+        @credentials = @credentials_file.get
+        FaaStRuby.configure do |config|
+          config.api_key = @credentials['api_key']
+          config.api_secret = @credentials['api_secret']
+        end
+      end
+
+      def help
+        if ['-h', '--help'].include?(@args.first)
+          usage
+          exit 0
+        end
+      end
+
+      def has_user_logged_in?
+        NewCredentials::CredentialsFile.new.has_user_logged_in?
+      end
+
+      def spin(message)
+        spinner = TTY::Spinner.new(":spinner #{message}", format: SPINNER_FORMAT)
+        spinner.auto_spin
+        spinner
+      end
+
+      def load_yaml
+        if File.file?(FAASTRUBY_YAML)
+          return YAML.load(File.read(FAASTRUBY_YAML))
+        end
+        FaaStRuby::CLI.error("Could not find file #{FAASTRUBY_YAML}")
+      end
+
+      def spin(message)
+        self.class.spin(message)
+      end
+    end
+  end
+end

data/lib/faastruby/cli/commands.rb

@@ -1,65 +1,128 @@
 module FaaStRuby
   module Command
-    class BaseCommand
-      def self.spin(message)
-        spinner = TTY::Spinner.new(":spinner #{message}", format: SPINNER_FORMAT)
-        spinner.auto_spin
-        spinner
-      end
-
-      def write_file(path, content, mode = 'w')
-        File.open(path, mode){|f| f.write(content) }
-        message = "#{mode == 'w' ? '+' : '~'} f #{path}"
-        puts message.green if mode == 'w'
-        puts message.yellow if mode == 'w+' || mode == 'a'
-      end
-
-      def spin(message)
-        spinner = TTY::Spinner.new(":spinner #{message}", format: SPINNER_FORMAT)
-        spinner.auto_spin
-        spinner
-      end
-
-      def load_yaml
-        return YAML.load(File.read(FAASTRUBY_YAML)) if File.file?(FAASTRUBY_YAML)
-        FaaStRuby.error("Could not find file #{FAASTRUBY_YAML}")
-      end
-
-      def spin(message)
-        self.class.spin(message)
-      end
-    end
-  end
-end
-
-require 'faastruby/cli/credentials'
-require 'faastruby/cli/commands/function'
-require 'faastruby/cli/commands/workspace'
-require 'faastruby/cli/commands/credentials'
-require 'faastruby/cli/commands/help'
-require 'faastruby/cli/commands/version'
-
-module FaaStRuby
-  module Command
+    require 'faastruby/cli/base_command'
+    # require 'faastruby/cli/credentials'
     COMMANDS = {
-      'new' => FaaStRuby::Command::Function::New,
-      'deploy-to' => FaaStRuby::Command::Function::DeployTo,
-      'deploy' => FaaStRuby::Command::Workspace::Deploy,
-      'remove-from' => FaaStRuby::Command::Function::RemoveFrom,
-      'update-context' => FaaStRuby::Command::Function::UpdateContext,
-      'upgrade' => FaaStRuby::Command::Function::Upgrade,
-      'build' => FaaStRuby::Command::Function::Build,
-      'create-workspace' => FaaStRuby::Command::Workspace::Create,
-      'destroy-workspace' => FaaStRuby::Command::Workspace::Destroy,
-      'list-workspace' => FaaStRuby::Command::Workspace::List,
-      'test' => FaaStRuby::Command::Function::Test,
-      'run' => FaaStRuby::Command::Function::Run,
-      'add-credentials' => FaaStRuby::Command::Credentials::Add,
-      'list-credentials' => FaaStRuby::Command::Credentials::List,
-      'help' => FaaStRuby::Command::Help,
-      '-h' => FaaStRuby::Command::Help,
-      '--help' => FaaStRuby::Command::Help,
-      '-v' => FaaStRuby::Command::Version
+      'new' => Proc.new do
+        require 'faastruby/cli/commands/function/new'
+        FaaStRuby::Command::Function::New
+      end,
+      'deploy-to' => Proc.new do
+        require 'faastruby/cli/commands/function/deploy_to'
+        FaaStRuby::Command::Function::DeployTo
+      end,
+      'remove-from' => Proc.new do
+        require 'faastruby/cli/commands/function/remove_from'
+        FaaStRuby::Command::Function::RemoveFrom
+      end,
+      'update-context' => Proc.new do
+        require 'faastruby/cli/commands/function/update_context'
+        FaaStRuby::Command::Function::UpdateContext
+      end,
+      # 'upgrade' => Proc.new do
+      #   require 'faastruby/cli/commands/function/upgrade'
+      #   FaaStRuby::Command::Function::Upgrade
+      # end,
+      'build' => Proc.new do
+        require 'faastruby/cli/commands/function/build'
+        FaaStRuby::Command::Function::Build
+      end,
+      'create-workspace' => Proc.new do
+        require 'faastruby/cli/commands/workspace/create'
+        FaaStRuby::Command::Workspace::Create
+      end,
+      'cp' => Proc.new do
+        require 'faastruby/cli/commands/workspace/cp'
+        FaaStRuby::Command::Workspace::CP
+      end,
+      'rm' => Proc.new do
+        require 'faastruby/cli/commands/workspace/rm'
+        FaaStRuby::Command::Workspace::RM
+      end,
+      'update-workspace' => Proc.new do
+        require 'faastruby/cli/commands/workspace/update'
+        FaaStRuby::Command::Workspace::Update
+      end,
+      'destroy-workspace' => Proc.new do
+        require 'faastruby/cli/commands/workspace/destroy'
+        FaaStRuby::Command::Workspace::Destroy
+      end,
+      'list-workspace' => Proc.new do
+        require 'faastruby/cli/commands/workspace/list'
+        FaaStRuby::Command::Workspace::List
+      end,
+      'new-project' => Proc.new do
+        require 'faastruby/cli/commands/project/new'
+        FaaStRuby::Command::Project::New
+      end,
+      'deploy' => Proc.new do
+        require 'faastruby/cli/commands/project/deploy'
+        FaaStRuby::Command::Project::Deploy
+      end,
+      'up' => Proc.new do
+        require 'faastruby/cli/commands/project/deploy'
+        FaaStRuby::Command::Project::Deploy
+      end,
+      'down' => Proc.new do
+        require 'faastruby/cli/commands/project/down'
+        FaaStRuby::Command::Project::Down
+      end,
+      'test' => Proc.new do
+        require 'faastruby/cli/commands/function/test'
+        FaaStRuby::Command::Function::Test
+      end,
+      'run' => Proc.new do
+        require 'faastruby/cli/commands/function/run'
+        FaaStRuby::Command::Function::Run
+      end,
+      # 'add-credentials' => Proc.new do
+      #   require 'faastruby/cli/commands/credentials/add'
+      #   FaaStRuby::Command::Credentials::Add
+      # end,
+      # 'list-credentials' => Proc.new do
+      #   require 'faastruby/cli/commands/credentials/list'
+      #   FaaStRuby::Command::Credentials::List
+      # end,
+      'help' => Proc.new do
+        require 'faastruby/cli/commands/help'
+        FaaStRuby::Command::Help
+      end,
+      '-h' => Proc.new do
+        require 'faastruby/cli/commands/help'
+        FaaStRuby::Command::Help
+      end,
+      '--help' => Proc.new do
+        require 'faastruby/cli/commands/help'
+        FaaStRuby::Command::Help
+      end,
+      '-v' => Proc.new do
+        require 'faastruby/cli/commands/version'
+        FaaStRuby::Command::Version
+      end,
+      'watch' => Proc.new do
+        require 'faastruby/local'
+        FaaStRuby::Local.start!
+      end,
+      'signup' => Proc.new do
+        require 'faastruby/cli/commands/account/signup'
+        FaaStRuby::Command::Account::Signup
+      end,
+      'confirm-account' => Proc.new do
+        require 'faastruby/cli/commands/account/confirm'
+        FaaStRuby::Command::Account::Confirm
+      end,
+      'login' => Proc.new do
+        require 'faastruby/cli/commands/account/login'
+        FaaStRuby::Command::Account::Login
+      end,
+      'logout' => Proc.new do
+        require 'faastruby/cli/commands/account/logout'
+        FaaStRuby::Command::Account::Logout
+      end,
+      'migrate-workspaces' => Proc.new do
+        require 'faastruby/cli/commands/workspace/migrate'
+        FaaStRuby::Command::Workspace::Migrate
+      end
     }
   end
 end

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

@@ -0,0 +1,10 @@
+module FaaStRuby
+  module Command
+    module Account
+      require 'faastruby/user'
+      require 'faastruby/cli/new_credentials'
+      class AccountBaseCommand < BaseCommand
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+
+module FaaStRuby
+  module Command
+    module Account
+      require 'faastruby/cli/commands/account/base_command'
+      class Confirm < AccountBaseCommand
+        def initialize(args)
+          @args = args
+          parse_options
+          @missing_args = []
+          FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
+        end
+
+        def run
+          user = User.new(email: @options['email'])
+          user.send_confirmation_code
+          puts "\nYou should have received an email with a confirmation token. If you didn't receive an email, make sure you sign up with the correct email address."
+          print "Confirmation Token: "
+          user.confirmation_token = STDIN.gets.chomp
+          spinner = spin("Confirming your account...")
+          user.confirm_account!
+          FaaStRuby::CLI.error(user.errors) if user.errors.any?
+          spinner.stop(" Done!")
+          user.save_credentials
+          puts "Login successful!"
+          migrate
+        end
+
+        def migrate
+          old_credentials = File.expand_path("~/.faastruby.tor1")
+          return unless File.file?(old_credentials)
+          puts "ATTENTION: I've detected you have workspace credentials saved in '#{old_credentials}'.".red
+          puts "You need to migrate these credentials into your account."
+          print "Do you want to do it right now? [Y/n] "
+          answer = STDIN.gets.chomp
+          if answer == 'n'
+            puts "You won't be able to manage these workspaces until you perform this migration."
+            puts "When you are ready to perform this migration, run 'faastruby migrate-workspaces'."
+            exit 0
+          else
+            exec("faastruby migrate-workspaces")
+          end
+        end
+
+        def self.help
+          "confirm-account [ARGS]"
+        end
+
+        def usage
+          puts "Usage: faastruby #{self.class.help}"
+          puts %(
+-e,--email EMAIL      # Your email
+          )
+        end
+
+        private
+
+        def missing_args
+          @missing_args << "Missing argument: --email EMAIL".red unless @options['email']
+          @missing_args << usage if @missing_args.any?
+          @missing_args
+        end
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '-h', '--help', 'help'
+              puts usage
+              exit 0
+            when '-e', '--email'
+              @options['email'] = @args.shift
+            else
+              FaaStRuby::CLI.error(["Unknown argument: #{option}".red, usage], color: nil)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,86 @@
+module FaaStRuby
+  module Command
+    module Account
+      require 'faastruby/cli/commands/account/base_command'
+      require 'io/console'
+      class Login < AccountBaseCommand
+        def initialize(args)
+          @args = args
+          parse_options
+          @email = @options['email']
+          @password = @options['password']
+        end
+
+        def run
+          ask_for_email unless @email
+          ask_for_password unless @password
+          user = User.new(email: @email, password: @password)
+          user.login
+          FaaStRuby::CLI.error(user.errors) if user&.errors.any?
+          user.save_credentials
+          puts "Login successful."
+          migrate
+        end
+
+        def ask_for_email
+          print "Email: "
+          @email = STDIN.gets.chomp
+        end
+
+        def ask_for_password
+          print "Password: "
+          @password = STDIN.noecho(&:gets).chomp
+          puts "\n"
+        end
+
+        def migrate
+          old_credentials = File.expand_path("~/.faastruby.tor1")
+          return unless File.file?(old_credentials)
+          puts "ATTENTION: I've detected you have workspace credentials saved in '#{old_credentials}'.".red
+          puts "You need to migrate these credentials into your account."
+          print "Do you want to do it right now? [Y/n] "
+          answer = STDIN.gets.chomp
+          if answer == 'n'
+            puts "You won't be able to manage these workspaces until you perform this migration."
+            puts "When you are ready to perform this migration, run 'faastruby migrate-workspaces'."
+            exit 0
+          else
+            exec("faastruby migrate-workspaces")
+          end
+        end
+
+        def self.help
+          "login [ARGS]"
+        end
+
+        def usage
+          puts "Usage: faastruby #{self.class.help}"
+          puts %(
+-e,--email EMAIL         # Your email
+-p,--password PASSWORD   # Your password
+          )
+        end
+
+        private
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '-h', '--help', 'help'
+              puts usage
+              exit 0
+            when '-e', '--email'
+              @options['email'] = @args.shift
+            when '-p', '--password'
+              @options['password'] = @args.shift
+            else
+              FaaStRuby::CLI.error(["Unknown argument: #{option}".red, usage], color: nil)
+            end
+          end
+        end
+      end
+    end
+  end
+end