masamune 0.17.12 → 0.17.13

data/lib/masamune/commands/aws_emr.rb

@@ -29,14 +29,14 @@ module Masamune::Commands
     include Masamune::Actions::Execute
 
     DEFAULT_ATTRIBUTES =
-    {
-      :path         => 'aws',
-      :extra        => [],
-      :config_file  => nil,
-      :action       => nil,
-      :cluster_id   => nil,
-      :interactive  => false
-    }
+      {
+        path: 'aws',
+        extra: [],
+        config_file: nil,
+        action: nil,
+        cluster_id: nil,
+        interactive: false
+      }.freeze
 
     def initialize(delegate, attrs = {})
       super delegate
@@ -104,10 +104,10 @@ module Masamune::Commands
     end
 
     def handle_stdout(line, line_no)
-      if line_no == 0 && line =~ /\Assh/
-        @delegate.handle_stderr(line, line_no) if @delegate.respond_to?(:handle_stderr)
-      else
-        @delegate.handle_stdout(line, line_no) if @delegate.respond_to?(:handle_stdout)
+      if line_no == 0 && line.start_with?('ssh') && @delegate.respond_to?(:handle_stderr)
+        @delegate.handle_stderr(line, line_no)
+      elsif @delegate.respond_to?(:handle_stdout)
+        @delegate.handle_stdout(line, line_no)
       end
     end
 

data/lib/masamune/commands/hadoop_filesystem.rb

@@ -25,13 +25,13 @@ require 'delegate'
 module Masamune::Commands
   class HadoopFilesystem < SimpleDelegator
     DEFAULT_ATTRIBUTES =
-    {
-      :path         => 'hadoop',
-      :options      => [],
-      :extra        => [],
-      :block        => nil,
-      :print        => false
-    }
+      {
+        path: 'hadoop',
+        options: [],
+        extra: [],
+        block: nil,
+        print: false
+      }.freeze
 
     def initialize(delegate, attrs = {})
       super delegate
@@ -49,7 +49,7 @@ module Masamune::Commands
       args.flatten
     end
 
-    def handle_stdout(line, line_no)
+    def handle_stdout(line, _line_no)
       @block.call(line) if @block
       console(line) if @print
     end

data/lib/masamune/commands/hadoop_streaming.rb

@@ -39,17 +39,17 @@ module Masamune::Commands
 
     DEFAULT_ATTRIBUTES =
     {
-      :path         => 'hadoop',
-      :options      => [],
-      :jar          => default_hadoop_streaming_jar,
-      :input        => [],
-      :output       => nil,
-      :mapper       => nil,
-      :reducer      => nil,
-      :extra        => [],
-      :upload       => true,
-      :quote        => false
-    }
+      path: 'hadoop',
+      options: [],
+      jar: default_hadoop_streaming_jar,
+      input: [],
+      output: nil,
+      mapper: nil,
+      reducer: nil,
+      extra: [],
+      upload: true,
+      quote: false
+    }.freeze
 
     attr_reader :input
 
@@ -61,7 +61,7 @@ module Masamune::Commands
       @input = Array.wrap(@input)
     end
 
-    # TODO ensure jar/ mapper/reduce exists, warn or remove if output exists
+    # TODO: ensure jar/ mapper/reduce exists, warn or remove if output exists
     def command_args
       args = []
       args << @path
@@ -95,10 +95,10 @@ module Masamune::Commands
           path + '/*'
         end
       end
-      console("hadoop_streaming %s -> %s (%s/%s)" % [@input.join(' '), @output, @mapper, @reducer])
+      console(format('hadoop_streaming %s -> %s (%s/%s)', @input.join(' '), @output, @mapper, @reducer))
     end
 
-    def around_execute(&block)
+    def around_execute
       Dir.chdir(filesystem.path(:run_dir)) do
         yield
       end
@@ -106,10 +106,10 @@ module Masamune::Commands
 
     private
 
