masamune 0.17.12 → 0.17.13

data/spec/masamune/transform/load_fact_spec.rb

@@ -69,7 +69,7 @@ describe Masamune::Transform::LoadFact do
   end
 
   let(:files) { (1..3).map { |i| double(path: "output_#{i}.csv") } }
-  let(:date) { DateTime.civil(2014,8) }
+  let(:date) { DateTime.civil(2014, 8) }
   let(:target) { catalog.postgres.visits_fact }
   let(:source) { catalog.postgres.visits_file }
   let(:source_table) { source.stage_table(suffix: 'file', table: target, inherit: false) }

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -29,7 +29,7 @@ describe Masamune::Transform::RollupFact do
         column 'id', type: :sequence, surrogate_key: true, auto: true
         column 'name', type: :string
 
-        row name: 'current_database()', attributes: {default: true}
+        row name: 'current_database()', attributes: { default: true }
       end
 
       dimension 'date', type: :date do
@@ -82,7 +82,7 @@ describe Masamune::Transform::RollupFact do
   end
 
   context 'with postgres transaction fact' do
-    let(:date) { DateTime.civil(2014,8) }
+    let(:date) { DateTime.civil(2014, 8) }
     let(:source) { catalog.postgres.visits_transaction_fact }
     let(:target) { catalog.postgres.visits_hourly_fact }
 
@@ -180,7 +180,7 @@ describe Masamune::Transform::RollupFact do
   end
 
   context 'with postgres hourly fact' do
-    let(:date) { DateTime.civil(2014,8) }
+    let(:date) { DateTime.civil(2014, 8) }
     let(:source) { catalog.postgres.visits_hourly_fact }
     let(:target) { catalog.postgres.visits_daily_fact }
 
@@ -278,7 +278,7 @@ describe Masamune::Transform::RollupFact do
   end
 
   context 'with postgres daily fact' do
-    let(:date) { DateTime.civil(2014,8) }
+    let(:date) { DateTime.civil(2014, 8) }
     let(:source) { catalog.postgres.visits_daily_fact }
     let(:target) { catalog.postgres.visits_monthly_fact }
 

data/spec/masamune/transform/stage_dimension_spec.rb

@@ -26,14 +26,14 @@ describe Masamune::Transform::StageDimension do
       dimension 'cluster', type: :mini do
         column 'id', type: :integer, surrogate_key: true, auto: true
         column 'name', type: :string, unique: true
-        row name: 'default', attributes: {default: true}
+        row name: 'default', attributes: { default: true }
       end
 
       dimension 'user_account_state', type: :mini do
         column 'name', type: :string, unique: true
         column 'description', type: :string
         row name: 'registered', description: 'Registered'
-        row name: 'active', description: 'Active', attributes: {default: true}
+        row name: 'active', description: 'Active', attributes: { default: true }
         row name: 'inactive', description: 'Inactive'
       end
 
@@ -41,7 +41,7 @@ describe Masamune::Transform::StageDimension do
         references :cluster
         column 'tenant_id', type: :integer, unique: true, natural_key: true
         column 'department_id', type: :integer, unique: true, natural_key: true
-        row tenant_id: -1, department_id: -1, attributes: {default: true}
+        row tenant_id: -1, department_id: -1, attributes: { default: true }
       end
 
       dimension 'user', type: :four do

data/spec/masamune/transform/stage_fact_spec.rb

@@ -29,7 +29,7 @@ describe Masamune::Transform::StageFact do
         column 'id', type: :sequence, surrogate_key: true, auto: true
         column 'name', type: :string
 
-        row name: 'current_database()', attributes: {default: true}
+        row name: 'current_database()', attributes: { default: true }
       end
 
       dimension 'date', type: :date do
@@ -68,8 +68,8 @@ describe Masamune::Transform::StageFact do
         column 'tenant_id', type: :integer, natural_key: true
         column 'group_id', type: :integer, natural_key: true
         column 'group_mode', type: :enum, sub_type: 'group_mode', values: %(missing unknown public private), index: true, natural_key: true, default: 'missing'
-        row group_id: -1, group_mode: 'missing', attributes: {id: :missing}
-        row group_id: -2, group_mode: 'unknown', attributes: {id: :unknown}
+        row group_id: -1, group_mode: 'missing', attributes: { id: :missing }
+        row group_id: -2, group_mode: 'unknown', attributes: { id: :unknown }
       end
 
       fact 'visits', partition: 'y%Ym%m', grain: %w(hourly daily monthly) do
@@ -104,7 +104,7 @@ describe Masamune::Transform::StageFact do
     end
   end
 
