radar-app 0.8.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d43b3d2a3f45092f6b6c5103139212ed172d8df2
-  data.tar.gz: 2761fcb6de99bae630fca6ca42b5d0b33549a99f
+SHA256:
+  metadata.gz: 747689e670764ac159b53aacd64031b35fba08dc5738b8283ecf815ed1a1a60f
+  data.tar.gz: b1d9e7acf27bf80ac06f951911e7a03e321522deb5062b986a37607f367fa79b
 SHA512:
-  metadata.gz: 01a4a69686ee07c2f5671cef8990b68a702a3d821c5abf7b7be886197765f11d23131301875f44f2478cea415952fe58ebab53be565ecfc16608d78714d712c3
-  data.tar.gz: 2317f952b12ad4b60334ab3f3dc2728cd54190233760005f55d27ec12fdfea3b6e9a1560282f5401315840dba74f328731b56df1eac8c5a6bfc7757157f7a290
+  metadata.gz: 2f0098ac27d965df611efd6b020080e4f3d5364474302efc87d780a44b4b91f994b99d027489d8765c35c96642e30a80b27535bc6a1dffb7680c72c0baa5472d
+  data.tar.gz: 010eb0a3b41c7fd06ead5b75a5a954715b15013675f9ddd00c92dd48826d5b674c27bac3bd37bf472340a14f7b26fa7af9e518d0c8e7429c16cdff799141eff4

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -8,3 +8,12 @@ guard 'rake', :task => 'install' do
   watch(%r{^lib/(.+)\.rb$})
   watch(/^bin/)
 end
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'

data/lib/radar/app.rb

@@ -7,7 +7,9 @@ require 'radar/app/analyzer_controller'
 require 'radar/app/server'
 require 'radar/app/bootstrap'
 require 'radar/app/analyzer'
+require 'radar/app/healthz'
 require 'radar/app/processor_factory'
+require 'radar/app/multiplexed_processor'
 
 require 'radar-api'
 require 'connection_pool'
@@ -58,6 +60,10 @@ module Radar
       @portfolio_service ||= connection_pool('PortfolioService')
     end
 
+    def self.integration_status_service
+      @integration_status_service ||= connection_pool('IntegrationStatusService')
+    end
+
     protected
 
     def self.connection_pool(client_class)

data/lib/radar/app/healthz.rb

@@ -0,0 +1,9 @@
+module Radar
+  module App
+    class Healthz
+      def status
+        Radar::API::HealthStatus::HEALTHY
+      end
+    end
+  end
+end

data/lib/radar/app/multiplexed_processor.rb

@@ -0,0 +1,20 @@
+class Radar::App::MultiplexedProcessor < Thrift::MultiplexedProcessor
+  def process(iprot, oprot)
+    begin
+      name, type, seqid = iprot.read_message_begin
+      super(Thrift::StoredMessageProtocol.new(iprot, [name, type, seqid]), oprot)
+    rescue Thrift::Exception => e
+      write_error(Thrift::ApplicationException.new(Thrift::ApplicationException::INTERNAL_ERROR, e.message), oprot, name, seqid)
+    end
+  end
+
+  protected
+
+  def write_error(err, oprot, name, seqid)
+    oprot.write_message_begin(name, Thrift::MessageTypes::EXCEPTION, seqid)
+    err.write(oprot)
+    oprot.write_message_end
+    oprot.trans.flush
+  end
+
+end

data/lib/radar/app/processor_factory.rb

@@ -1,10 +1,34 @@
 require 'thrift/exceptions'
+require 'radar-api'
 
 module Radar
   module App
     module ProcessorFactory
+
+      class AppErrorHandler
+        def initialize(target)
+          @target = target
+        end
+
+        def method_missing(m, *args, &block)
+          begin
+            @target.send(m, *args, &block)
+          rescue => e
+            if e.kind_of?(Thrift::Exception)
+              raise e
+            else
+              raise Radar::API::ApplicationError.new(message: e.message, stacktrace: e.backtrace)
+            end
+          end
+        end
+      end
+
       def self.create_processor(superclass)
         Class.new(superclass) do
+          def initialize(handler)
+            super(AppErrorHandler.new(handler))
+          end
+
           def write_error(err, oprot, name, seqid)
             super
             raise if err.type == Thrift::ApplicationException::INTERNAL_ERROR

data/lib/radar/app/runner.rb