-    # FIXME shell quoting is a separate concern
+    # FIXME: shell quoting is a separate concern
     def quote_arg(arg)
       out = arg.dup
-      out.gsub!(%q('\t'), %q('"'\\\\\\\\t'"'))
+      out.gsub!('\'\t\'', %q('"'\\\\\\\\t'"'))
       out
     end
   end

data/lib/masamune/commands/hive.rb

@@ -30,27 +30,27 @@ module Masamune::Commands
   class Hive < SimpleDelegator
     include Masamune::StringFormat
 
-    PROMPT = 'hive>'
+    PROMPT = 'hive>'.freeze
 
     DEFAULT_ATTRIBUTES =
-    {
-      :path           => 'hive',
-      :options        => [],
-      :database       => 'default',
-      :setup_files    => [],
-      :schema_files   => [],
-      :file           => nil,
-      :exec           => nil,
-      :output         => nil,
-      :print          => false,
-      :block          => nil,
-      :variables      => {},
-      :buffer         => nil,
-      :service        => false,
-      :delimiter      => "\001",
-      :csv            => false,
-      :debug          => false
-    }
+      {
+        path: 'hive',
+        options: [],
+        database: 'default',
+        setup_files: [],
+        schema_files: [],
+        file: nil,
+        exec: nil,
+        output: nil,
+        print: false,
+        block: nil,
+        variables: {},
+        buffer: nil,
+        service: false,
+        delimiter: "\001",
+        csv: false,
+        debug: false
+      }.freeze
 
     def initialize(delegate, attrs = {})
       super delegate
@@ -83,11 +83,9 @@ module Masamune::Commands
     end
 
     def before_execute
-      if @file
-        console("hive with file #{@file}")
-      end
+      console("hive with file #{@file}") if @file
 
-      if @debug and output = rendered_template || @file
+      if @debug && (output = rendered_template || @file)
         logger.debug("#{output}:\n" + File.read(output))
       end
 
@@ -96,12 +94,10 @@ module Masamune::Commands
         @file = exec_file
       end
 
-      if @output
-        @buffer = Tempfile.create('masamune_hive_output')
-      end
+      @buffer = Tempfile.create('masamune_hive_output') if @output
     end
 
-    def around_execute(&block)
+    def around_execute
       Dir.chdir(filesystem.path(:run_dir)) do
         yield
       end
@@ -115,21 +111,21 @@ module Masamune::Commands
 
       filesystem.move_file_to_file(@buffer.path, @output)
     ensure
-      File.delete(@buffer.path) if @buffer && @buffer.path && File.exists?(@buffer.path)
+      File.delete(@buffer.path) if @buffer && @buffer.path && File.exist?(@buffer.path)
     end
 
-    def handle_stdout(line, line_no)
+    def handle_stdout(line, _line_no)
       if line =~ /\A#{PROMPT}/
         logger.debug(line)
-      elsif line =~ /\AQuery returned non-zero code:/
+      elsif line.start_with?('Query returned non-zero code:')
         raise SystemExit, line
       else
         @block.call(line) if @block
 
         if @buffer
           @buffer.puts(@csv ? line.split(@delimiter).map { |row| encode_row(row) }.to_csv : line)
-        else
-          console(line) if print?
+        elsif print?
+          console(line)
         end
       end
     end
@@ -142,7 +138,7 @@ module Masamune::Commands
       files = @setup_files.map do |path|
         filesystem.glob_sort(path, order: :basename)
       end
-      files.flatten.compact.map { |file| {'-i' => file} }
+      files.flatten.compact.map { |file| { '-i' => file } }
     end
 
     def command_args_for_file
@@ -153,7 +149,7 @@ module Masamune::Commands
       filesystem.copy_file_to_file(@file, remote_file)
       ['-f', remote_file].tap do |args|
         @variables.each do |key, val|
-          args << ['-d', "#{key.to_s}=#{val.to_s}"]
+          args << ['-d', "#{key}=#{val}"]
         end
       end
     end