-  let(:date) { DateTime.civil(2014,8) }
+  let(:date) { DateTime.civil(2014, 8) }
   let(:target) { catalog.postgres.visits_hourly_fact }
   let(:source) { catalog.postgres.visits_hourly_file.stage_table(suffix: 'file', table: target, inherit: false) }
 

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Bundler.require(:default, :development, :test)
 require 'tempfile'
 require 'tmpdir'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'active_support/core_ext/string/strip'
 

data/spec/support/masamune/example_group.rb

@@ -25,11 +25,11 @@ require 'masamune/has_environment'
 # Separate environment for test harness itself
 module Masamune::ExampleGroup
   include Masamune::HasEnvironment
-  extend self
+  extend self # rubocop:disable Style/ModuleFunction
 
   def self.included(base)
     base.before(:all) do
-      self.filesystem.environment = self.environment = Masamune::ExampleGroup.environment
+      filesystem.environment = self.environment = Masamune::ExampleGroup.environment
       Thor.send(:include, Masamune::ThorMute)
     end
   end

data/spec/support/masamune/job_example_group.rb

@@ -38,7 +38,7 @@ module Masamune::JobExampleGroup
       it "should match #{fixture_file}" do
         aggregate_failures 'generates expected output' do
           gather_example_output(fixture) do |actual_data, expect_file, expect_data|
-            expect(File.exists?(expect_file)).to eq(true)
+            expect(File.exist?(expect_file)).to eq(true)
             expect(actual_data).to eq(expect_data)
           end
         end
@@ -57,6 +57,6 @@ module Masamune::JobExampleGroup
 end
 
 RSpec.configure do |config|
-  config.include Masamune::JobExampleGroup, :type => :job, :file_path => %r{.*/spec/.*job_spec\.rb}
-  config.include Masamune::JobExampleGroup, :type => :task, :file_path => %r{.*/spec/.*task_spec\.rb}
+  config.include Masamune::JobExampleGroup, type: :job, file_path: %r{.*/spec/.*job_spec\.rb}
+  config.include Masamune::JobExampleGroup, type: :task, file_path: %r{.*/spec/.*task_spec\.rb}
 end

data/spec/support/masamune/job_fixture.rb

@@ -43,7 +43,7 @@ module Masamune
     class << self
       def load(options = {}, context = binding)
         file = file_name(options)
-        raise ArgumentError, "Fixture '#{file}' does not exist" unless File.exists?(file)
+        raise ArgumentError, "Fixture '#{file}' does not exist" unless File.exist?(file)
         YAML.load(ERB.new(File.read(file)).result(context)).tap do |data|
           return new(options.merge(data: data, context: context))
         end
@@ -77,7 +77,7 @@ module Masamune
         @data['inputs'].each do |input|
           file.puts '-'.indent(INDENT)
           serialize(input) do |elem|
-            file.puts elem.indent(INDENT*2)
+            file.puts elem.indent(INDENT * 2)
           end
         end
         file.puts
@@ -85,7 +85,7 @@ module Masamune
         @data['outputs'].each do |output|
           file.puts '-'.indent(INDENT)
           serialize(output) do |elem|
-            file.puts elem.indent(INDENT*2)
+            file.puts elem.indent(INDENT * 2)
           end
         end
       end
@@ -97,7 +97,7 @@ module Masamune
         @data['inputs'].map do |input|
           if input['reference']
             raise ArgumentError, "reference in #{file_name} requires fixture" unless input['reference']['fixture'] || input['reference']['file']
-            reference = self.class.load({path: input['reference']['path'] || path, name: input['reference']['fixture'], file: input['reference']['file'], type: @type}, @context)
+            reference = self.class.load({ path: input['reference']['path'] || path, name: input['reference']['fixture'], file: input['reference']['file'], type: @type }, @context)
             section = input['reference']['section'] || 'outputs'
             reference.send(section) if reference.respond_to?(section)
           else

data/spec/support/masamune/mock_command.rb

@@ -50,20 +50,20 @@ module Masamune::MockCommand
 
     def around_execute(&block)
       self.class.patterns.each do |pattern, (value, io)|
-        if @delegate.command_args.join(' ') =~ pattern
-          while line = io.gets
-            line_no ||= 0
-            @delegate.handle_stdout(line.chomp, line_no) if @delegate.respond_to?(:handle_stdout)
-            line_no += 1
-          end
-          return value.respond_to?(:call) ? value.call : value
+        next unless @delegate.command_args.join(' ') =~ pattern
+        until io.eof?
+          line = io.gets
+          line_no ||= 0
+          @delegate.handle_stdout(line.chomp, line_no) if @delegate.respond_to?(:handle_stdout)
+          line_no += 1
         end
