bricolage 6.0.0beta6 → 6.0.0beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d057475396d2f1e47cfccc490ec4ab07467c0056f519abd5a7c9bafdfdb63714
-  data.tar.gz: 252a0d2c7cb00f1fee102b25eec0b0f0a52919652f2210e2a8c877ec9e532638
+  metadata.gz: ef43e23cf027382323db0fed6c6b4265571e4d1c88e44c95119fe71146394df2
+  data.tar.gz: 75d044569f5305a26bd17d977e18bb6ff0275e37f6c3227c0bcca5bdef0990f3
 SHA512:
-  metadata.gz: 685f46050cb796689a9756387dabad8dcae318e6f7ae342f130d0b470b2375986b36aba65284d3cb516bdf9630aae8372eb47426f314dd233abea50bc087c86b
-  data.tar.gz: b50a8d23ec9b1df0e0303b0d6dee90a1c896fabb085943557158e61504107b64fbeaadfc15b83931a56db987ad524933281403ef1f0c41f56e2a0e5b7ac8c043
+  metadata.gz: 69b3daa09d4bb3043e88ea4538c372ca638cdbda8a3a45e4bd3e49253e3cdaa62d089603b31de3d43bd508e9da82e68cbe3db64b3f305fa624c59a5ffd33ab30
+  data.tar.gz: adc15a875db0d084310b48869fa7dcd637e5f9366660f440f044a925df708d364d3e3bdc0c65726b267fdbcddf1b79c32ee59a4bb38362f00cec690dc3542b9f

data/RELEASE.md

@@ -1,5 +1,12 @@
 # Bricolage Release Note
 
+## version 6.0.0 beta 7
+
+- [new] Add Parquet and JSON to unload formats.
+- [new] Supports Ruby 3.1 and 3.2.
+- [fix] Update gems for security updates.
+- [fix] If a .rb.job file does not contain shebang line (#!), it wrongly fails to parse parameter block.
+
 ## version 6.0.0 beta 6
 
 - [new] Now you can refer job file local variables from job parameters.

data/bricolage.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.required_ruby_version = '>= 2.4.0'
-  s.add_dependency 'pg', '~> 1.2.3'
+  s.add_dependency 'pg', '~> 1.2', '>= 1.2.3'
   s.add_dependency 'aws-sdk-s3', '~> 1.64'
   s.add_dependency 'aws-sdk-sns', '~> 1.23'
   s.add_dependency 'nokogiri'   # aws-sdk-core requires this

data/jobclass/unload.rb

@@ -7,7 +7,7 @@ JobClass.define('unload') {
     params.add SrcTableParam.new(optional: false)
     params.add DataSourceParam.new('s3', 'dest-ds', 'Target data source (s3).')
     params.add DestFileParam.new
-    params.add EnumParam.new('format', %w(tsv csv), 'Data file format.', default: 'tsv')
+    params.add EnumParam.new('format', %w(tsv csv parquet json), 'Data file format.', default: 'tsv')
     params.add KeyValuePairsParam.new('options', 'OPTIONS', 'Loader options.',
         optional: true, default: PSQLLoadOptions.new,
         value_handler: lambda {|value, ctx, vars| PSQLLoadOptions.parse(value) })

data/lib/bricolage/configloader.rb

@@ -42,7 +42,11 @@ module Bricolage
     private
 
     def parse_yaml(text, path)
-      YAML.load(text)
+      if Gem::Version.new(YAML::VERSION) >= Gem::Version.new("4.0.0")
+        YAML.load(text, aliases: true)
+      else
+        YAML.load(text)
+      end
     rescue => err
       raise ParameterError, "#{path}: config file syntax error: #{err.message}"
     end

data/lib/bricolage/jobfile.rb

@@ -85,7 +85,7 @@ module Bricolage
         if first_line.start_with?('#!')
           yaml_lines = []
         else
-          yaml_lines = [first_line]
+          yaml_lines = [first_line[1..-1]]
         end
         script.each_line do |line|
           break unless line.start_with?('#')

data/lib/bricolage/psqldatasource.rb

@@ -457,6 +457,10 @@ module Bricolage
         %q(delimiter '\t')
       when 'csv'
         %q(delimiter ',')
+      when 'parquet'
+        'format as parquet'
+      when 'json'
+        'format as json'
       else
         raise ParameterError, "unsupported format: #{fmt}"
       end

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '6.0.0beta6'
+  VERSION = '6.0.0beta7'
 end

data/schema/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'ridgepole'
-gem 'activerecord', '~> 6.0.0'  # activerecord 6.1 did not work with check_constraint
+gem 'activerecord', '~> 6.0.6'  # activerecord 6.1 did not work with check_constraint
 gem 'pg'

data/schema/Gemfile.lock

@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.6)
-      activesupport (= 6.0.3.6)
-    activerecord (6.0.3.6)
-      activemodel (= 6.0.3.6)
-      activesupport (= 6.0.3.6)
-    activesupport (6.0.3.6)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.8)
-    diffy (3.4.0)
-    i18n (1.8.10)
+    concurrent-ruby (1.2.0)
+    diffy (3.4.2)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.17.0)
     pg (1.2.3)
     ridgepole (0.9.2)
       activerecord (>= 5.1, < 6.2)
       diffy
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 6.0.0)
+  activerecord (~> 6.0.6)
   pg
   ridgepole
 

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 6.0.0beta6
+  version: 6.0.0beta7
 platform: ruby
 authors:
 - Minero Aoki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
@@ -225,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: SQL Batch Framework