byld-cli 0.0.4 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277caf41280001f2587527817c56ec5744c90460adda580c7fb951f4e16e32c5
-  data.tar.gz: 9c1c6362c89ad322259898b1e1ef6f48042bc9decb4bafd67fc5b17e2bd5eb7b
+  metadata.gz: f54dcaf0f049e530ed6e87ee51716fb2e1ca0c43a65e45312a54917917d7c9f0
+  data.tar.gz: d2ef0b741afef1d26914b5ed7375c2532f8fa8b5e56b25c3c7fc576366ffaf12
 SHA512:
-  metadata.gz: b9f004be65ccd30f5deaf4e38d3d4ea3a4349cb58a1ac0ab35b58c89f52b35d280c84edc115193f54490a8ec00b5637506d402a617ece6fb54c5831f1dc7370d
-  data.tar.gz: c14b670b116ee4f97b8cc4a47df7f36c56afaac0c49cc9ca79e14c845d073784147e7143a06e6b52dc655b3231c278d75830418777c20c54a93eeb013fa3fe73
+  metadata.gz: 4ce0b15f358b8963bd50ad9c3812a999cfda080c44b372de5c91f9ef20060b3baf71550e26de22bf2c4e8a6098d2b7fa2aa99ad821d4b0478df812131a5154d8
+  data.tar.gz: 6b45b3fc3f0699a0b717aed44fbd41708569f8e6dc8654d62a5f2181ae3323900105eea3856987b8be2cec8a48246e9ea730cacc77a3624a440ec85d1ed6eba2

data/Dockerfile

@@ -0,0 +1,18 @@
+FROM ruby:2.6.6
+ENV APP_HOME /cli
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+RUN gem install guard guard-process guard-shell
+
+ADD *.gemspec $APP_HOME/
+ADD Gemfile* $APP_HOME/
+ADD ./lib/constants.rb $APP_HOME/lib/
+RUN bundle install
+
+ARG project_type
+ADD .irbrc /root/
+ADD Guardfile.$project_type /root/.Guardfile
+
+ADD . $APP_HOME
+RUN rake install

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    byld-cli (0.0.1)
+    byld-cli (0.0.10)
+      activerecord (= 5.2.3)
       activesupport (= 5.2.3)
       archive-zip (= 0.12)
       faye-websocket (= 0.10.9)
@@ -12,6 +13,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
     activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -19,6 +26,7 @@ GEM
       tzinfo (~> 1.1)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
+    arel (9.0.0)
     concurrent-ruby (1.1.6)
     eventmachine (1.2.7)
     faye-websocket (0.10.9)
@@ -42,7 +50,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
 

data/Guardfile.block

@@ -0,0 +1,13 @@
+guard :shell do
+  watch('Gemfile') do
+    `bundle install`
+  end
+  watch /.byld\/migrations\/.*.rb/ do
+    `byld block migrate`
+  end
+end
+
+guard :process, command: ['bundle', 'exec', 'ruby', '-e', "require('byld/block/server')"], stop_signal: 'KILL' do
+  watch /.*/
+  ignore /.*\.sqlite/
+end

data/Guardfile.gate

@@ -0,0 +1,9 @@
+guard :shell do
+  watch('Gemfile') do
+    `bundle install`
+  end
+end
+
+guard :process, command: ['bundle', 'exec', 'ruby', '-e', "require('byld/gate/server')"], stop_signal: 'KILL' do
+  watch /.*/
+end

data/byld-cli.gemspec

@@ -1,9 +1,10 @@
+require_relative ('./lib/constants')
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'byld-cli'
-  spec.version       = '0.0.4'
+  spec.version       = BYLD_VERSION
 
   spec.authors = ['the fellowhip co']
   spec.summary       = 'cli for byld'

data/lib/blocks/connect.rb

@@ -11,15 +11,15 @@ class Connect < Thor::Group
   end
 
   def create_client
+    namespace_id, project_id = ConfigHelper.get_namespace_and_project
     puts "☝️  Connecting #{name}..."
