masamune 0.18.11 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dd3fb8ccd6de6212ecdf97971916b26c2761ebc
-  data.tar.gz: 7b9c608f895b6b5abc8b32c097754fa720d04cde
+  metadata.gz: 3449c74f195c657f9c934ca252ee55979fcf373c
+  data.tar.gz: e16324d9a0e4582bb4060acf6fcd920409909309
 SHA512:
-  metadata.gz: 2567cc86397502ebf47886c61262bbe4d2e08188ec3c049e477efd91c36008df8fecb333c47a9c6743d7b3dd0633e9ced8a5a34832a706a46ba1714c8ebb0483
-  data.tar.gz: 045e5e14031ef288f7a85758d6cf317f5814d0d0a9ec5d1ef0dddf8a7a894d3ab1d11af7283fe8948f53e695e2915ab73d15e5360c946d1e7aa2ac735c7ed798
+  metadata.gz: 84f7dc5b7d970c6e46a17ddc6612244b193b88cebb01ebe40125197388a933fa3810b9f4bd0e5147b54e46a98e72f195f5b46f1cfbb3328725ea238fce52c96a
+  data.tar.gz: f9113e58e109151ac16372b94495837f97c6881a7a3a893bff990e767d3d4f40b65f3dbc3fa337b085d8efa7c8ba2510ed286a6752ac3128c589c1024672edf7

data/Rakefile

@@ -46,7 +46,7 @@ namespace :spec do
   end
 
   desc 'Run All Rspec code examples'
-  task all: [:unit, :acceptance]
+  task all: %i[unit acceptance]
 end
 
 task default: :spec

data/lib/masamune/cached_filesystem.rb

@@ -83,7 +83,7 @@ module Masamune
     end
 
     # FIXME: cache eviction policy can be more precise
-    [:touch!, :mkdir!, :copy_file_to_file, :copy_file_to_dir, :copy_dir, :remove_file, :remove_dir, :move_file_to_file, :move_file_to_dir, :move_dir, :write].each do |method|
+    %i[touch! mkdir! copy_file_to_file copy_file_to_dir copy_dir remove_file remove_dir move_file_to_file move_file_to_dir move_dir write].each do |method|
       define_method(method) do |*args|
         clear!
         @filesystem.send(method, *args)

data/lib/masamune/configuration.rb

@@ -44,7 +44,7 @@ class Masamune::Configuration < Hashie::Dash
     end
 
     def default_commands
-      @default_commands ||= %i(aws_emr hive hadoop_streaming hadoop_filesystem s3cmd postgres postgres_admin)
+      @default_commands ||= %i[aws_emr hive hadoop_streaming hadoop_filesystem s3cmd postgres postgres_admin]
     end
   end
 

data/lib/masamune/data_plan/rule.rb

@@ -326,6 +326,6 @@ class Masamune::DataPlan::Rule
   end
 
   def options_for_elem
-    @options.reject { |k, _| [:path, :table].include?(k) }
+    @options.reject { |k, _| %i[path table].include?(k) }
   end
 end

data/lib/masamune/filesystem.rb

@@ -283,26 +283,26 @@ module Masamune
     def copy_dir(src, dst)
       check_immutable_path!(dst)
       case [type(src), type(dst)]
-      when [:hdfs, :hdfs]
+      when %i[hdfs hdfs]
         copy_file_to_dir(src, dst)
-      when [:hdfs, :local]
+      when %i[hdfs local]
         copy_file_to_dir(src, dst)
-      when [:hdfs, :s3]
+      when %i[hdfs s3]
         copy_file_to_dir(src, dst)
-      when [:s3, :s3]
+      when %i[s3 s3]
         s3cmd('cp', '--recursive', s3b(src, dir: true), s3b(dst, dir: true))
-      when [:s3, :local]
+      when %i[s3 local]
         fixed_dst = File.join(dst, src.split('/')[-1])
         FileUtils.mkdir_p(fixed_dst, file_util_args)
         s3cmd('get', '--recursive', '--skip-existing', s3b(src, dir: true), fixed_dst)
-      when [:s3, :hdfs]
+      when %i[s3 hdfs]
         copy_file_to_dir(src, dst)
-      when [:local, :local]
+      when %i[local local]
         FileUtils.mkdir_p(dst, file_util_args)
         FileUtils.cp_r(src, dst, file_util_args)
-      when [:local, :hdfs]
+      when %i[local hdfs]
         copy_file_to_dir(src, dst)
-      when [:local, :s3]
+      when %i[local s3]
         s3cmd('put', '--recursive', src, s3b(dst, dir: true))
       end
     end
@@ -348,27 +348,27 @@ module Masamune
     def move_dir(src, dst)
       check_immutable_path!(src)
       case [type(src), type(dst)]
-      when [:hdfs, :hdfs]
+      when %i[hdfs hdfs]
         move_file_to_file(src, dst)
-      when [:hdfs, :local]
+      when %i[hdfs local]
         copy_file_to_dir(src, dst)
         remove_dir(src)
-      when [:s3, :s3]
+      when %i[s3 s3]
         s3cmd('mv', '--recursive', d(src), f(dst))
