faastruby 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ece53c09286e9112f6cbf104e2da719f6bfa1af81c0f143e57a8648b172492
-  data.tar.gz: cbcc0483287fae2b62cc9e8eac2089df5af57d9643199a92fbc944a5e67fe034
+  metadata.gz: 78ae5a5b233203bdddaf6ba73a83efdb1046020909be4a4e2e4382aef76eedb6
+  data.tar.gz: d5391ab896bf2fb2b6aaa2726f602fd857bc03e99c1bb1f3423e443c9d3c6aa1
 SHA512:
-  metadata.gz: 5e29abfaa6e7f5bbca266a6ce034c6594a4d606aecbdae73a0fc2bdc1fc6b3643dde1909de6b74c441cc3e050caaac80c2055e8efd2825bb30756d863e7ddffb
-  data.tar.gz: f2496500afd5ce5213bdc59899fe77e4ef42cd6e0a221708eb025d244f173fc76c571a6d2acd81526c8212ef9447e78f3d5690faa621269db505d8ed7940d514
+  metadata.gz: 44d01a454d491ceb188cd4571c1cfbd7c4424053e4722b9eca08f0ea291b3e4dfb2d2e5852614d7af0bc450a4efc42ddf29a3880e120a40ad3f7ff63dcde96c5
+  data.tar.gz: 13eb59c4aa0ed8ad27f0588701302ea7a94f5dcc0c346ef43b1e09a26e5156d53316d7d71ac4274ef9604c1917e92c0ff6b5e2339ea3d6ad65597dccbe842880

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.5.13 - unreleased
+- Update help with new spelling
+- Better handle of deploys when sync is enabled
+- Fix broken output spinners
+- Improved console messages
+- Disable initial compile of crystal functions when starting Local
+- Fixed output bug when deploying from Local
+- Clearer message output for the command `confirm-account`
+- Ignore when Gemfile.lock is added
+- Don't trigger a deploy when Gemfile is added
+- Ignore Gemfile changes while initializing it
+
 ## 0.5.12 - Mar 16 2019
 - Add new branding to Local web templates.
 - Fix secrets.yml example in comments.

data/README.md

