faastruby 0.4.18 → 0.5.0

data/lib/faastruby/cli/commands/function/remove_from.rb

@@ -1,22 +1,30 @@
 module FaaStRuby
   module Command
     module Function
+      require 'faastruby/cli/commands/function/base_command'
+      require 'faastruby/cli/new_credentials'
       class RemoveFrom < FunctionBaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
-          load_yaml
-          @function_name = @yaml_config['name']
-          FaaStRuby::Credentials.load_for(@workspace_name)
           parse_options
+          load_yaml
+          @function_name = @options['function_name'] || @yaml_config['name']
+          load_credentials
+        end
+
+        def load_yaml
+          return true if @options['function_name']
+          super
         end
 
         def run
           warning unless @options['force']
           FaaStRuby::CLI.error("Cancelled") unless @options['force'] == 'y'
-          spinner = spin("Removing function from workspace '#{@workspace_name}'...")
+          spinner = spin("Removing function '#{@function_name}' from workspace '#{@workspace_name}'...")
           workspace = FaaStRuby::Workspace.new(name: @workspace_name)
           function = FaaStRuby::Function.new(name: @function_name, workspace: workspace)
           function.destroy
@@ -28,11 +36,16 @@ module FaaStRuby
         end
 
         def self.help
-          "remove-from".light_cyan + " WORKSPACE_NAME [-y, --yes]"
+          "remove-from 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
+-f,--function FUNCTION_NAME    # Pass the function name instead of attempting
+                               # to read from the function's config file.
+          )
         end
 
         private
@@ -51,6 +64,8 @@ module FaaStRuby
             case option
             when '-y', '--yes'
               @options['force'] = 'y'
+            when '--function', '-f'
+              @options['function_name'] = @args.shift
             else
               FaaStRuby::CLI.error(["Unknown argument: #{option}".red, usage], color: nil)
             end

data/lib/faastruby/cli/commands/function/run.rb

@@ -1,9 +1,11 @@
 module FaaStRuby
   module Command
     module Function
+      require 'faastruby/cli/commands/function/base_command'
       class Run < FunctionBaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @options = {}
@@ -31,24 +33,22 @@ module FaaStRuby
         end
 
         def self.help
-          'run'.light_cyan + ' WORKSPACE_NAME [OPTIONS]' +
-          <<-EOS
-
-    Options:
-    -b, --body 'DATA'              # The request body
-    --stdin                        # Read the request body from STDIN
-    -m, --method METHOD            # The request method
-    -h, --header 'Header: Value'   # Set a header. Can be used multiple times.
-    -f, --form 'a=1&b=2'           # Send form data and set header 'Content-Type: application/x-www-form-urlencoded'
-    -j, --json '{"a":"1"}'         # Send JSON data and set header 'Content-Type: application/json'
-    -t, --time                     # Return function run time in the response
-    -q, --query 'foo=bar'          # Set a query parameter for the request. Can be used multiple times.
-    --curl                         # Return the CURL command equivalent for the request
-EOS
+          'run WORKSPACE_NAME [ARGS]'
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          puts "\nUsage: faastruby #{self.class.help}"
+          puts %(
+-b,--body 'DATA'               # The request body
+--stdin                        # Read the request body from STDIN
+-m,--method METHOD             # The request method
+-h,--header 'Header: Value'    # Set a header. Can be used multiple times.
+-f,--form 'a=1&b=2'            # Send form data and set header 'Content-Type: application/x-www-form-urlencoded'
+-j,--json '{"a":"1"}'          # Send JSON data and set header 'Content-Type: application/json'
+-t,--time                      # Return function run time in the response
+-q,--query 'foo=bar'           # Set a query parameter for the request. Can be used multiple times.
+--curl                         # Return the CURL command equivalent for the request
+          )
         end
 
         private

data/lib/faastruby/cli/commands/function/test.rb

@@ -2,6 +2,7 @@ require 'open3'
 module FaaStRuby
   module Command
     module Function
+      require 'faastruby/cli/commands/function/base_command'
       class Test < FunctionBaseCommand
         def initialize(args)
           @args = args
@@ -12,19 +13,19 @@ module FaaStRuby
 
         def run(do_not_exit: false)
           unless @test_command
-            puts "[skipped] You have no 'test_command' key/value in 'faastruby.yml'. Please consider using rspec!".yellow
+            # puts "[skipped tests] You have no 'test_command' key/value in 'faastruby.yml'. Please consider using rspec!".yellow
             return true
           end
