envoy-cli 1.0.0rc1 → 1.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec124e3b5fc290be2ef15c35db1efe32015c810
-  data.tar.gz: 3c60fd82c958edcec08994fc3b63a3ccc708ee23
+  metadata.gz: 09cc0766e2fbb6a44d96f4cd2ad4e7a3b8012f36
+  data.tar.gz: b152d8336231821b31d49c66ef5c647004013f12
 SHA512:
-  metadata.gz: 556842fa3ea2aee9da0c13801b928ae013b9be5040b84ccd040ae24f978374767977066633d162ca12e83bbe268de2a7e775730852993b9722ae13fa684a2418
-  data.tar.gz: fccef4834dc086872214a57ad7f0a04035b032ecbcdc5fb6c83da5f20b7c603a5fa9cdef95f16d0c4d7adbea5bd16f5313f6fbc7da441b38a1388db4cc0a2b38
+  metadata.gz: e6bd6788c27b249f1a7e33370f7cb400d2a1fd88600bdcd27fe443c6d20e6484f55431867395b4cd08b09f5fc55756e17baf3e9153e6f9d1b7b7ab685ea3ff39
+  data.tar.gz: d94b22579d54c2e21d04d8618f0dc814e060a4e2825faba6b54852ec8adcf81f1837f91e796622ad048a190504832f9f14d3919490a9cddd62aba3e0d6d562bf

data/bootstrap/base/Gruntfile.js

@@ -0,0 +1,13 @@
+var grunt = require('grunt');
+grunt.loadNpmTasks('grunt-aws-lambda');
+
+grunt.initConfig({
+  lambda_package: {
+    default: {
+      options: {
+        include_time:false,
+        include_version:false
+      }
+    }
+  }
+});

data/bootstrap/templates/index.js.erb

@@ -1,5 +1,7 @@
 var Platform = require('envoy-platform-sdk');
-var platform = new Platform(require('./envoy-manifest.json'));
+var platform = new Platform({
+  baseDir: __dirname
+});
 
 require('dotenv').config();
 exports.handler = platform.handler();

data/bootstrap/templates/package.json

@@ -1,24 +1,20 @@
 {
   "name": "",
-  "version": "",
+  "version": "0.0.1",
   "description": "",
   "main": "index.js",
   "repository": "",
   "private": true,
-  "scripts": {
-    "setup": "./bin/setup",
-    "invoke": "./bin/invoke"
-  },
   "author": "",
   "license": "SEE LICENSE IN license.md",
   "devDependencies": {
+    "grunt": "^1.0.1",
+    "grunt-aws-lambda": "^0.12.0"
   },
   "dependencies": {
-    "dotenv": "^2.0.0",
-    "envoy-platform-sdk": "git+ssh://git@github.com/envoy/envoy-platform-sdk-nodejs.git"
+    "envoy-platform-sdk": "git+ssh://git@github.com/envoy/envoy-platform-sdk-nodejs.git#develop"
   },
   "bundledDependencies": [
-    "dotenv",
     "envoy-platform-sdk"
   ]
 }

data/lib/envoy.rb

@@ -1,16 +1,16 @@
-require 'envoy/version'
 require 'thor'
 
 require 'inc/runner'
 require 'inc/commands'
 require 'inc/mixins'
 require 'inc/generator'
+require 'inc/schema_model'
 
 require 'unirest'
 require 'colorize'
 
 project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob("#{project_root}/tasks/**/*.rb", &method(:require))
+Dir.glob("#{project_root}/envoy/**/*.rb", &method(:require))
 
 module Envoy
   class Main < Commands
@@ -20,12 +20,12 @@ module Envoy
 
     # Authenticates the user by storing their auth_token in ~/.envoy-cfg
     # @param --local [String] will use localhost:3000 as the API url
-    # @param --path [String] can be used to override the endpoint for this profile
+    # @param --endpoint [String] can be used to override the endpoint for this profile
     # @param --profile NAME [String] will save the login information for that profile, in order
     #   to use that info, you must specify the same profile name on other requests
 
     desc "login", "Login to your account"
-    option :path, type: :string
+    option :endpoint, type: :string
 
     def login
       # collect login information
@@ -55,7 +55,7 @@ module Envoy
         'access_token' => res['access_token']
       }
       conf['local']    = true         if options.local
-      conf['api_path'] = options.path if options.path
+      conf['api_path'] = options.endpoint if options.endpoint
 
       config.params[profile(options)] = conf
 

data/lib/{tasks → envoy}/plugin.rb

@@ -136,9 +136,14 @@ module Envoy
       bootstrap = options.bootstrap
       if dir
         # @TODO create dir if it doesn't already exist
+        unless Dir.exists? dir
+          Dir.mkdir dir
+        end
         Dir.chdir dir
       end
 
