From 984c3230c413f7f156ebc9f484efe04db63048e2 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Tue, 21 Jan 2020 15:12:48 +0800 Subject: [PATCH 01/26] WIP - updated gemspec and gemfiles to point to cnfs gems --- services/iam/Gemfile.lock | 79 +++++++++++++++++++++-------- services/iam/lib/ros/iam/version.rb | 2 +- services/iam/ros-iam.gemspec | 10 ++-- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/services/iam/Gemfile.lock b/services/iam/Gemfile.lock index 272ca1f3e..41ee23057 100644 --- a/services/iam/Gemfile.lock +++ b/services/iam/Gemfile.lock @@ -47,12 +47,12 @@ PATH PATH remote: . specs: - ros-iam (0.1.0) + cnfs-iam (0.0.1.alpha) bcrypt (~> 3.1.12) + cnfs-core (= 0.0.1alpha) + cnfs_sdk (= 0.0.1alpha) devise (>= 4.7.1, < 5.0) rails (~> 6.0.2.1) - ros-core (~> 0.1.0) - ros_sdk (~> 0.1.0) GEM remote: https://rubygems.org/ @@ -130,13 +130,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.266.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -154,6 +154,43 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) choice (0.2.0) + cnfs-core (0.0.1.alpha) + attr_encrypted (~> 3.1.0) + avro_turf (~> 0.9.0) + aws-sdk-s3 (~> 1.60.1) + bullet (~> 6.1.0) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) + rails (~> 6.0.2.1) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) + rufus-scheduler (~> 3.6.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) + trailblazer-activity (~> 0.10.0) + trailblazer-activity-dsl-linear (~> 0.2.1) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) @@ -185,12 +222,12 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) + dry-initializer (3.0.3) dry-logic (1.0.5) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) + dry-schema (1.4.3) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.4) @@ -205,13 +242,13 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-validation (1.4.2) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) dry-core (~> 0.4) dry-equalizer (~> 0.2) dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-schema (~> 1.4, >= 1.4.3) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) @@ -224,13 +261,13 @@ GEM factory_bot_rails (5.1.1) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faker (2.10.0) - i18n (>= 1.6, < 1.8) + faker (2.10.1) + i18n (>= 1.6, < 2) faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) - ffi (1.11.3) + ffi (1.12.1) fluent-logger (0.8.2) msgpack (>= 1.0.0, < 2) fugit (1.3.3) @@ -249,7 +286,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.7.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) inifile (3.0.0) jaro_winkler (1.5.4) @@ -304,12 +341,12 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.19.1) - parser (2.7.0.1) + parser (2.7.0.2) ast (~> 2.4.0) perx-rubocop (0.0.3) rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) - pg (1.2.1) + pg (1.2.2) prometheus_exporter (0.4.13) pry (0.12.2) coderay (~> 1.1.0) @@ -319,7 +356,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -435,7 +472,7 @@ GEM rake (>= 10.0) sentry-raven (2.11.1) faraday (>= 0.7.6, < 1.0) - shoulda-matchers (4.1.2) + shoulda-matchers (4.2.0) activesupport (>= 4.2.0) sidekiq (6.0.0) connection_pool (>= 2.2.2) @@ -459,7 +496,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) tzinfo (1.2.6) @@ -467,7 +504,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) uniform_notifier (1.13.0) uri_template (0.7.0) warden (1.2.8) @@ -488,6 +525,7 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-iam! dotenv factory_bot_rails faker @@ -501,7 +539,6 @@ DEPENDENCIES pundit-matchers rails-erd ros-core! - ros-iam! ros_sdk! rspec-rails rspec_junit_formatter diff --git a/services/iam/lib/ros/iam/version.rb b/services/iam/lib/ros/iam/version.rb index 25bc11ac0..f13bc0899 100644 --- a/services/iam/lib/ros/iam/version.rb +++ b/services/iam/lib/ros/iam/version.rb @@ -2,6 +2,6 @@ module Ros module Iam - VERSION = '0.1.0' + VERSION = '0.0.1.alpha' end end diff --git a/services/iam/ros-iam.gemspec b/services/iam/ros-iam.gemspec index bcc824518..ea682c9ef 100644 --- a/services/iam/ros-iam.gemspec +++ b/services/iam/ros-iam.gemspec @@ -1,10 +1,11 @@ # frozen_string_literal: true $LOAD_PATH.push File.expand_path('lib', __dir__) +require 'ros/iam/version' Gem::Specification.new do |spec| - spec.name = 'ros-iam' - spec.version = '0.1.0' + spec.name = 'cnfs-iam' + spec.version = Ros::Iam::VERSION spec.authors = ['Robert Roach'] spec.email = ['rjayroach@gmail.com'] spec.homepage = 'https://github.com/rails-on-services' @@ -16,8 +17,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'bcrypt', '~> 3.1.12' spec.add_dependency 'rails', '~> 6.0.2.1' - # spec.add_dependency 'devise-jwt', '~> 0.5.8' spec.add_dependency 'devise', '>= 4.7.1', '< 5.0' - spec.add_dependency 'ros-core', '~> 0.1.0' - spec.add_dependency 'ros_sdk', '~> 0.1.0' + spec.add_dependency 'cnfs-core', '= 0.0.1alpha' + spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' end From d9630cbd2546c7e92836ba27b2c857cf05995ca7 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Tue, 21 Jan 2020 15:13:24 +0800 Subject: [PATCH 02/26] WIP - renamed gemspec --- services/iam/{ros-iam.gemspec => cnfs-iam.gemspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename services/iam/{ros-iam.gemspec => cnfs-iam.gemspec} (100%) diff --git a/services/iam/ros-iam.gemspec b/services/iam/cnfs-iam.gemspec similarity index 100% rename from services/iam/ros-iam.gemspec rename to services/iam/cnfs-iam.gemspec From 001a6a70739cbb8c2a4b09ad392b1642b8f1de94 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 12:31:41 +0800 Subject: [PATCH 03/26] WIP - updated iam gemspec --- services/iam/cnfs-iam.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/iam/cnfs-iam.gemspec b/services/iam/cnfs-iam.gemspec index ea682c9ef..b3c9641d3 100644 --- a/services/iam/cnfs-iam.gemspec +++ b/services/iam/cnfs-iam.gemspec @@ -6,9 +6,9 @@ require 'ros/iam/version' Gem::Specification.new do |spec| spec.name = 'cnfs-iam' spec.version = Ros::Iam::VERSION - spec.authors = ['Robert Roach'] - spec.email = ['rjayroach@gmail.com'] - spec.homepage = 'https://github.com/rails-on-services' + spec.authors = ['Robert Roach', 'Rui Baltazar'] + spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] + spec.homepage = 'http://guides.rails-on-services.org/' spec.summary = 'Provides Identity and Access Management for the Ros Platform' spec.description = 'Facilities to manage Users, Groups and Roles permission to Platform Resources' spec.license = 'MIT' From 9a885ea99a674ff8b4b386230241f7f514caf4de Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 12:31:54 +0800 Subject: [PATCH 04/26] WIP - prepared cognito gem --- services/cognito/lib/ros/cognito/version.rb | 2 +- services/cognito/ros-cognito.gemspec | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/cognito/lib/ros/cognito/version.rb b/services/cognito/lib/ros/cognito/version.rb index 1845a7cb3..9ceea59f1 100644 --- a/services/cognito/lib/ros/cognito/version.rb +++ b/services/cognito/lib/ros/cognito/version.rb @@ -2,6 +2,6 @@ module Ros module Cognito - VERSION = '0.1.0' + VERSION = '0.0.1.alpha' end end diff --git a/services/cognito/ros-cognito.gemspec b/services/cognito/ros-cognito.gemspec index 38da2bff5..af151c059 100644 --- a/services/cognito/ros-cognito.gemspec +++ b/services/cognito/ros-cognito.gemspec @@ -3,15 +3,15 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) # Maintain your gem's version: -# require 'ros/cognito/version' +require 'ros/cognito/version' # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| - spec.name = 'ros-cognito' - spec.version = '0.1.0' # Ros::Cognito::VERSION - spec.authors = ['Robert Roach'] - spec.email = ['rjayroach@gmail.com'] - spec.homepage = '' + spec.name = 'cnfs-cognito' + spec.version = Ros::Cognito::VERSION + spec.authors = ['Robert Roach', 'Rui Baltazar'] + spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] + spec.homepage = 'http://guides.rails-on-services.org/' spec.summary = ': Summary of Ros::Cognito.' spec.description = ': Description of Ros::Cognito.' spec.license = 'MIT' @@ -28,6 +28,6 @@ Gem::Specification.new do |spec| spec.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] spec.add_dependency 'rails', '~> 6.0.2.1' - - # spec.add_development_dependency 'sqlite3' + spec.add_dependency 'cnfs-core', '= 0.0.1alpha' + spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' end From 6ef1207fe8b84dd4c8dd7fe60bea6a1ee81e1dca Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 12:32:28 +0800 Subject: [PATCH 05/26] WIP - renamed gemspec file --- services/cognito/{ros-cognito.gemspec => cnfs-cognito.gemspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename services/cognito/{ros-cognito.gemspec => cnfs-cognito.gemspec} (100%) diff --git a/services/cognito/ros-cognito.gemspec b/services/cognito/cnfs-cognito.gemspec similarity index 100% rename from services/cognito/ros-cognito.gemspec rename to services/cognito/cnfs-cognito.gemspec From 5db7fafae87ced358d20a10e214b080421772ee9 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 12:58:43 +0800 Subject: [PATCH 06/26] WIP - specified ruby version --- services/cognito/cnfs-cognito.gemspec | 10 +--------- services/cognito/lib/ros/cognito/version.rb | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/services/cognito/cnfs-cognito.gemspec b/services/cognito/cnfs-cognito.gemspec index af151c059..98836632b 100644 --- a/services/cognito/cnfs-cognito.gemspec +++ b/services/cognito/cnfs-cognito.gemspec @@ -15,15 +15,7 @@ Gem::Specification.new do |spec| spec.summary = ': Summary of Ros::Cognito.' spec.description = ': Description of Ros::Cognito.' spec.license = 'MIT' - - # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host' - # to allow pushing to a single host or delete this section to allow pushing to any host. - if spec.respond_to?(:metadata) - spec.metadata['allowed_push_host'] = ": Set to 'http://mygemserver.com'" - else - raise 'RubyGems 2.0 or newer is required to protect against ' \ - 'public gem pushes.' - end + spec.required_ruby_version = ['> 2.6.0', '< 2.7' ] spec.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] diff --git a/services/cognito/lib/ros/cognito/version.rb b/services/cognito/lib/ros/cognito/version.rb index 9ceea59f1..8f9c80346 100644 --- a/services/cognito/lib/ros/cognito/version.rb +++ b/services/cognito/lib/ros/cognito/version.rb @@ -2,6 +2,6 @@ module Ros module Cognito - VERSION = '0.0.1.alpha' + VERSION = '0.0.1.alpha1' end end From 483cd2846c76fc6599805b6df7ecb634252b4584 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 13:24:22 +0800 Subject: [PATCH 07/26] WIP - updated cognito dependency --- services/cognito/Gemfile.lock | 43 +++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/services/cognito/Gemfile.lock b/services/cognito/Gemfile.lock index 27fa9c3a7..86b9cacba 100644 --- a/services/cognito/Gemfile.lock +++ b/services/cognito/Gemfile.lock @@ -47,7 +47,9 @@ PATH PATH remote: . specs: - ros-cognito (0.1.0) + cnfs-cognito (0.0.1.alpha1) + cnfs-core (= 0.0.1alpha) + cnfs_sdk (= 0.0.1alpha) rails (~> 6.0.2.1) GEM @@ -149,6 +151,43 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) choice (0.2.0) + cnfs-core (0.0.1.alpha) + attr_encrypted (~> 3.1.0) + avro_turf (~> 0.9.0) + aws-sdk-s3 (~> 1.60.1) + bullet (~> 6.1.0) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) + rails (~> 6.0.2.1) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) + rufus-scheduler (~> 3.6.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) + trailblazer-activity (~> 0.10.0) + trailblazer-activity-dsl-linear (~> 0.2.1) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) @@ -473,6 +512,7 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-cognito! dotenv factory_bot_rails faker @@ -485,7 +525,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-cognito! ros-core! ros_sdk! rspec-rails From 75b7c99769e1256235286a8f3f9dc60be1eb50f2 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 13:26:32 +0800 Subject: [PATCH 08/26] [Hotfix] updated ros-core to cnfs-core --- lib/core/Gemfile | 6 +- lib/core/Gemfile.lock | 145 +++++++++++++++++-------------------- lib/core/cnfs-core.gemspec | 50 +++++++++++++ lib/core/ros-core.gemspec | 50 ------------- 4 files changed, 117 insertions(+), 134 deletions(-) create mode 100644 lib/core/cnfs-core.gemspec delete mode 100644 lib/core/ros-core.gemspec diff --git a/lib/core/Gemfile b/lib/core/Gemfile index 8a89b5b15..7263a4a50 100644 --- a/lib/core/Gemfile +++ b/lib/core/Gemfile @@ -2,11 +2,9 @@ source ENV['GEM_SERVER'] || 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec +gem 'awesome_print' gem 'pg' gem 'pry-rails' -gem 'awesome_print' - -gem 'ros_sdk', path: '../sdk' group :development do gem 'bullet' @@ -14,6 +12,6 @@ end group :development, :test do gem 'brakeman', require: false - gem 'spring-commands-rspec' gem 'database_cleaner' + gem 'spring-commands-rspec' end diff --git a/lib/core/Gemfile.lock b/lib/core/Gemfile.lock index d726d3785..2acf49aa2 100644 --- a/lib/core/Gemfile.lock +++ b/lib/core/Gemfile.lock @@ -1,48 +1,35 @@ -PATH - remote: ../sdk - specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) - request_store (= 1.5.0) - PATH remote: . specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) GEM remote: https://rubygems.org/ @@ -113,13 +100,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.266.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -133,15 +120,23 @@ GEM bullet (6.1.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) - crass (1.0.5) + crass (1.0.6) database_cleaner (1.7.0) declarative (0.0.10) declarative-option (0.1.0) @@ -158,33 +153,24 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) @@ -197,9 +183,9 @@ GEM factory_bot_rails (5.0.2) factory_bot (~> 5.0.2) railties (>= 4.2.0) - faraday (0.17.1) + faraday (0.17.3) multipart-post (>= 1.2, < 3) - faraday_middleware (0.13.1) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) fluent-logger (0.8.2) msgpack (>= 1.0.0, < 2) @@ -211,12 +197,12 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) hashids (1.0.5) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.4.0) @@ -227,15 +213,15 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) - jsonapi-resources (0.9.10) + jsonapi-resources (0.9.11) activerecord (>= 4.1) concurrent-ruby railties (>= 4.1) @@ -251,7 +237,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) msgpack (1.3.1) multi_json (1.14.1) multipart-post (2.1.1) @@ -259,18 +245,18 @@ GEM nokogiri (1.10.7) mini_portile2 (~> 2.4.0) parallel (1.19.1) - pg (1.2.0) - prometheus_exporter (0.4.13) + pg (1.2.2) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.2) + public_suffix (4.0.3) pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.0.8) + rack (2.1.1) rack-cors (1.1.1) rack (>= 2.0.0) rack-fluentd-logger (0.1.5) @@ -346,9 +332,9 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -367,7 +353,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) trailblazer-developer (0.0.10) @@ -385,7 +371,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -397,16 +383,15 @@ DEPENDENCIES awesome_print brakeman bullet + cnfs-core! database_cleaner factory_bot_rails (~> 5.0.2) pg pry-rails - ros-core! - ros_sdk! rspec-rails (~> 3.8.2) rspec_junit_formatter (~> 0.4.1) spring-commands-rspec - trailblazer-developer + trailblazer-developer (~> 0.0.10) BUNDLED WITH 2.1.2 diff --git a/lib/core/cnfs-core.gemspec b/lib/core/cnfs-core.gemspec new file mode 100644 index 000000000..0bf9f9bfc --- /dev/null +++ b/lib/core/cnfs-core.gemspec @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +$LOAD_PATH.push File.expand_path('lib', __dir__) + +Gem::Specification.new do |spec| + spec.name = 'cnfs-core' + spec.version = '0.0.1.alpha' + spec.authors = ['Robert Roach'] + spec.email = ['rjayroach@gmail.com'] + spec.homepage = 'https://github.com/rails-on-services' + spec.summary = 'Provides common support services to Rails on Services based Projects' + spec.description = 'Base controller, model, resource and policy classes; authentication with JWT, per request tenant selection, exception reporting' + spec.license = 'MIT' + + spec.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] + + spec.add_dependency 'attr_encrypted', '~> 3.1.0' + spec.add_dependency 'avro_turf', '~> 0.9.0' + spec.add_dependency 'aws-sdk-s3', '~> 1.60.1' + spec.add_dependency 'bullet', '~> 6.1.0' + spec.add_dependency 'cnfs_sdk', '= 0.0.1.alpha' + spec.add_dependency 'config', '~> 1.7.1' + spec.add_dependency 'dotenv', '~> 2.7.5' + spec.add_dependency 'grpc', '~> 1.23.0' + spec.add_dependency 'hashids', '~> 1.0.5' + spec.add_dependency 'json_schemer', '~> 0.2.6' + spec.add_dependency 'jsonapi-authorization', '~> 3.0.1' + spec.add_dependency 'jsonapi-resources', '~> 0.9.10' + spec.add_dependency 'jwt', '~> 2.2.1' + spec.add_dependency 'prometheus_exporter', '~> 0.4.13' + spec.add_dependency 'pry-rails', '~> 0.3.9' + spec.add_dependency 'rack-cors', '~> 1.1.1' + spec.add_dependency 'rack-fluentd-logger', '~> 0.1.5' + spec.add_dependency 'rails', '~> 6.0.2.1' + spec.add_dependency 'ros-apartment', '~> 2.3.0' + spec.add_dependency 'ros-apartment-sidekiq', '~> 1.2.0' + spec.add_dependency 'rufus-scheduler', '~> 3.6.0' + spec.add_dependency 'seedbank', '~> 0.5.0' + spec.add_dependency 'sentry-raven', '~> 2.11.1' + spec.add_dependency 'sidekiq', '~> 6.0.0' + spec.add_dependency 'trailblazer-activity', '~> 0.10.0' + spec.add_dependency 'trailblazer-activity-dsl-linear', '~> 0.2.1' + spec.add_dependency 'warden', '~> 1.2.8' + spec.add_dependency 'zero-rails_openapi', '~> 2.1.0' + + spec.add_development_dependency 'factory_bot_rails', '~> 5.0.2' + spec.add_development_dependency 'rspec-rails', '~> 3.8.2' + spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1' + spec.add_development_dependency 'trailblazer-developer', '~> 0.0.10' +end diff --git a/lib/core/ros-core.gemspec b/lib/core/ros-core.gemspec deleted file mode 100644 index 628810142..000000000 --- a/lib/core/ros-core.gemspec +++ /dev/null @@ -1,50 +0,0 @@ -$:.push File.expand_path("lib", __dir__) - -# require 'ros/core/version' - -Gem::Specification.new do |spec| - spec.name = 'ros-core' - spec.version = '0.1.0' # Ros::Core::VERSION - spec.authors = ['Robert Roach'] - spec.email = ['rjayroach@gmail.com'] - spec.homepage = 'https://github.com/rails-on-services' - spec.summary = 'Provides common support services to Rails on Services based Projects' - spec.description = 'Base controller, model, resource and policy classes; authentication with JWT, per request tenant selection, exception reporting' - spec.license = 'MIT' - - spec.files = Dir["{app,config,db,lib}/**/*", 'MIT-LICENSE', 'Rakefile', 'README.md'] - - spec.add_dependency 'ros-apartment', '2.3.0' - spec.add_dependency 'ros-apartment-sidekiq', '1.2.0' - spec.add_dependency 'attr_encrypted', '~> 3.1.0' - spec.add_dependency 'avro_turf', '~> 0.9.0' - spec.add_dependency 'aws-sdk-s3' - spec.add_dependency 'bullet', '~> 6.1.0' - spec.add_dependency 'config', '1.7.1' - spec.add_dependency 'dotenv' - spec.add_dependency 'hashids', '1.0.5' - spec.add_dependency 'grpc', '1.23.0' - spec.add_dependency 'json_schemer', '0.2.6' - spec.add_dependency 'jsonapi-authorization', '3.0.1' - spec.add_dependency 'jsonapi-resources', '0.9.10' - spec.add_dependency 'jwt', '2.2.1' - spec.add_dependency 'prometheus_exporter', '0.4.13' - spec.add_dependency 'pry-rails', '0.3.9' - spec.add_dependency 'rack-cors' - spec.add_dependency 'rack-fluentd-logger', '0.1.5' - spec.add_dependency 'rails', '~> 6.0.2.1' - spec.add_dependency 'rufus-scheduler', '~> 3.6.0' - spec.add_dependency 'seedbank', '0.5.0' - spec.add_dependency 'sentry-raven', '2.11.1' - spec.add_dependency 'sidekiq', '6.0.0' - spec.add_dependency 'trailblazer-activity', '~> 0.10.0' - spec.add_dependency 'trailblazer-activity-dsl-linear', '~> 0.2.1' - spec.add_dependency 'warden', '1.2.8' - spec.add_dependency 'zero-rails_openapi', '2.1.0' - # spec.add_dependency 'ros_sdk', '~> 0.1.0' - - spec.add_development_dependency 'factory_bot_rails', '~> 5.0.2' - spec.add_development_dependency 'rspec-rails', '~> 3.8.2' - spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1' - spec.add_development_dependency 'trailblazer-developer' -end From b35bfe34890787d174aa3482f9b990c1670a2e60 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 13:28:04 +0800 Subject: [PATCH 09/26] [Hotfix] updated ros-sdk to cnfs-sdk --- lib/sdk/Gemfile.lock | 67 ++++++++----------- lib/sdk/{ros_sdk.gemspec => cnfs_sdk.gemspec} | 27 ++++---- lib/sdk/lib/ros_sdk/version.rb | 6 +- 3 files changed, 45 insertions(+), 55 deletions(-) rename lib/sdk/{ros_sdk.gemspec => cnfs_sdk.gemspec} (62%) diff --git a/lib/sdk/Gemfile.lock b/lib/sdk/Gemfile.lock index 1f98bb595..dfb48765e 100644 --- a/lib/sdk/Gemfile.lock +++ b/lib/sdk/Gemfile.lock @@ -1,16 +1,14 @@ PATH remote: . specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) - request_store (= 1.5.0) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) GEM remote: https://rubygems.org/ @@ -28,10 +26,10 @@ GEM awesome_print (1.8.0) coderay (1.1.2) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) deep_merge (1.2.1) diff-lcs (1.3) dry-configurable (0.9.0) @@ -44,40 +42,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) - faraday_middleware (0.13.1) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) inifile (3.0.0) json_api_client (1.15.0) @@ -89,13 +78,13 @@ GEM rack (>= 0.2) jwt (2.2.1) method_source (0.9.2) - minitest (5.13.0) + minitest (5.14.0) multipart-post (2.1.1) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (4.0.2) - rack (2.0.8) + public_suffix (4.0.3) + rack (2.1.1) rake (12.3.3) request_store (1.5.0) rack (>= 1.4) @@ -121,11 +110,11 @@ PLATFORMS ruby DEPENDENCIES - awesome_print (= 1.8.0) + awesome_print (~> 1.8.0) bundler (~> 2.0) + cnfs_sdk! + pry (~> 0.12.2) rake (~> 12.0) - ros_sdk! - rspec (~> 3.9.0) BUNDLED WITH 2.1.4 diff --git a/lib/sdk/ros_sdk.gemspec b/lib/sdk/cnfs_sdk.gemspec similarity index 62% rename from lib/sdk/ros_sdk.gemspec rename to lib/sdk/cnfs_sdk.gemspec index 5928032de..bbb354b1a 100644 --- a/lib/sdk/ros_sdk.gemspec +++ b/lib/sdk/cnfs_sdk.gemspec @@ -1,11 +1,12 @@ # frozen_string_literal: true -lib = File.expand_path("../lib", __FILE__) +lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'ros_sdk/version' Gem::Specification.new do |spec| - spec.name = 'ros_sdk' - spec.version = '0.1.0' + spec.name = 'cnfs_sdk' + spec.version = RosSdk::VERSION spec.authors = ['Robert Roach'] spec.email = ['rjayroach@gmail.com'] @@ -19,24 +20,24 @@ Gem::Specification.new do |spec| # spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do # `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } # end - spec.files = Dir["{bin,lib}/**/*", 'ros_sdk.gemspec', 'settings.yml', 'Rakefile', 'README.md'] + spec.files = Dir['{bin,lib}/**/*', 'cnfs_sdk.gemspec', 'settings.yml', 'Rakefile', 'README.md'] spec.bindir = 'exe' spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'activemodel', '6.0.2.1' - spec.add_dependency 'activesupport', '6.0.2.1' - spec.add_dependency 'config', '1.7.1' - spec.add_dependency 'globalid', '0.4.2' - spec.add_dependency 'inifile', '3.0.0' - spec.add_dependency 'json_api_client', '1.15.0' - spec.add_dependency 'jwt', '2.2.1' - spec.add_dependency 'pry', '0.12.2' + spec.add_dependency 'activemodel', '~> 6.0.2.1' + spec.add_dependency 'activesupport', '~> 6.0.2.1' + spec.add_dependency 'config', '~> 1.7.1' + spec.add_dependency 'globalid', '~> 0.4.2' + spec.add_dependency 'inifile', '~> 3.0.0' + spec.add_dependency 'json_api_client', '~> 1.15.0' + spec.add_dependency 'jwt', '~> 2.2.1' spec.add_dependency 'request_store', '1.5.0' - spec.add_development_dependency 'awesome_print', '1.8.0' + spec.add_development_dependency 'awesome_print', '~> 1.8.0' spec.add_development_dependency 'bundler', '~> 2.0' + spec.add_development_dependency 'pry', '~> 0.12.2' spec.add_development_dependency 'rake', '~> 12.0' spec.add_development_dependency 'rspec', '~> 3.9.0' end diff --git a/lib/sdk/lib/ros_sdk/version.rb b/lib/sdk/lib/ros_sdk/version.rb index e4f823a05..d0675bded 100644 --- a/lib/sdk/lib/ros_sdk/version.rb +++ b/lib/sdk/lib/ros_sdk/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -# module Ros::Client -# VERSION = "0.1.0" -# end +module RosSdk + VERSION = '0.0.1.alpha' +end From 693b9620bb0394e5357296658f162728a0885898 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:25:45 +0800 Subject: [PATCH 10/26] WIP - updated comm gemspec --- services/comm/ros-comm.gemspec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/services/comm/ros-comm.gemspec b/services/comm/ros-comm.gemspec index ee348e142..4faa5dd4f 100644 --- a/services/comm/ros-comm.gemspec +++ b/services/comm/ros-comm.gemspec @@ -1,22 +1,26 @@ # frozen_string_literal: true -$:.push File.expand_path("lib", __dir__) +$LOAD_PATH.push File.expand_path('lib', __dir__) + +# Maintain your gem's version: +require 'ros/comm/version' Gem::Specification.new do |spec| - spec.name = 'ros-comm' - spec.version = '0.1.0' - spec.authors = ['Robert Roach'] - spec.email = ['rjayroach@gmail.com'] - spec.homepage = 'https://github.com/rails-on-services' + spec.name = 'cnfs-comm' + spec.version = Ros::Comm::VERSION + spec.authors = ['Robert Roach', 'Rui Baltazar'] + spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] + spec.homepage = 'http://guides.rails-on-services.org/' spec.summary = 'Provides communication tools, e.g. Twilio to the Ros Platform' spec.description = '3rd party communication services can be invoked by other services per tenant' spec.license = 'MIT' + spec.required_ruby_version = ['> 2.6.0', '< 2.7' ] spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] + spec.add_dependency 'aws-sdk-sns', '~> 1.21.0' + spec.add_dependency 'cnfs-core', '= 0.0.1alpha' + spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' spec.add_dependency 'rails', '~> 6.0.2.1' - spec.add_dependency 'twilio-ruby' - spec.add_dependency 'aws-sdk-sns' - spec.add_dependency 'ros-core', '~> 0.1.0' - spec.add_dependency 'ros_sdk', '~> 0.1.0' + spec.add_dependency 'twilio-ruby', '~> 5.31.0' end From 26b5bde2e48eacabd2e617722df968938695871d Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:26:22 +0800 Subject: [PATCH 11/26] WIP - updated gem version --- services/comm/lib/ros/comm/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/comm/lib/ros/comm/version.rb b/services/comm/lib/ros/comm/version.rb index 6f9152f83..41697a311 100644 --- a/services/comm/lib/ros/comm/version.rb +++ b/services/comm/lib/ros/comm/version.rb @@ -2,6 +2,6 @@ module Ros module Comm - VERSION = '0.1.0' + VERSION = '0.0.1.alpha' end end From dcd49fdb2772aeeb7da38f812350ea2073bfcbae Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:27:13 +0800 Subject: [PATCH 12/26] WIP - renamed gemspec file --- services/comm/{ros-comm.gemspec => cnfs-comm.gemspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename services/comm/{ros-comm.gemspec => cnfs-comm.gemspec} (100%) diff --git a/services/comm/ros-comm.gemspec b/services/comm/cnfs-comm.gemspec similarity index 100% rename from services/comm/ros-comm.gemspec rename to services/comm/cnfs-comm.gemspec From 506fa8e4438de7a57c9fbb4eb46339e31fd87b48 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:40:08 +0800 Subject: [PATCH 13/26] WIP - preparing org release --- .../lib/ros/organization/version.rb | 6 ++-- .../organization/ros-organization.gemspec | 29 ++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/services/organization/lib/ros/organization/version.rb b/services/organization/lib/ros/organization/version.rb index a3c5b236b..b54d88c53 100644 --- a/services/organization/lib/ros/organization/version.rb +++ b/services/organization/lib/ros/organization/version.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true -module Organization - VERSION = '0.1.0' +module Ros + module Organization + VERSION = '0.0.1.alpha' + end end diff --git a/services/organization/ros-organization.gemspec b/services/organization/ros-organization.gemspec index ec9c690b0..f529b19b5 100644 --- a/services/organization/ros-organization.gemspec +++ b/services/organization/ros-organization.gemspec @@ -1,22 +1,25 @@ -$:.push File.expand_path("lib", __dir__) +# frozen_string_literal: true + +$LOAD_PATH.push File.expand_path('lib', __dir__) # Maintain your gem's version: -# require "organization/version" +require 'ros/organization/version' # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| - spec.name = "ros-organization" - spec.version = '0.1.0' - spec.authors = ["Write your name"] - spec.email = ["Write your email address"] - # spec.homepage = "TODO" - spec.summary = "Summary of Organization." - spec.description = "Description of Organization." - spec.license = "MIT" + spec.name = 'cnfs-organization' + spec.version = Ros::Cognito::VERSION + spec.authors = ['Robert Roach', 'Rui Baltazar'] + spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] + spec.homepage = 'http://guides.rails-on-services.org/' + spec.summary = 'Summary of Organization.' + spec.description = 'Description of Organization.' + spec.license = 'MIT' + spec.required_ruby_version = ['> 2.6.0', '< 2.7' ] - spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] + spec.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] spec.add_dependency 'rails', '~> 6.0.2.1' - spec.add_dependency 'ros-core', '~> 0.1.0' - spec.add_dependency 'ros_sdk', '~> 0.1.0' + spec.add_dependency 'cnfs-core', '= 0.0.1alpha' + spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' end From 25971413fe23a545efdaccdf0f982b680dbb7086 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:40:50 +0800 Subject: [PATCH 14/26] WIP - renamed gemspec --- .../{ros-organization.gemspec => cnfs-organization.gemspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename services/organization/{ros-organization.gemspec => cnfs-organization.gemspec} (100%) diff --git a/services/organization/ros-organization.gemspec b/services/organization/cnfs-organization.gemspec similarity index 100% rename from services/organization/ros-organization.gemspec rename to services/organization/cnfs-organization.gemspec From 60c71a25cc294edf65a902fe6e6b3c8c45b2942a Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:42:28 +0800 Subject: [PATCH 15/26] WIP - fixed version in gemspec --- services/organization/cnfs-organization.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/organization/cnfs-organization.gemspec b/services/organization/cnfs-organization.gemspec index f529b19b5..139b031f0 100644 --- a/services/organization/cnfs-organization.gemspec +++ b/services/organization/cnfs-organization.gemspec @@ -8,7 +8,7 @@ require 'ros/organization/version' # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| spec.name = 'cnfs-organization' - spec.version = Ros::Cognito::VERSION + spec.version = Ros::Organization::VERSION spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/' From 6f271689cd2ec31c4c3e493fca3fc8e7eb645cb0 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 14:59:52 +0800 Subject: [PATCH 16/26] WIP - cleanup storage gemfile --- services/storage/lib/storage.rb | 1 - services/storage/ros-storage.gemspec | 45 ++++++++++++---------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/services/storage/lib/storage.rb b/services/storage/lib/storage.rb index 01c241e3a..56cd5d2c2 100644 --- a/services/storage/lib/storage.rb +++ b/services/storage/lib/storage.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'aasm' require 'ros/core' require 'storage/engine' diff --git a/services/storage/ros-storage.gemspec b/services/storage/ros-storage.gemspec index 102667319..610d62379 100644 --- a/services/storage/ros-storage.gemspec +++ b/services/storage/ros-storage.gemspec @@ -1,35 +1,28 @@ -$:.push File.expand_path("lib", __dir__) +# frozen_string_literal: true + +$LOAD_PATH.push File.expand_path('lib', __dir__) # Maintain your gem's version: -# require "storage/version" +require 'ros/storage/version' # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| - spec.name = "ros-storage" - spec.version = '0.1.0' - spec.authors = ['Robert Roach'] - spec.email = ['rjayroach@gmail.com'] - spec.homepage = 'https://github.com/rails-on-services' - spec.summary = "Manages uploads and downloads of files via UI and SFTP" - spec.description = "Processes CSV files, notifies other services when new files are available" - spec.license = "MIT" - - # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host' - # to allow pushing to a single host or delete this section to allow pushing to any host. - if spec.respond_to?(:metadata) - spec.metadata["allowed_push_host"] = "Set to 'http://mygemserver.com'" - else - raise "RubyGems 2.0 or newer is required to protect against " \ - "public gem pushes." - end + spec.name = 'cnfs-storage' + spec.version = Ros::Storage::VERSION + spec.authors = ['Robert Roach', 'Rui Baltazar'] + spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] + spec.homepage = 'http://guides.rails-on-services.org/' + spec.summary = 'Manages uploads and downloads of files via UI and SFTP' + spec.description = 'Processes CSV files, notifies other services when new files are available' + spec.license = 'MIT' + spec.required_ruby_version = ['> 2.6.0', '< 2.7' ] - spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] + spec.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] + spec.add_dependency 'aws-sdk-sqs', '~> 1.23.1' + spec.add_dependency 'cnfs-core', '= 0.0.1alpha' + spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' + spec.add_dependency 'net-sftp', '~> 2.1.2' spec.add_dependency 'rails', '~> 6.0.2.1' - spec.add_dependency 'shoryuken' - spec.add_dependency 'aasm' - spec.add_dependency 'aws-sdk-sqs' - spec.add_dependency 'net-sftp' - spec.add_dependency 'ros-core', '~> 0.1.0' - spec.add_dependency 'ros_sdk', '~> 0.1.0' + spec.add_dependency 'shoryuken', '~> 5.0.2' end From 087b0e068db43deb70d421362a49a67a6334f531 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:00:54 +0800 Subject: [PATCH 17/26] WIP - renamed file --- services/storage/{ros-storage.gemspec => cnfs-storage.gemspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename services/storage/{ros-storage.gemspec => cnfs-storage.gemspec} (100%) diff --git a/services/storage/ros-storage.gemspec b/services/storage/cnfs-storage.gemspec similarity index 100% rename from services/storage/ros-storage.gemspec rename to services/storage/cnfs-storage.gemspec From e2a206b34086fdc0ebeaa976884e432d230135c7 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:01:43 +0800 Subject: [PATCH 18/26] WIP - fixed version --- services/storage/lib/storage/version.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/storage/lib/storage/version.rb b/services/storage/lib/storage/version.rb index 007e78c20..bec0ff5e4 100644 --- a/services/storage/lib/storage/version.rb +++ b/services/storage/lib/storage/version.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true -module Storage - VERSION = '0.1.0' +module Ros + module Storage + VERSION = '0.0.1.alpha' + end end From 17c2f39f604f91ad51fe010d7ca1fc4d1afd4c67 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:03:57 +0800 Subject: [PATCH 19/26] WIP - replicated folder structure --- services/storage/lib/{ => ros}/storage.rb | 0 services/storage/lib/{ => ros}/storage/engine.rb | 0 services/storage/lib/{ => ros}/storage/version.rb | 0 services/storage/lib/tasks/{ => ros}/storage_tasks.rake | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename services/storage/lib/{ => ros}/storage.rb (100%) rename services/storage/lib/{ => ros}/storage/engine.rb (100%) rename services/storage/lib/{ => ros}/storage/version.rb (100%) rename services/storage/lib/tasks/{ => ros}/storage_tasks.rake (100%) diff --git a/services/storage/lib/storage.rb b/services/storage/lib/ros/storage.rb similarity index 100% rename from services/storage/lib/storage.rb rename to services/storage/lib/ros/storage.rb diff --git a/services/storage/lib/storage/engine.rb b/services/storage/lib/ros/storage/engine.rb similarity index 100% rename from services/storage/lib/storage/engine.rb rename to services/storage/lib/ros/storage/engine.rb diff --git a/services/storage/lib/storage/version.rb b/services/storage/lib/ros/storage/version.rb similarity index 100% rename from services/storage/lib/storage/version.rb rename to services/storage/lib/ros/storage/version.rb diff --git a/services/storage/lib/tasks/storage_tasks.rake b/services/storage/lib/tasks/ros/storage_tasks.rake similarity index 100% rename from services/storage/lib/tasks/storage_tasks.rake rename to services/storage/lib/tasks/ros/storage_tasks.rake From 7372d991992d311bac6cc5e8d2af94683efb9c9c Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:13:28 +0800 Subject: [PATCH 20/26] WIP - fixing file referencign --- services/storage/lib/ros/storage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/storage/lib/ros/storage.rb b/services/storage/lib/ros/storage.rb index 56cd5d2c2..714544a5d 100644 --- a/services/storage/lib/ros/storage.rb +++ b/services/storage/lib/ros/storage.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'ros/core' -require 'storage/engine' +require 'ros/storage/engine' module Ros class << self From 5aa649b63b602c887971d39bb0a7ac07503f9389 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:21:18 +0800 Subject: [PATCH 21/26] WIP - added missing dependency to comm gem --- services/comm/cnfs-comm.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/services/comm/cnfs-comm.gemspec b/services/comm/cnfs-comm.gemspec index 4faa5dd4f..03a685a9a 100644 --- a/services/comm/cnfs-comm.gemspec +++ b/services/comm/cnfs-comm.gemspec @@ -18,6 +18,7 @@ Gem::Specification.new do |spec| spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] + spec.add_dependency 'aasm', '~> 5.0.6' spec.add_dependency 'aws-sdk-sns', '~> 1.21.0' spec.add_dependency 'cnfs-core', '= 0.0.1alpha' spec.add_dependency 'cnfs_sdk', '= 0.0.1alpha' From e40e713f46515c7025885f5fa70435822147ae14 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Thu, 23 Jan 2020 15:22:41 +0800 Subject: [PATCH 22/26] WIP - increment alpha version --- services/comm/lib/ros/comm/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/comm/lib/ros/comm/version.rb b/services/comm/lib/ros/comm/version.rb index 41697a311..aeff7a98f 100644 --- a/services/comm/lib/ros/comm/version.rb +++ b/services/comm/lib/ros/comm/version.rb @@ -2,6 +2,6 @@ module Ros module Comm - VERSION = '0.0.1.alpha' + VERSION = '0.0.1.alpha1' end end From d59686b3872f0850a0fc8880cbf817e03ef42a03 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Tue, 28 Jan 2020 12:26:54 +0800 Subject: [PATCH 23/26] [Hotfix] Fixed all things that are not related with namespacing isolation --- lib/core/spec/dummy/config/environments/test.rb | 3 --- lib/sdk/cnfs_sdk.gemspec | 4 ++-- services/Gemfile | 4 ++-- services/comm/lib/ros/comm.rb | 1 + services/iam/spec/dummy/config/environments/test.rb | 3 --- services/storage/spec/dummy/config/application.rb | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/core/spec/dummy/config/environments/test.rb b/lib/core/spec/dummy/config/environments/test.rb index d859f0978..35fc7ccd5 100644 --- a/lib/core/spec/dummy/config/environments/test.rb +++ b/lib/core/spec/dummy/config/environments/test.rb @@ -39,7 +39,4 @@ # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true - - # Prevent expensive template finalization at end of test suite runs. - config.action_view.finalize_compiled_template_methods = false end diff --git a/lib/sdk/cnfs_sdk.gemspec b/lib/sdk/cnfs_sdk.gemspec index bbb354b1a..b90375b61 100644 --- a/lib/sdk/cnfs_sdk.gemspec +++ b/lib/sdk/cnfs_sdk.gemspec @@ -1,7 +1,7 @@ # frozen_string_literal: true -lib = File.expand_path('lib', __dir__) -$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +$LOAD_PATH.push File.expand_path('lib', __dir__) + require 'ros_sdk/version' Gem::Specification.new do |spec| diff --git a/services/Gemfile b/services/Gemfile index 78881473a..916a948c4 100644 --- a/services/Gemfile +++ b/services/Gemfile @@ -7,8 +7,8 @@ gem 'pry-rails' gem 'awesome_print' gem 'pg' -gem 'ros-core', path: '../../lib/core' -gem 'ros_sdk', path: '../../lib/sdk' +gem 'cnfs-core', path: '../../lib/core' +gem 'cnfs_sdk', path: '../../lib/sdk' group :development do gem 'listen', '>= 3.0.5', '< 3.2' diff --git a/services/comm/lib/ros/comm.rb b/services/comm/lib/ros/comm.rb index ecb151c61..e28bea33d 100644 --- a/services/comm/lib/ros/comm.rb +++ b/services/comm/lib/ros/comm.rb @@ -3,6 +3,7 @@ require 'twilio-ruby' require 'aws-sdk-sns' +require 'ros/core' require 'ros/comm/engine' module Ros diff --git a/services/iam/spec/dummy/config/environments/test.rb b/services/iam/spec/dummy/config/environments/test.rb index d633c0188..cd7ba1932 100644 --- a/services/iam/spec/dummy/config/environments/test.rb +++ b/services/iam/spec/dummy/config/environments/test.rb @@ -40,7 +40,4 @@ # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true - - # Prevent expensive template finalization at end of test suite runs. - config.action_view.finalize_compiled_template_methods = false end diff --git a/services/storage/spec/dummy/config/application.rb b/services/storage/spec/dummy/config/application.rb index 15d9e9d37..f61b735c6 100644 --- a/services/storage/spec/dummy/config/application.rb +++ b/services/storage/spec/dummy/config/application.rb @@ -16,7 +16,7 @@ # require "rails/test_unit/railtie" Bundler.require(*Rails.groups) -require 'storage' +require 'ros/storage' module Dummy class Application < Rails::Application From a2a04313b474af1426de6788ec7ed0654fc65a3a Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Tue, 28 Jan 2020 12:30:39 +0800 Subject: [PATCH 24/26] WIP - ran bundle in all gems --- lib/core/Gemfile.lock | 2 - lib/sdk/Gemfile.lock | 2 + services/cognito/Gemfile.lock | 162 +++++++++++------------------ services/comm/Gemfile.lock | 140 ++++++++++++------------- services/iam/Gemfile.lock | 154 ++++++++++----------------- services/organization/Gemfile.lock | 135 +++++++++++------------- services/storage/Gemfile.lock | 144 ++++++++++++------------- 7 files changed, 309 insertions(+), 430 deletions(-) diff --git a/lib/core/Gemfile.lock b/lib/core/Gemfile.lock index 2acf49aa2..5851337cb 100644 --- a/lib/core/Gemfile.lock +++ b/lib/core/Gemfile.lock @@ -299,8 +299,6 @@ GEM declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.5.0) - rack (>= 1.4) ros-apartment (2.3.0) activerecord (>= 3.1.2, < 6.1) parallel (>= 0.7.1) diff --git a/lib/sdk/Gemfile.lock b/lib/sdk/Gemfile.lock index dfb48765e..8c84790fc 100644 --- a/lib/sdk/Gemfile.lock +++ b/lib/sdk/Gemfile.lock @@ -9,6 +9,7 @@ PATH inifile (~> 3.0.0) json_api_client (~> 1.15.0) jwt (~> 2.2.1) + request_store (= 1.5.0) GEM remote: https://rubygems.org/ @@ -115,6 +116,7 @@ DEPENDENCIES cnfs_sdk! pry (~> 0.12.2) rake (~> 12.0) + rspec (~> 3.9.0) BUNDLED WITH 2.1.4 diff --git a/services/cognito/Gemfile.lock b/services/cognito/Gemfile.lock index 86b9cacba..ab99c6e8c 100644 --- a/services/cognito/Gemfile.lock +++ b/services/cognito/Gemfile.lock @@ -1,47 +1,47 @@ PATH remote: ../../lib/core specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) PATH remote: ../../lib/sdk specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) request_store (= 1.5.0) PATH @@ -128,13 +128,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.269.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -151,50 +151,13 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) choice (0.2.0) - cnfs-core (0.0.1.alpha) - attr_encrypted (~> 3.1.0) - avro_turf (~> 0.9.0) - aws-sdk-s3 (~> 1.60.1) - bullet (~> 6.1.0) - cnfs_sdk (= 0.0.1.alpha) - config (~> 1.7.1) - dotenv (~> 2.7.5) - grpc (~> 1.23.0) - hashids (~> 1.0.5) - json_schemer (~> 0.2.6) - jsonapi-authorization (~> 3.0.1) - jsonapi-resources (~> 0.9.10) - jwt (~> 2.2.1) - prometheus_exporter (~> 0.4.13) - pry-rails (~> 0.3.9) - rack-cors (~> 1.1.1) - rack-fluentd-logger (~> 0.1.5) - rails (~> 6.0.2.1) - ros-apartment (~> 2.3.0) - ros-apartment-sidekiq (~> 1.2.0) - rufus-scheduler (~> 3.6.0) - seedbank (~> 0.5.0) - sentry-raven (~> 2.11.1) - sidekiq (~> 6.0.0) - trailblazer-activity (~> 0.10.0) - trailblazer-activity-dsl-linear (~> 0.2.1) - warden (~> 1.2.8) - zero-rails_openapi (~> 2.1.0) - cnfs_sdk (0.0.1.alpha) - activemodel (~> 6.0.2.1) - activesupport (~> 6.0.2.1) - config (~> 1.7.1) - globalid (~> 0.4.2) - inifile (~> 3.0.0) - json_api_client (~> 1.15.0) - jwt (~> 2.2.1) coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) crass (1.0.5) debug_inspector (0.0.3) @@ -213,40 +176,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) erubi (1.9.0) et-orbi (1.2.2) tzinfo - excon (0.71.1) + excon (0.72.0) factory_bot (5.1.1) activesupport (>= 4.2.0) factory_bot_rails (5.1.1) @@ -269,7 +223,7 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) @@ -289,13 +243,13 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) jsonapi-resources (0.9.10) activerecord (>= 4.1) @@ -337,7 +291,7 @@ GEM rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) pg (1.2.1) - prometheus_exporter (0.4.13) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -346,7 +300,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -457,11 +411,11 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -483,7 +437,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) tzinfo (1.2.6) @@ -500,7 +454,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -513,6 +467,8 @@ DEPENDENCIES awesome_print brakeman cnfs-cognito! + cnfs-core! + cnfs_sdk! dotenv factory_bot_rails faker @@ -525,8 +481,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-core! - ros_sdk! rspec-rails rspec_junit_formatter shoulda-matchers diff --git a/services/comm/Gemfile.lock b/services/comm/Gemfile.lock index e3bd1d5c6..ad22fac28 100644 --- a/services/comm/Gemfile.lock +++ b/services/comm/Gemfile.lock @@ -1,58 +1,59 @@ PATH remote: ../../lib/core specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) PATH remote: ../../lib/sdk specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) request_store (= 1.5.0) PATH remote: . specs: - ros-comm (0.1.0) - aws-sdk-sns + cnfs-comm (0.0.1.alpha1) + aasm (~> 5.0.6) + aws-sdk-sns (~> 1.21.0) + cnfs-core (= 0.0.1alpha) + cnfs_sdk (= 0.0.1alpha) rails (~> 6.0.2.1) - ros-core (~> 0.1.0) - ros_sdk (~> 0.1.0) - twilio-ruby + twilio-ruby (~> 5.31.0) GEM remote: https://rubygems.org/ @@ -132,13 +133,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.269.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -161,10 +162,10 @@ GEM coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) crass (1.0.5) debug_inspector (0.0.3) @@ -183,40 +184,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) erubi (1.9.0) et-orbi (1.2.2) tzinfo - excon (0.71.1) + excon (0.72.0) factory_bot (5.1.1) activesupport (>= 4.2.0) factory_bot_rails (5.1.1) @@ -239,7 +231,7 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) @@ -259,13 +251,13 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) jsonapi-resources (0.9.10) activerecord (>= 4.1) @@ -289,7 +281,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -307,7 +299,7 @@ GEM rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) pg (1.2.1) - prometheus_exporter (0.4.13) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -316,7 +308,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -427,11 +419,11 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -453,7 +445,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) twilio-ruby (5.31.1) @@ -474,7 +466,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -487,6 +479,9 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-comm! + cnfs-core! + cnfs_sdk! dotenv factory_bot_rails faker @@ -499,9 +494,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-comm! - ros-core! - ros_sdk! rspec-rails rspec_junit_formatter shoulda-matchers diff --git a/services/iam/Gemfile.lock b/services/iam/Gemfile.lock index 41ee23057..1cb6803c7 100644 --- a/services/iam/Gemfile.lock +++ b/services/iam/Gemfile.lock @@ -1,47 +1,47 @@ PATH remote: ../../lib/core specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) PATH remote: ../../lib/sdk specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) request_store (= 1.5.0) PATH @@ -130,7 +130,7 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.266.0) + aws-partitions (1.269.0) aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -154,50 +154,13 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) choice (0.2.0) - cnfs-core (0.0.1.alpha) - attr_encrypted (~> 3.1.0) - avro_turf (~> 0.9.0) - aws-sdk-s3 (~> 1.60.1) - bullet (~> 6.1.0) - cnfs_sdk (= 0.0.1.alpha) - config (~> 1.7.1) - dotenv (~> 2.7.5) - grpc (~> 1.23.0) - hashids (~> 1.0.5) - json_schemer (~> 0.2.6) - jsonapi-authorization (~> 3.0.1) - jsonapi-resources (~> 0.9.10) - jwt (~> 2.2.1) - prometheus_exporter (~> 0.4.13) - pry-rails (~> 0.3.9) - rack-cors (~> 1.1.1) - rack-fluentd-logger (~> 0.1.5) - rails (~> 6.0.2.1) - ros-apartment (~> 2.3.0) - ros-apartment-sidekiq (~> 1.2.0) - rufus-scheduler (~> 3.6.0) - seedbank (~> 0.5.0) - sentry-raven (~> 2.11.1) - sidekiq (~> 6.0.0) - trailblazer-activity (~> 0.10.0) - trailblazer-activity-dsl-linear (~> 0.2.1) - warden (~> 1.2.8) - zero-rails_openapi (~> 2.1.0) - cnfs_sdk (0.0.1.alpha) - activemodel (~> 6.0.2.1) - activesupport (~> 6.0.2.1) - config (~> 1.7.1) - globalid (~> 0.4.2) - inifile (~> 3.0.0) - json_api_client (~> 1.15.0) - jwt (~> 2.2.1) coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) crass (1.0.6) debug_inspector (0.0.3) @@ -222,40 +185,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.3) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.3) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.2) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.4, >= 1.4.3) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) erubi (1.9.0) et-orbi (1.2.2) tzinfo - excon (0.71.1) + excon (0.72.0) factory_bot (5.1.1) activesupport (>= 4.2.0) factory_bot_rails (5.1.1) @@ -278,7 +232,7 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) @@ -298,13 +252,13 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) jsonapi-resources (0.9.10) activerecord (>= 4.1) @@ -347,7 +301,7 @@ GEM rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) pg (1.2.2) - prometheus_exporter (0.4.13) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -470,11 +424,11 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) shoulda-matchers (4.2.0) activesupport (>= 4.2.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -513,7 +467,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -525,7 +479,9 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-core! cnfs-iam! + cnfs_sdk! dotenv factory_bot_rails faker @@ -538,8 +494,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-core! - ros_sdk! rspec-rails rspec_junit_formatter shoulda-matchers diff --git a/services/organization/Gemfile.lock b/services/organization/Gemfile.lock index 65ee6190f..9342479e3 100644 --- a/services/organization/Gemfile.lock +++ b/services/organization/Gemfile.lock @@ -1,56 +1,56 @@ PATH remote: ../../lib/core specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) PATH remote: ../../lib/sdk specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) request_store (= 1.5.0) PATH remote: . specs: - ros-organization (0.1.0) + cnfs-organization (0.0.1.alpha) + cnfs-core (= 0.0.1alpha) + cnfs_sdk (= 0.0.1alpha) rails (~> 6.0.2.1) - ros-core (~> 0.1.0) - ros_sdk (~> 0.1.0) GEM remote: https://rubygems.org/ @@ -128,13 +128,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.269.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -154,10 +154,10 @@ GEM coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) crass (1.0.5) debug_inspector (0.0.3) @@ -176,40 +176,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) erubi (1.9.0) et-orbi (1.2.2) tzinfo - excon (0.71.1) + excon (0.72.0) factory_bot (5.1.1) activesupport (>= 4.2.0) factory_bot_rails (5.1.1) @@ -232,7 +223,7 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) @@ -252,13 +243,13 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) jsonapi-resources (0.9.10) activerecord (>= 4.1) @@ -282,7 +273,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -300,7 +291,7 @@ GEM rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) pg (1.2.1) - prometheus_exporter (0.4.13) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -309,7 +300,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -420,11 +411,11 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -446,7 +437,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) tzinfo (1.2.6) @@ -463,7 +454,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -475,6 +466,9 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-core! + cnfs-organization! + cnfs_sdk! dotenv factory_bot_rails faker @@ -487,9 +481,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-core! - ros-organization! - ros_sdk! rspec-rails rspec_junit_formatter shoulda-matchers diff --git a/services/storage/Gemfile.lock b/services/storage/Gemfile.lock index b88022cc5..b4060d71f 100644 --- a/services/storage/Gemfile.lock +++ b/services/storage/Gemfile.lock @@ -1,66 +1,63 @@ PATH remote: ../../lib/core specs: - ros-core (0.1.0) + cnfs-core (0.0.1.alpha) attr_encrypted (~> 3.1.0) avro_turf (~> 0.9.0) - aws-sdk-s3 + aws-sdk-s3 (~> 1.60.1) bullet (~> 6.1.0) - config (= 1.7.1) - dotenv - grpc (= 1.23.0) - hashids (= 1.0.5) - json_schemer (= 0.2.6) - jsonapi-authorization (= 3.0.1) - jsonapi-resources (= 0.9.10) - jwt (= 2.2.1) - prometheus_exporter (= 0.4.13) - pry-rails (= 0.3.9) - rack-cors - rack-fluentd-logger (= 0.1.5) + cnfs_sdk (= 0.0.1.alpha) + config (~> 1.7.1) + dotenv (~> 2.7.5) + grpc (~> 1.23.0) + hashids (~> 1.0.5) + json_schemer (~> 0.2.6) + jsonapi-authorization (~> 3.0.1) + jsonapi-resources (~> 0.9.10) + jwt (~> 2.2.1) + prometheus_exporter (~> 0.4.13) + pry-rails (~> 0.3.9) + rack-cors (~> 1.1.1) + rack-fluentd-logger (~> 0.1.5) rails (~> 6.0.2.1) - ros-apartment (= 2.3.0) - ros-apartment-sidekiq (= 1.2.0) + ros-apartment (~> 2.3.0) + ros-apartment-sidekiq (~> 1.2.0) rufus-scheduler (~> 3.6.0) - seedbank (= 0.5.0) - sentry-raven (= 2.11.1) - sidekiq (= 6.0.0) + seedbank (~> 0.5.0) + sentry-raven (~> 2.11.1) + sidekiq (~> 6.0.0) trailblazer-activity (~> 0.10.0) trailblazer-activity-dsl-linear (~> 0.2.1) - warden (= 1.2.8) - zero-rails_openapi (= 2.1.0) + warden (~> 1.2.8) + zero-rails_openapi (~> 2.1.0) PATH remote: ../../lib/sdk specs: - ros_sdk (0.1.0) - activemodel (= 6.0.2.1) - activesupport (= 6.0.2.1) - config (= 1.7.1) - globalid (= 0.4.2) - inifile (= 3.0.0) - json_api_client (= 1.15.0) - jwt (= 2.2.1) - pry (= 0.12.2) + cnfs_sdk (0.0.1.alpha) + activemodel (~> 6.0.2.1) + activesupport (~> 6.0.2.1) + config (~> 1.7.1) + globalid (~> 0.4.2) + inifile (~> 3.0.0) + json_api_client (~> 1.15.0) + jwt (~> 2.2.1) request_store (= 1.5.0) PATH remote: . specs: - ros-storage (0.1.0) - aasm - aws-sdk-sqs - net-sftp + cnfs-storage (0.0.1.alpha) + aws-sdk-sqs (~> 1.23.1) + cnfs-core (= 0.0.1alpha) + cnfs_sdk (= 0.0.1alpha) + net-sftp (~> 2.1.2) rails (~> 6.0.2.1) - ros-core (~> 0.1.0) - ros_sdk (~> 0.1.0) - shoryuken + shoryuken (~> 5.0.2) GEM remote: https://rubygems.org/ specs: - aasm (5.0.6) - concurrent-ruby (~> 1.0) actioncable (6.0.2.1) actionpack (= 6.0.2.1) nio4r (~> 2.0) @@ -134,13 +131,13 @@ GEM excon (~> 0.45) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.269.0) + aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) @@ -163,10 +160,10 @@ GEM coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.1.5) - config (1.7.1) + config (1.7.2) activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 0.12, >= 0.12.2, < 1.0.0) connection_pool (2.2.2) crass (1.0.5) debug_inspector (0.0.3) @@ -185,40 +182,31 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + dry-logic (0.6.1) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.2) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-logic (~> 1.0) - dry-types (~> 1.2) - dry-types (1.2.2) + dry-types (0.14.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.4.0) + dry-logic (~> 0.5, >= 0.5) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) dry-equalizer (~> 0.2) - dry-initializer (~> 3.0) - dry-schema (~> 1.0, >= 1.3.1) + dry-logic (~> 0.5, >= 0.5.0) + dry-types (~> 0.14.0) ecma-re-validator (0.2.0) regexp_parser (~> 1.2) encryptor (3.0.0) erubi (1.9.0) et-orbi (1.2.2) tzinfo - excon (0.71.1) + excon (0.72.0) factory_bot (5.1.1) activesupport (>= 4.2.0) factory_bot_rails (5.1.1) @@ -241,7 +229,7 @@ GEM google-protobuf (3.11.2) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.23.0) + grpc (1.23.1) google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hana (1.3.5) @@ -261,13 +249,13 @@ GEM faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) rack (>= 0.2) - json_schemer (0.2.6) + json_schemer (0.2.8) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonapi-authorization (3.0.1) - jsonapi-resources (~> 0.9) + jsonapi-authorization (3.0.2) + jsonapi-resources (~> 0.9.0) pundit (>= 1.0.0, < 3.0.0) jsonapi-resources (0.9.10) activerecord (>= 4.1) @@ -291,7 +279,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -312,7 +300,7 @@ GEM rubocop (~> 0.77.0) rubocop-rails (~> 2.3.2) pg (1.2.1) - prometheus_exporter (0.4.13) + prometheus_exporter (0.4.17) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -321,7 +309,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -432,7 +420,7 @@ GEM fugit (~> 1.1, >= 1.1.6) seedbank (0.5.0) rake (>= 10.0) - sentry-raven (2.11.1) + sentry-raven (2.11.3) faraday (>= 0.7.6, < 1.0) shoryuken (5.0.3) aws-sdk-core (>= 2) @@ -440,7 +428,7 @@ GEM thor shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - sidekiq (6.0.0) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) @@ -462,7 +450,7 @@ GEM thread_safe (0.3.6) trailblazer-activity (0.10.0) trailblazer-context (>= 0.2.0, < 0.3.0) - trailblazer-activity-dsl-linear (0.2.4) + trailblazer-activity-dsl-linear (0.2.5) trailblazer-activity (>= 0.9.1, < 1.0.0) trailblazer-context (0.2.0) tzinfo (1.2.6) @@ -479,7 +467,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) zeitwerk (2.2.2) - zero-rails_openapi (2.1.0) + zero-rails_openapi (2.1.2) activesupport (>= 4.1) colorize rails (>= 4.1) @@ -491,6 +479,9 @@ DEPENDENCIES airborne awesome_print brakeman + cnfs-core! + cnfs-storage! + cnfs_sdk! dotenv factory_bot_rails faker @@ -503,9 +494,6 @@ DEPENDENCIES puma pundit-matchers rails-erd - ros-core! - ros-storage! - ros_sdk! rspec-rails rspec_junit_formatter shoulda-matchers From 8a8d7476d3488b7a579534f1c1c1de7212f35be9 Mon Sep 17 00:00:00 2001 From: Rui Baltazar Date: Tue, 28 Jan 2020 12:34:04 +0800 Subject: [PATCH 25/26] WIP - removed actionview reference --- services/comm/spec/dummy/config/environments/test.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/comm/spec/dummy/config/environments/test.rb b/services/comm/spec/dummy/config/environments/test.rb index 30d915598..0de2f0db7 100644 --- a/services/comm/spec/dummy/config/environments/test.rb +++ b/services/comm/spec/dummy/config/environments/test.rb @@ -41,8 +41,5 @@ # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true - # Prevent expensive template finalization at end of test suite runs. - config.action_view.finalize_compiled_template_methods = false - config.active_job.queue_adapter = :test end From db3142ee2f50709b1671dab7704b0431d6a82001 Mon Sep 17 00:00:00 2001 From: Robert Roach Date: Tue, 28 Jan 2020 17:00:52 +0800 Subject: [PATCH 26/26] hard code gem versions in gempsec --- Dockerfile | 2 +- lib/sdk/cnfs_sdk.gemspec | 4 +--- services/cognito/cnfs-cognito.gemspec | 5 +---- services/comm/cnfs-comm.gemspec | 7 ++----- services/iam/cnfs-iam.gemspec | 3 +-- services/organization/cnfs-organization.gemspec | 5 +---- services/storage/cnfs-storage.gemspec | 5 +---- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28efcbf02..50d0f3561 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN sed -i '/git/d' ../../lib/sdk/*.gemspec \ # RUN sed -i '/path/d' Gemfile ARG project=user COPY services/${project}/Gemfile* ./ -COPY services/${project}/ros-${project}.gemspec ./ +COPY services/${project}/cnfs-${project}.gemspec ./ RUN bundle install \ && find /usr/local/bundle -iname '*.o' -exec rm -rf {} \; \ diff --git a/lib/sdk/cnfs_sdk.gemspec b/lib/sdk/cnfs_sdk.gemspec index b90375b61..aaeab22da 100644 --- a/lib/sdk/cnfs_sdk.gemspec +++ b/lib/sdk/cnfs_sdk.gemspec @@ -2,11 +2,9 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) -require 'ros_sdk/version' - Gem::Specification.new do |spec| spec.name = 'cnfs_sdk' - spec.version = RosSdk::VERSION + spec.version = '0.0.1.alpha' spec.authors = ['Robert Roach'] spec.email = ['rjayroach@gmail.com'] diff --git a/services/cognito/cnfs-cognito.gemspec b/services/cognito/cnfs-cognito.gemspec index 98836632b..7f354a5ac 100644 --- a/services/cognito/cnfs-cognito.gemspec +++ b/services/cognito/cnfs-cognito.gemspec @@ -2,13 +2,10 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) -# Maintain your gem's version: -require 'ros/cognito/version' - # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| spec.name = 'cnfs-cognito' - spec.version = Ros::Cognito::VERSION + spec.version = '0.0.1.alpha1' spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/' diff --git a/services/comm/cnfs-comm.gemspec b/services/comm/cnfs-comm.gemspec index 03a685a9a..d6fb71c0c 100644 --- a/services/comm/cnfs-comm.gemspec +++ b/services/comm/cnfs-comm.gemspec @@ -2,16 +2,13 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) -# Maintain your gem's version: -require 'ros/comm/version' - Gem::Specification.new do |spec| spec.name = 'cnfs-comm' - spec.version = Ros::Comm::VERSION + spec.version = '0.0.1.alpha' spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/' - spec.summary = 'Provides communication tools, e.g. Twilio to the Ros Platform' + spec.summary = 'Provides communication tools, e.g. Twilio to the CNFS Platform' spec.description = '3rd party communication services can be invoked by other services per tenant' spec.license = 'MIT' spec.required_ruby_version = ['> 2.6.0', '< 2.7' ] diff --git a/services/iam/cnfs-iam.gemspec b/services/iam/cnfs-iam.gemspec index b3c9641d3..6ff139fe7 100644 --- a/services/iam/cnfs-iam.gemspec +++ b/services/iam/cnfs-iam.gemspec @@ -1,11 +1,10 @@ # frozen_string_literal: true $LOAD_PATH.push File.expand_path('lib', __dir__) -require 'ros/iam/version' Gem::Specification.new do |spec| spec.name = 'cnfs-iam' - spec.version = Ros::Iam::VERSION + spec.version = '0.0.1.alpha' spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/' diff --git a/services/organization/cnfs-organization.gemspec b/services/organization/cnfs-organization.gemspec index 139b031f0..01faa7451 100644 --- a/services/organization/cnfs-organization.gemspec +++ b/services/organization/cnfs-organization.gemspec @@ -2,13 +2,10 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) -# Maintain your gem's version: -require 'ros/organization/version' - # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| spec.name = 'cnfs-organization' - spec.version = Ros::Organization::VERSION + spec.version = '0.0.1.alpha' spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/' diff --git a/services/storage/cnfs-storage.gemspec b/services/storage/cnfs-storage.gemspec index 610d62379..ffeec21cf 100644 --- a/services/storage/cnfs-storage.gemspec +++ b/services/storage/cnfs-storage.gemspec @@ -2,13 +2,10 @@ $LOAD_PATH.push File.expand_path('lib', __dir__) -# Maintain your gem's version: -require 'ros/storage/version' - # Describe your gem and declare its dependencies: Gem::Specification.new do |spec| spec.name = 'cnfs-storage' - spec.version = Ros::Storage::VERSION + spec.version = '0.0.1.alpha' spec.authors = ['Robert Roach', 'Rui Baltazar'] spec.email = ['rjayroach@gmail.com', 'rui.p.baltazar@gmail.com'] spec.homepage = 'http://guides.rails-on-services.org/'