hucpa 0.2.0-jruby → 0.2.1-jruby

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76724120a511fd2988290a12e58fd2afa1b6049f
-  data.tar.gz: 02b211715ac55a80670f052c770449fcab447a43
+  metadata.gz: d538ef624e81e52a2d237f4f641fad68be8ffb8a
+  data.tar.gz: 29423b126f3a541ba486aad08dc58bd6777c8dc4
 SHA512:
-  metadata.gz: 8a21d102d78878e68b363cd720980b4140749e470cef39d9f5967b13f6c5b7bc799785bd352ffa97b46339df2665556b364b0dac441baf2d73f2cf89f2afc4ef
-  data.tar.gz: 5effc93b3e647db68cde71868db329a3eafb7f8d820760f0e81f18a72205e4819c9f6eca05f3843949d0470aff5f4afc6e595ce23b7f845453cb074343b782ed
+  metadata.gz: 787f08d771d146f8c681e72bb3d229cd4bde3a8e37ddedad735c854aa4db4d48691d77926d9498bc8b310f45196095c05e6945093b0b6fe7659e005dda53d767
+  data.tar.gz: 7d31cb45248d1db32b36ff4d235ca827fbb4ff63c7e280f8eb6a3461d6790687374751a0919ee77c6e19f8e9a273f5bf9f9d32b07ee61d428e13bfdcbb687dbb

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
+Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Max: 32
+  Exclude:
+    - "spec/**/*.rb"
+
+Metrics/LineLength:
+  Max: 120
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/IndentHash:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%i": "[]"
+    "%I": "[]"
+    "%w": "[]"
+    "%W": "[]"
+
+Style/RedundantSelf:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: true
+  EnforcedStyle: semantic
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+* fixed importing `HikariCP` jars
+
 ## 0.2.0
 
 * upgraded `HikariCP` to `2.6.0`

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    hucpa (0.2.0-java)
+    hucpa (0.2.1-java)
       dry-validation (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.3.0)
     concurrent-ruby (1.0.4-java)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -40,6 +41,10 @@ GEM
     inflecto (0.0.2)
     jdbc-postgres (9.4.1206)
     json (2.0.3-java)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.1)
     rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -54,11 +59,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    unicode-display_width (1.1.3)
 
 PLATFORMS
   java
@@ -69,6 +82,7 @@ DEPENDENCIES
   jdbc-postgres (~> 9.4)
   rake (~> 12.0)
   rspec (~> 3.5)
+  rubocop (~> 0)
   simplecov (~> 0)
 
 BUNDLED WITH

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+load "lib/tasks/ci.rake"
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: :spec

data/circle.yml

@@ -13,4 +13,5 @@ dependencies:
 
 test:
   override:
+    - docker run --net=host --env DATABASE_HOST=localhost --rm tomekw/hucpa rubocop
     - docker run --net=host --env DATABASE_HOST=localhost --rm tomekw/hucpa rspec spec

data/hucpa.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = "hucpa"
-  spec.version = "0.2.0"
+  spec.version = "0.2.1"
   spec.authors = ["Tomek Wałkuski"]
   spec.email = "ja@jestem.tw"
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = %w[lib vendor]
+  spec.require_paths = %w[lib]
 
   spec.add_dependency "dry-validation", "~> 0.10"
 
@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "jdbc-postgres", "~> 9.4"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "rubocop", "~> 0"
   spec.add_development_dependency "simplecov", "~> 0"
 end

data/lib/hucpa/configuration.rb

@@ -1,15 +1,15 @@
 require "dry-validation"
 
-import com.zaxxer.hikari.HikariConfig
-
 module Hucpa
   class Configuration
+    java_import com.zaxxer.hikari.HikariConfig
+
     def initialize(options)
       @options = options
     end
 
     def to_hikari_config
-      raise ArgumentError.new(validation_errors) if validation.failure?
+      fail ArgumentError, validation_errors if validation.failure?
 
       HikariConfiguration.new.tap do |config|
         CONFIGURATION_OPTIONS.each do |option|
@@ -43,7 +43,7 @@ module Hucpa
       sqlserver: "com.microsoft.sqlserver.jdbc.SQLServerDataSource",
       sqlserver_jtds: "net.sourceforge.jtds.jdbcx.JtdsDataSource",
       sybase: "com.sybase.jdbcx.SybDataSource"
-    }
+    }.freeze
     private_constant :ADAPTERS
 
     VALIDATION_SCHEMA = Dry::Validation.Schema do
@@ -52,7 +52,7 @@ module Hucpa
           super.merge(
             en: {
               errors: {
-                :"adapter/jdbc_url options" => "are invalid. Either adapter or jdbc_url must be filled"
+                "adapter/jdbc_url options": "are invalid. Either adapter or jdbc_url must be filled"
               }
             }
           )
@@ -76,7 +76,7 @@ module Hucpa
       optional(:pool_name).filled(:str?)
       optional(:server_name).filled(:str?)
 
-      rule(:"adapter/jdbc_url options" => %i[adapter jdbc_url]) do |adapter, jdbc_url|
+      rule("adapter/jdbc_url options": %i[adapter jdbc_url]) do |adapter, jdbc_url|
         adapter.filled? ^ jdbc_url.filled?
       end
     end

data/lib/hucpa/connection_pool.rb

@@ -1,7 +1,7 @@
-import com.zaxxer.hikari.HikariDataSource
-
 module Hucpa
   class ConnectionPool
+    java_import com.zaxxer.hikari.HikariDataSource
+
     def initialize(options)
       @options = options
       @hikari_config = Configuration.new(options).to_hikari_config
@@ -15,10 +15,10 @@ module Hucpa
       datasource.close
     end
 
-    def with_connection(&block)
+    def with_connection
       conn = datasource.connection
 
-      block.call(conn)
+      yield conn
     ensure
       conn.close
     end

data/lib/hucpa.rb

@@ -1,4 +1,4 @@
-Dir["vendor/*"].each { |f| require File.join(Dir.pwd, f) }
+Dir[File.expand_path("..", __FILE__) + "/*.jar"].each { |f| require f }
 
 require "hucpa/configuration"
 require "hucpa/connection_pool"

data/lib/tasks/ci.rake

@@ -0,0 +1,8 @@
+require "rubocop/rake_task"
+
+namespace :ci do
+  RuboCop::RakeTask.new(:rubocop)
+
+  desc "Run all CI checks"
+  task run: %i[rubocop spec]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hucpa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: jruby
 authors:
 - Tomek Wałkuski
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rubocop
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -103,6 +117,7 @@ files:
 - ".gitignore"
 - ".irbrc"
 - ".rspec"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -114,12 +129,13 @@ files:
 - circle.yml
 - docker-compose.yml
 - hucpa.gemspec
+- lib/HikariCP-2.6.0.jar
 - lib/hucpa.rb
 - lib/hucpa/configuration.rb
 - lib/hucpa/connection_pool.rb
-- vendor/HikariCP-2.6.0.jar
-- vendor/slf4j-api-1.7.22.jar
-- vendor/slf4j-nop-1.7.22.jar
+- lib/slf4j-api-1.7.22.jar
+- lib/slf4j-nop-1.7.22.jar
+- lib/tasks/ci.rake
 homepage: https://github.com/tomekw/hucpa
 licenses:
 - MIT
@@ -128,7 +144,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="