+        return value.respond_to?(:call) ? value.call : value
       end
 
       if @delegate.respond_to?(:around_execute)
         @delegate.around_execute(&block)
       else
-        block.call
+        yield
       end
     end
   end
@@ -82,11 +82,11 @@ module Masamune::MockCommand
   end
 
   def mock_success
-    OpenStruct.new(:success? => true)
+    OpenStruct.new(success?: true)
   end
 
   def mock_failure
-    OpenStruct.new(:success? => false)
+    OpenStruct.new(success?: false)
   end
 
   def mock_command(pattern, value = nil, io = StringIO.new, &block)

data/spec/support/masamune/mock_delegate.rb

@@ -38,11 +38,11 @@ class Masamune::MockDelegate
   end
 
   def handle_stdout(line, line_no)
-    self.stdout[line_no] = line
+    stdout[line_no] = line
   end
 
   def handle_stderr(line, line_no)
-    self.stderr[line_no] = line
+    stderr[line_no] = line
   end
 
   def handle_failure(code)

data/spec/support/masamune/mock_filesystem.rb

@@ -63,7 +63,7 @@ class Masamune::MockFilesystem < Delegator
   def glob_stat(pattern, options = {})
     return Set.new(to_enum(:glob_stat, pattern, options)) unless block_given?
     file_regexp = glob_to_regexp(pattern, recursive: true)
-    @files.each do |name, stat|
+    @files.each do |_name, stat|
       next if stat.name == dirname(pattern)
       next unless stat.name =~ file_regexp
       yield stat
@@ -85,12 +85,12 @@ class Masamune::MockFilesystem < Delegator
   def clear!
   end
 
-  def check_immutable_path!(file)
+  def check_immutable_path!(_file)
     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|
-    define_method(method) do |*args|
+    define_method(method) do |*_args|
       # Empty
     end
   end

data/spec/support/masamune/shared_example_group.rb

@@ -29,20 +29,22 @@ module Masamune::SharedExampleGroup
       io.sync = true
       io.write stdin
       io.close_write
-      while !io.eof?
-        stdout << io.read
-      end
+      stdout << io.read until io.eof?
     end
     stdout.string
   end
 
   def capture_output
-    @stdout, @stderr = StringIO.new, StringIO.new
-    tmp_stdout, $stdout = $stdout, @stdout
-    tmp_stderr, $stderr = $stderr, @stderr
+    @stdout = StringIO.new
+    @stderr = StringIO.new
+    tmp_stdout = $stdout
+    $stdout = @stdout
+    tmp_stderr = $stderr
+    $stderr = @stderr
     yield
   ensure
-    $stdout, $stderr = tmp_stdout, tmp_stderr
+    $stdout = tmp_stdout
+    $stderr = tmp_stderr
   end
 
   def capture(enable = true)
@@ -85,25 +87,21 @@ module Masamune::SharedExampleGroup
     end
   end
 
-  # TODO encapsulate commands as runners
+  # TODO: encapsulate commands as runners
   def setup_example_input!(fixture)
     fixture.inputs.each do |input|
       if input['file']
         filesystem.write(with_delim(input['data'], input['delim']), input['file'])
       end
 
-      if input['hive']
-        hive(exec: input['hive'])
-      end
+      hive(exec: input['hive']) if input['hive']
 
-      if input['psql']
-        postgres(exec: input['psql'])
-      end
+      postgres(exec: input['psql']) if input['psql']
     end
   end
 
   def gather_example_output(fixture)
-    fail "No outputs defined for #{fixture.file_name}" if fixture.outputs.none?
+    raise "No outputs defined for #{fixture.file_name}" if fixture.outputs.none?
     fixture.outputs.each do |output|
       output_file = output['file'] || Tempfile.new('masamune').path
 
@@ -123,7 +121,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']}"
+      table = eval "catalog.#{output['table']}" # rubocop:disable Lint/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/step_example_group.rb

@@ -32,7 +32,7 @@ module Masamune::StepExampleGroup
       end
 
       context "with #{fixture_file} fixture" do
-        let(:fixture) { Masamune::StepFixture.load({file: fixture_file}, binding) }
+        let(:fixture) { Masamune::StepFixture.load({ file: fixture_file }, binding) }
 
         let(:input) { fixture.input }
         let(:output) { fixture.output }
@@ -62,7 +62,7 @@ module Masamune::StepExampleGroup
 end
 
 RSpec.configure do |config|