-      when [:s3, :local]
+      when %i[s3 local]
         s3cmd('get', '--recursive', d(src), f(dst))
         remove_dir(src)
-      when [:s3, :hdfs]
+      when %i[s3 hdfs]
         copy_file_to_dir(src, dst)
         remove_dir(src)
-      when [:hdfs, :s3]
+      when %i[hdfs s3]
         copy_file_to_dir(src, d(dst))
         remove_dir(src)
-      when [:local, :local]
+      when %i[local local]
         move_file_to_file(src, dst)
-      when [:local, :hdfs]
+      when %i[local hdfs]
         move_file_to_file(src, dst)
-      when [:local, :s3]
+      when %i[local s3]
         s3cmd('put', '--recursive', d(src), d(dst))
         remove_dir(src)
       end
@@ -531,51 +531,51 @@ module Masamune
 
     def copy_file_helper(src, dst, dir)
       case [type(src), type(dst)]
-      when [:hdfs, :hdfs]
+      when %i[hdfs hdfs]
         hadoop_fs('-cp', src, dst)
-      when [:hdfs, :local]
+      when %i[hdfs local]
         hadoop_fs('-copyToLocal', src, local_file_prefix(dst))
-      when [:hdfs, :s3]
+      when %i[hdfs s3]
         hadoop_fs('-cp', src, s3n(dst))
-      when [:s3, :s3]
+      when %i[s3 s3]
         s3cmd('cp', src, s3b(dst, dir: dir))
-      when [:s3, :local]
+      when %i[s3 local]
         s3cmd('get', src, dst)
-      when [:s3, :hdfs]
+      when %i[s3 hdfs]
         hadoop_fs('-cp', s3n(src), dst)
-      when [:local, :local]
+      when %i[local local]
         FileUtils.cp(src, dst, file_util_args)
-      when [:local, :hdfs]
+      when %i[local hdfs]
         hadoop_fs('-copyFromLocal', local_file_prefix(src), dst)
-      when [:local, :s3]
+      when %i[local s3]
         s3cmd('put', src, s3b(dst, dir: dir))
       end
     end
 
     def move_file_helper(src, dst, dir)
       case [type(src), type(dst)]
-      when [:hdfs, :hdfs]
+      when %i[hdfs hdfs]
         hadoop_fs('-mv', src, dst)
-      when [:hdfs, :local]
+      when %i[hdfs local]
         # NOTE: moveToLocal: Option '-moveToLocal' is not implemented yet
         hadoop_fs('-copyToLocal', src, local_file_prefix(dst))
         hadoop_fs('-rm', src)
-      when [:hdfs, :s3]
+      when %i[hdfs s3]
         copy_file_to_file(src, s3n(dst, dir: dir))
         hadoop_fs('-rm', src)
-      when [:s3, :s3]
+      when %i[s3 s3]
         s3cmd('mv', src, s3b(dst, dir: dir))
-      when [:s3, :local]
+      when %i[s3 local]
         s3cmd('get', src, dst)
         s3cmd('del', src)
-      when [:s3, :hdfs]
+      when %i[s3 hdfs]
         hadoop_fs('-mv', s3n(src), dst)
-      when [:local, :local]
+      when %i[local local]
         FileUtils.mv(src, dst, file_util_args)
         FileUtils.chmod(FILE_MODE, dst, file_util_args)
-      when [:local, :hdfs]
+      when %i[local hdfs]
         hadoop_fs('-moveFromLocal', local_file_prefix(src), dst)
-      when [:local, :s3]
+      when %i[local s3]
         s3cmd('put', src, s3b(dst, dir: dir))
         FileUtils.rm(src, file_util_args)
       end

data/lib/masamune/schema/column.rb

@@ -287,7 +287,9 @@ module Masamune::Schema
         when Hash
           value
         when String
-          JSON.parse(value)
+          JSON.parse(value).tap do |new_value|
+            raise unless new_value.is_a?(Hash) || new_value.is_a?(Array)
+          end
         when nil
           {}
         end
@@ -354,7 +356,7 @@ module Masamune::Schema
     end
 
     def hash_value?
-      [:key_value, :yaml, :json].include?(type)
+      %i[key_value yaml json].include?(type)
     end
 
     def as_psql
@@ -404,11 +406,11 @@ module Masamune::Schema
     def typecast?(other_type)
       return true if type == other_type
       case [type, other_type]
-      when [:key_value, :yaml]
+      when %i[key_value yaml]
         true
-      when [:key_value, :json]
+      when %i[key_value json]
         true
-      when [:yaml, :json]
+      when %i[yaml json]
         true
       else
         false

data/lib/masamune/schema/dimension.rb

@@ -22,7 +22,7 @@
 
 module Masamune::Schema
   class Dimension < Table
-    SUPPORTED_GRAINS = [:hourly, :daily, :monthly].freeze
+    SUPPORTED_GRAINS = %i[hourly daily monthly].freeze
 
     def initialize(opts = {})
       opts.symbolize_keys!
