radar-app 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8903361bd6e9ce3c13909e031057e647377da02d
-  data.tar.gz: dc56e484252d63d3de3a211587f379f9c1e1d6d0
+SHA256:
+  metadata.gz: 9968d291e85ae6a4ab8301ee64bc479a539862bb1c38a6fb863824e11a1c1575
+  data.tar.gz: 77a8cca4490407185c660f3f38be20102d7e228e083c29a23721fd80021deaba
 SHA512:
-  metadata.gz: e611e556f141036fa70873e0eb648f21c34351da61e435afdeff6b58433c44eddcbac267583005778dc074308616904f49dc0926bef77bfd18bc9d9a5fe66ccc
-  data.tar.gz: 4f53ea0ca3b7c36c8f9336b175fdd92bd8353c9d519b2df6bc91b7506b257fe1ca86337b8c050568ce31584bf9146008e4c780cdeb4cd372f414758f8955b249
+  metadata.gz: e9f699c85c8b82f9a8728b3dc83a2fdb0fd8d2ba6ce4fee999f146886fc07981ac6743093ee43961e6ce2e9e4d47c0632c845efcf04c9c3abf03eb899ead2fc8
+  data.tar.gz: f6850b2b331a259fb95df90929db17bb6c79c84853a88ed1b9c88b4948d7a21104ef017df7b9c1b5d3b4fff3198e3a141fa7d114cc0fbd64d923155abb787a5f

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'

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/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,32 @@
+require 'thrift'
+require 'radar-api'
+
+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.9.0"
+    VERSION = "0.10.0"
   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/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.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Leonardo Mendonca
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2019-08-06 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
@@ -169,6 +183,7 @@ files:
 - bin/radar-app
 - lib/radar-app.rb
 - lib/radar/app.rb
+- lib/radar/app/Healthz.rb
 - lib/radar/app/analyzer.rb
 - lib/radar/app/analyzer_controller.rb
 - lib/radar/app/bootstrap.rb
@@ -176,6 +191,7 @@ files:
 - lib/radar/app/core_ext.rb
 - lib/radar/app/core_ext/date.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.4
 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