-          puts "[test] Running tests"
+          # puts "[test] Running tests"
           system(@test_command)
         end
 
         def self.help
-          'test'.light_cyan
+          'test'
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          "\nUsage: faastruby #{self.class.help}"
         end
       end
     end

data/lib/faastruby/cli/commands/function/update_context.rb

@@ -1,16 +1,19 @@
 module FaaStRuby
   module Command
     module Function
+      require 'faastruby/cli/commands/function/base_command'
+      require 'faastruby/cli/new_credentials'
       class UpdateContext < FunctionBaseCommand
         def initialize(args)
           @args = args
+          help
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
           load_yaml
           @function_name = @yaml_config['name']
-          FaaStRuby::Credentials.load_for(@workspace_name)
           parse_options(require_options: {'data' => 'context data'} )
+          load_credentials
         end
 
         def run
@@ -26,11 +29,15 @@ module FaaStRuby
         end
 
         def self.help
-          "update-context".light_cyan + " WORKSPACE_NAME [-d, --data 'STRING'] [--stdin]"
+          "update-context WORKSPACE_NAME [ARGS]"
         end
 
         def usage
-          "Usage: faastruby #{self.class.help}"
+          puts "\nUsage: faastruby #{self.class.help}"
+          puts %(
+-d, --data 'STRING'    # The context data. Must be quoted.
+--stdin                # Read context data from STDIN
+          )
         end
 
         private

data/lib/faastruby/cli/commands/function/upgrade.rb

@@ -1,69 +1,70 @@
-module FaaStRuby
-  module Command
-    module Function
-      class Upgrade < FunctionBaseCommand
-        def initialize(args)
-          @args = args
-        end
+# module FaaStRuby
+#   module Command
+#     module Function
+#       require 'faastruby/cli/commands/function/base_command'
+#       class Upgrade < FunctionBaseCommand
+#         def initialize(args)
+#           @args = args
+#         end
 
-        def run
-          check_function_name
-          set_yaml_content
-          write_yaml
-          write_gemfile
-          copy_spec_folder
-          puts "Upgrade complete. Please read the documentation at https://faastruby.io/tutorial.html to learn about the changes."
-          puts "To deploy, run 'faastruby deploy-to WORKSPACE_NAME'."
-        end
+#         def run
+#           check_function_name
+#           set_yaml_content
+#           write_yaml
+#           write_gemfile
+#           copy_spec_folder
+#           puts "Upgrade complete. Please read the documentation at https://faastruby.io/tutorial.html to learn about the changes."
+#           puts "To deploy, run 'faastruby deploy-to WORKSPACE_NAME'."
+#         end
 
-        def set_yaml_content
-          @yaml_content = {
-            'name' => @function_name,
-            'test_command' => nil,
-            'abort_build_when_tests_fail' => false,
-            'abort_deploy_when_tests_fail' => false
-          }
-        end
+#         def set_yaml_content
+#           @yaml_content = {
+#             'name' => @function_name,
+#             'test_command' => nil,
+#             'abort_build_when_tests_fail' => false,
+#             'abort_deploy_when_tests_fail' => false
+#           }
+#         end
 
-        def check_function_name
-          FaaStRuby::CLI.error('You need to run this command from the function directory') unless File.file?('handler.rb')
-          @function_name = Dir.pwd.split('/').last
-          unless @function_name
-            puts "What's the name of this function? (accepts only letters, numbers, - or _)"
-            print "Enter function name: "
-            @function_name = STDIN.gets.chomp
-          end
-          FaaStRuby::CLI.error('You need to provide a valid function name (letters, numbers, - or _)') unless @function_name.match(/^[a-zA-Z\-_0-9]{1,}$/)
-        end
+#         def check_function_name
+#           FaaStRuby::CLI.error('You need to run this command from the function directory') unless File.file?('handler.rb')
+#           @function_name = Dir.pwd.split('/').last
+#           unless @function_name
+#             puts "What's the name of this function? (accepts only letters, numbers, - or _)"
+#             print "Enter function name: "
+#             @function_name = STDIN.gets.chomp
+#           end
+#           FaaStRuby::CLI.error('You need to provide a valid function name (letters, numbers, - or _)') unless @function_name.match(/^[a-zA-Z\-_0-9]{1,}$/)
+#         end
 
