avmtrf1-tools 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1590e048bb7bc9796bdd575bc57e925c636861bd4807e5c48542cb9a03b527
-  data.tar.gz: b1319b639563051687d546b1801053ac00bec9b84e9add31be091f74a94ff815
+  metadata.gz: 74d89accf83c82b82c4cabc7ae771fd0cf7977e6b3a18c1c94e5a7b6d035a7e8
+  data.tar.gz: 729168d22da5b1f2418712687afd767cdc1365b70f2ae2cc7bcd138a592c3803
 SHA512:
-  metadata.gz: 52e4d1ae9b2aba368c6225ae65e9b6548a74c02c2f0d142ab98c90fbd8bc9e542e6be33c24edd8ee68705d6832fb0c6072cc83d98c963e957922a7113a1b14e3
-  data.tar.gz: e481c6ccc6057b73d84c8ec76837d5c7e34fba19f2090b72f9a9d1ac2afed7ca6b94886e4262a4a7eb18700c123bb94a1c937b45e016f51985bf9b8d91de1347
+  metadata.gz: 16ac680b2e78a38f944afb194892e8655dfbcbc377107a37edfb760b2a17704746972a0f2344c88ee20e3088ed505913b51f07743086e692817ce194d82632b5
+  data.tar.gz: 7df63a50a530c9f466f9be161d1e5699abe48e0d29c39d1710e6dc693d165bb9171f18a1c530df3405536ff93202ca3790f1a9190c7f14ef1bae0eac92bc71d6

data/Gemfile

@@ -3,3 +3,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :oracle do
+  gem 'ruby-oci8'
+end

data/lib/avmtrf1/oracle/connection/base.rb

@@ -12,6 +12,7 @@ module Avmtrf1
         delegate :exec, to: :connection
 
         def initialize(connection_string)
+          ::Avmtrf1::Oracle::Oci8.require_lib
           @connection = OCI8.new(connection_string)
         end
 

data/lib/avmtrf1/oracle/oci8.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/ruby/gems/dependency'
+
 module Avmtrf1
   module Oracle
     module Oci8
-      NLS_LANG_DEFAULT_VALUE = 'BRAZILIAN PORTUGUESE_BRAZIL.WE8ISO8859P1'
+      NLS_LANG_DEFAULT_VALUE = 'BRAZILIAN PORTUGUESE_BRAZIL.UTF8'
       NLS_LANG_ENVIRONMENT_KEY = 'NLS_LANG'
 
       class << self
+        def dependency
+          @dependency ||= ::Avmtrf1::Ruby::Gems::Dependency.new('ruby-oci8', 'oci8')
+        end
+
         def require_lib
           nls_lang_set
-          require 'oci8'
+          dependency.require_lib
         end
 
         def nls_lang_set
@@ -21,5 +27,3 @@ module Avmtrf1
     end
   end
 end
-
-::Avmtrf1::Oracle::Oci8.require_lib

data/lib/avmtrf1/ruby.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Ruby
+    require_sub __FILE__
+  end
+end

data/lib/avmtrf1/ruby/gems.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avmtrf1/ruby/gems/dependency.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/ruby/gems/not_found_error'
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      class Dependency
+        common_constructor :gem_name, :lib_name
+
+        def require_lib
+          require lib_name
+        rescue LoadError
+          raise ::Avmtrf1::Ruby::Gems::NotFoundError, self
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/ruby/gems/not_found_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      class NotFoundError < ::StandardError
+        attr_reader :dependency
+
+        def initialize(dependency)
+          @dependency = dependency
+          super("Gem \"#{dependency.gem_name}\" not found" \
+              " (Library required: \"#{dependency.lib_name}\")")
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner.rb

@@ -4,6 +4,7 @@ require 'aranha/selenium/driver_factory/base'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/require_sub'
 require 'avmtrf1/tools/version'
+require 'avmtrf1/ruby/gems/not_found_error'
 require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
@@ -33,6 +34,17 @@ module Avmtrf1
         else
           run_with_subcommand
         end
+      rescue ::Avmtrf1::Ruby::Gems::NotFoundError => e
+        on_gem_not_found(e.dependency)
+      end
+
+      private
+
+      def on_gem_not_found(dependency)
+        fatal_error "A gem \"#{dependency.gem_name}\" foi requerida " \
+          "(Por \"require '#{dependency.lib_name}'\") e não encontrada. Para instalá-la:\n\n" \
+          "  gem install #{dependency.gem_name}\n\n" \
+          'Nota: procedimentos adicionais podem ser necessários.'
       end
     end
   end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.27.1'
+    VERSION = '0.28.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -182,20 +182,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ruby-oci8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +306,10 @@ files:
 - lib/avmtrf1/rest_provider/entity.rb
 - lib/avmtrf1/rest_provider/instance.rb
 - lib/avmtrf1/result.rb
+- lib/avmtrf1/ruby.rb
+- lib/avmtrf1/ruby/gems.rb
+- lib/avmtrf1/ruby/gems/dependency.rb
+- lib/avmtrf1/ruby/gems/not_found_error.rb
 - lib/avmtrf1/template.rb
 - lib/avmtrf1/tools.rb
 - lib/avmtrf1/tools/runner.rb