byld-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc1cade5d8f4698aa5d65436f066a6f2b157ae9ac0bd2c0860243c56e8c2997
-  data.tar.gz: 325fcba6e9b8eda3da98c7a53241cdfae26ac6fa53bc6b7bc1786fdd61d15ea0
+  metadata.gz: 9921ce939ed12c148d831a6f945df7f7a4ad59e4f7192a00a1012a32b94b946d
+  data.tar.gz: d52d9affbe3a25ebc20fd6df327d03f12e3bed95443f647a48381d272a058412
 SHA512:
-  metadata.gz: 2c961c79b62a0fa01b04b457e72bb211ae5e9e6c9371a098cbdff212187e99af8eb4ef01206101421abff4bb7c0c48392a816bf1f1e3b4c5c8d4d03d19d8476c
-  data.tar.gz: 26b482af245002cb2d51d996438a72d7175fc15bba6a927ee92a6f7a80e51837bdb39e721d57986ee234628fc41e1b3996d07a5025148ba73e933078fa769a80
+  metadata.gz: 044136c15876ced63c09474f23b939786a6fc3ae2980bd6f1865ce397b6dd41c727f1ac0e46aae2d29814d8c4f40e825997479682dd9d19bde36683d17596097
+  data.tar.gz: 919d5255bea0eb5880154b080042d48d9d0db84c43db46ab65585ffbfda08975c165600d8179495312a229d6ed2de076d0480e7966fe2adb28eb31c8f14f20c4

data/byld-cli.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'byld-cli'
-  spec.version       = '0.0.6'
+  spec.version       = '0.0.7'
 
   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}..."
-    project_config = Config.load(".byld/config.yml")
     
-    success, res = Infra.generate_client(name, project_config['project']['namespaceId'])
+    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

@@ -13,15 +13,15 @@ class CreateBlock < Thor::Group
   end
 
   def create_infra    
-    namespace_config = Config.load(".byld/config.yml")
-    success, res = Infra.create_project(namespace_config['namespace']['id'], name, 'domain')
+    namespace_id = ConfigHelper.get_namespace_id
+    success, res = Infra.create_project(namespace_id, name, 'domain')
     
     if success
-      block_config = Config.load("#{name}/.byld/config.yml")
-      block_config.merge!(project: res)
+      ConfigHelper.save_config(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,7 +7,7 @@ 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
   end

data/lib/common/access_console.rb

@@ -54,7 +54,7 @@ class AccessConsole < Thor::Group
         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

@@ -17,12 +17,11 @@ class CreateProject < Thor::Group
     success, res = Infra.create_namespace(Config.instance['id'], name)
     
     if success
-      namespace_config = Config.load("#{name}/.byld/config.yml")
-      namespace_config.merge!(namespace: res)
+      ConfigHelper.save_config(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,9 +8,9 @@ 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)
@@ -29,14 +29,4 @@ class Status < Thor::Group
     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/gates/create_gate.rb

@@ -12,15 +12,15 @@ class CreateGate < Thor::Group
   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)
+      ConfigHelper.save_config('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,20 +12,20 @@ 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']

data/lib/helpers/config_helper.rb

@@ -1,13 +1,19 @@
 module ConfigHelper
+
+  def self.save_config(dir, config)
+    block_config = Config.load("#{dir}/.byld/config.yml")
+    block_config.merge!(project: 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: byld-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - the fellowhip co
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.3
 description: cli for byld
-email: 
+email:
 executables:
 - byld
 extensions: []
@@ -162,10 +162,10 @@ files:
 - lib/templates/gate/.byld/config.yml.tt
 - lib/templates/gate/Gemfile
 - lib/templates/gate/edges/.empty_directory
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: cli for byld
 test_files: []