@@ -81,11 +81,11 @@ module Masamune::Schema
       when :one, :date
         [:last_modified_at]
       when :two
-        [:start_at, :end_at, :version, :last_modified_at]
+        %i[start_at end_at version last_modified_at]
       when :four
-        [:start_at, :end_at, :version, :last_modified_at]
+        %i[start_at end_at version last_modified_at]
       when :ledger
-        [:source_kind, :source_uuid, :start_at, :last_modified_at, :delta]
+        %i[source_kind source_uuid start_at last_modified_at delta]
       else
         super
       end
@@ -117,14 +117,14 @@ module Masamune::Schema
       when :one, :date
         initialize_column! id: 'last_modified_at', type: :timestamp, default: 'NOW()'
       when :two
-        initialize_column! id: 'start_at', type: :timestamp, default: 'TO_TIMESTAMP(0)', index: [:start_at, :natural], unique: :natural
+        initialize_column! id: 'start_at', type: :timestamp, default: 'TO_TIMESTAMP(0)', index: %i[start_at natural], unique: :natural
         initialize_column! id: 'end_at', type: :timestamp, null: true, index: :end_at
         initialize_column! id: 'version', type: :integer, default: 1, null: true
         initialize_column! id: 'last_modified_at', type: :timestamp, default: 'NOW()'
       when :four
         children << ledger_table
         # FIXME: derive type from from parent
-        initialize_column! id: 'start_at', type: :timestamp, default: 'TO_TIMESTAMP(0)', index: [:start_at, :natural], unique: :natural
+        initialize_column! id: 'start_at', type: :timestamp, default: 'TO_TIMESTAMP(0)', index: %i[start_at natural], unique: :natural
         initialize_column! id: 'end_at', type: :timestamp, null: true, index: :end_at
         initialize_column! id: 'version', type: :integer, default: 1, null: true
         initialize_column! id: 'last_modified_at', type: :timestamp, default: 'NOW()'

data/lib/masamune/schema/fact.rb

@@ -22,7 +22,7 @@
 
 module Masamune::Schema
   class Fact < Table
-    SUPPORTED_GRAINS = [:transaction, :hourly, :daily, :monthly].freeze
+    SUPPORTED_GRAINS = %i[transaction hourly daily monthly].freeze
 
     attr_accessor :grain
     attr_accessor :partition
@@ -114,7 +114,7 @@ module Masamune::Schema
     def reserved_column_ids
       case type
       when :fact
-        [:time_key, :last_modified_at]
+        %i[time_key last_modified_at]
       else
         super
       end

data/lib/masamune/schema/store.rb

@@ -51,7 +51,7 @@ module Masamune::Schema
 
     class << self
       def types
-        [:postgres, :hive, :files]
+        %i[postgres hive files]
       end
     end
 

data/lib/masamune/tasks/dump_thor.rb

@@ -35,8 +35,8 @@ module Masamune::Tasks
     skip_lock!
 
     desc 'dump', 'Dump schema'
-    method_option :type, enum: %w(psql hql), desc: 'Schema type', default: 'psql'
-    method_option :section, enum: %w(pre post all), desc: 'Schema section', default: 'all'
+    method_option :type, enum: %w[psql hql], desc: 'Schema type', default: 'psql'
+    method_option :section, enum: %w[pre post all], desc: 'Schema section', default: 'all'
     method_option :exclude, type: :array, desc: 'Exclude tables matching globs', default: []
     method_option :skip_indexes, type: :boolean, desc: 'Disable indexes', default: false
     def dump_exec

data/lib/masamune/thor.rb

@@ -70,7 +70,7 @@ module Masamune
       def start(*a)
         super
       rescue SignalException => e
-        raise e unless %w(SIGHUP SIGTERM).include?(e.to_s)
+        raise e unless %w[SIGHUP SIGTERM].include?(e.to_s)
         instance.logger.debug("Exiting at user request on #{e}")
         exit 0
       rescue ::Thor::MalformattedArgumentError, ::Thor::RequiredArgumentMissingError => e

data/lib/masamune/transform/postgres/define_table.psql.erb

@@ -84,7 +84,7 @@ END IF; END $$;
   copy_options << "DELIMITER '\t'" if target.store.format == :tsv
   copy_options << "HEADER true" if target.store.headers
 -%>
-COPY <%= target.name %> FROM '<%= file %>' WITH (<%= copy_options.join(", ") %>);
+\COPY <%= target.name %> FROM '<%= file %>' WITH (<%= copy_options.join(", ") %>);
 <%- end -%>
 <%- end -%>
 

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.11'.freeze
+  VERSION = '0.19.0'.freeze
 end

data/spec/masamune/actions/execute_spec.rb

@@ -44,14 +44,14 @@ describe Masamune::Actions::Execute do
     end
 
     context 'with a simple command' do
-      let(:command) { %w(echo ping) }
+      let(:command) { %w[echo ping] }
       let(:options) { { fail_fast: true } }
 
       it { expect { |b| instance.execute(*command, options, &b) }.to yield_with_args('ping', 0) }
     end
 
     context 'with a simple command with input' do
