faastruby 0.4.18 → 0.5.0

data/lib/faastruby/cli/commands/project/down.rb

@@ -0,0 +1,58 @@
+require 'open3'
+module FaaStRuby
+  module Command
+    STDOUT_MUTEX = Mutex.new
+    module Project
+      require 'faastruby/cli/commands/project/base_command'
+      require 'faastruby/server/logger'
+      class Down < ProjectBaseCommand
+        extend FaaStRuby::Logger
+        def initialize(args)
+          @args = args
+          help
+          parse_options
+          @options['environment'] ||= 'stage'
+          @project_yaml = YAML.load(File.read(PROJECT_YAML_FILE))['project'] rescue FaaStRuby::CLI.error("Could not find file 'project.yml'. Are you running this command from the project's folder?")
+          @project_name = @project_yaml['name']
+          @project_identifier = "-#{@project_yaml['identifier']}" if @project_yaml['identifier']
+        end
+
+        def run
+          workspace = "#{@project_name}-#{@options['environment']}#{@project_identifier}"
+          if @options['force']
+            exec("faastruby destroy-workspace #{workspace} -y")
+          else
+            exec("faastruby destroy-workspace #{workspace}")
+          end
+        end
+
+        def self.help
+          "down [ARGS]"
+        end
+
+        def usage
+          puts "Usage: faastruby #{self.class.help}"
+          puts %(
+-e,--env ENVIRONMENT           # ENVIRONMENT is added to the project name to compose the workspace name.
+          )
+        end
+
+        def parse_options
+          @options = {'functions' => []}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '-y', '--yes'
+              @options['force'] = true
+            when '--env', '-e'
+              @options['environment'] = @args.shift
+            else
+              FaaStRuby::CLI.error("Unknown argument: #{option}")
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/faastruby/cli/commands/project/new.rb