@@ -8,6 +8,7 @@ module Radar
       register(Radar::App::Tasks::New, :new, 'new APP', 'Create a new app')
       register(Radar::App::Tasks::Generate, :generate, 'generate TYPE NAME', 'Generate source files')
       register(Radar::App::Tasks::Server, :server, 'server', 'Start the app server')
+      register(Radar::App::Tasks::Status, :status, 'status', 'Check the server status')
       register(Radar::App::Tasks::Console, :console, 'console', 'Start the console for test')
     end
   end

data/lib/radar/app/server.rb

@@ -7,7 +7,7 @@ module Radar
       include Radar::App::Logger
       
       def start
-        multiplexer = Thrift::MultiplexedProcessor.new
+        multiplexer = MultiplexedProcessor.new
         analyzer_controller = Radar::App::AnalyzerController.new
         multiplexer.register_processor(
           'PortfolioAnalyzer',
@@ -28,6 +28,11 @@ module Radar
               new(Radar::App.transaction_file_importer)
           )
         end
+        multiplexer.register_processor(
+          'Healthz',
+          ProcessorFactory.create_processor(Radar::API::Healthz::Processor).
+            new(Radar::App::Healthz.new)
+        )
         transport = Thrift::ServerSocket.new(port)
         server = Thrift::NonblockingServer.new(multiplexer, transport, Thrift::FramedTransportFactory.new)
         logger.info { "Starting app on port #{port}..." }

data/lib/radar/app/tasks.rb

@@ -2,3 +2,4 @@ require 'radar/app/tasks/new'
 require 'radar/app/tasks/server'
 require 'radar/app/tasks/generate'
 require 'radar/app/tasks/console'
+require 'radar/app/tasks/status'

data/lib/radar/app/tasks/server.rb

@@ -1,3 +1,5 @@
+require 'sigdump'
+
 module Radar
   module App
     module Tasks
@@ -6,6 +8,7 @@ module Radar
         namespace :server
 
         def start_server
+          Sigdump.setup('TTIN', '-')
           Radar::App::Bootstrap.startup
           Radar::App::Server.new(ENV['PORT'] || 5000).start
         end

data/lib/radar/app/tasks/status.rb

@@ -0,0 +1,33 @@
+require 'thrift'
+require 'radar-api'
+require 'radar/api/healthz'
+
+module Radar
+  module App
+    module Tasks
+      class Status < Thor::Group
+        include Thor::Actions
+        namespace :status
+
+        def status
+          transport = Thrift::FramedTransport.new(Thrift::Socket.new('127.0.0.1', ENV['PORT'] || 5000))
+          protocol = Thrift::MultiplexedProtocol.new(Thrift::BinaryProtocolAccelerated.new(transport), 'Healthz')
+          client = Radar::Api::Healthz::Client.new(protocol)
+          begin
+            transport.open
+            client.status
+          rescue Thrift::TransportException => e
+            case e.type
+            when 1
+              puts "Server is down!"
+            else
+              puts "Server is not ready: #{e}"
+            end
+            exit 100 + e.type
+          end
+          puts "Server is up!"
+        end
+      end
+    end
+  end
+end

data/lib/radar/app/version.rb

@@ -1,5 +1,5 @@
 module Radar
   module App
-    VERSION = "0.8.0"
+    VERSION = "0.11.1"
   end
 end

data/radar-app.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "radar-api", "~> 0.2"
+  spec.add_dependency "radar-api", ">= 0.10.0"
   spec.add_dependency "thin", "1.6.2"
   spec.add_dependency "connection_pool", "~> 2.0"
   spec.add_dependency "activesupport", "~> 4.1"
   spec.add_dependency "RaymondChou-thrift_client", "~> 0.9"
+  spec.add_dependency "sigdump", "~> 0.2.4"
 end

data/spec/lib/radar/app/processor_factory_spec.rb

@@ -1,11 +1,31 @@
 require 'radar/app/processor_factory'
 
 describe Radar::App::ProcessorFactory do
+  let(:handler_class) do
+    Class.new do
+    end
+  end
 
   let(:parent_processor_class) do
     Class.new do
       attr_reader :write_error_called
 