-    namespace_config = Config.load(".byld/config.yml")
     
-    success, res = Infra.generate_client(name, namespace_config['namespace']['id'])
+    success, res = Infra.generate_client(name, namespace_id)
     if success
       create_file ".byld/gen/#{name.underscore}.rb", res.first['content']
       puts "🔗 #{name} connected successfully!"
     else
-      say "⚠️  Error connecting block. Reason: #{res}" unless success
+      say "⚠️  Error connecting block. Reason: #{res['error']}" unless success
     end
   end
 

data/lib/blocks/create_block.rb

@@ -7,21 +7,18 @@ class CreateBlock < Thor::Group
     File.dirname(__FILE__)
   end
 
-  def create_directory
+  def create_infra
     say "✍️  Setting up #{name}..."
-    directory '../templates/block', name
-  end
+    namespace_id = ConfigHelper.get_namespace_id
+    success, res = Infra.create_project(namespace_id, name, 'domain')
 
-  def create_infra    
-    namespace_config = Config.load(".byld/config.yml")
-    success, res = Infra.create_project(namespace_config['namespace']['id'], name, 'domain')
-    
     if success
-      block_config = Config.load("#{name}/.byld/config.yml")
-      block_config.merge!(project: res)
+      directory '../templates/block', name
+      ConfigHelper.save_config('project', name, res)
+      
       say "👍 Block created successfully!"
     else
-      say "⚠️  Error creating block. Reason: #{res}" unless success
+      say "⚠️  Error creating block. Reason: #{res['error']}" unless success
     end
   end
 

data/lib/blocks/run_migration.rb

@@ -7,13 +7,13 @@ class RunMigration < Thor::Group
   class_option :env, :default => 'dev'
 
   def run_migrations
-    db_config = YAML::load(File.open(".byld/config.yml"))['storage']
+    db_config = Config.load(".byld/config.yml")['storage']
     ActiveRecord::Base.establish_connection(db_config)
-    ActiveRecord::MigrationContext.new(".byld/migrations/").migrate
+    ActiveRecord::MigrationContext.new("models/migrations/").migrate
   end
 
   def update_schema
-    filename = ".byld/schema.rb"
+    filename = "models/schema.rb"
     File.open(filename, "w:utf-8") do |file|
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
     end

data/lib/blocks/start_block.rb

@@ -8,6 +8,6 @@ class StartBlock < Thor::Group
   end
 
   def start_block
-    Kernel.exec("bundle exec ruby -e \"require 'byld/block/server'\"")
+    Kernel.exec("bundle exec ruby -e \"require('byld/block/server')\"")
   end
 end

data/lib/byld_cli.rb

@@ -22,6 +22,8 @@ require_relative 'gates/gate'
 require_relative 'gates/expose'
 
 class ByldCli < Thor
+  map %w[--version -v] => :__print_version
+
   register(LoginUser, 'login', 'login', 'Logins into your account')
   register(CreateProject, 'new', 'new [NAME]', 'Creates a new project')
   register(Deploy, 'deploy', 'deploy', 'Deploys the current block or gate')
@@ -37,5 +39,11 @@ class ByldCli < Thor
 
   desc 'gate [COMMAND]', 'Gate commands'
   subcommand 'gate', Gate
+
+  desc "--version, -v", "Display the version"
+  def __print_version
+    puts BYLD_VERSION
+  end
+
 end
 

data/lib/common/access_console.rb

@@ -32,13 +32,16 @@ class AccessConsole < Thor::Group
         ws = Faye::WebSocket::Client.new("ws://#{BIFROST_HOST}?namespace=#{res['namespace_name']}&pod=#{res['pod_name']}")
 
         ws.on :open do |event|
-          puts "🟢 Connected!"
+          puts "🌐 Connecting to Byld Console..."
         end
 
         command = ""
+        connected = false
         ws.on :message do |event|
           data = Base64.strict_decode64(event.data)
           if (data.strip.end_with?("#"))
+            puts "🟢 Connected!" unless connected
+            connected = true
             command = ask(data)
             ws.send(command)
           else