@@ -0,0 +1,237 @@
+module FaaStRuby
+  module Command
+    module Project
+      require 'faastruby/cli/commands/project/base_command'
+      require 'faastruby/cli/template'
+      require 'faastruby/cli/commands/function/new'
+
+      DEFAULT_FUNCTIONS = {
+        'root' => "local:#{FaaStRuby::Template.gem_template_path_for('web-root', runtime: 'ruby')}",
+        'catch-all' => "local:#{FaaStRuby::Template.gem_template_path_for('web-404', runtime: 'ruby')}",
+      }
+      def self.templates_for(kind)
+        t = {
+          'root' => "local:#{FaaStRuby::Template.gem_template_path_for("#{kind}-root", runtime: 'ruby')}",
+          'catch-all' => "local:#{FaaStRuby::Template.gem_template_path_for("#{kind}-404", runtime: 'ruby')}"
+        }
+        return t
+      end
+      class New < ProjectBaseCommand
+        def initialize(args)
+          @args = args
+          help
+          @missing_args = []
+          FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
+          @project_name = @args.shift
+          FaaStRuby::CLI.error("The project name must have between 3 and 15 characters, and can only have letters, numbers and dashes.") unless name_valid?
+          @base_dir = "./#{@project_name}"
+          parse_options
+          @options['credentials_file'] ||= PROJECT_CREDENTIALS_FILE
+          @options['project_type'] ||= 'web'
+        end
+
+        def run
+          dir_exists?
+          create_dir
+          create_config
+          install_functions
+          git_init
+          puts "Project '#{@project_name}' initialized."
+          puts "Now run:"
+          puts "$ cd #{@project_name}"
+          puts "$ faastruby local\n\n"
+          puts "Then visit http://localhost:3000"
+        end
+
+        def self.help
+          "new-project PROJECT_NAME [ARGS]"
+        end
+
+        def usage
+          puts "Usage: faastruby #{self.class.help}"
+          puts %(
+--api     # Initialize a project folder using an API template
+--web     # (Default) Initialize a project folder using a WEB template
+          )
+        end
+
+        private
+
+        def create_dir
+          FileUtils.mkdir_p(@base_dir)
+          puts "+ d #{@base_dir}".green
+        end
+
+        def git_init
+          File.write("#{@base_dir}/.gitignore", "secrets.yml")
+          puts "+ f #{@base_dir}/.gitignore".green
+          puts `git init #{@base_dir}`
+        end
+
+        def install_functions
+          current_dir = Dir.pwd
+          FileUtils.mkdir_p("#{@base_dir}/functions")
+          Dir.chdir("#{@base_dir}/functions")
+          Project.templates_for(@options['project_type']).each do |name, template|
+            args = [name, '--template', template]
+            FaaStRuby::Command::Function::New.new(args).run(print_base_dir: "#{@base_dir}/functions", blank_template: true)
+          end
+          Dir.chdir("..")
+          if @options['project_type'] == 'web'
+            copy_public_template
+          else
+            create_public_folder
+          end
+          Dir.chdir(current_dir)
+        end
+
+        def create_public_folder
+          Dir.mkdir 'public'
+          puts "+ d #{@base_dir}/public".green
+          write_public_config
+        end
+
+        def copy_public_template
+          template_dir = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/templates/public-#{@options['project_type']}"
+          FileUtils.cp_r(template_dir, "./public")
+          write_public_config
+        end
+
+        def write_public_config
+          File.write("public/faastruby.yml", default_public_config)
+          puts "+ f #{@base_dir}/public/faastruby.yml".green
+        end
+
+        def create_config
+          File.write("#{@base_dir}/#{PROJECT_YAML_FILE}", default_project_file)
+          puts "+ f #{@base_dir}/#{PROJECT_YAML_FILE}".green
+          if @options['tmux']
+            File.write("#{@base_dir}/tmuxinator.yml", tmuxinator_config)
+            puts "+ f #{@base_dir}/tmuxinator.yml".green
+          end
+          File.write("#{@base_dir}/#{PROJECT_SECRETS_FILE}", default_secrets_file)
+          puts "+ f #{@base_dir}/#{PROJECT_SECRETS_FILE}".green
+        end
+
+        def default_public_config
+          [
+            "cli_version: #{FaaStRuby::VERSION}",
+            'name: public',
+            'serve_static: true',
+          ].join("\n")
+        end
+
+        def default_secrets_file
+          [
+            'secrets:',
+            "  # Add secrets here and they will be available inside the function as \"event.context\"",
+            "  # Example:",
+            "  # prod:",
+            "  #   pages/root:",
+            "  #     a_secret: bfe76f4557ffc2de901cb24e0f87436f",
+            "  #   another/function:",
+            "  #     another_secret: 4d1c281e.619a2489c.8b5d.dd945616d324",
+            "  # stage:",
+            "  #   pages/root:",
+            "  #     a_secret: bfe76f4557ffc2de901cb24e0f87436f",
+            "  #   another/function:",
+            "  #     another_secret: 4d1c281e.619a2489c.8b5d.dd945616d324"
+          ].join("\n")
+        end
+
+        def default_project_file
+          [
+            "project:",
+            "  # The project name",
+            "  name: #{@project_name}",
+            "  # The project identifier is used to ensure your workspaces will have unique names.",
+            "  # This is not a secret, but don't lose it!",
+            "  identifier: #{Digest::MD5.hexdigest(Time.now.to_s).slice(0..5)}",
+            "",
+            "  ## The 'public' directory, where you put static files.",
+            "  ## Files will be served from here first, meaning that if",
+            "  ## you have a function at '/product' and a folder '/product'",
+            "  ## inside the public folder, the public one will take precedence.",
+            "  ## Defaults to 'public'.",
+            "  # public_dir: public",
+            "",
+            "  ## The name of the folder containing your functions. Defaults to 'functions'",
+            "  # functions_dir: functions",
+            "",
+            "  ## The name of the function that will respond to requests made",
+            "  ## to '/'. Defaults to 'root'",
+            "  # root_to: root",
+            "",
+            "  ## The setting 'catch_all' allows you to capture requests to",
+            "  ## non-existing functions and send them to another function.",
+            "  ## This is useful for setting custom 404 pages, for example.",
+            "  ## Defaults to 'catch-all'.",
+            "  # catch_all: catch-all"
+          ].join("\n")
+        end
+
+        def tmuxinator_config
+          {
+            "name" => @project_name,
+            "root" => ".",
+            "startup_window" => "server",
+            "windows" => [{
+              "server" => {
+                "layout" => "main-horizontal",
+                  "panes" => [
+                    [
+                      "tmux set -g mouse on",
+                      "tmux set -g history-limit 30000",
+                      "clear",
+                      "faastruby server"
+                    ],
+                    [
+                      "tmux select-pane -t 0.1",
+                      "clear"
+                    ]
+                  ]
+                }
+              }
+            ]
+          }.to_yaml
+        end
+
+        def dir_exists?
+          return false unless File.directory?(@base_dir)
+          FaaStRuby::CLI.error("Error: Directory '#{@project_name}' already exists. Aborting.")
+        end
+
+        def name_valid?
+          return true if @project_name.match(/^#{WORKSPACE_NAME_REGEX}$/)
+          return false
+        end
+
+        def missing_args
+          if @args.empty?
+            @missing_args << "Missing argument: PROJECT_NAME".red
+            @missing_args << usage
+          end
+          FaaStRuby::CLI.error(["'#{@args.first}' is not a valid project name.".red, usage], color: nil) if @args.first =~ /^-.*/
+          @missing_args
+        end
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '--tmux'
+              @options['tmux'] = true
+            when '--web', '-w'
+              @options['project_type'] = 'web'
+            when '--api', '-a'
+              @options['project_type'] = 'api'
+            else
+              FaaStRuby::CLI.error("Unknown argument: #{option}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,107 @@
+module FaaStRuby
+  module Command
+    module Workspace
+      require 'tmpdir'
+      require 'tempfile'
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/package'
+      require 'faastruby/cli/new_credentials'
+      class CP < BaseCommand
+        def initialize(args)
+          @args = args
+          help
+          @source_file = @args.shift
+          @workspace_name, @relative_path = @args.shift.split(':')
+          validate_command
+          @package_file = Tempfile.new('package')
+          @tmpdir = Dir.mktmpdir("package")
+          # 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("[#{@source_file}] Copying file to '#{destination_url}'...", quiet: true)
+          workspace = FaaStRuby::Workspace.new(name: @workspace_name)
+          package = build_package
+          workspace.upload_file(package, relative_path: @relative_path)
+          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          # spinner.stop("Done!")
+          puts "* [#{@source_file}] Upload OK".green
+          puts "* [#{@source_file}] URL: #{destination_url}".green
+        ensure
+          FileUtils.remove_entry @tmpdir
+          @package_file.unlink
+        end
+
+
+        def build_package
+          FileUtils.cp @source_file, @tmpdir
+          output_file = @package_file.path
+          FaaStRuby::Package.new(@tmpdir, output_file).build
+          # FaaStRuby::Command::Function::Build.build(@source_file, output_file, @function_name, true)
+          @package_file.close
+          output_file
+        end
+
+        def self.help
+          "cp SOURCE_FILE WORKSPACE_NAME:/DESTINATION/PATH"
+        end
+
+        def usage
+          puts "\n# Deploy static file SOURCE_FILE to workspace path /DESTINATION/PATH.\n"
+          puts "\nUsage: faastruby #{self.class.help}\n\n"
+        end
+
+        private
+
+        def validate_command
+          validate_source_file
+          validate_workspace_name
+          validate_relative_path
+        end
+
+        def validate_relative_path
+          @relative_path.sub!(/^\//, '')
+          FaaStRuby::CLI.error(["Invalid destination path: #{@relative_path}".red, "The destination path must have at least one character and can only contain letters, numbers, -, _, . and /."], color: nil) unless @relative_path&.match(/#{FUNCTION_NAME_REGEX}/)
+        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 validate_source_file
+          FaaStRuby::CLI.error(["You must specify source file, workspace and destination path for the file.".red, usage], color: nil) unless (@source_file && @source_file != '')
+          FaaStRuby::CLI.error("No such file: '#{@source_file}'") unless File.exists?(@source_file)
+          FaaStRuby::CLI.error("You can only 'cp' files, not directories.") unless File.file?(@source_file)
+          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/create.rb

@@ -1,40 +1,47 @@
 module FaaStRuby
   module Command
     module Workspace
-      class Create < WorkspaceBaseCommand
+      # require 'faastruby/cli/commands/workspace/base_command'
+      require 'faastruby/cli/new_credentials'
+      class Create < BaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
+          validate_name
           @base_dir = "./#{@workspace_name}"
           parse_options
-          @options['credentials_file'] ||= FaaStRuby.credentials_file
+          load_credentials
         end
 
         def run(create_directory: true, exit_on_error: true)
-          spinner = spin("Requesting credentials...")
-          workspace = FaaStRuby::Workspace.create(name: @workspace_name, email: @options['email'])
-          spinner.stop("Done!")
-          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any? && exit_on_error
-          if @options['stdout']
-            puts "IMPORTANT: Please store the credentials below in a safe place. If you lose them you will not be able to manage your workspace.".yellow
-            puts "API_KEY: #{workspace.credentials['api_key']}"
-            puts "API_SECRET: #{workspace.credentials['api_secret']}"
-          else
-            puts "Writing credentials to #{@options['credentials_file']}"
-            FaaStRuby::Credentials.add(@workspace_name, workspace.credentials, @options['credentials_file'])
+          unless @options['skip_creation']
+            spinner = spin("Setting up workspace '#{@workspace_name}'...")
+            workspace = FaaStRuby::Workspace.create(name: @workspace_name, email: @options['email'])
+            if workspace.errors.any?
+              spinner.stop(" Failed :(") if exit_on_error
+              FaaStRuby::CLI.error(workspace.errors) if exit_on_error
+              spinner.stop
+              return false
+            end
+            spinner.stop(" Done!")
           end
-          puts "Workspace '#{@workspace_name}' created"
           create_dir if @options['create_local_dir'] && create_directory && !dir_exists?
+          true
         end
 
         def self.help
-          "create-workspace".light_cyan + " WORKSPACE_NAME [--create-local-dir] [--stdout] [-c, --credentials-file CREDENTIALS_FILE] [-e, --email YOUR_EMAIL_ADDRESS]"
+          "create-workspace WORKSPACE_NAME [ARGS]"
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          puts "\nUsage: faastruby #{self.class.help}"
+          puts %(
+--create-local-dir    # Create a local folder in addition to the cloud
+--local-only          # Only create a local folder. Skip creating workspace on the cloud
+          )
         end
 
         private
@@ -46,7 +53,7 @@ module FaaStRuby
 
         def dir_exists?
           return false unless File.directory?(@base_dir)
-          puts "Local folder '#{@workspace_name}' already exists."
+          puts "Error: Local folder '#{@workspace_name}' already exists.".red
           true
         end
 
@@ -59,23 +66,24 @@ module FaaStRuby
           @missing_args
         end
 
+        def validate_name
+          unless @workspace_name.match(/^#{WORKSPACE_NAME_REGEX}$/)
+            FaaStRuby::CLI.error("The workspace name must have between 3 and 15 characters, and can only have letters, numbers and dashes.")
+          end
+        end
+
         def parse_options
           @options = {}
           while @args.any?
             option = @args.shift
             case option
-            # when '--file'
-            #   @options['credentials_file'] = @args.shift
-            when '--stdout'
-              @options['stdout'] = true
-            when '--create-local-dir'
+            when '--create-local-dir',
+              @options['create_local_dir'] = true
+            when '--local-only'
               @options['create_local_dir'] = true
-            when '-c', '--credentials-file'
-              @options['credentials_file'] = @args.shift
-            when '-e', '--email'
-              @options['email'] = @args.shift
+              @options['skip_creation'] = true
             else
-              FaaStRuby.error("Unknown argument: #{option}")
+              FaaStRuby::CLI.error("Unknown argument: #{option}")
             end
           end
         end