-      let(:command) { %w(cat) }
+      let(:command) { %w[cat] }
       let(:options) { { input: 'pong', fail_fast: true } }
 
       it { expect { |b| instance.execute(*command, options, &b) }.to yield_with_args('pong', 0) }

data/spec/masamune/actions/transform_spec.rb

@@ -44,7 +44,7 @@ describe Masamune::Actions::Transform do
         column 'updated_at', type: :timestamp
       end
 
-      fact 'visits', partition: 'y%Ym%m', grain: %w(hourly daily monthly) do
+      fact 'visits', partition: 'y%Ym%m', grain: %w[hourly daily monthly] do
         references :date
         references :user
 

data/spec/masamune/commands/aws_emr_spec.rb

@@ -45,7 +45,7 @@ describe Masamune::Commands::AwsEmr do
   describe '#command_args' do
     subject { instance.command_args }
 
-    it { is_expected.to eq(%w(aws emr ssh)) }
+    it { is_expected.to eq(%w[aws emr ssh]) }
 
     context 'with --cluster-id j-XYZ' do
       let(:delegate) { double(command_args: ['hive', '-e', "'show tables;'"]) }

data/spec/masamune/commands/shell_spec.rb

@@ -116,7 +116,7 @@ describe Masamune::Commands::Shell do
       end
 
       it { expect(delegate.status).to eq(0) }
-      it { expect(delegate.stdout).to eq(%w(ping pong)) }
+      it { expect(delegate.stdout).to eq(%w[ping pong]) }
       it { expect(delegate.stderr).to eq([]) }
     end
 
@@ -172,17 +172,17 @@ describe Masamune::Commands::Shell do
 
       context 'with command_args containing nil' do
         let(:command_args) { ['echo', nil, 'foo'] }
-        it { is_expected.to eq(%w(echo foo)) }
+        it { is_expected.to eq(%w[echo foo]) }
       end
 
       context 'with command_args containing an integer' do
         let(:command_args) { ['echo', nil, 5] }
-        it { is_expected.to eq(%w(echo 5)) }
+        it { is_expected.to eq(%w[echo 5]) }
       end
 
       context 'with nested command_args' do
         let(:command_args) { [['echo'], ['foo']] }
-        it { is_expected.to eq(%w(echo foo)) }
+        it { is_expected.to eq(%w[echo foo]) }
       end
     end
   end

data/spec/masamune/data_plan/builder_spec.rb

@@ -27,8 +27,8 @@ describe Masamune::DataPlan::Builder do
     end
 
     context 'with multiple namespaces' do
-      let(:namespaces) { %w(a b) }
-      let(:commands) { %w(load store) }
+      let(:namespaces) { %w[a b] }
+      let(:commands) { %w[load store] }
       let(:sources) { [{ path: 'log/%Y%m%d.*.log' }, { path: 'table/y=%Y/m=%m/d=%d' }] }
       let(:targets) { [{ path: 'table/y=%Y/m=%m/d=%d' }, { path: 'daily/%Y-%m-%d' }] }
 
@@ -47,8 +47,8 @@ describe Masamune::DataPlan::Builder do
     end
 
     context 'with :for option' do
-      let(:namespaces) { %w(a a a) }
-      let(:commands) { %w(missing_before override missing_after) }
+      let(:namespaces) { %w[a a a] }
+      let(:commands) { %w[missing_before override missing_after] }
       let(:sources) { [{ path: 'log/%Y%m%d.*.log', for: 'override' }] }
       let(:targets) { [{ path: 'table/y=%Y/m=%m/d=%d', for: 'override' }] }
 
@@ -70,8 +70,8 @@ describe Masamune::DataPlan::Builder do
     end
 
     context 'with :skip option' do
-      let(:namespaces) { %w(a a a) }
-      let(:commands) { %w(missing_before override) }
+      let(:namespaces) { %w[a a a] }
+      let(:commands) { %w[missing_before override] }
       let(:sources) { [{ skip: true }, { path: 'log/%Y%m%d.*.log' }] }
       let(:targets) { [{ skip: true }, { path: 'table/y=%Y/m=%m/d=%d' }] }
 

data/spec/masamune/filesystem_spec.rb

@@ -739,14 +739,14 @@ shared_examples_for 'Filesystem' do
 
   describe '#glob_sort' do
     before do
-      allow_any_instance_of(Masamune::Filesystem).to receive(:glob).and_return(%w(/tmp/a/02.txt /tmp/b/01.txt /tmp/c/00.txt))
+      allow_any_instance_of(Masamune::Filesystem).to receive(:glob).and_return(%w[/tmp/a/02.txt /tmp/b/01.txt /tmp/c/00.txt])
     end
 
     subject do
       instance.glob_sort('/tmp/*', order: :basename)
     end
 
-    it { is_expected.to eq(%w(/tmp/c/00.txt /tmp/b/01.txt /tmp/a/02.txt)) }
+    it { is_expected.to eq(%w[/tmp/c/00.txt /tmp/b/01.txt /tmp/a/02.txt]) }
     it { expect { |b| instance.glob_sort('/tmp/*', order: :basename, &b) }.to yield_successive_args('/tmp/c/00.txt', '/tmp/b/01.txt', '/tmp/a/02.txt') }
   end
 