@@ -170,7 +166,7 @@ module Masamune::Commands
     end
 
     def remote_file
-      @remote_file ||= File.join(filesystem.mktempdir!(:tmp_dir), filesystem.basename(@file)).gsub(/.erb\z/,'')
+      @remote_file ||= File.join(filesystem.mktempdir!(:tmp_dir), filesystem.basename(@file)).gsub(/.erb\z/, '')
     end
 
     def exec_file

data/lib/masamune/commands/postgres.rb

@@ -31,24 +31,24 @@ module Masamune::Commands
     include Masamune::Commands::PostgresCommon
 
     DEFAULT_ATTRIBUTES =
-    {
-      :path           => 'psql',
-      :options        => [],
-      :hostname       => 'localhost',
-      :database       => 'postgres',
-      :username       => 'postgres',
-      :pgpass_file    => nil,
-      :file           => nil,
-      :exec           => nil,
-      :input          => nil,
-      :output         => nil,
-      :print          => false,
-      :block          => nil,
-      :csv            => false,
-      :variables      => {},
-      :tuple_output   => false,
-      :debug          => false
-    }
+      {
+        path: 'psql',
+        options: [],
+        hostname: 'localhost',
+        database: 'postgres',
+        username: 'postgres',
+        pgpass_file: nil,
+        file: nil,
+        exec: nil,
+        input: nil,
+        output: nil,
+        print: false,
+        block: nil,
+        csv: false,
+        variables: {},
+        tuple_output: false,
+        debug: false
+      }.freeze
 
     def initialize(delegate, attrs = {})
       super delegate
@@ -60,9 +60,7 @@ module Masamune::Commands
     end
 
     def stdin
-      if @input
-        @stdin ||= StringIO.new(strip_sql(@input))
-      end
+      @stdin ||= StringIO.new(strip_sql(@input)) if @input
     end
 
     def interactive?
@@ -76,14 +74,14 @@ module Masamune::Commands
     def command_args
       args = []
       args << @path
-      args << '--host=%s' % @hostname if @hostname
-      args << '--dbname=%s' % @database
-      args << '--username=%s' % @username if @username
+      args << "--host=#{@hostname}" if @hostname
+      args << "--dbname=#{@database}"
+      args << "--username=#{@username}" if @username
       args << '--no-password'
       args << '--set=ON_ERROR_STOP=1'
       args << @options.map(&:to_a)
       args << command_args_for_file if @file
-      args << '--output=%s' % @output if @output
+      args << "--output=#{@output}" if @output
       args << '--no-align' << '--field-separator=,' << '--pset=footer' if @csv
       args << '--pset=tuples_only' if @tuple_output
       args.flatten.compact
@@ -91,7 +89,7 @@ module Masamune::Commands
 
     def before_execute
       console("psql with file #{@file}") if @file
-      if @debug and output = rendered_template || @file
+      if @debug && (output = rendered_template || @file)
         logger.debug("#{output}:\n" + File.read(output))
       end
 
@@ -101,7 +99,7 @@ module Masamune::Commands
       end
     end
 
-    def handle_stdout(line, line_no)
+    def handle_stdout(line, _line_no)
       if line =~ /\A#{prompt}/
         logger.debug(line)
       else
@@ -110,12 +108,12 @@ module Masamune::Commands
       end
     end
 
-    def handle_stderr(line, line_no)
+    def handle_stderr(line, _line_no)
       @error = line.split(/ERROR:\s*/).last if line =~ /ERROR:/
       logger.debug(line)
     end
 
-    def failure_message(status)
+    def failure_message(_status)
       @error || 'psql failed without error'
     end
 
@@ -134,15 +132,15 @@ module Masamune::Commands
     end
 
     def command_args_for_simple_file
-      ['--file=%s' % @file].tap do |args|
+      ["--file=#{@file}"].tap do |args|
         @variables.each do |key, val|
