rubypitaya 1.1.0 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573d0dce81f6383ae631e5bcde6676f45d516ce7a38b51eefa4ebd922d229e4e
-  data.tar.gz: 1b163c885db0a3a532edfd21d07cd9058f7003f2ad44dd40e90429f1311c337e
+  metadata.gz: 01e78050058f7e00777d3d9f168855354b46796eec352f1df99bc27e7c16af3d
+  data.tar.gz: 7d875078ea6c1935a86ad06ca1e737ebdf2b1b7da14a8cc972d8e4d81c641542
 SHA512:
-  metadata.gz: b5a39ccf4533c32c285c1e31f0db14131c3a255639693e4c343b4d2f8cd2fda9f4be5d000c7b68a0a7b78fbb9a80d32e26a23792a3e88dbaab27efefd7ceb55c
-  data.tar.gz: bc1c57916f513bac17a22e8b3ad720d725d93fd9369111b6bcb0fd18175063c7a69e84e90cf1aaab474ad215c0658102c10c7355ce075783fa85c53302e98035
+  metadata.gz: 816cc0dc23754b0624a9cba1dd450986b6d1e5570c44995c03779a91fd3118f17c4cc6104b2fbbc3660bb43bdf1695922acc73625c450335bf9bfc2aa263ca7d
+  data.tar.gz: 3c2124c65a0c24e1c1bb3eebd4fd080b62f4938df37d161051df34522905087c42126d4bc764c3a4bb5bc79816035225241c316396cb0e90fdda469a03ff88e6

data/lib/rubypitaya/app-template/.gitignore

@@ -0,0 +1,166 @@
+### GEM ###
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status
+
+### History ###
+.irb-history
+.bash-history
+
+### Rider ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Ruby ###
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history

data/lib/rubypitaya/app-template/.irbrc

@@ -0,0 +1,10 @@
+require 'irb/completion'
+require 'irb/ext/save-history'
+IRB.conf[:SAVE_HISTORY] = 2000
+IRB.conf[:HISTORY_FILE] = '/app/rubypitaya/.irb-history'
+IRB.conf[:AUTO_INDENT] = true
+IRB.conf[:USE_READLINE] = true
+IRB.conf[:LOAD_MODULES] = [] unless IRB.conf.key?(:LOAD_MODULES)
+unless IRB.conf[:LOAD_MODULES].include?('irb/completion')
+  IRB.conf[:LOAD_MODULES] << 'irb/completion'
+end

data/lib/rubypitaya/app-template/Gemfile

@@ -1,10 +1,11 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.1.0'
+gem 'rubypitaya', '1.2.7'
 
 group :development do
   gem 'pry', '0.12.2'
   gem 'bundler', '1.17.2'
   gem 'rake', '10.0'
   gem 'rspec', '3.8.0'
+  gem 'listen', '3.2.1'
 end

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

@@ -18,14 +18,18 @@ GEM
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    google-protobuf (3.11.4)
+    ffi (1.12.2)
+    google-protobuf (3.11.4-x86_64-linux)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    grpc (1.28.0)
+    grpc (1.28.0-x86_64-linux)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     method_source (0.9.2)
     middleware (0.1.0)
     minitest (5.14.0)
@@ -41,6 +45,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (10.0.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     redis (4.1.3)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -55,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (1.1.0)
+    rubypitaya (1.2.7)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -74,10 +81,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (= 1.17.2)
+  listen (= 3.2.1)
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.0.6)
+  rubypitaya (= 1.2.7)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -44,7 +44,7 @@ generate-gemfilelock:
 
 ## Build image to production environment
 prod-build-image:
-	@docker build . -f docker/prod/Dockerfile -t registry.gitlab.com/lucianopc/ruby-pitaya-app:latest
+	@docker build . -f docker/prod/Dockerfile -t rubypitaya-prod:latest
 
 .DEFAULT_GOAL := show-help
 

data/lib/rubypitaya/app-template/docker/prod/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app/rubypitaya/
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle install
+RUN bundle install --without development
 
 COPY . .
 

data/lib/rubypitaya/core/application_files_importer.rb

@@ -9,5 +9,42 @@ module RubyPitaya
 
       Gem.find_files(app_files_path).each { |path| require path }
     end