data/spec/masamune/schema/catalog_spec.rb

@@ -55,8 +55,8 @@ describe Masamune::Schema::Catalog do
   end
 
   context '#load' do
-    let(:postgres_extra) { %w(/tmp/schema.psql /tmp/00_schema.psql /tmp/20_schema.psql /tmp/40_schema.psql.erb) }
-    let(:hive_extra) { %w(/tmp/schema.hql /tmp/00_schema.hql /tmp/20_schema.hql /tmp/40_schema.hql.erb) }
+    let(:postgres_extra) { %w[/tmp/schema.psql /tmp/00_schema.psql /tmp/20_schema.psql /tmp/40_schema.psql.erb] }
+    let(:hive_extra) { %w[/tmp/schema.hql /tmp/00_schema.hql /tmp/20_schema.hql /tmp/40_schema.hql.erb] }
     let(:extra) { postgres_extra + hive_extra }
 
     before do
@@ -322,7 +322,7 @@ describe Masamune::Schema::Catalog do
             column 'user_id'
           end
 
-          fact 'visits', grain: %w(hourly daily monthly) do
+          fact 'visits', grain: %w[hourly daily monthly] do
             references :user
             measure 'count'
           end

data/spec/masamune/schema/column_spec.rb

@@ -59,7 +59,7 @@ describe Masamune::Schema::Column do
     end
 
     context 'with type :enum' do
-      subject(:column) { described_class.new(id: 'mode', type: :enum, values: %w(public private)) }
+      subject(:column) { described_class.new(id: 'mode', type: :enum, values: %w[public private]) }
 
       context '#default' do
         subject { column.default }
@@ -81,7 +81,7 @@ describe Masamune::Schema::Column do
       end
 
       context 'with :default' do
-        subject(:column) { described_class.new(id: 'mode', type: :enum, values: %w(public private), default: 'private') }
+        subject(:column) { described_class.new(id: 'mode', type: :enum, values: %w[public private], default: 'private') }
 
         context '#default' do
           subject { column.default }
@@ -123,7 +123,7 @@ describe Masamune::Schema::Column do
     end
 
     context 'with index: ["id", "shared"]' do
-      subject(:column) { described_class.new(id: 'id', index: %w(id shared)) }
+      subject(:column) { described_class.new(id: 'id', index: %w[id shared]) }
       context '#index' do
         subject { column.index }
         it { is_expected.to include(:id) }
@@ -210,7 +210,7 @@ describe Masamune::Schema::Column do
     end
 
     context 'with type :enum' do
-      let(:column) { described_class.new(id: 'enum', type: :enum, values: %w(public private)) }
+      let(:column) { described_class.new(id: 'enum', type: :enum, values: %w[public private]) }
       context 'with enum value' do
         let(:value) { 'public' }
         it { is_expected.to eq("'public'::ENUM_TYPE") }
@@ -476,7 +476,7 @@ describe Masamune::Schema::Column do
 
       context 'when array' do
         let(:value) { '["1","2","3"]' }
-        it { is_expected.to eq(%w(1 2 3)) }
+        it { is_expected.to eq(%w[1 2 3]) }
       end
 
       context 'when hash' do
@@ -494,7 +494,7 @@ describe Masamune::Schema::Column do
   describe '#default_ruby_value' do
     subject(:result) { column.default_ruby_value }
 
-    [:boolean, :integer, :string].each do |type|
+    %i[boolean integer string].each do |type|
       context "with type :#{type}" do
         let(:column) { described_class.new(id: 'column', type: type) }
         it { is_expected.to be_nil }
@@ -511,7 +511,7 @@ describe Masamune::Schema::Column do
       it { is_expected.to eq(Time.new(0)) }
     end
 
-    [:json, :yaml, :key_value].each do |type|
+    %i[json yaml key_value].each do |type|
       context "with type :#{type}" do
         let(:column) { described_class.new(id: 'column', type: type) }
         it { is_expected.to eq({}) }
@@ -602,7 +602,7 @@ describe Masamune::Schema::Column do
       end
 
       context 'when array of string' do
-        let(:value) { %w(1 2) }
+        let(:value) { %w[1 2] }
         it { is_expected.to eq('[1,2]') }
       end
     end
@@ -626,7 +626,7 @@ describe Masamune::Schema::Column do
       end
 
       context 'when array of string' do
-        let(:value) { %w(1 2) }
+        let(:value) { %w[1 2] }
         it { is_expected.to eq('["1","2"]') }
       end
 

data/spec/masamune/schema/table_spec.rb

@@ -70,8 +70,8 @@ describe Masamune::Schema::Table do
     let(:table) do
       described_class.new id: 'user',
         columns: [
-          Masamune::Schema::Column.new(id: 'tenant_id', index: %w(tenant_id shared)),
-          Masamune::Schema::Column.new(id: 'user_id', index: %w(user_id shared))
+          Masamune::Schema::Column.new(id: 'tenant_id', index: %w[tenant_id shared]),
+          Masamune::Schema::Column.new(id: 'user_id', index: %w[user_id shared])
         ]
     end
 