-  config.include Masamune::StepExampleGroup, :type => :step, :file_path => %r{.*/spec/.*step_spec\.rb}
-  config.include Masamune::StepExampleGroup, :type => :step, :file_path => %r{.*/spec/.*mapper_spec\.rb}
-  config.include Masamune::StepExampleGroup, :type => :step, :file_path => %r{.*/spec/.*reducer_spec\.rb}
+  config.include Masamune::StepExampleGroup, type: :step, file_path: %r{.*/spec/.*step_spec\.rb}
+  config.include Masamune::StepExampleGroup, type: :step, file_path: %r{.*/spec/.*mapper_spec\.rb}
+  config.include Masamune::StepExampleGroup, type: :step, file_path: %r{.*/spec/.*reducer_spec\.rb}
 end

data/spec/support/masamune/step_fixture.rb

@@ -38,7 +38,7 @@ module Masamune
     class << self
       def load(options = {}, context = binding)
         file = options[:file]
-        raise ArgumentError, "Fixture '#{file}' does not exist" unless File.exists?(file)
+        raise ArgumentError, "Fixture '#{file}' does not exist" unless File.exist?(file)
         YAML.load(ERB.new(File.read(file)).result(context)).tap do |data|
           return new(options.merge(data: data))
         end

data/spec/support/masamune/task_example_group.rb

@@ -56,5 +56,5 @@ module Masamune::TaskExampleGroup
 end
 
 RSpec.configure do |config|
-  config.include Masamune::TaskExampleGroup, :type => :task, :file_path => %r{.*/spec/.*task_spec\.rb}
+  config.include Masamune::TaskExampleGroup, type: :task, file_path: %r{.*/spec/.*task_spec\.rb}
 end

data/spec/support/masamune/thor_mute.rb

@@ -25,8 +25,9 @@ module Masamune::ThorMute
   def self.included(base)
     base.instance_eval do
       def create_command(*a)
-        $stdout, tmp_stdout = StringIO.new, $stdout
-        super *a
+        tmp_stdout = $stdout
+        $stdout = StringIO.new
+        super(*a)
       ensure
         $stdout = tmp_stdout
       end

data/spec/support/rspec/example/action_example_group.rb

@@ -31,5 +31,5 @@ module ActionExampleGroup
 end
 
 RSpec.configure do |config|
-  config.include ActionExampleGroup, :type => :action, :file_path => %r{spec/masamune/actions}
+  config.include ActionExampleGroup, type: :action, file_path: %r{spec/masamune/actions}
 end

data/spec/support/rspec/example/task_example_group.rb

@@ -21,12 +21,15 @@
 #  THE SOFTWARE.
 
 module TaskExampleGroup
-  def capture(stdout, stderr, &block)
-    tmp_stdout, $stdout = $stdout, stdout
-    tmp_stderr, $stderr = $stderr, stderr
+  def capture(stdout, stderr)
+    tmp_stdout = $stdout
+    $stdout = stdout
+    tmp_stderr = $stderr
+    $stderr = stderr
     yield
   ensure
-    $stdout, $stderr = tmp_stdout, tmp_stderr
+    $stdout = tmp_stdout
+    $stderr = tmp_stderr
   end
 
   shared_examples 'general usage' do

data/spec/support/rspec/example/transform_example_group.rb

@@ -32,5 +32,5 @@ module TransformExampleGroup
 end
 
 RSpec.configure do |config|
-  config.include TransformExampleGroup, :type => :action, :file_path => %r{spec/masamune/transform}
+  config.include TransformExampleGroup, type: :action, file_path: %r{spec/masamune/transform}
 end

data/spec/support/shared_examples/postgres_common_examples.rb

@@ -31,7 +31,7 @@ shared_examples_for Masamune::Commands::PostgresCommon do
     end
 
     context 'with pgpass_file' do
-      let(:configuration) { {:pgpass_file => 'pgpass_file'} }
+      let(:configuration) { { pgpass_file: 'pgpass_file' } }
 
       before do
         allow(File).to receive(:readable?) { true }
@@ -41,7 +41,7 @@ shared_examples_for Masamune::Commands::PostgresCommon do
     end
 
     context 'with pgpass_file that is not readable' do
-      let(:configuration) { {:pgpass_file => 'pgpass_file'} }
+      let(:configuration) { { pgpass_file: 'pgpass_file' } }
 
       before do
         allow(File).to receive(:readable?) { false }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.12
+  version: 0.17.13
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: user_agent_parser
   requirement: !ruby/object:Gem::Requirement