+
+    def auto_reload
+      require 'listen'
+
+      @app_files_listener = Listen.to(Path::APP_FOLDER_PATH, only: /\.rb$/) do |modified, added, removed|
+        import_added_files(added)
+        reload_modified_files(modified)
+      end
+
+      @app_files_listener.start
+    end
+
+    private
+
+    def import_added_files(files_path)
+      Gem.find_files(files_path).each do |path|
+        require path
+
+        puts "ADDED ruby file: #{path}"
+      end
+
+      rescue Exception => error
+        puts "ERROR: #{error}"
+        puts error.backtrace
+    end
+
+    def reload_modified_files(files_path)
+      files_path.each do |path|
+        load(path)
+
+        puts "MODIFIED ruby file: #{path}"
+      end
+
+      rescue Exception => error
+        puts "ERROR: #{error}"
+        puts error.backtrace
+    end
   end
-end
+end

data/lib/rubypitaya/core/config.rb

@@ -3,23 +3,16 @@ module RubyPitaya
   class Config
 
     def initialize(configs_folder_path)
-      path_to_all_files = File.join(configs_folder_path, '**/*.json')
+      @configs_folder_path = configs_folder_path
+
+      path_to_all_files = File.join(@configs_folder_path, '**/*.json')
       config_files = Dir.glob(path_to_all_files)
 
-      config_hashes = []
+      @config = {}
 
       config_files.each do |config_file|
-        config_text = File.open(config_file, &:read)
-        config_readed = JSON.parse(config_text)
-
-        path_array = config_file.sub(/^#{configs_folder_path}/, '')[0..-6]
-                                .split('/')
-        config_hash = path_array.reverse.inject(config_readed) {|a, b| {b => a}}
-
-        config_hashes << config_hash
+        load_config_file(config_file)
       end
-
-      @config = config_hashes.inject(&:deep_merge)
     end
 
     def get
@@ -29,5 +22,63 @@ module RubyPitaya
     def [](key)
       @config[key]
     end
+
+    def auto_reload
+      require 'listen'
+
+      @config_files_listener = Listen.to(@configs_folder_path, only: /\.json$/) do |modified, added, removed|
+        import_added_files(added)
+        reload_modified_files(modified)
+      end
+
+      @config_files_listener.start
+    end
+
+    private
+
+    def load_config_file(file_path)
+      config_text = File.open(file_path, &:read)
+      config_hash = JSON.parse(config_text)
+
+      path_array = file_path.sub(/^#{@configs_folder_path}/, '')[0..-6]
+                              .split('/')
+
+      set_config_value(path_array, config_hash)
+
+      rescue Exception => error
+        puts "ERROR: #{error}"
+        puts error.backtrace
+    end
+
+    def import_added_files(files_path)
+      files_path.each do |path|
+        load_config_file(path)
+
+        puts "ADDED config: #{path}"
+      end
+    end
+
+    def reload_modified_files(files_path)
+      files_path.each do |path|
+        load_config_file(path)
+
+        puts "MODIFIED @config: #{path}"
+      end
+    end
+
+    def set_config_value(keys, value)
+      config = @config
+
+      keys.each_with_index do |key, index|
+        is_last_index = index == keys.size - 1
+
+        if is_last_index
+          config[key] = value
+        else
+          config[key] = {}
+          config = config[key]
+        end
+      end
+    end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -26,8 +26,12 @@ module RubyPitaya
 
     private
     def initialize
+      @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
+      @is_development_environment = @environment_name == 'development'
+
       @application_files_importer = ApplicationFilesImporter.new
       @application_files_importer.import
+      @application_files_importer.auto_reload if @is_development_environment
 
       @server_name = ENV['SERVER_NAME']
       @service_uuid = SecureRandom.uuid
@@ -49,7 +53,6 @@ module RubyPitaya
       @redis_connector = RedisConnector.new(@redis_address)
       @redis_connector.connect
 
-      @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
       @database_config = DatabaseConfig.new(@environment_name, Path::DATABASE_CONFIG_PATH)
       @database_connector = DatabaseConnector.new(@database_config)
       @database_connector.connect
@@ -57,6 +60,7 @@ module RubyPitaya
       @session = Session.new
       @postman = Postman.new(@nats_connector)
       @config = Config.new(Path::APP_CONFIG_FOLDER_PATH)
+      @config.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
 

data/lib/rubypitaya/version.rb

@@ -1,4 +1,4 @@
 module RubyPitaya
-  VERSION = "1.1.0"
+  VERSION = "1.2.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.7
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -164,6 +164,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -173,6 +187,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./lib/rubypitaya.rb"
+- "./lib/rubypitaya/app-template/.gitignore"
+- "./lib/rubypitaya/app-template/.irbrc"
 - "./lib/rubypitaya/app-template/Gemfile"
 - "./lib/rubypitaya/app-template/Gemfile.lock"
 - "./lib/rubypitaya/app-template/Makefile"