@@ -83,7 +83,7 @@ describe Masamune::Schema::Table do
       described_class.new id: 'user',
         columns: [
           Masamune::Schema::Column.new(id: 'tenant_id', unique: ['shared']),
-          Masamune::Schema::Column.new(id: 'user_id', unique: %w(user_id shared))
+          Masamune::Schema::Column.new(id: 'user_id', unique: %w[user_id shared])
         ]
     end
 
@@ -99,7 +99,7 @@ describe Masamune::Schema::Table do
         columns: [
           Masamune::Schema::Column.new(id: 'tenant_id'),
           Masamune::Schema::Column.new(id: 'user_id'),
-          Masamune::Schema::Column.new(id: 'state', type: :enum, sub_type: :user_state, values: %w(active inactive terminated), default: 'active')
+          Masamune::Schema::Column.new(id: 'state', type: :enum, sub_type: :user_state, values: %w[active inactive terminated], default: 'active')
         ]
     end
 
@@ -324,22 +324,22 @@ describe Masamune::Schema::Table do
     end
 
     context 'with specified columns' do
-      subject(:stage_table) { table.stage_table(columns: %w(id name user_account_state.id hr_user_account_state.id)) }
+      subject(:stage_table) { table.stage_table(columns: %w[id name user_account_state.id hr_user_account_state.id]) }
 
       it 'should stage table' do
         expect(stage_table.name).to eq('user_table_stage')
-        expect(stage_table.columns.keys).to eq([:name, :user_account_state_table_id, :hr_user_account_state_table_id])
-        expect(stage_table.references.keys).to eq([:user_account_state, :hr_user_account_state])
+        expect(stage_table.columns.keys).to eq(%i[name user_account_state_table_id hr_user_account_state_table_id])
+        expect(stage_table.references.keys).to eq(%i[user_account_state hr_user_account_state])
       end
     end
 
     context 'with specified columns (denormalized)' do
-      subject(:stage_table) { table.stage_table(columns: %w(id name user_account_state.name hr_user_account_state.name)) }
+      subject(:stage_table) { table.stage_table(columns: %w[id name user_account_state.name hr_user_account_state.name]) }
 
       it 'should stage table' do
         expect(stage_table.name).to eq('user_table_stage')
-        expect(stage_table.columns.keys).to eq([:name, :user_account_state_table_name, :hr_user_account_state_table_name])
-        expect(stage_table.references.keys).to eq([:user_account_state, :hr_user_account_state])
+        expect(stage_table.columns.keys).to eq(%i[name user_account_state_table_name hr_user_account_state_table_name])
+        expect(stage_table.references.keys).to eq(%i[user_account_state hr_user_account_state])
       end
     end
 
@@ -357,8 +357,8 @@ describe Masamune::Schema::Table do
 
       it 'should stage table' do
         expect(stage_table.name).to eq('user_table_stage')
-        expect(stage_table.columns.keys).to eq([:name, :user_account_state_table_name, :hr_user_account_state_table_name])
-        expect(stage_table.references.keys).to eq([:user_account_state, :hr_user_account_state])
+        expect(stage_table.columns.keys).to eq(%i[name user_account_state_table_name hr_user_account_state_table_name])
+        expect(stage_table.references.keys).to eq(%i[user_account_state hr_user_account_state])
       end
     end
 
@@ -376,7 +376,7 @@ describe Masamune::Schema::Table do
 
       it 'should stage table' do
         expect(stage_table.name).to eq('user_table_stage')
-        expect(stage_table.columns.keys).to eq([:user_id, :name, :hr_user_account_state_table_name])
+        expect(stage_table.columns.keys).to eq(%i[user_id name hr_user_account_state_table_name])
         expect(stage_table.references.keys).to eq([:hr_user_account_state])
       end
     end
@@ -396,7 +396,7 @@ describe Masamune::Schema::Table do
 
       it 'should stage table' do
         expect(stage_table.name).to eq('user_table_stage')
-        expect(stage_table.columns.keys).to eq([:hr_user_account_state_table_id, :user_id, :name])
+        expect(stage_table.columns.keys).to eq(%i[hr_user_account_state_table_id user_id name])
         expect(stage_table.references.keys).to eq([:hr_user_account_state])
       end
     end

data/spec/masamune/thor_spec.rb

@@ -93,11 +93,11 @@ describe Masamune::Thor do
       let(:command) { 'command' }
       let(:options) { ['--version'] }
       it 'exits with status code 0 and prints version' do
-        expect { execute_command }.to raise_error { |e|
+        expect { execute_command }.to raise_error do |e|
           expect(e).to be_a(SystemExit)
           expect(e.message).to eq('exit')
           expect(e.status).to eq(0)
-        }
+        end
         expect(stdout.string).to match(/\Amasamune/)
         expect(stderr.string).to be_blank
       end