@@ -1,111 +1,93 @@
+![faastRuby](https://faastruby.io/wp-content/uploads/2019/03/logo-positive.png)
+
 [![Gem Version](https://badge.fury.io/rb/faastruby.svg)](https://badge.fury.io/rb/faastruby)
 [![Build Status](https://travis-ci.org/FaaStRuby/faastruby-cli.svg?branch=master)](https://travis-ci.org/FaaStRuby/faastruby-cli)
 
-* Looking for help? [Ask a question](https://meta.stackoverflow.com/questions/ask?tags=FaaStRuby,Serverless,Ruby,FaaS).
+* Looking for help? [Join our Slack!](https://faastruby.io/slack).
 
-* [Changelog](https://github.com/FaaStRuby/faastruby-cli/blob/master/CHANGELOG.md)
+* [Changelog](https://github.com/faastRuby/faastruby-cli/blob/master/CHANGELOG.md)
 
 # faastruby-cli
 
-CLI tool for managing workspaces and functions hosted at [FaaStRuby](https://faastruby.io).
+Local development kit and CLI tool for managing workspaces and functions hosted at [faastRuby](https://faastruby.io).
 
-## What is FaaStRuby?
-FaaStRuby is a Serverless Software Development Platform for Ruby and Crystal.
+## What is faastRuby?
+faastRuby is a Serverless Software Development Platform for Ruby and Crystal.
 
-* [Tutorial](https://faastruby.io/getting-started)
+* [Documentation](https://faastruby.io/docs/faastruby-local/)
 
 ## Try it
 
 Getting up and running is quick and easy:
 
-![Getting up and running](https://s3.amazonaws.com/faastruby/public/create-project.mp4)
-
 1. Install the gem so `faastruby` is available in your terminal
 
 ```
 ~$ gem install faastruby
 ```
 
-2. Create a new FaaStRuby project
+2. Create a new faastRuby project
 
 ```
-~$ faastruby new-project hello-world
-+ d ./hello-world
-+ f ./hello-world/project.yml
-+ f ./hello-world/secrets.yml
-+ d ./hello-world/functions/root
-+ f ./hello-world/functions/root/index.html.erb
-+ f ./hello-world/functions/root/template.rb
-+ f ./hello-world/functions/root/handler.rb
-+ f ./hello-world/functions/root/faastruby.yml
-+ d ./hello-world/functions/catch-all
-+ f ./hello-world/functions/catch-all/404.html
-+ f ./hello-world/functions/catch-all/handler.rb
-+ f ./hello-world/functions/catch-all/faastruby.yml
-+ f ./hello-world/public/faastruby.yml
-+ f ./hello-world/.gitignore
-Initialized empty Git repository in /Users/mf/OpenSource/faastruby/hello-world/.git/
-Project 'hello-world' initialized.
+~$ faastruby new-project my-project
++ d ./myproject
++ f ./myproject/project.yml
++ f ./myproject/secrets.yml
++ d ./myproject/functions/root
++ f ./myproject/functions/root/index.html.erb
++ f ./myproject/functions/root/template.rb
++ f ./myproject/functions/root/handler.rb
++ f ./myproject/functions/root/faastruby.yml
++ d ./myproject/functions/catch-all
++ f ./myproject/functions/catch-all/404.html
++ f ./myproject/functions/catch-all/handler.rb
++ f ./myproject/functions/catch-all/faastruby.yml
++ f ./myproject/public/faastruby.yml
++ f ./myproject/.gitignore
+Initialized empty Git repository in /Users/DemoUser/myproject/.git/
+Project 'myproject' initialized.
 Now run:
-$ cd hello-world
+$ cd myproject
 $ faastruby local
 ```
 
 3. Fire up the local development environment for your new project
 
 ```
-~$ cd hello-world
-~/hello-world$ faastruby local
+~$ cd myproject
+~/myproject$ faastruby local
 Puma starting in single mode...
 * Version 3.12.0 (ruby 2.5.3-p105), codename: Llamas in Pajamas
 * Min threads: 0, max threads: 32
 * Environment: production
-sh: crystal: command not found
-2019-02-27 23:36:03 +0800 (EventHub) Channel subscriptions: {}
+* Listening on tcp://0.0.0.0:3000
+Use Ctrl-C to stop
+2019-03-16 21:09:36 -0300 | Detecting existing functions.
 ---
-2019-02-27 23:36:03 +0800 (EventHub) Please restart the server if you modify channel subscriptions in 'faastruby.yml' for any function.
+2019-03-16 21:09:36 -0300 | Ruby functions: ["lists/pets", "root", "catch-all", "ruby"]
 ---
-2019-02-27 23:36:03 +0800 (EventHub) Events thread started.
+2019-03-16 21:09:36 -0300 | Crystal functions: []
 ---
-2019-02-27 23:36:03 +0800 (Sentinel) Ruby functions: ["root", "catch-all"]
+2019-03-16 21:09:37 -0300 | Listening for changes.
 ---
-2019-02-27 23:36:03 +0800 (Sentinel) Watching for new Ruby functions...
 ```
 
 As you can see, this runs with Ruby only. If you want to run Crystal as well (similar to Ruby, but with types and compiled to run very fast), simply [install Crystal](https://crystal-lang.org/reference/installation/) and start `faastruby local` again.
 
 
-`faastruby local` is very powerful. When you add a new folder with a `handler.rb` or `handler.cr`, it will automatically be detected. FaaStRuby will automatically add the configuration for the function so you can jump straight in:
-
-![How to add a new folder and file](https://s3.amazonaws.com/faastruby/public/new-paths.mp4)
+`faastruby local` is very powerful. When you add a new folder with a `handler.rb` or `handler.cr`, it will automatically be detected. faastRuby will automatically add the configuration for the function so you can jump straight in.
 
-Changes to the code will automatically be detected and immediately refreshed for you, making local development easy and comfortable:
-[!How to edit files and refresh them in the browser](https://s3.amazonaws.com/faastruby/public/local-file-refresh.mp4)
+Changes to the code will automatically be detected and immediately refreshed for you, making local development easy and comfortable.
 
-4. Deploy it to a workspace:
+4. Deploy it to the cloud:
 
 ```
-~/hello-world$ faastruby deploy-to awesome-prod
-◐ Running tests... Passed!
+~/hello-world$ faastruby deploy
 ...
-
-Finished in 0.00563 seconds (files took 0.15076 seconds to load)
-3 examples, 0 failures
-
-◐ Building package... Done!
-◐ Deploying to workspace 'awesome-prod'... Done!
-Endpoint: https://api.tor1.faastruby.io/awesome-prod/hello-world
+* Project URL: https://myproject-stage-abd123.tor1.faast.cloud
 ```
+Now visit that url in the browser!
 
-3. Run it:
-
-```
-~/hello-world$ curl https://api.tor1.faastruby.io/awesome-prod/hello-world
-Hello, World!
-```
-
-Build lots of functions and share them with fellow Ruby devs!
-
-## FaaStRuby + Hyperstack = fullstack Ruby apps!
+## faastRuby + Hyperstack = fullstack Ruby apps!
 
-Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.
+Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.

data/lib/faastruby/cli/base_command.rb

@@ -3,8 +3,10 @@ require 'yaml'
 module FaaStRuby
   module Command
     class BaseCommand
-      def self.spin(message)
-        spinner = TTY::Spinner.new(":spinner #{message}", format: SPINNER_FORMAT)
+      def self.spin(message=nil)
+        s = ":spinner"
+        s += " #{message}" if message
+        spinner = TTY::Spinner.new(s, format: SPINNER_FORMAT)
         spinner.auto_spin
         spinner
       end

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

@@ -14,13 +14,16 @@ module FaaStRuby
         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."
+          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"
+          puts "- The system won't send an email if you account status is already 'confirmed'"
           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!")
+          spinner.success
           user.save_credentials
           puts "Login successful!"
           migrate

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

@@ -32,10 +32,10 @@ module FaaStRuby
           spinner = spin("Creating your account...")
           user = User.create(email: email, password: password)
           if user.errors.any?
-            spinner.stop(" Failed :(")
+            spinner.error
             FaaStRuby::CLI.error(user.errors)
           end
-          spinner.stop(' Done!')
+          spinner.success
           exec("faastruby confirm-account --email #{email}")
           exit 0
         end

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

@@ -62,7 +62,7 @@ module FaaStRuby
           @yaml_config['before_build']&.each do |command|
             puts `#{command}`
           end
-          spinner.stop(' Done!')
+          spinner.success
           self.class.build(source, output_file, @function_name)
         end
 

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

@@ -41,10 +41,21 @@ module FaaStRuby
         def run
           create_or_use_workspace
           if @yaml_config['serve_static']
+            if @options['quiet']
+              puts "[#{@function_name}] Deploying static files '#{@function_name}' to workspace '#{@workspace_name}'..."
+              spinner = spin("")
+            else
+              spinner = say("[#{@function_name}] Deploying static files '#{@function_name}' to workspace '#{@workspace_name}'...")
+            end
             package_file_name = build_package
-            spinner = say("* [#{@function_name}] Deploying static files '#{@function_name}' to workspace '#{@workspace_name}'...", quiet: @options['quiet'])
             workspace = FaaStRuby::Workspace.new(name: @workspace_name).deploy(package_file_name)
           else
+            if @options['quiet']
+              puts "[#{@function_name}] Deploying #{runtime_name} function '#{@function_name}' to workspace '#{@workspace_name}'..."
+              spinner = spin("")
+            else
+              spinner = spin("[#{@function_name}] Deploying #{runtime_name} function '#{@function_name}' to workspace '#{@workspace_name}'...")
+            end
             if ruby_runtime?
               FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
             end
@@ -53,15 +64,14 @@ module FaaStRuby
             end
             FaaStRuby::CLI.error("[#{@function_name}] Deploy aborted because 'test_command' exited non-zero.") unless run_tests
             package_file_name = build_package
-            spinner = say("* [#{@function_name}] Deploying #{runtime_name} function '#{@function_name}' to workspace '#{@workspace_name}'...", quiet: @options['quiet'])
             workspace = FaaStRuby::Workspace.new(name: @workspace_name).deploy(package_file_name, root_to: @options['root_to'], catch_all: @options['catch_all'], context: @options['context'])
           end
           if workspace.errors.any?
-            puts ' Failed :(' unless spinner&.stop(' Failed :(')
+            puts ' Failed :(' unless spinner&.error
             @package_file.unlink
             FaaStRuby::CLI.error(workspace.errors)
           end
-          spinner.stop(' Done!') unless @options['quiet']
+          spinner.success unless @options['quiet']
           @package_file.unlink
           puts "* [#{@function_name}] Deploy OK".green
           unless @yaml_config['serve_static']
@@ -101,20 +111,24 @@ module FaaStRuby
             # for consistency. This is temporary until the API gets patched.
             spinner = say("[#{@function_name}] Waiting for the workspace '#{@workspace_name}' to be ready...", quiet: @options['quiet'])
             sleep 2
-            puts ' Done!' unless spinner&.stop(' Done!')
+            puts ' Done!' unless spinner&.success
           end
         end
 
         def shards_install
           return true unless File.file?('shard.yml')
-          puts "[#{@function_name}] Verifying dependencies"
+          # puts "[#{@function_name}] Verifying dependencies" unless @options["quiet"]
           system('shards check > /dev/null') || system('shards install')
+        rescue Errno::EPIPE
+          true
         end
 
         def bundle_install
           return true unless File.file?('Gemfile')
-          puts "* [#{@function_name}] Verifying dependencies"
+          # puts "* [#{@function_name}] Verifying dependencies" unless @options["quiet"]
           system('bundle check >/dev/null') || system('bundle install')
+        rescue Errno::EPIPE
+          true
         end
 
         def missing_args
@@ -140,7 +154,7 @@ module FaaStRuby
             @yaml_config['before_build']&.each do |command|
               puts `#{command}`
             end
-            spinner&.stop(' Done!')
+            spinner&.success
           end
           require 'faastruby/cli/commands/function/build'
           FaaStRuby::Command::Function::Build.build(source, output_file, @function_name, true)

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

@@ -186,7 +186,7 @@ module FaaStRuby
           return true unless File.file?("#{@base_dir}/Gemfile")
           spinner = spin("Installing gems...")
           system("bundle install --gemfile=#{@base_dir}/Gemfile > /dev/null")
-          spinner.stop('Done!')
+          spinner.success
         end
 
         def write_shards_file
@@ -213,7 +213,7 @@ module FaaStRuby
           return true unless File.file?("#{@base_dir}/shard.yml")
           spinner = spin("Installing shards...")
           system("cd #{@base_dir} && shards install > /dev/null")
-          spinner.stop('Done!')
+          spinner.success
         end
 
         def name_valid?

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

@@ -29,10 +29,10 @@ module FaaStRuby
           function = FaaStRuby::Function.new(name: @function_name, workspace: workspace)
           function.destroy
           if function.errors.any?
-            spinner.stop('Failed :(')
+            spinner.error
             FaaStRuby::CLI.error(function.errors)
           end
-          spinner.stop('Done!')
+          spinner.success
         end
 
         def self.help

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

@@ -22,10 +22,10 @@ module FaaStRuby
           function = FaaStRuby::Function.new(name: @function_name, workspace: workspace)
           function.update(new_context: @options['data'])
           if function.errors.any?
-            spinner.stop('Failed :(')
+            spinner.error
             FaaStRuby::CLI.error(function.errors)
           end
-          spinner.stop('Done!')
+          spinner.success
         end
 
         def self.help

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

@@ -7,7 +7,7 @@ module FaaStRuby
       end
 
       def run
-        puts "FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io"
+        puts "faastRuby CLI - Manage workspaces and functions hosted at faastruby.io"
         puts "Version: #{FaaStRuby::VERSION}"
         puts
         puts "Usage: faastruby [update] [OPTIONS] COMMAND [--help | -h] [ARGS]"

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

@@ -13,13 +13,19 @@ module FaaStRuby
           @args = args
           help
           parse_options
+          @mutex = Mutex.new
+          @failed = {}
           @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_secrets = YAML.load(File.read(PROJECT_SECRETS_FILE)) rescue {secrets: {}}
           @project_name = @project_yaml['name']
           @root_to = @project_yaml['root_to'] || 'root'
           @catch_all = @project_yaml['catch_all'] || 'catch-all'
           @project_identifier = "-#{@project_yaml['identifier']}" if @project_yaml['identifier']
+          @workspace = "#{@project_name}-#{@options['environment']}#{@project_identifier}"
+          @spinners = TTY::Spinner::Multi.new("Deploying project '#{@project_name}' to workspace '#{@workspace}'", format: SPINNER_FORMAT)
+          # puts
         end
 
         def puts(msg)
@@ -33,38 +39,69 @@ module FaaStRuby
           errors = false
           root_folder = Dir.pwd
           jobs = []
-          workspace = "#{@project_name}-#{@options['environment']}#{@project_identifier}"
-          spinner = spin "Deploying project '#{@project_name}' to workspace #{workspace}..."
-          try_workspace(workspace)
+
+          # spinner = spin "Deploying project '#{@project_name}' to workspace #{workspace}..."
+          connect_spinner = @spinners.register "[:spinner] Connecting to workspace '#{@workspace}'"
+          connect_spinner.auto_spin
+          try_workspace(@workspace, connect_spinner)
           @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 --dont-create-workspace"
+              msg = function_name == 'public' ? "Uploading static assets in '#{function_name}'" : "Deploying function '#{function_path}'"
+              spinner = @spinners.register "[:spinner] #{msg}"
+              spinner.auto_spin
+              # puts "[#{function_path}] Entering folder '#{function_path}'"
+              # Dir.chdir function_path
+              cmd = "cd #{function_path} && faastruby deploy-to #{@workspace} --quiet --dont-create-workspace"
               cmd += " --set-root" if @root_to == function_name
               cmd += " --set-catch-all" if @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?
+              secrets = secrets_for(function_name)
+              secrets_json = Oj.dump(secrets) if secrets
+              cmd += " --context '#{secrets_json}'" if secrets_json
+              output, status = Open3.capture2e(cmd)
+              if status == 0
+                spinner.success
+              else
+                add_failed(function_name, output)
+                spinner.error
               end
             end
           end
           jobs.each{|thr| thr.join}
-          puts "* Project URL: #{FaaStRuby.workspace_host_for(workspace)}\n\n".green
+          if @failed.any?
+            puts "\n\nFAILURES:".red
+            @failed.each do |function_name, output|
+              puts "* Function '#{function_name}' deploy failed:".red
+              puts output
+              puts nil
+            end
+            puts "* Project URL: #{FaaStRuby.workspace_host_for(@workspace)}\n".green
+          end
+        end
+
+        def secrets_for(function_name)
+          secrets = @project_secrets[@options['environment']]
+          return nil unless secrets
+          secrets[function_name]
+        end
+
+        def add_failed(function_name, output)
+          @mutex.synchronize do
+            @failed[function_name] = output
+          end
         end
 
-        def try_workspace(workspace)
+        def try_workspace(workspace, connect_spinner)
+          return true if @options['skip_create_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
+            connect_spinner.error
             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
+          connect_spinner.success
           true
         end
 
@@ -95,6 +132,8 @@ module FaaStRuby
           while @args.any?
             option = @args.shift
             case option
+            when '--skip-create-workspace'
+              @options['skip_create_workspace'] = true
             when '--function', '-f'
               @options['functions'] << @args.shift
             when '--env', '-e'

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

@@ -21,12 +21,12 @@ module FaaStRuby
             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
+              spinner.error if exit_on_error
               FaaStRuby::CLI.error(workspace.errors) if exit_on_error
-              spinner.stop
+              spinner.success
               return false
             end
-            spinner.stop(" Done!")
+            spinner.success
           end
           create_dir if @options['create_local_dir'] && create_directory && !dir_exists?
           true

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

@@ -21,10 +21,10 @@ module FaaStRuby
           spinner = spin("Destroying...")
           workspace.destroy
           if workspace.errors.any?
-            spinner.stop(" Failed :(")
+            spinner.error
             FaaStRuby::CLI.error(workspace.errors)
           end
-          spinner.stop("Done!")
+          spinner.success
           puts "Workspace '#{@workspace_name}' was deleted from the cloud platform."
         end
 

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

@@ -70,11 +70,11 @@ module FaaStRuby
           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)
+            spinner.error
             return false
           end
           @migrated << workspace_name
-          spinner.stop(" Done!".green)
+          spinner.success
           return true
         end
 

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

@@ -19,7 +19,7 @@ module FaaStRuby
           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!")
+          spinner.success
           puts "* [#{@relative_path}] File removed from cloud workspace '#{@workspace_name}'.".green
         end
 

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

@@ -19,7 +19,7 @@ module FaaStRuby
           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!")
+          spinner.success
         end
 
         def self.help

data/lib/faastruby/local.rb

@@ -128,10 +128,11 @@ module FaaStRuby
       puts "Crystal functions: #{crystal_functions.inspect}"
       listen_on_functions_dir
       listen_on_public_dir if SYNC_ENABLED
-      initial_compile_and_deploy(crystal_functions)
-      puts "Listening for changes."
       FunctionProcessor.new(FUNCTIONS_EVENT_QUEUE).start
       StaticFileProcessor.new(PUBLIC_EVENT_QUEUE).start if SYNC_ENABLED
+      # initial_compile
+      puts "Listening for changes."
+      puts "faastRuby Local is ready at http://localhost:3000"
       sleep
     ensure
       puts "Stopping Watchdog..."
@@ -139,30 +140,21 @@ module FaaStRuby
       Local::Listener.public_listener.each(&:stop)
     end
 
-    def self.initial_compile_and_deploy(crystal_functions)
-      debug "initial_compile_and_deploy(#{crystal_functions.inspect})"
-      puts "Triggering 'compile' on Crystal functions." if crystal_functions.any?
-      if SYNC_ENABLED
-        puts "Running initial cloud sync."
-        StaticFile.full_sync
+    def self.initial_compile
+      debug __method__
+      Thread.new do
+        sleep 1
+        crystal_functions = @@functions.map{|f| f if f.language == "crystal"}.compact
+        puts "Triggering 'compile' on Crystal functions." if crystal_functions.any?
+        crystal_functions.each {|f| FileUtils.touch("#{f.absolute_folder}/faastruby.yml")}
       end
-      sleep 1
-      @@functions.each {|f| FileUtils.touch("#{f.absolute_folder}/faastruby.yml")}
     end
 
     def self.sync_mode_enabled
       debug __method__
       puts "Sync mode enabled."
-      print "Connecting to workspace '#{workspace}'... "
-      try_to_create = Proc.new {system("faastruby create-workspace #{workspace}")}
-      has_credentials = system("faastruby list-workspace #{workspace} > /dev/null 2>&1")
-      continue = has_credentials || try_to_create.call
-      unless continue
-        puts "[FATAL] Unable to setup project workspace '#{workspace}'. Make sure you have the credentials, or try a different environment name.\nExample: faastruby local --sync --deploy-env #{DEPLOY_ENVIRONMENT}-#{(rand * 100).to_i}".red
-        exit 1
-      end
-      STDOUT.puts "connected!\n".yellow
       puts "Your local environment will be synced to https://#{workspace}.tor1.faast.cloud"
+      system("faastruby deploy")
       true
     end
 

data/lib/faastruby/local/functions/function.rb

@@ -64,16 +64,15 @@ module FaaStRuby
         debug "deploy"
         deploy_cmd, deploy_cmd_print = generate_deploy_command
         puts "Running: #{deploy_cmd_print.join(' ')}".yellow
-        i, oe, thr = Open3.popen2(deploy_cmd.join(' '))
-        i.close
-        oe.each_line do |line|
-          next if line.chomp == '' || line.chomp == '---'
-          STDOUT.puts "#{Time.now} | #{line}"
-          STDOUT.puts "---"
+        status = nil
+        Open3.popen2(deploy_cmd.join(' ')) do |i, oe, thr|
+          oe.each_line do |line|
+            next if line.chomp == '' || line.chomp == '---'
+            STDOUT.puts "#{Time.now} | #{line}"
+            STDOUT.puts "---"
+          end
+          status = thr.value
         end
-        thr.join
-        oe.close
-        status = thr.value
       end
 
       def language

data/lib/faastruby/local/listeners/listener.rb

@@ -66,6 +66,18 @@ module FaaStRuby
         debug "EVENT: #{@full_path}"
       end
 
+      def to_h
+        {
+          listened_directory: @listened_directory,
+          full_path: @full_path,
+          relative_path: @relative_path,
+          relative_path_dirname: @relative_path_dirname,
+          filename: @filename,
+          dirname: @dirname,
+          type: @type
+        }
+      end
+
       def function_created?
         debug __method__
         added? && filename.match(/^handler\.(rb|cr)$/)
@@ -76,6 +88,11 @@ module FaaStRuby
         filename == 'Gemfile'
       end
 
+      def file_is_a_gemfile_lock?
+        debug __method__
+        filename == 'Gemfile.lock'
+      end
+
       def file_is_a_handler?
         debug __method__
         filename.match(/^handler\.(rb|cr)$/)

data/lib/faastruby/local/processors/function.rb

@@ -4,7 +4,8 @@ module FaaStRuby
 
       def should_ignore?(event)
         debug "should_ignore?(#{event.inspect})"
-        if present_in_ignore_list?(event.dirname)
+        return true if event.file_is_a_gemfile_lock?
+        if present_in_ignore_list?(event.dirname) || present_in_ignore_list?(event.full_path)
           debug "SKIP #{event}"
           return true
         end
@@ -36,7 +37,7 @@ module FaaStRuby
           return new_function(event)
         end
         init_gemfile(event) if event.file_is_a_gemfile?
-        unless event.file_is_a_function_config? && event.file_is_a_gemfile?
+        unless event.file_is_a_function_config? || event.file_is_a_gemfile? || event.file_is_a_gemfile_lock?
           debug "added: a file was added"
           deploy(event)
         end
@@ -124,7 +125,6 @@ module FaaStRuby
       end
 
       def deploy(event)
-        debug "deploy(#{event.inspect})"
         return false unless SYNC_ENABLED
         # This should run when sync is enabled and:
         # - added any file but handler
@@ -132,11 +132,11 @@ module FaaStRuby
         # - removed any file but handler
         function = Local::Function.that_has_file(event.full_path, event.type)
         run(function.name, 'deploy') do
-          debug "+ IGNORE #{function.absolute_folder}"
-            add_ignore(function.absolute_folder)
-            function.deploy
-            debug "- IGNORE #{function.absolute_folder}"
-            remove_ignore(function.absolute_folder)
+          # debug "+ IGNORE #{function.absolute_folder}"
+          # add_ignore(function.absolute_folder)
+          function.deploy
+          # debug "- IGNORE #{function.absolute_folder}"
+          # remove_ignore(function.absolute_folder)
         end
       end
 
@@ -150,24 +150,30 @@ module FaaStRuby
       end
 
       def bundle_install(event)
-        puts "Running: cd #{event.relative_path_dirname} && bundle install"
-        if system("cd #{event.dirname} && bundle install")
-          STDOUT.puts '---'.yellow
-          puts "Gems from Gemfile '#{event.relative_path}' installed."
-        else
-          STDOUT.puts '---'.red
-          STDOUT.puts "#{Time.now} | Error installing gems for Gemfile '#{event.relative_path}'.".red
+        run(event.dirname, 'bundle install') do
+          puts "Running: cd #{event.relative_path_dirname} && bundle install"
+          if system("cd #{event.dirname} && bundle install")
+            STDOUT.puts '---'.yellow
+            puts "Gems from Gemfile '#{event.relative_path}' were installed in your local machine."
+          else
+            STDOUT.puts '---'.red
+            STDOUT.puts "#{Time.now} | Error installing gems in your local machine for Gemfile '#{event.relative_path}'.".red
+          end
         end
       end
 
       def init_gemfile(event)
         unless File.size(event.full_path) > 0
-          puts "Initializing Gemfile '#{event.relative_path}'"
-          sleep 0.2
-          File.write(event.full_path, Local::RubyFunction.default_gemfile)
+          run(event.full_path, "init_gemfile") do
+            puts "Initializing Gemfile '#{event.relative_path}'"
+            add_ignore(event.full_path)
+            sleep 0.2
+            File.write(event.full_path, Local::RubyFunction.default_gemfile)
+            sleep 0.5
+            remove_ignore(event.full_path)
+          end
         end
       end
-
     end
   end
 end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client