+      destination_root = Dir.pwd
+
       if file_exist?('config/default.json') || file_exist?("config/#{profile.downcase}.json")
         prompt.yes?("It looks you've already created a plugin here. Would you like to register it?") || exit
       else

data/lib/{tasks → envoy}/routes.rb

@@ -5,7 +5,8 @@ module Envoy
     include Envoy::Generator
 
     desc 'add <name>', 'Add a route to your plugin'
-    def add(name)
+    def add(name = false)
+      name ||= prompt.ask("Route name (lowercase alphanumeric):")
       setup_route name
     end
 
@@ -22,7 +23,6 @@ module Envoy
       say_status 'request', indent_lines(pretty_json(min_json(fake_data))).lstrip, :magenta
       output = `node_modules/.bin/invoke local #{fake_data.to_json.to_json}`
       output = output.split('------%%------')
-      puts output
       json = JSON.parse output[1]
       if json.dig('payload', 'body', 'html')
         tmpfile = ".tmp/response-#{Time.now.to_i}.html"

data/lib/envoy/schema.rb

@@ -0,0 +1,86 @@
+module Envoy
+  class Schema < Commands
+    include Mixins
+    include Envoy::Generator
+    include Envoy::SchemaModel
+
+    desc 'add <name>', 'Add a schema to your plugin'
+    def add(name = false)
+      unless name
+        name = prompt.ask("Name (lowercase alphanumeric):") do |q|
+          q.required true
+          q.validate(/^[\w0-9\-]+$/)
+          q.modify :downcase
+        end
+      end
+      profiles = get_profiles
+
+      modify_profiles(profiles) do |profile, data|
+        if data.dig('schema', name)
+          next error "The schema <#{name}> already exists in environment <#{profile}>. Skipping."
+        end
+        data['schema'][name] = []
+      end
+    end
+
+    desc 'remove <name>', 'Remove a schema from your plugin'
+    def remove(name = nil)
+      profiles = get_profiles
+      schemas = []
+      read_profiles(profiles) do |_, data|
+        schemas |= data['schema'].keys
+      end
+
+      if schemas.empty?
+        error('No schemas to remove.') && exit
+      end
+
+      unless name
+        name = prompt.select("Select schema to remove:", schemas)
+      end
+
+      modify_profiles(profiles) do |profile, data|
+        unless data.dig('schema', name)
+          next warn "The schema <#{name}> does not exist in environment <#{profile}>. Skipping."
+        end
+        data['schema'].delete(name)
+      end
+    end
+
+    desc 'add-field <name>', 'Remove a schema from your plugin'
+    def add_field(schema = nil, key = nil)
+      profiles = get_profiles
+      schemas = []
+      read_profiles(profiles) do |_, data|
+        schemas |= data['schema'].keys
+      end
+
+      unless schema
+        schema = prompt.select("Select schema to add a field to:", schemas)
+      end
+
+      until key
+        key = prompt.ask("Key (required):")
+      end
+
+      type = choose_field_type
+
+      config = get_field_options type
+      config[:type] = type
+      config[:key] = key
+
+      modify_profiles(profiles) do |profile, data|
+        unless data.dig('schema', schema)
+          next warn "The schema <#{schema}> does not exist in environment <#{profile}>. Skipping."
+        end
+        if data['schema'][schema].detect { |f| f["key"] == key }
+          if prompt.yes?("Discovered schema field with key <#{key}> in <#{profile}:#{schema}>. Override?")
+            data.dig('schema', schema).push(config)
+          end
+        else
+          data.dig('schema', schema).push(config)
+        end
+      end
+    end
+  end
+end

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = "1.0.0rc1".freeze
+  VERSION = "1.0.0rc2".freeze
 end

data/lib/inc/generator.rb

@@ -12,7 +12,7 @@ module Envoy
           'installable_on' => ['location'],
           'oauth2'         => {},
           'schema'         => {},
-          'setup'          => [],
+          'setup_flow'     => [],
           'routes'         => [],
           'jobs_handled'   => {}
         })
@@ -91,11 +91,45 @@ module Envoy
                     .select { |file| file.end_with? '.json' }
                     .map { |file| file.chomp('.json') }
       if choose && profiles.length > 1
-        profiles = prompt.multi_select("Select profiles to add configuration to:", profiles)
+        profiles = prompt.multi_select("Select environments to apply this change to:", profiles)
       end
       profiles
     end
 