@@ -199,11 +199,11 @@ describe Masamune::Thor do
       let(:command) { 'unknown' }
       let(:options) { ['--start', '2013-01-01'] }
       it 'exits with status code 1 and prints error to stderr' do
-        expect { execute_command }.to raise_error { |e|
+        expect { execute_command }.to raise_error do |e|
           expect(e).to be_a(SystemExit)
           expect(e.message).to eq('Path :unknown_dir not defined')
           expect(e.status).to eq(1)
-        }
+        end
         expect(stdout.string).to be_blank
         expect(stderr.string).to match(/Path :unknown_dir not defined/)
       end

data/spec/masamune/transform/define_table.dimension_spec.rb

@@ -45,8 +45,8 @@ describe Masamune::Transform::DefineTable do
       catalog.schema :hive do
         dimension 'tenant', type: :ledger do
           column 'tenant_id', type: :integer, natural_key: true
-          column 'tenant_account_state', type: :enum, values: %w(missing unknown active inactive)
-          column 'tenant_premium_state', type: :enum, values: %w(missing unkown goodwill pilot sandbox premium internal free vmware)
+          column 'tenant_account_state', type: :enum, values: %w[missing unknown active inactive]
+          column 'tenant_premium_state', type: :enum, values: %w[missing unkown goodwill pilot sandbox premium internal free vmware]
           column 'preferences', type: :key_value, null: true
         end
       end
@@ -81,8 +81,8 @@ describe Masamune::Transform::DefineTable do
           partition :y
           partition :m
           column 'tenant_id', type: :integer, natural_key: true
-          column 'tenant_account_state', type: :enum, values: %w(missing unknown active inactive)
-          column 'tenant_premium_state', type: :enum, values: %w(missing unkown goodwill pilot sandbox premium internal free vmware)
+          column 'tenant_account_state', type: :enum, values: %w[missing unknown active inactive]
+          column 'tenant_premium_state', type: :enum, values: %w[missing unkown goodwill pilot sandbox premium internal free vmware]
           column 'preferences', type: :key_value, null: true
         end
       end

data/spec/masamune/transform/define_table.fact_spec.rb

@@ -179,9 +179,9 @@ describe Masamune::Transform::DefineTable do
           total INTEGER
         );
 
-        COPY visits_file_fact_stage FROM 'output_1.csv' WITH (FORMAT 'csv', HEADER true);
-        COPY visits_file_fact_stage FROM 'output_2.csv' WITH (FORMAT 'csv', HEADER true);
-        COPY visits_file_fact_stage FROM 'output_3.csv' WITH (FORMAT 'csv', HEADER true);
+        \\COPY visits_file_fact_stage FROM 'output_1.csv' WITH (FORMAT 'csv', HEADER true);
+        \\COPY visits_file_fact_stage FROM 'output_2.csv' WITH (FORMAT 'csv', HEADER true);
+        \\COPY visits_file_fact_stage FROM 'output_3.csv' WITH (FORMAT 'csv', HEADER true);
 
         CREATE INDEX visits_file_fact_stage_964dac1_index ON visits_file_fact_stage (date_dimension_date_id);
         CREATE INDEX visits_file_fact_stage_5a187ed_index ON visits_file_fact_stage (feature_type_name);

data/spec/masamune/transform/define_table.table_spec.rb

@@ -101,8 +101,8 @@ describe Masamune::Transform::DefineTable do
     before do
       catalog.schema :postgres do
         table 'user' do
-          column 'tenant_id', index: %w(tenant_id shared)
-          column 'user_id', index: %w(user_id shared)
+          column 'tenant_id', index: %w[tenant_id shared]
+          column 'user_id', index: %w[user_id shared]
         end
       end
     end
@@ -146,7 +146,7 @@ describe Masamune::Transform::DefineTable do
       catalog.schema :postgres do
         table 'user' do
           column 'tenant_id', unique: ['shared']
-          column 'user_id', unique: %w(user_id shared)
+          column 'user_id', unique: %w[user_id shared]
         end
       end
     end
@@ -381,7 +381,7 @@ describe Masamune::Transform::DefineTable do
         table 'user' do
           column 'tenant_id'
           column 'user_id'
-          column 'state', type: :enum, sub_type: :user_state, values: %w(active inactive terminated), default: 'active'
+          column 'state', type: :enum, sub_type: :user_state, values: %w[active inactive terminated], default: 'active'
         end
       end
     end
@@ -724,7 +724,7 @@ describe Masamune::Transform::DefineTable do
     end
 
     context 'for postgres table with all specified columns' do
-      let(:columns) { %w(hr_user_account_state_table_id user_account_state_table_id name) }
+      let(:columns) { %w[hr_user_account_state_table_id user_account_state_table_id name] }
 
       it 'should render table template' do
         is_expected.to eq <<-EOS.strip_heredoc
@@ -739,7 +739,7 @@ describe Masamune::Transform::DefineTable do
     end
 
     context 'for postgres table with all specified columns in denormalized form' do
