rails-on-services · rpbaltazar · Jan 21, 2020 · Jan 21, 2020 · Jan 23, 2020 · Jan 23, 2020
diff --git 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/core/Gemfile b/lib/core/Gemfile
@@ -2,18 +2,16 @@ 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'
 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
@@ -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,26 +237,26 @@ 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)
     nio4r (2.5.2)
     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)
@@ -313,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)
@@ -346,9 +330,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 +351,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 +369,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 +381,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
@@ -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       = ['[email protected]']
+  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