+    def get_profile(choose = true)
+      profiles = Dir.entries("#{destination_root}/config")
+                    .select { |file| file.end_with? '.json' }
+                    .map { |file| file.chomp('.json') }
+      if choose && profiles.length > 1
+        profile = prompt.select("Select environment to apply this change to", profiles)
+      else
+        profile = profiles[0]
+      end
+      profile
+    end
+
+    def modify_profiles(profiles)
+      read_profiles(profiles) do |profile, data|
+        state_hash = data.to_json.hash
+        yield profile, data
+        if state_hash != data.to_json.hash
+          write_data("config/#{profile}.json", data)
+        else
+          say_status("no change", "config/#{profile}.json", :yellow)
+        end
+      end
+    end
+
+    def read_profiles(profiles)
+      unless profiles.is_a? Array
+        profiles = [profiles]
+      end
+      profiles.each do |profile|
+        data = read_data("config/#{profile}.json")
+        yield profile, data
+      end
+    end
+
     def setup_worker(name)
       @job_name = name
       template "templates/worker.js.erb", "workers/#{name}.js"

data/lib/inc/schema_model.rb

@@ -0,0 +1,98 @@
+module Envoy
+  module SchemaModel
+    SCHEMA_CONFIG = {
+      string:   {
+        desc: 'Single-line Input',
+        asks: %w(label note is_required default_value read_only placeholder)
+      },
+      textarea: {
+        desc: 'Multi-line Input',
+        asks: %w(label note is_required default_value read_only placeholder)
+      },
+      checkbox: {
+        desc: 'Checkbox',
+        asks: %w(label note default_value)
+      },
+      select:   {
+        desc: 'Select',
+        asks: %w(label note is_required default_value options)
+      },
+      divider:  {
+        desc: 'Divider Line',
+        asks: []
+      },
+      note:     {
+        desc: 'Paragraph of Text',
+        asks: %w(label note)
+      }
+    }.freeze
+
+    def choose_field_type
+      prompt.select("Choose field type") do |menu|
+        # menu.default :string
+        SCHEMA_CONFIG.each do |key, value|
+          menu.choice value[:desc] + " (#{key})", key
+        end
+      end
+    end
+
+    def get_field_options(type)
+      config = {}
+      SCHEMA_CONFIG[type.to_sym][:asks].each do |ask|
+        out = send("schema_ask_#{ask}")
+        config[out[0]] = out[1]
+      end
+      config
+    end
+
+    def schema_ask_label
+      ['label', prompt.ask("Label:")]
+    end
+
+    def schema_ask_note
+      ['note', prompt.ask("Note:")]
+    end
+
+    def schema_ask_default_value
+      value = prompt.ask("Default Value:")
+      ['default_value', value || nil]
+    end
+
+    def schema_ask_is_required
+      required = prompt.yes?("Required?")
+      ['is_required', required]
+    end
+
+    def schema_ask_read_only
+      required = prompt.yes?("Read Only?")
+      ['read_only', required]
+    end
+
+    def schema_ask_options
+      type = prompt.select("How should this select load its options?", {
+        "I'll specify the exact options now."                  => :static,
+        "It will load the options on demand from an endpoint." => :dynamic
+      })
+      if type == :static
+        continue = true
+        index = 1
+        options = []
+        while continue
+          say "> Option #{index}:"
+          value = prompt.ask("Value:", required: true)
+          label = prompt.ask("Label:", default: value)
+          continue = prompt.yes?("Add another option?")
+          index += 1
+          options.push({ value: value, label: label })
+        end
+      else
+        options = prompt.ask("Route name:")
+      end
+      ['options', options]
+    end
+
+    def schema_ask_placeholder
+      ['placeholder', prompt.ask('Placeholder')]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc1
+  version: 1.0.0rc2
 platform: ruby
 authors:
 - David Boskovic
@@ -206,12 +206,11 @@ files:
 - Gemfile
 - bin/envoy
 - bin/envoy.bak
-- bootstrap/base/.envoyrc
 - bootstrap/base/.jshintrc
 - bootstrap/base/.nvmrc
+- bootstrap/base/Gruntfile.js
 - bootstrap/base/config/.gitkeep
 - bootstrap/base/docs/.gitkeep
-- bootstrap/base/gulpfile.js
 - bootstrap/base/i18n/.gitkeep
 - bootstrap/base/index.js
 - bootstrap/base/lib/.gitkeep
@@ -238,15 +237,17 @@ files:
 - bootstrap/templates/worker.js.erb
 - envoy-cli.gemspec
 - lib/envoy.rb
+- lib/envoy/plugin.rb
+- lib/envoy/routes.rb
+- lib/envoy/schema.rb
+- lib/envoy/test.rb
 - lib/envoy/version.rb
+- lib/envoy/workers.rb
 - lib/inc/commands.rb
 - lib/inc/generator.rb
 - lib/inc/mixins.rb
 - lib/inc/runner.rb
-- lib/tasks/plugin.rb
-- lib/tasks/routes.rb
-- lib/tasks/test.rb
-- lib/tasks/workers.rb
+- lib/inc/schema_model.rb
 - readme.md
 homepage: http://rubygemspec.org/gems/envoy-cli
 licenses:

data/bootstrap/base/.envoyrc

@@ -1 +0,0 @@
-{}