-          args << '--set=%s' % "#{key.to_s}='#{val.to_s}'"
+          args << "--set=#{key}='#{val}'"
         end
       end
     end
 
     def command_args_for_template
-      ['--file=%s' % rendered_template]
+      ["--file=#{rendered_template}"]
     end
 
     def exec_file

data/lib/masamune/commands/postgres_admin.rb

@@ -29,18 +29,18 @@ module Masamune::Commands
     include Masamune::Commands::PostgresCommon
 
     DEFAULT_ATTRIBUTES =
-    {
-      :create_db_path => 'createdb',
-      :drop_db_path   => 'dropdb',
-      :pg_dump_path   => 'pg_dump',
-      :options        => [],
-      :hostname       => 'localhost',
-      :username       => 'postgres',
-      :pgpass_file    => nil,
-      :action         => nil,
-      :database       => nil,
-      :output         => nil
-    }
+      {
+        create_db_path: 'createdb',
+        drop_db_path: 'dropdb',
+        pg_dump_path: 'pg_dump',
+        options: [],
+        hostname: 'localhost',
+        username: 'postgres',
+        pgpass_file: nil,
+        action: nil,
+        database: nil,
+        output: nil
+      }.freeze
 
     def initialize(delegate, attrs = {})
       super delegate
@@ -53,8 +53,8 @@ module Masamune::Commands
       raise ArgumentError, ':database must be given' unless @database
       args = []
       args << command_path
-      args << '--host=%s' % @hostname if @hostname
-      args << '--username=%s' % @username if @username
+      args << "--host=#{@hostname}" if @hostname
+      args << "--username=#{@username}" if @username
       args << '--no-password'
       args << database
       args << @options
@@ -79,12 +79,13 @@ module Masamune::Commands
 
     def database
       return @database unless @action == :dump
-      '--dbname=%s' % @database
+      "--dbname=#{@database}"
     end
 
     def output
       return unless @action == :dump
-      '--file=%s' % @output if @output
+      return unless @output
+      "--file=#{@output}"
     end
   end
 end

data/lib/masamune/commands/postgres_common.rb

@@ -23,7 +23,7 @@
 module Masamune::Commands
   module PostgresCommon
     def command_env
-      { 'PGOPTIONS'=> '--client-min-messages=warning' }.tap do |env|
+      { 'PGOPTIONS' => '--client-min-messages=warning' }.tap do |env|
         if @pgpass_file && File.readable?(@pgpass_file)
           env['PGPASSFILE'] = @pgpass_file
         end

data/lib/masamune/commands/retry_with_backoff.rb

@@ -35,25 +35,25 @@ module Masamune::Commands
     end
 
     def around_execute(&block)
-      begin
-        status = if @delegate.respond_to?(:around_execute)
-          @delegate.around_execute(&block)
-        else
-          block.call
-        end
-        raise "exited with code: #{status.exitstatus}" unless status.success?
-        status
-      rescue => e
-        logger.error(e.to_s)
-        sleep @backoff
-        @retry_count += 1
-        unless @retry_count > @retries
-          logger.debug("retrying (#{@retry_count}/#{@retries})")
-          retry
-        else
-          logger.debug("max retries (#{@retries}) attempted, bailing")
-          OpenStruct.new(:success? => false, :exitstatus => MAX_RETRY_EXIT_STATUS)
-        end
+      status =
+      if @delegate.respond_to?(:around_execute)
+        @delegate.around_execute(&block)
+      else
+        yield
+      end
+
+      raise "exited with code: #{status.exitstatus}" unless status.success?
+      status
+    rescue => e
+      logger.error(e.to_s)
+      sleep @backoff
+      @retry_count += 1
+      if @retry_count > @retries
+        logger.debug("max retries (#{@retries}) attempted, bailing")
+        OpenStruct.new(success?: false, exitstatus: MAX_RETRY_EXIT_STATUS)
+      else
+        logger.debug("retrying (#{@retry_count}/#{@retries})")
+        retry
       end
     end
   end