@@ -49,12 +52,13 @@ class AccessConsole < Thor::Group
         end
 
         ws.on :close do |event|
-          # p [:close, event.code, event.reason]
           ws = nil
+          say "⚠️  Connection lost: #{event.code}: #{event.reason}"
+          exit
         end
       }
     else
-      say "⚠️  Error connecting to the console. Reason: #{res}" unless success
+      say "⚠️  Error connecting to the console. Reason: #{res['error']}" unless success
     end
   end
 end

data/lib/common/access_logs.rb

@@ -26,7 +26,7 @@ class AccessLogs < Thor::Group
         last_since_time = has_new_logs ? since_time : last_since_time
         say res['logs'] if has_new_logs
       else
-        say "⚠️  Error getting logs. Reason: #{res}" unless success
+        say "⚠️  Error getting logs. Reason: #{res['error']}" unless success
       end
       sleep 2
     end

data/lib/common/create_project.rb

@@ -7,22 +7,18 @@ class CreateProject < Thor::Group
     File.dirname(__FILE__)
   end
 
-  def create_directory
+  def create_project
     say "✍️  Setting up your project..."
-    empty_directory name
-    create_file "#{name}/.byld/config.yml"
-  end
-
-  def create_project    
     success, res = Infra.create_namespace(Config.instance['id'], name)
-    
+
     if success
-      namespace_config = Config.load("#{name}/.byld/config.yml")
-      namespace_config.merge!(namespace: res)
+      empty_directory name
+      create_file "#{name}/.byld/config.yml"
+      ConfigHelper.save_config('namespace', name, res)
 
       say "👍 Project created successfully!"
     else
-      say "⚠️  Error creating project. Reason: #{res}" unless success
+      say "⚠️  Error creating project. Reason: #{res['error']}" unless success
     end
   end
 end

data/lib/common/deploy.rb

@@ -7,14 +7,14 @@ class Deploy < Thor::Group
 
   def deploy
     name = File.basename(Dir.getwd)
-    project_config = Config.load(".byld/config.yml")
+    _, project_id = ConfigHelper.get_namespace_and_project
     
     say "☝️  Deploying #{name}..."
-    success, res = Infra.deploy(project_config['project']['id'])
+    success, res = Infra.deploy(project_id)
     if success
       say "👌 Deployment triggered!"
     else
-      say "⚠️  Error deploying block or gate. Reason: #{res}" unless success
+      say "⚠️  Error deploying block or gate. Reason: #{res['error']}" unless success
     end
   end
 

data/lib/common/login_user.rb

@@ -17,7 +17,7 @@ class LoginUser < Thor::Group
       
       say "👋 You're logged in!"
     else
-      say "⚠️  Error signing in. Reason: #{res}" unless success
+      say "⚠️  Error signing in. Reason: #{res['error']}" unless success
     end
   end
 end

data/lib/common/status.rb

@@ -8,35 +8,25 @@ class Status < Thor::Group
   end
 
   def print_status
-    success, res = Infra.get_namespace(namespace_id)
+    success, res = Infra.get_namespace(ConfigHelper.get_namespace_id)
     
-    say "⚠️  Error fetching project status. Reason: #{res}" unless success
+    say "⚠️  Error fetching project status. Reason: #{res['error']}" and return unless success
     
     say set_color("\n#{res['name']}\n", :bold)
     say set_color("gate\n", :bold)
 
     gates = res['projects']
-      .filter { |project| project['projectType'] == 'graph' }
+      .select { |project| project['projectType'] == 'graph' }
       .map { |project| [project['name'], project['status'], project['url'], project['docsUrl']] }
 
     say Terminal::Table.new headings: ['name', 'status', 'url', 'docs'], rows: gates
     
     say set_color("\nblocks\n", :bold)
     blocks = res['projects']
-      .filter { |project| project['projectType'] == 'domain' }
+      .select { |project| project['projectType'] == 'domain' }
       .map { |project| [project['name'], project['status']] }
     
     say Terminal::Table.new headings: ['name', 'status'], rows: blocks
   end
 