-        def write_yaml
-          write_file("./faastruby.yml", @yaml_content.to_yaml)
-        end
+#         def write_yaml
+#           write_file("./faastruby.yml", @yaml_content.to_yaml)
+#         end
 
-        def write_gemfile
-          content = "\n# Added by 'faastruby upgrade'\ngroup :test do\n  gem 'rspec'\nend\n"
-          write_file("./Gemfile", content, 'a')
-        end
+#         def write_gemfile
+#           content = "\n# Added by 'faastruby upgrade'\ngroup :test do\n  gem 'rspec'\nend\n"
+#           write_file("./Gemfile", content, 'a')
+#         end
 
-        def copy_spec_folder
-          @base_dir = '.'
-          source = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/example-blank"
-          FileUtils.cp_r("#{source}/spec", "#{@base_dir}/")
-          puts "+ d #{@base_dir}/spec".green
-          puts "+ d #{@base_dir}/spec/helpers".green
-          puts "+ f #{@base_dir}/spec/helpers/faastruby.rb".green
-          puts "+ f #{@base_dir}/spec/handler_spec.rb".green
-          puts "+ f #{@base_dir}/spec/spec_helper.rb".green
-        end
+#         def copy_spec_folder
+#           @base_dir = '.'
+#           source = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/example-blank"
+#           FileUtils.cp_r("#{source}/spec", "#{@base_dir}/")
+#           puts "+ d #{@base_dir}/spec".green
+#           puts "+ d #{@base_dir}/spec/helpers".green
+#           puts "+ f #{@base_dir}/spec/helpers/faastruby.rb".green
+#           puts "+ f #{@base_dir}/spec/handler_spec.rb".green
+#           puts "+ f #{@base_dir}/spec/spec_helper.rb".green
+#         end
 
-        def self.help
-          "upgrade".light_cyan
-        end
+#         def self.help
+#           "upgrade"
+#         end
 
-        def usage
-          "Usage: faastruby #{self.class.help}"
-        end
-      end
-    end
-  end
-end
+#         def usage
+#           "Usage: faastruby #{self.class.help}"
+#         end
+#       end
+#     end
+#   end
+# end

data/lib/faastruby/cli/commands/help.rb

@@ -1,5 +1,6 @@
 module FaaStRuby
   module Command
+    require 'faastruby/cli/base_command'
     class Help < BaseCommand
       def initialize(args)
         @args = args
@@ -7,31 +8,43 @@ module FaaStRuby
 
       def run
         puts "FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io"
+        puts "Version: #{FaaStRuby::VERSION}"
         puts
-        puts "Usage: faastruby [--region REGION, -h, -v] COMMAND ARGS"
+        puts "Usage: faastruby [OPTIONS] COMMAND [--help | -h] [ARGS]"
         puts
+        puts "OPTIONS:"
         puts 'help, -h, --help     # Displays this help'
         puts '-v                   # Print version and exit'
         puts '--region tor1        # Specify a region. "tor1" (default) is the only region available'
-        workspaces = ["Workspaces:"]
-        functions = ["Functions:"]
-        credentials = ["Credentials:"]
-        FaaStRuby::Command::COMMANDS.each do |command, klass|
-          next if command == 'upgrade'
-          next if klass.to_s.match(/.+Command::Help$/)
-          next if klass.to_s.match(/.+Command::Version$/)
-          section = functions if klass.to_s.match(/.+::Function::.+/)
-          section = workspaces if klass.to_s.match(/.+::Workspace::.+/)
-          section = credentials if klass.to_s.match(/.+::Credentials::.+/)
-          section ||= []
-          section << "  #{klass.help}"
-        end
-        puts workspaces
-        puts
-        puts functions
-        puts
-        puts credentials
-        puts
+        puts "\nCOMMANDS:"
+        puts %(
+Accounts:
+  signup
+  confirm-account      # Send a token over email for account confirmation
+  login
+  logout
+
+Functions:
+  new                  # Initialize a function in your local machine
+  deploy-to            # Deploy a function to a cloud workspace
+  remove-from          # Remove a function from a cloud workspace
+  run                  # Trigger the function via HTTP endpoint
+  update-context       # Update the context data for a function
+
+Projects:
+  new                  # Initialize a project in your local machine
+  deploy               # Deploy all functions and static files of a project
+
+Workspaces:
+  create-workspace     # Create a cloud workspace
+  destroy-workspace    # Erase a workspace from the cloud
+  list-workspace       # List what's in a cloud workspace
+  cp                   # Copy a static file from your local machine to a cloud workspace
+  rm                   # Remove a static file from a cloud workspace
+  update-workspace     # Update workspace settings
+
+)
+        puts "Run faastruby COMMAND --help for more details."
       end
     end
   end

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

