faastruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2b492f1a720606438bf41373fc04ef892932224b8272cc1ef9ee48a793d31e
-  data.tar.gz: c9489fbc690bd3ab685067852c7dda8115c0a7c6f075b145ebeb92558f83c8ab
+  metadata.gz: 8f94b2b6822fa6d477e75642336d2d67c1f7c3f7596e87fa03e9119e43637836
+  data.tar.gz: 49986876b8202867c2e5e388656e517232e2bf2132c3acab624f1021541f4d10
 SHA512:
-  metadata.gz: 2ddf53f3d75310e788d2671a6939d2706f7658bb946b49dfc5828c52816d8a091c06cf815e2a93e31294c09ae93d475ea82525c825f6bd44f3466d36e7387b5a
-  data.tar.gz: 325b6fc49cb1168ac0522abdfaebad1bd06466d511e5271bcb9c0bdb03e5dda0dcac93a8abb990035b768997db52e1a864495234d61e98afa4fac84e050bec13
+  metadata.gz: 8bb18dedc52a1dedb1c379ed4cf318367e44f8e175a0ebe02b74f3ac7ca3e6d3829ff65cf49113beaa8a122e78cb2c3ce12f6c9de64e0afa8782e2d7a943cb94
+  data.tar.gz: 567d11e675800ae13e529aacb05011f207158673b7cc25874bfa93bdbae3cd1363c45ab3279280b3855eae417517da3392a7b7bff6776fba757bb1b8fdb96b63

data/CHANGELOG.md

@@ -1,11 +1,16 @@
 # Changelog
 
+## 0.2.1 - Oct 16 2018
+- New command: `add-credentials` - add credentials to a credentials file
+- New command: `list-credentials` - list current credentials in a credentials file
+Run `faastruby help` for usage details.
+
 ## 0.2.0 - Oct 12 2018