-  def namespace_id 
-    config = Config.load(".byld/config.yml")
-    
-    if config['namespace'].present?
-      config['namespace']['id']
-    elsif config['project'].present?
-      config['project']['namespaceId']
-    end
-  end
-
 end

data/lib/constants.rb

@@ -1,3 +1,4 @@
 BYLD_CONF = "#{Dir.home}/.byld.yaml"
 BYLD_HOST = ENV['BYLD_HOST'] || 'api.letsbyld.com'
 BIFROST_HOST = ENV['BIFROST_HOST'] || 'sockets.letsbyld.com'
+BYLD_VERSION = '0.0.10'

data/lib/gates/create_gate.rb

@@ -5,22 +5,19 @@ class CreateGate < Thor::Group
     File.dirname(__FILE__)
   end
 
-  def create_directory
+  def create_infra
     say "✍️  Setting up your gate..."
-    
-    directory "../templates/gate", 'gate'
-  end
 
-  def create_infra
-    namespace_config = Config.load(".byld/config.yml")
-    sucess, res = Infra.create_project(namespace_config['namespace']['id'], 'gate', 'graph')
-    
+    namespace_id = ConfigHelper.get_namespace_id
+    sucess, res = Infra.create_project(namespace_id, 'gate', 'graph')
+
     if sucess
-      say "👍 Gate created successfully!"
-      gate_config = Config.load("gate/.byld/config.yml")
-      gate_config.merge!(project: res)
+      directory "../templates/gate", 'gate'
+      ConfigHelper.save_config('project', 'gate', res)
+      
+      say "👍 Gate created successfully!"      
     else
-      say "⚠️  Error creating gate. Reason: #{res}"
+      say "⚠️  Error creating gate. Reason: #{res['error']}"
     end
   end
 

data/lib/gates/expose.rb

@@ -12,27 +12,27 @@ class Expose < Thor::Group
   def create_client
     puts "☝️  Connecting #{name}..."
     
-    gate_config = Config.load(".byld/config.yml")
-    success, res = Infra.generate_client(name, gate_config['project']['namespaceId'])
+    namespace_id, gate_id = ConfigHelper.get_namespace_and_project
+    success, res = Infra.generate_client(name, namespace_id)
     if success
       create_file ".byld/gen/#{name.underscore}.rb", res.first['content']
       puts "🔗 #{name} connected successfully!"
     else
-      puts "⚠️  Error connecting block. Reason: #{res}"
+      puts "⚠️  Error connecting block. Reason: #{res['error']}"
     end
   end
 
   def create_edge
     puts "☝️  Exposing #{name}..."
-    gate_config = Config.load(".byld/config.yml")
-    success, res = Infra.generate_edges(name, gate_config['project']['namespaceId'])
+    namespace_id, gate_id = ConfigHelper.get_namespace_and_project
+    success, res = Infra.generate_edges(name, namespace_id)
     if success
       res.each do |edge|
         create_file "./edges/#{edge['name']}", edge['content']
         puts "🌐 #{name} exposed successfully!"
       end
     else
-      puts "⚠️  Error exposing block. Reason: #{res}"
+      puts "⚠️  Error exposing block. Reason: #{res['error']}"
     end
   end
 

data/lib/generators/migration.rb

@@ -18,10 +18,10 @@ class MigrationGenerator
   private
   def create_migration_file(name, template)
     timestamp = Time.now.strftime("%Y%m%d%H%M%S")
-    path = ".byld/migrations/#{timestamp}_#{name}.rb"
-    
+    path = "models/migrations/#{timestamp}_#{name}.rb"
+
     template("./templates/#{template}", path)
     puts "Migration #{path} created!"
   end
-  
+
 end

data/lib/generators/templates/active_record_model.tt

@@ -1,3 +1,3 @@
-class <%= @model_camel %> < ActiveRecord::Base
-  expose allow: [:get, :create, :update, :delete]
+class <%= @model_camel %> < Byld::Model
+  enable_builtins
 end

data/lib/helpers/config_helper.rb