@@ -0,0 +1,14 @@
+module FaaStRuby
+  module Command
+    module Project
+      PROJECT_YAML_FILE = 'project.yml'
+      PROJECT_SECRETS_FILE = 'secrets.yml'
+      PROJECT_CREDENTIALS_FILE = '.credentials.yml'
+      class ProjectBaseCommand < BaseCommand
+        def read_credentials_file
+          File.file?(PROJECT_CREDENTIALS_FILE)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,114 @@
+require 'open3'
+module FaaStRuby
+  module Command
+    STDOUT_MUTEX = Mutex.new
+    module Project
+      require 'faastruby/cli/commands/project/base_command'
+      require 'faastruby/server/logger'
+      class Deploy < ProjectBaseCommand
+        extend FaaStRuby::Logger
+        def initialize(args)
+          @errors = []
+          @args = args
+          help
+          parse_options
+          @options['functions'] += find_functions unless @options['functions'].any?
+          @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']
+          @options['root_to'] ||= @project_yaml['root_to']
+          @options['catch_all'] ||= @project_yaml['catch_all']
+        end
+
+        def puts(msg)
+          STDOUT_MUTEX.synchronize do
+            STDOUT.puts msg
+          end
+        end
+
+        def run
+          result = []
+          errors = false
+          root_folder = Dir.pwd
+          jobs = []
+          workspace = "#{@project_name}-#{@options['environment']}#{@project_identifier}"
+          try_workspace(workspace)
+          spinner = spin("Deploying project '#{@project_name}'...")
+          @options['functions'].each do |function_path|
+            jobs << Thread.new do
+              # puts "[#{function_path}] Entering folder '#{function_path}'"
+              # Dir.chdir function_path
+              function_config = YAML.load(File.read("#{function_path}/faastruby.yml"))
+              function_name = function_config['name']
+              cmd = "cd #{function_path} && faastruby deploy-to #{workspace} --quiet"
+              cmd += " --set-root" if @options['root_to'] == function_name
+              cmd += " --set-catch-all" if @options['catch_all'] == function_name
+              Open3.popen2(cmd) do |stdin, stdout, status_thread|
+                stdout.each_line do |line|
+                  puts line
+                end
+                FaaStRuby::CLI.error("* [#{function_path}] Deploy FAILED", color: nil) unless status_thread.value.success?
+              end
+            end
+          end
+          jobs.each{|thr| thr.join}
+          spinner.stop(" Done!")
+          puts "* Project URL: #{FaaStRuby.workspace_host_for(workspace)}\n\n".green
+        end
+
+        def try_workspace(workspace)
+          try_to_create = Proc.new {system("faastruby create-workspace #{workspace} > /dev/null 2>&1")}
+          has_credentials = system("faastruby list-workspace #{workspace} > /dev/null 2>&1")
+          continue = has_credentials || try_to_create.call
+          unless continue
+            FaaStRuby::CLI.error("Unable to deploy project to workspace '#{workspace}'. Make sure you have the credentials, or try a different environment name.\nExample: faastruby deploy --deploy-env #{@options['environment']}-#{(rand * 100).to_i}")
+          end
+          true
+        end
+
+        def find_functions
+          Dir.glob("**/faastruby.yml").map do |f|
+            path = f.split('/')
+            path.pop
+            path.join('/')
+          end
+        end
+
+        def self.help
+          "deploy [ARGS]"
+        end
+
+        def usage
+          puts "Usage: faastruby #{self.class.help}"
+          puts %(
+-f,--function FUNCTION_PATH    # Specify the path to the function directory in your local machine.
+                               # This argument can be repeated many times for multiple functions. Example:
+                               # -f path/to/function1 -f path/to/function2
+-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 '--root-to'
+              @options['root_to'] = @args.shift
+            when '--catch-all'
+              @options['catch_all'] = @args.shift
+            when '--function', '-f'
+              @options['functions'] << @args.shift
+            when '--env', '-e'
+              @options['environment'] = @args.shift
+            else
+              FaaStRuby::CLI.error("Unknown argument: #{option}")
+            end
+          end
+        end
+
+      end
+    end
+  end
+end