+      def raise_an_error
+        raise 'an error'
+      end
+
+      def initialize(handler)
+      end
+
+      def process_an_error
+        begin
+          raise 'an error'
+        rescue => e
+          x = Thrift::ApplicationException.new(Thrift::ApplicationException::INTERNAL_ERROR, 'Internal error')
+          write_error(x, nil, nil, nil)
+        end
+      end
+
       def process_an_error
         begin
           raise 'an error'
@@ -29,7 +49,7 @@ describe Radar::App::ProcessorFactory do
 
   describe '#create_processor' do
     describe 'it creates a processor that' do
-      let(:processor) { Radar::App::ProcessorFactory.create_processor(parent_processor_class).new }
+      let(:processor) { Radar::App::ProcessorFactory.create_processor(parent_processor_class).new(nil) }
       it 'raises the exception on error' do
         expect { processor.process_an_error }.to raise_error 'an error'
       end
@@ -48,4 +68,22 @@ describe Radar::App::ProcessorFactory do
       end
     end
   end
+  describe 'AppErrorHandler' do
+    let(:error_handler) { Radar::App::ProcessorFactory::AppErrorHandler.new }
+    let(:target) { double() }
+    context 'then target raises a non-Thrift exception' do
+      it 'raises an ApplicationError' do
+        allow(target).to receive(:raise_an_error).and_raise 'an error'
+        error_handler = Radar::App::ProcessorFactory::AppErrorHandler.new(target)
+        expect { error_handler.raise_an_error }.to raise_error(Radar::Api::ApplicationError)
+      end
+      context 'then target raises a Thrift exception' do
+        it 'raises the original error' do
+          allow(target).to receive(:raise_an_error).and_raise Radar::Api::AuthenticationError.new
+          error_handler = Radar::App::ProcessorFactory::AppErrorHandler.new(target)
+          expect { error_handler.raise_an_error }.to raise_error(Radar::Api::AuthenticationError)
+        end
+      end
+    end
+  end
 end

data/spec/lib/radar/app/tasks/status_spec.rb

@@ -0,0 +1,26 @@
+require 'radar/app/runner'
+require 'radar/app'
+require 'socket'
+
+describe Radar::App::Tasks::Status do
+  describe '#status' do
+    let(:port) do
+      server = TCPServer.new('127.0.0.1', 0)
+      port = server.addr[1]
+      server.close
+      port
+    end
+    before :each do
+      allow(ENV).to receive(:[]).and_return nil
+      allow(ENV).to receive(:[]).with('PORT').and_return port
+    end
+    it 'exits with error code when cannot connect to server' do
+      expect { Radar::App::Runner.start(%w{status}) }.to raise_error SystemExit
+    end
+    it 'does not exit with error when PONG is received' do
+      Thread.new { @server = Radar::App::Server.new(port).start }
+      sleep 0.3
+      expect { Radar::App::Runner.start(%w{status}) }.not_to raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radar-app
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Leonardo Mendonca
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,16 +85,16 @@ dependencies:
   name: radar-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: sigdump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: generates and run a radar-app.
 email:
 - desenvolvimento@investtools.com.br
@@ -175,7 +189,9 @@ files:
 - lib/radar/app/controller.rb
 - lib/radar/app/core_ext.rb
 - lib/radar/app/core_ext/date.rb
+- lib/radar/app/healthz.rb
 - lib/radar/app/logger.rb
+- lib/radar/app/multiplexed_processor.rb
 - lib/radar/app/processor_factory.rb
 - lib/radar/app/runner.rb
 - lib/radar/app/server.rb
@@ -185,11 +201,13 @@ files:
 - lib/radar/app/tasks/generate.rb
 - lib/radar/app/tasks/new.rb
 - lib/radar/app/tasks/server.rb
+- lib/radar/app/tasks/status.rb
 - lib/radar/app/version.rb
 - radar-app.gemspec
 - spec/lib/radar/app/analyzer_spec.rb
 - spec/lib/radar/app/processor_factory_spec.rb
 - spec/lib/radar/app/tasks/generate_spec.rb
+- spec/lib/radar/app/tasks/status_spec.rb
 - templates/DOKKU_SCALE
 - templates/Gemfile
 - templates/Procfile
@@ -215,8 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: radar-app generator
@@ -224,3 +241,4 @@ test_files:
 - spec/lib/radar/app/analyzer_spec.rb
 - spec/lib/radar/app/processor_factory_spec.rb
 - spec/lib/radar/app/tasks/generate_spec.rb
+- spec/lib/radar/app/tasks/status_spec.rb