rubypitaya 3.0.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a9246223a2328fd375d34a04259e1ac01f3eb3b021a39cfad33d8541870dbcc
-  data.tar.gz: 5e0182a29f83521950107d6863889055452ed73ec465cb613ddd959a1b511710
+  metadata.gz: f57bbdb5e9f7f12097c4013871c3947a1655e3c79fe31b9e259d911c0563ef0d
+  data.tar.gz: bd54ecb7812fd7d16573f986f274abf0949cd0a7d460ec30ece58bef51201ec2
 SHA512:
-  metadata.gz: bb5a55039932f42a8595b3f3e2641c8b865a5d3e0dd4fb3d69781d48ce0fcffc8b1aaec445943c6f7e366cf0dc2b722294f2540a0400a415913e7d7166f7e9f6
-  data.tar.gz: 5a08fbfd5dc3225bcd6d0383b930876db9d907fcf89a97c3d6b4844eb118fde5806490981aaa8fefee9bb62a325a17fda060764dc4465c56a4a7f2eaa960ff0c
+  metadata.gz: 2440c10e3c923ccfbe29e6730bbfae01385caf00a8d9c2aff001740c5f3e91670d8cfc020bfd4655fd143062a1a1921a21dcc6846424cef48403344b9841497b
+  data.tar.gz: 2beb8d98dade8520167c774714bb71673ee6f8329494a8b0a80674ac44f63384b50dd2af32dd20e01975dcb622a0624c74457fd730ea6a77b44ea821dfb41ed6

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.0.3'
+gem 'rubypitaya', '3.3.0'
 
 group :development do
   gem 'pry', '0.14.1'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -103,7 +103,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.0.3)
+    rubypitaya (3.3.0)
       activerecord (= 6.1.4.1)
       etcdv3 (= 0.11.4)
       google-protobuf (= 3.18.1)
@@ -143,7 +143,7 @@ DEPENDENCIES
   listen (= 3.7.0)
   pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 3.0.3)
+  rubypitaya (= 3.3.0)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/app/constants/status_codes.rb

@@ -11,6 +11,7 @@ class StatusCodes
   #
   #
   ## Error codes
+  # RubyPitaya::StatusCodes::CODE_ERROR                = 'RP-201'
   # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
   # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND    = 'RP-001'
   # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND     = 'RP-002'

data/lib/rubypitaya/app-template/plugins.yaml

@@ -0,0 +1,2 @@
+---
+plugins: {}

data/lib/rubypitaya/core/error.rb

@@ -0,0 +1,9 @@
+class RubyPitayaError < StandardError
+
+  def initialize(code, message)
+    @code = code
+    @message = message
+
+    super(message)
+  end
+end

data/lib/rubypitaya/core/main.rb

@@ -109,7 +109,7 @@ module RubyPitaya
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
       HttpRoutes.set :objects, @objects
-      HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
+      HttpRoutes.set :views, [Path::HTTP_VIEWS_FOLDER_PATH] + Path::Plugins::HTTP_VIEWS_FOLDER_PATHS
 
       HttpRoutes.auto_reload if @is_development_environment
 
@@ -190,9 +190,14 @@ module RubyPitaya
 
         response
       end
+      rescue RubyPitaya::Error => error
+        @log.error "ROUTE ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+        response = {
+          code: error.code,
+          message: error.message
+        }
       rescue Exception => error
-        @log.info "ERROR: #{error}"
-        @log.info error.backtrace.join("\n")
+        @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
         run_nats_connection
     end
   end

data/lib/rubypitaya/core/path.rb

@@ -10,10 +10,10 @@ module RubyPitaya
     APP_SETUP_FOLDER_PATH = File.join(Dir.pwd, 'app/setup/')
     MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'app/migrations/')
     PLUGINS_FOLDER_PATH = File.join(Dir.pwd, 'plugins/')
+    HTTP_VIEWS_FOLDER_PATH = File.join(Dir.pwd, 'app/http/views/')
 
     ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
-
-    HTTP_VIEWS_PATH = File.join(Dir.pwd, 'app/http/views')
+    PLUGIN_CONFIG_FILE_PATH = File.join(Dir.pwd, 'plugins.yaml')
 
 
     class Core
@@ -27,7 +27,7 @@ module RubyPitaya
       APP_CONFIG_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/config/'))
       APP_SETUP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/setup/'))
       MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/migrations/'))
-      HTTP_VIEWS_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views'))
+      HTTP_VIEWS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views/'))
     end
   end
 end

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -77,6 +77,14 @@ module RubyPitaya
       @@log
     end
 
+    def setup
+      @@setup
+    end
+
+    def config
+      @@config
+    end
+
     def session
       @@session
     end

data/lib/rubypitaya/core/status_codes.rb

@@ -5,6 +5,7 @@ module RubyPitaya
     CODE_OK = 'RP-200'
 
     # Error codes
+    CODE_ERROR = 'RP-201'
     CODE_UNKNOWN = 'RP-000'
     CODE_HANDLER_NOT_FOUND = 'RP-001'
     CODE_ACTION_NOT_FOUND = 'RP-002'

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.0.3'
+  VERSION = '3.3.0'
 end

data/lib/rubypitaya.rb

@@ -45,12 +45,14 @@ module RubyPitaya
       plugin_folder_path = File.join(Path::PLUGINS_FOLDER_PATH, plugin_name)
       plugin_git_path = File.join(plugin_folder_path, '.git/')
 
-      branch_command = ""
+      commit_hash = ''
+      branch_command = ''
       branch_command = "--branch #{branch_name}" unless branch_name.blank?
 
       FileUtils.rm_rf(plugin_folder_path) if File.exists?(plugin_folder_path)
       puts "git -C #{Path::PLUGINS_FOLDER_PATH} clone  --depth 1 #{branch_command} #{plugin_git_url}"
       `git -C #{Path::PLUGINS_FOLDER_PATH} clone --depth 1 #{branch_command} #{plugin_git_url}`
+      commit_hash = `git rev-parse --short HEAD`.strip
       FileUtils.rm_rf(plugin_git_path)
 
       Dir.entries(plugin_folder_path).each do |entry|
@@ -71,6 +73,15 @@ module RubyPitaya
         File.rename(migration_file, new_file)
       end
 
+      plugins_config = YAML.load(File.open(Path::PLUGIN_CONFIG_FILE_PATH, &:read))
+      plugins_config['plugins'][plugin_name] = {
+        'git' => plugin_git_url,
+        'branch' => branch_name || '',
+        'commit' => commit_hash,
+      }
+
+      File.open(Path::PLUGIN_CONFIG_FILE_PATH, 'w') { |f| f.write(plugins_config.to_yaml) }
+
       plugin_name
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -328,6 +328,7 @@ files:
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
+- "./lib/rubypitaya/app-template/plugins.yaml"
 - "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/spec_helper.rb"
@@ -338,6 +339,7 @@ files:
 - "./lib/rubypitaya/core/config_core.rb"
 - "./lib/rubypitaya/core/database_config.rb"
 - "./lib/rubypitaya/core/database_connector.rb"
+- "./lib/rubypitaya/core/error.rb"
 - "./lib/rubypitaya/core/etcd_connector.rb"
 - "./lib/rubypitaya/core/handler_base.rb"
 - "./lib/rubypitaya/core/handler_router.rb"