@@ -1,13 +1,19 @@
 module ConfigHelper
+
+  def self.save_config(key, dir, config)
+    block_config = Config.load("#{dir}/.byld/config.yml")
+    block_config.merge!(key => config)
+  end
+  
   def self.get_namespace_and_project
-    namespace_path = "../.byld/config.yml"
-    project_path = ".byld/config.yml"
+    namespace_path = '../.byld/config.yml'
+    project_path = '.byld/config.yml'
 
-    namespace_config = Config.load("../.byld/config.yml") if File.exist?(namespace_path)
-    project_config = Config.load(".byld/config.yml") if File.exist?(project_path)
+    namespace_config = Config.load(namespace_path) if File.exist?(namespace_path)
+    project_config = Config.load(project_path) if File.exist?(project_path)
 
     if namespace_config.nil? or project_config.nil?
-      puts "\n 🚫Config is missing! Note: command is valid only within block or gate root folder \n\n"
+      puts "\n🚫 Config is missing! Note: This command is valid only within block or gate directory \n\n"
       exit
     end
 
@@ -16,4 +22,21 @@ module ConfigHelper
 
     [namespace_id, project_id]
   end
+
+  def self.get_namespace_id
+    config_path = '.byld/config.yml'
+    config = Config.load(config_path) if File.exist?(config_path)
+
+    if config.nil?
+      puts "\n🚫 Config is missing! Note: This command is valid only within block or gate or project directory \n\n"
+      exit
+    end
+    
+    if config['namespace'].present?
+      config['namespace']['id']
+    elsif config['project'].present?
+      config['project']['namespaceId']
+    end
+  end
+
 end

data/lib/templates/block/Gemfile

@@ -3,5 +3,5 @@ source "https://rubygems.org"
 gem 'sqlite3'
 
 source "https://rubygems.pkg.github.com/the-fellowship-co/" do
-  gem "byld-framework", "0.1.27"
+  gem "byld-framework", "0.1.38"
 end

data/lib/templates/block/config.yml.tt

@@ -0,0 +1,9 @@
+# Add your configs in this file. You can access them in your code using
+# `Settings`.
+# Ex:
+# key1: val1
+# key2:
+#    nestedKey: val
+# To access the config data,
+# Settings.key1, Settings.key2, Settings.key2.nestedKey
+

data/lib/templates/block/models/migrations/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/lib/templates/gate/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
 source "https://rubygems.pkg.github.com/the-fellowship-co/" do
-  gem "byld-framework", "0.1.27"
+  gem "byld-framework", "0.1.38"
 end

data/lib/templates/gate/config.yml.tt

@@ -0,0 +1,9 @@
+# Add your configs in this file. You can access them in your code using
+# `Settings`.
+# Ex:
+# key1: val1
+# key2:
+#    nestedKey: val
+# To access the config data,
+# Settings.key1, Settings.key2, Settings.key2.nestedKey
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: byld-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.10
 platform: ruby
 authors:
 - the fellowhip co
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -120,8 +120,11 @@ files:
 - ".irbrc"
 - ".ruby-gemset"
 - ".ruby-version"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
+- Guardfile.block
+- Guardfile.gate
 - README.md
 - Rakefile
 - byld-cli.gemspec
@@ -155,12 +158,14 @@ files:
 - lib/helpers/config_helper.rb
 - lib/templates/block/.byld/config.yml.tt
 - lib/templates/block/.byld/gen/.empty_directory
-- lib/templates/block/.byld/migrations/.empty_directory
 - lib/templates/block/Gemfile
+- lib/templates/block/config.yml.tt
 - lib/templates/block/models/.empty_directory
 - lib/templates/block/models/messages/.empty_directory
+- lib/templates/block/models/migrations/.empty_directory
 - lib/templates/gate/.byld/config.yml.tt
 - lib/templates/gate/Gemfile
+- lib/templates/gate/config.yml.tt
 - lib/templates/gate/edges/.empty_directory
 homepage: 
 licenses: []
@@ -180,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: cli for byld