masamune 0.17.12 → 0.17.13

data/lib/masamune/environment.rb

@@ -54,7 +54,7 @@ module Masamune
     end
 
     def with_exclusive_lock(name)
-      raise 'filesystem path :run_dir not defined' unless filesystem.has_path?(:run_dir)
+      raise 'filesystem path :run_dir not defined' unless filesystem.path?(:run_dir)
       lock_name = [name, configuration.lock].compact.join(':')
       logger.debug("acquiring lock '#{lock_name}'")
       lock_file = lock_file(lock_name)
@@ -80,7 +80,7 @@ module Masamune
     end
 
     def log_file_template
-      @log_file_template || "#{Time.now.to_i}-#{$$}.log"
+      @log_file_template || "#{Time.now.to_i}-#{$PROCESS_ID}.log"
     end
 
     def log_file_template=(log_file_template)
@@ -149,7 +149,7 @@ module Masamune
     end
 
     def log_file_io
-      if filesystem.has_path?(:log_dir)
+      if filesystem.path?(:log_dir)
         log_file = File.open(log_file_name, 'a')
         log_file.sync = true
         configuration.debug ? Masamune::MultiIO.new($stderr, log_file) : log_file

data/lib/masamune/filesystem.rb

@@ -54,7 +54,7 @@ module Masamune
     def get_path(symbol, *args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       lazy_path = lambda do |fs|
-        fs.has_path?(symbol) or raise "Path :#{symbol} not defined"
+        fs.path?(symbol) || raise("Path :#{symbol} not defined")
         path, options = fs.paths[symbol]
 
         mkdir!(path) if options[:mkdir]
@@ -67,15 +67,13 @@ module Masamune
         lazy_path
       end
     end
-    alias :path :get_path
+    alias path get_path
 
-    def has_path?(symbol)
-      @paths.has_key?(symbol)
+    def path?(symbol)
+      @paths.key?(symbol)
     end
 
-    def paths
-      @paths
-    end
+    attr_reader :paths
 
     def eval_path(path)
       path.respond_to?(:call) ? path.call(self) : path
@@ -84,7 +82,7 @@ module Masamune
     def expand_params(fs, path)
       new_path = path.dup
       fs.environment.configuration.params.each do |key, value|
-        new_path.gsub!("%#{key.to_s}", value.to_s)
+        new_path.gsub!("%#{key}", value.to_s)
       end
       new_path
     end
@@ -95,7 +93,8 @@ module Masamune
     end
 
     def parent_paths(path)
-      if prefix = remote_prefix(path)
+      prefix = remote_prefix(path)
+      if prefix
         node = path.split(prefix).last
       else
         prefix = ''
@@ -104,7 +103,7 @@ module Masamune
 
       return [] if prefix.blank? && node.blank?
       parent_paths = node ? File.expand_path(node, '/').split('/') : []
-      parent_paths.reject! { |x| x.blank? }
+      parent_paths.reject!(&:blank?)
       parent_paths.prepend('/') if node =~ %r{\A/}
       tmp = []
       result = []
@@ -125,7 +124,7 @@ module Masamune
     end
 
     def resolve_file(paths = [])
-      Array.wrap(paths).select { |path| File.exists?(path) && File.file?(path) }.first
+      Array.wrap(paths).select { |path| File.exist?(path) && File.file?(path) }.first
     end
 
     def dirname(path)
@@ -165,12 +164,12 @@ module Masamune
       when :s3
         result = Set.new
         s3cmd('ls', s3b(file), safe: true) do |line|
-          date, time, size, name = line.split(/\s+/)
+          _date, _time, _size, name = line.split(/\s+/)
           result << (name == file)
         end
         result.any?
       when :local
-        File.exists?(file)
+        File.exist?(file)
       end
     end
 
@@ -218,9 +217,9 @@ module Masamune
         when :hdfs
           hadoop_fs('-mkdir', '-p', *dir_set)
         when :s3
-          touch! *dir_set.map { |dir| File.join(dir, '.not_empty') }
+          touch!(*dir_set.map { |dir| File.join(dir, '.not_empty') })
         when :local
-          missing_dir_set = dir_set.reject { |dir| File.exists?(dir) }
+          missing_dir_set = dir_set.reject { |dir| File.exist?(dir) }
           FileUtils.mkdir_p(missing_dir_set, file_util_args) if missing_dir_set.any?
         end
       end
@@ -230,7 +229,7 @@ module Masamune
       return Set.new(to_enum(:glob, pattern, options)) unless block_given?
       case type(pattern)
       when :hdfs
-        file_glob, file_regexp = glob_split(pattern)
+        _file_glob, file_regexp = glob_split(pattern)
         hadoop_fs('-ls', pattern, safe: true) do |line|
           next if line =~ /\AFound \d+ items/
           name = line.split(/\s+/).last
@@ -258,7 +257,7 @@ module Masamune
       return to_enum(:glob_sort, pattern, options).to_a unless block_given?
       case options[:order]
       when :basename
-        glob(pattern).sort { |x,y| File.basename(x) <=> File.basename(y) }.each do |result|
+        glob(pattern).sort { |x, y| File.basename(x) <=> File.basename(y) }.each do |result|
           yield result
         end
       else
@@ -381,7 +380,7 @@ module Masamune
           case type
           when :local
             file_set.map do |file|
-              next unless File.exists?(file)
+              next unless File.exist?(file)
               next if File.directory?(file)
               buf << File.read(file)
             end
@@ -403,7 +402,8 @@ module Masamune
 
     def chown!(*files)
       opts = files.last.is_a?(Hash) ? files.pop : {}
-      user, group = opts.fetch(:user, current_user), opts.fetch(:group, current_group)
+      user = opts.fetch(:user, current_user)
+      group = opts.fetch(:group, current_group)
 
       files.group_by { |path| type(path) }.each do |type, file_set|
         case type
@@ -430,12 +430,12 @@ module Masamune
     end
 
     def glob_split(input, options = {})
-      [ input.include?('*') ? input.split('*').first + '*' : input, glob_to_regexp(input, options) ]
+      [input.include?('*') ? input.split('*').first + '*' : input, glob_to_regexp(input, options)]
     end
 
     def glob_to_regexp(input, options = {})
       if input.include?('*') || options.fetch(:recursive, false)
-        %r|\A#{Regexp.escape(input).gsub('\\*', '.*?').gsub(%r{\/\.\*\?\z}, '/?.*?')}|
+        /\A#{Regexp.escape(input).gsub('\\*', '.*?').gsub(%r{\/\.\*\?\z}, '/?.*?')}/
       else
         /\A#{Regexp.escape(input)}\z/
       end
@@ -472,7 +472,7 @@ module Masamune
     end
 
     def eager_load_paths?
-      @paths.reject { |key,_| key == :root_dir }.any?
+      @paths.reject { |key, _| key == :root_dir }.any?
     end
 
     def type(path)
@@ -487,27 +487,27 @@ module Masamune
     end
 
     def file_util_args
-      {noop: configuration.dry_run, verbose: configuration.verbose}
+      { noop: configuration.dry_run, verbose: configuration.verbose }
     end
 
     def qualify_file(dir, file)
-      if prefix = remote_prefix(dir) and file !~ /\A#{Regexp.escape(prefix)}/
+      if (prefix = remote_prefix(dir)) && file !~ /\A#{Regexp.escape(prefix)}/
         "#{prefix}/#{file.sub(%r{\A/+}, '')}"
       else
         file
       end
     end
-    alias :q :qualify_file
+    alias q qualify_file
 
     def ensure_dir(dir)
       File.join(dir, '/')
     end
-    alias :d :ensure_dir
+    alias d ensure_dir
 
     def ensure_file(file)
       file.chomp('/')
     end
-    alias :f :ensure_file
+    alias f ensure_file
 
     def add_immutable_path(path)
       @immutable_paths[path] = /\A#{Regexp.escape(path)}/
@@ -526,6 +526,7 @@ module Masamune
     def current_group
       Etc.getgrgid(Etc.getpwnam(current_user).gid).name
     rescue
+      nil
     end
 
     def copy_file_helper(src, dst, dir)
@@ -569,7 +570,7 @@ module Masamune
         s3cmd('del', src)
       when [:s3, :hdfs]
         hadoop_fs('-mv', s3n(src), dst)
-     when [:local, :local]
+      when [:local, :local]
         FileUtils.mv(src, dst, file_util_args)
         FileUtils.chmod(FILE_MODE, dst, file_util_args)
       when [:local, :hdfs]

data/lib/masamune/helpers/postgres.rb

@@ -66,7 +66,7 @@ module Masamune::Helpers
       return unless @cache.empty?
       postgres(exec: 'SELECT table_name FROM information_schema.tables;', tuple_output: true, retries: 0) do |line|
         table = line.strip
-        next if table =~ /\Apg_/
+        next if table.start_with?('pg_')
         @cache[table] ||= nil
       end
     end
@@ -74,11 +74,14 @@ module Masamune::Helpers
     def update_table_last_modified_at(table, column)
       return if @cache[table].present?
       postgres(exec: "SELECT MAX(#{column}) FROM #{table};", tuple_output: true, retries: 0) do |line|
-        begin
-          @cache[table] = Time.parse(line.strip).at_beginning_of_minute.utc
-        rescue ArgumentError
-        end
+        @cache[table] = parse_date_time(line.strip)
       end
     end
+
+    def parse_date_time(value)
+      Time.parse(value).at_beginning_of_minute.utc
+    rescue ArgumentError
+      nil
+    end
   end
 end

data/lib/masamune/io.rb

@@ -22,12 +22,12 @@
 
 class IO
   def wait_readable(timeout = 0)
-    rs, ws = IO.select([self], [], [], timeout)
+    rs, _ws = IO.select([self], [], [], timeout)
     rs && rs[0]
   end unless IO.method_defined?(:wait_readable)
 
   def wait_writable(timeout = 0)
-    rs, ws = IO.select([], [self], [], timeout)
+    _rs, ws = IO.select([], [self], [], timeout)
     ws && ws[0]
   end unless IO.method_defined?(:wait_writable)
 end

data/lib/masamune/last_element.rb

@@ -36,12 +36,12 @@ module Masamune
 
     module ClassMethods
       def method_with_last_element(method)
-        self.class_eval do
+        class_eval do
           new_method = "#{method}_with_last_element"
           old_method = "#{method}_without_last_element"
           alias_method old_method, method
-          define_method(new_method) do |*args, &block|
-            last_element(old_method,  *args)
+          define_method(new_method) do |*args|
+            last_element(old_method, *args)
           end
           alias_method method, new_method
         end

data/lib/masamune/method_logger.rb

@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-# FIXME refactor as Command
+# FIXME: refactor as Command
 module Masamune
   class MethodLogger < SimpleDelegator
     def initialize(target, *methods)

data/lib/masamune/schema/catalog.rb

@@ -37,7 +37,7 @@ module Masamune::Schema
       end
 
       def map(options = {})
-        self.maps[options[:to]]
+        maps[options[:to]]
       end
     end
 
@@ -66,8 +66,8 @@ module Masamune::Schema
       def initialize(store, options = {})
         super store
         @store    = store
-        @options  = Hash.new { |h,k| h[k] = [] }
-        @options.merge!(store: @store)
+        @options  = Hash.new { |h, k| h[k] = [] }
+        @options[:store] = @store
         @options.merge!(options)
       end
 
@@ -83,7 +83,7 @@ module Masamune::Schema
 
     def initialize(environment)
       self.environment = environment
-      @stores   = Hash.new { |h,k| h[k] = Masamune::Schema::Store.new(environment, type: k) }
+      @stores   = Hash.new { |h, k| h[k] = Masamune::Schema::Store.new(environment, type: k) }
       @context  = nil
     end
 
@@ -98,7 +98,7 @@ module Masamune::Schema
       stores.each do |id|
         begin
           @context = Context.new(@stores[id], options)
-          instance_eval &block
+          instance_eval(&block)
         ensure
           @context = nil
         end
@@ -182,14 +182,11 @@ module Masamune::Schema
       @context.pop
     end
 
-    def attribute(id, options = {})
-      @context.options[:attributes] << Masamune::Schema::Event::Attribute.new(options.merge(id: id))
-    end
-
     def map(options = {}, &block)
-      raise ArgumentError, "invalid map, from: is missing" unless options.is_a?(Hash)
-      from, to = options.delete(:from), options.delete(:to)
-      raise ArgumentError, "invalid map, from: is missing" unless from && from.try(:id)
+      raise ArgumentError, 'invalid map, from: is missing' unless options.is_a?(Hash)
+      from = options.delete(:from)
+      to = options.delete(:to)
+      raise ArgumentError, 'invalid map, from: is missing' unless from && from.try(:id)
       raise ArgumentError, "invalid map from: '#{from.id}', to: is missing" unless to
       @context.push(options)
       @context.options[:function] = block.to_proc if block

data/lib/masamune/schema/column.rb

@@ -47,7 +47,7 @@ module Masamune::Schema
       reference:           nil,
       parent:              nil,
       debug:               false
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -139,7 +139,7 @@ module Masamune::Schema
     end
 
     def reference_name(label = nil)
-      qualified_name(label).to_s.gsub(/\./, '_').to_sym
+      qualified_name(label).to_s.tr('.', '_').to_sym
     end
 
     def sql_type(for_surrogate_key = false)
@@ -209,7 +209,11 @@ module Masamune::Schema
       return nil if value.nil?
       case type
       when :boolean
-        value ? 'TRUE' : (hive_encoding? ? nil : 'FALSE')
+        if value
+          'TRUE'
+        else
+          hive_encoding? ? nil : 'FALSE'
+        end
       when :yaml
         value.to_hash.to_yaml
       when :json, :key_value
@@ -298,14 +302,12 @@ module Masamune::Schema
 
     def default_ruby_value
       return [] if array_value?
-      return HashWithIndifferentAccess.new { |h,k| h[k] = HashWithIndifferentAccess.new(&h.default_proc) } if hash_value?
+      return HashWithIndifferentAccess.new { |h, k| h[k] = HashWithIndifferentAccess.new(&h.default_proc) } if hash_value?
       case type
       when :date
         Date.new(0)
       when :timestamp
         Time.new(0)
-      else
-        nil
       end
     end
 
@@ -348,7 +350,7 @@ module Masamune::Schema
     end
 
     def array_value?
-      !!(array || (reference && reference.respond_to?(:multiple) && reference.multiple))
+      (array || (reference && reference.respond_to?(:multiple) && reference.multiple)) == true
     end
 
     def hash_value?
@@ -364,7 +366,7 @@ module Masamune::Schema
     end
 
     def as_hash
-      {id: id}.tap do |hash|
+      { id: id }.tap do |hash|
         DEFAULT_ATTRIBUTES.keys.each do |attr|
           hash[attr] = public_send(attr)
         end
@@ -451,7 +453,7 @@ module Masamune::Schema
     def required_value?
       return false if reference && (reference.null || !reference.default.nil?)
       return false if null || !default.nil?
-      return false if !strict
+      return false unless strict
       true
     end
 
@@ -465,7 +467,7 @@ module Masamune::Schema
 
     def sql_default
       return if default.nil?
-      return if !strict
+      return unless strict
       "DEFAULT #{sql_value(default)}"
     end
 

data/lib/masamune/schema/dimension.rb

@@ -22,7 +22,7 @@
 
 module Masamune::Schema
   class Dimension < Table
-    SUPPORTED_GRAINS = [:hourly, :daily, :monthly]
+    SUPPORTED_GRAINS = [:hourly, :daily, :monthly].freeze
 
     def initialize(opts = {})
       opts.symbolize_keys!
@@ -48,7 +48,8 @@ module Masamune::Schema
     end
 
     def suffix
-      suffix = case type
+      suffix =
+      case type
       when :mini
         'type'
       when :one, :two, :four, :date
@@ -111,7 +112,7 @@ module Masamune::Schema
     end
 
     def initialize_dimension_columns!
-      # TODO assign index for load_fact
+      # TODO: assign index for load_fact
       case type
       when :one, :date
         initialize_column! id: 'last_modified_at', type: :timestamp, default: 'NOW()'
@@ -122,7 +123,7 @@ module Masamune::Schema
         initialize_column! id: 'last_modified_at', type: :timestamp, default: 'NOW()'
       when :four
         children << ledger_table
-        # FIXME derive type from from parent
+        # 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: 'end_at', type: :timestamp, null: true, index: :end_at
         initialize_column! id: 'version', type: :integer, default: 1, null: true