-      let(:columns) { %w(hr_user_account_state.name user_account_state.name name) }
+      let(:columns) { %w[hr_user_account_state.name user_account_state.name name] }
 
       it 'should render table template' do
         is_expected.to eq <<-EOS.strip_heredoc

data/spec/masamune/transform/denormalize_table_spec.rb

@@ -311,8 +311,8 @@ describe Masamune::Transform::DenormalizeTable do
           partition :y
           partition :m
           column 'tenant_id', type: :integer, natural_key: true
-          column 'tenant_account_state', type: :enum, values: %w(missing unknown active inactive)
-          column 'tenant_premium_state', type: :enum, values: %w(missing unkown goodwill pilot sandbox premium internal free vmware)
+          column 'tenant_account_state', type: :enum, values: %w[missing unknown active inactive]
+          column 'tenant_premium_state', type: :enum, values: %w[missing unkown goodwill pilot sandbox premium internal free vmware]
           column 'preferences', type: :key_value, null: true
         end
       end
@@ -322,18 +322,18 @@ describe Masamune::Transform::DenormalizeTable do
 
     let(:options) do
       {
-        columns: %w(
+        columns: %w[
           tenant_id
           tenant_account_state
           tenant_premium_state
           preferences
           y
           m
-        ),
-        order: %w(
+        ],
+        order: %w[
           tenant_id
           start_at
-        )
+        ]
       }
     end
 

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -69,7 +69,7 @@ describe Masamune::Transform::RollupFact do
         measure 'total', type: :integer, aggregate: :sum
       end
 
-      fact 'visits', partition: 'y%Ym%m', grain: %w(hourly daily monthly) do
+      fact 'visits', partition: 'y%Ym%m', grain: %w[hourly daily monthly] do
         references :cluster
         references :date
         references :tenant

data/spec/masamune/transform/stage_fact_spec.rb

@@ -72,10 +72,10 @@ describe Masamune::Transform::StageFact do
         row group_id: -2, group_mode: 'unknown', attributes: { id: :unknown }
       end
 
-      fact 'visits', partition: 'y%Ym%m', grain: %w(hourly daily monthly) do
+      fact 'visits', partition: 'y%Ym%m', grain: %w[hourly daily monthly] do
         references :cluster
         references :date
-        references :tenant, through: [:user, :from_group, :group]
+        references :tenant, through: %i[user from_group group]
         references :user
         references :group, label: 'from', default: :missing, unknown: :unknown
         references :group, default: :missing, unknown: :unknown

data/spec/support/masamune/mock_filesystem.rb

@@ -88,7 +88,7 @@ class Masamune::MockFilesystem < Delegator
     true
   end
 
-  [:mkdir!, :copy_file_to_file, :copy_file_to_dir, :copy_dir, :remove_file, :remove_dir, :move_file_to_file, :move_file_to_dir, :move_dir, :write].each do |method|
+  %i[mkdir! copy_file_to_file copy_file_to_dir copy_dir remove_file remove_dir move_file_to_file move_file_to_dir move_dir write].each do |method|
     define_method(method) do |*_args|
       # Empty
     end

data/spec/support/masamune/shared_example_group.rb

@@ -119,7 +119,7 @@ module Masamune::SharedExampleGroup
     if output['hive'] && output['hive'].is_a?(String)
       hive(exec: output['hive'], output: output_file)
     elsif output['table']
-      table = eval "catalog.#{output['table']}" # rubocop:disable Lint/Eval
+      table = eval "catalog.#{output['table']}" # rubocop:disable Security/Eval
       query = denormalize_table(table, output.slice('columns', 'order', 'except', 'include')).to_s
       # FIXME: define format based on table.store.format
       case table.store.type

data/spec/support/masamune/task_example_group.rb

@@ -34,10 +34,10 @@ module Masamune::TaskExampleGroup
 
   shared_examples 'general usage' do
     it 'exits with status code 0 and prints general usage' do
-      expect { execute_command }.to raise_error { |e|
+      expect { execute_command }.to raise_error do |e|
         expect(e).to be_a(SystemExit)
         expect(e.status).to eq(0)
-      }
+      end
       expect(stdout.string).to match(/^Commands:/)
       expect(stderr.string).to be_blank
     end
@@ -45,10 +45,10 @@ module Masamune::TaskExampleGroup
 
   shared_examples 'command usage' do
     it 'exits with status code 0 and prints command usage' do
-      expect { execute_command }.to raise_error { |e|
+      expect { execute_command }.to raise_error do |e|
         expect(e).to be_a(SystemExit)
         expect(e.status).to eq(0)
-      }
+      end
       expect(stdout.string).to match(/^Usage:/)
       expect(stdout.string).to match(/^Options:/)
       expect(stderr.string).to be_blank
@@ -57,10 +57,10 @@ module Masamune::TaskExampleGroup
 
   shared_examples 'executes with success' do
     it 'exits with status code 0' do
-      expect { execute_command }.to raise_error { |e|
+      expect { execute_command }.to raise_error do |e|
         expect(e).to be_a(SystemExit)
         expect(e.status).to eq(0)
-      }
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.11
+  version: 0.19.0
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -464,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Hybrid Data & Work Flow