-- Full rewrite of the gem. All command line parameters have changed. Please see the documentation.
-- No more git dependence.
-- Functions are packaged and deployed individually, and also removed individually.
+- Full rewrite of the gem. All command line parameters have changed. Please see the [documentation](https://faastruby.io/tutorial.html).
+- No more git repositories.
+- Functions are packaged, deployed and managed individually.
 - Functions have a YAML configuration file.
-- Functions can have tests and they can be configured to run before each deploy, aborting it if a failure happens.
+- Functions can have tests and they can be configured to run before each deploy, aborting if a failure happens.
 - Added option to print or save the workspace credentials into a different file upon creation, instead of saving it to ~/.faastruby
 - Read a different credentials file via FAASTRUBY_CREDENTIALS environment variable.
 - Read credentials via environment variables: FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET.

data/Gemfile.lock

@@ -2,12 +2,12 @@ PATH
   remote: .
   specs:
     faastruby (0.2.0)
-      colorize
-      oj
-      rest-client
-      rubyzip
-      tty-spinner
-      tty-table
+      colorize (~> 0.8)
+      oj (~> 3.6)
+      rest-client (~> 2.0)
+      rubyzip (~> 1.2)
+      tty-spinner (~> 0.8)
+      tty-table (~> 0.10)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,39 +1,60 @@
-# FaaSt Ruby
+[![Gem Version](https://badge.fury.io/rb/faastruby.svg)](https://badge.fury.io/rb/faastruby)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rubyfaas`. To experiment with that code, run `bin/console` for an interactive prompt.
+# faastruby-cli
 
-TODO: Delete this and the text above, and describe your gem
+CLI tool for managing workspaces and functions hosted at [FaaStRuby](https://faastruby.io).
 
-## Installation
+## What is FaaStRuby?
+Fast, lightweight and scalable serverless platform built for Ruby developers.
 
-Add this line to your application's Gemfile:
+* [Tutorial](https://faastruby.io/tutorial.html)
 
-```ruby
-gem 'faastruby'
+## Try it
+
+1. Install the gem:
+
+```
+$ gem install faastruby
 ```
 
-And then execute:
+2. Create a workspace to deploy your functions. The workspace name must be unique (like a username).
 
-    $ bundle
+```
+$ faastruby create-workspace awesome-prod
+```
 
-Or install it yourself as:
+3. Create a function and deploy it to your workspace:
 
-    $ gem install faastruby
+```
+$ faastruby new my-first-function
+$ cd my-first-function
+$ faastruby deploy-to awesome-prod
+◐ Running tests... Passed!
+...
 
-## Usage
+Finished in 0.00563 seconds (files took 0.15076 seconds to load)
+3 examples, 0 failures
 
-TODO: Write usage instructions here
+◐ Building package... Done!
+◐ Deploying to workspace 'awesome-prod'... Done!
+```
 
-## Development
+4. Run it:
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```
+$ faastruby run awesome-prod --json '{"name":"Ruby"}'
+Hello, Ruby!
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+You can also generate a CURL command:
 
-## Contributing
+```
+$ faastruby run awesome-prod --json '{"name":"Ruby"}' --header 'My-Header: value' --query 'foo=bar' --query 'baz=fox' --curl
+curl -X POST -H 'Content-Type: application/json' -H 'My-Header: value' -d '{"name":"Ruby"}' 'https://api.faastruby.io/awesome-prod/my-first-function?foo=bar&baz=fox'
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/faastruby.
+Build lots of functions and share them with fellow Ruby devs!
 
-## License
+## FaaStRuby + Hyperstack = fullstack Ruby apps!
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+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.rb

@@ -1,5 +1,5 @@
-require 'yaml'
 require 'tty-spinner'
+require 'yaml'
 require 'tty-table'
 require 'zip'
 require 'colorize'

data/lib/faastruby/cli/commands.rb

@@ -35,6 +35,7 @@ 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'
 
@@ -52,6 +53,8 @@ module FaaStRuby
       '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,

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

@@ -0,0 +1,11 @@
+module FaaStRuby
+  module Command
+    module Credentials
+      class CredentialsBaseCommand < BaseCommand
+      end
+    end
+  end
+end
+
+require 'faastruby/cli/commands/credentials/add'
+require 'faastruby/cli/commands/credentials/list'

data/lib/faastruby/cli/commands/credentials/add.rb

@@ -0,0 +1,58 @@
+module FaaStRuby
+  module Command
+    module Credentials
+      class Add < CredentialsBaseCommand
+        def initialize(args)
+          @args = args
+          @workspace_name = @args.shift
+          FaaStRuby::CLI.error(['Missing argument: WORKSPACE_NAME'.red, usage], color: nil) if @workspace_name.nil? || @workspace_name =~ /^-.*/
+          parse_options
+          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+          @missing_args = []
+          FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
+        end
+
+        def run
+          new_credentials = {'api_key' => @options['api_key'], 'api_secret' => @options['api_secret']}
+          FaaStRuby::Credentials.add(@workspace_name, new_credentials, @options['credentials_file'])
+          puts "Credentials file updated."
+        end
+
+        def self.help
+          "add-credentials".blue + " WORKSPACE_NAME -k API_KEY -s API_SECRET [-c CREDENTIALS_FILE]"
+        end
+
+        def usage
+          "Usage: faastruby #{self.class.help}"
+        end
+
+        private
+
+        def missing_args
+          @missing_args << "Missing argument: API_KEY".red unless @options['api_key']
+          @missing_args << "Missing argument: API_SECRET".red unless @options['api_secret']
+          @missing_args << "Missing argument: CREDENTIALS_FILE".red unless @options['credentials_file']
+          @missing_args << usage if @missing_args.any?
+          @missing_args
+        end
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '-k', '--api-key'
+              @options['api_key'] = @args.shift
+            when '-c', '--credentials-file'
+              @options['credentials_file'] = @args.shift
+            when '-s', '--api-secret'
+              @options['api_secret'] = @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/credentials/list.rb

@@ -0,0 +1,54 @@
+module FaaStRuby
+  module Command
+    module Credentials
+      class List < CredentialsBaseCommand
+        def initialize(args)
+          @args = args
+          parse_options
+          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+        end
+
+        def run
+          FaaStRuby::CLI.error("The file '#{@options['credentials_file']}' does not exist.") unless File.file?(@options['credentials_file'])
+          rows = []
+          credentials = FaaStRuby::Credentials.load_credentials_file(@options['credentials_file'])
+          FaaStRuby::CLI.error("The credentials file '#{@options['credentials_file']}' is empty.") unless credentials.any?
+          credentials.each do |workspace, credentials|
+            rows << [workspace, credentials['api_key'], credentials['api_secret']]
+          end
+          table = TTY::Table.new(['Workspace','API_KEY', 'API_SECRET'], rows)
+          puts table.render(:basic)
+        end
+
+        def self.help
+          "list-credentials".blue + " [-c CREDENTIALS_FILE]"
+        end
+
+        def usage
+          "Usage: faastruby #{self.class.help}"
+        end
+
+        private
+
+        def missing_args
+          @missing_args << "Missing argument: CREDENTIALS_FILE".red unless @options['credentials_file']
+          @missing_args << usage if @missing_args.any?
+          @missing_args
+        end
+
+        def parse_options
+          @options = {}
+          while @args.any?
+            option = @args.shift
+            case option
+            when '-c', '--credentials-file'
+              @options['credentials_file'] = @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/workspace/create.rb

@@ -28,7 +28,7 @@ module FaaStRuby
         end
 
         def self.help
-          "create-workspace".blue + " WORKSPACE_NAME [--stdout|-o, --output-file] [-e, --email YOUR_EMAIL_ADDRESS]"
+          "create-workspace".blue + " WORKSPACE_NAME [--stdout|-c, --credentials-file CREDENTIALS_FILE] [-e, --email YOUR_EMAIL_ADDRESS]"
         end
 
         def usage
@@ -40,7 +40,7 @@ module FaaStRuby
         def missing_args
           if @args.empty?
             @missing_args << "Missing argument: WORKSPACE_NAME".red
-            @missing_args << "Usage: faastruby create-workspace WORKSPACE_NAME"
+            @missing_args << usage
           end
           FaaStRuby::CLI.error(["'#{@args.first}' is not a valid workspace name.".red, usage], color: nil) if @args.first =~ /^-.*/
           @missing_args
@@ -55,7 +55,7 @@ module FaaStRuby
             #   @options['credentials_file'] = @args.shift
             when '--stdout'
               @options['stdout'] = true
-            when '-o', '--output-file'
+            when '-c', '--credentials-file'
               @options['credentials_file'] = @args.shift
             when '-e', '--email'
               @options['email'] = @args.shift

data/lib/faastruby/cli/credentials.rb

@@ -1,15 +1,17 @@
 module FaaStRuby
   class Credentials # TODO: change it to YAML?
-    def self.load_credentials_file
-      if File.file?(FAASTRUBY_CREDENTIALS)
-        Oj.load(File.read(FAASTRUBY_CREDENTIALS))
+    def self.load_credentials_file(credentials_file = FAASTRUBY_CREDENTIALS)
+      if File.file?(credentials_file)
+        creds = Oj.load(File.read(credentials_file))
+        return creds if creds.is_a?(Hash)
+        return {}
       else
         {}
       end
     end
 
     def self.add(workspace_name, new_credentials, credentials_file)
-      credentials = load_credentials_file
+      credentials = load_credentials_file(credentials_file)
       credentials.merge!({workspace_name => new_credentials})
       save_file(credentials, credentials_file)
     end
@@ -32,9 +34,9 @@ module FaaStRuby
       puts "#{symbol} f #{credentials_file}".colorize(color)
     end
 
-    def self.load_for(workspace_name)
-      credentials = load_from_env(workspace_name) || load_credentials_file
-      FaaStRuby::CLI.error("Could not find credentials for '#{workspace_name}' in '#{FAASTRUBY_CREDENTIALS}'") unless credentials.has_key?(workspace_name)
+    def self.load_for(workspace_name, cred_file = FAASTRUBY_CREDENTIALS)
+      credentials = load_from_env(workspace_name) || load_credentials_file(cred_file)
+      FaaStRuby::CLI.error("Could not find credentials for '#{workspace_name}' in '#{cred_file}'") unless credentials.has_key?(workspace_name)
       FaaStRuby.configure do |config|
         config.api_key = credentials[workspace_name]['api_key']
         config.api_secret = credentials[workspace_name]['api_secret']

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/faastruby/workspace.rb

@@ -13,7 +13,7 @@ module FaaStRuby
       case response.code
       when 422
         workspace.errors += ['(422) Unprocessable Entity', response.body]
-      when 200
+      when 200, 201
         workspace.credentials = response.body['credentials']
       else
         workspace.errors << "(#{response.code}) Error"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -156,6 +156,9 @@ files:
 - lib/faastruby/base.rb
 - lib/faastruby/cli.rb
 - lib/faastruby/cli/commands.rb
+- lib/faastruby/cli/commands/credentials.rb
+- lib/faastruby/cli/commands/credentials/add.rb
+- lib/faastruby/cli/commands/credentials/list.rb
 - lib/faastruby/cli/commands/function.rb
 - lib/faastruby/cli/commands/function/build.rb
 - lib/faastruby/cli/commands/function/deploy.rb