metacrunch 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a192155704d21d4792eab70bb1122bcd92a14d84
-  data.tar.gz: 07cf95291da074427756f363621947baaa248d95
+  metadata.gz: c57943da0f6fc1236b58f06326223070fd1cf20d
+  data.tar.gz: 0a905216b6a340aed1fe95425711877cfd3384ea
 SHA512:
-  metadata.gz: 1f360eebf44dc1b2a3025194c592e4bf01787c6637feec58aba758826c8d73eb4ec119730f539321911237cd395172b1c4a16cbdcc5d2728ed3830cc5fe64957
-  data.tar.gz: fa06ae98c1a2d4d8d7b4c7eaad845526df3ee5c12bbd1c6902a5ac90e9c32c1bab43b4886d13a40b691f7bff9c09d745ef60e61ac038a8163534b6fd307c6471
+  metadata.gz: '086cafcc6d00451da522d74a57379fa9be25538b77f4733be5ee3a1923ea38933394e00dd111fdbdfba43055989db2ba0e2879b5145ae3aa7fb8060e8f6295db'
+  data.tar.gz: 19c2bfaf59bd1e695aa5569f12037448ce19a52cde3c93a62b9afa99b3c4269fc5efba1042b7321d255c099ae8b44cff269d25ad9b14b44928f9983badfae61b

data/lib/metacrunch/cli.rb

@@ -1,72 +1,70 @@
 require "optparse"
 
-module Metacrunch
-  class Cli
+class Metacrunch::Cli
 
-    def run
-      # Parse global options on order
-      job_argv = global_parser.order(ARGV)
-      # The first of the unparsed arguments is by definition the filename
-      # of the job.
-      job_file = job_argv[0]
-      # Manipulate ARGV so that the option handling for the job can work
-      ARGV.clear
-      job_argv[1..-1]&.each {|arg| ARGV << arg}
-      # Delete the old separator symbol for backward compatability
-      ARGV.delete_if{|arg| arg == "@@"}
-      # Finally run the job
-      run!(job_file)
-    rescue OptionParser::ParseError => e
-      error(e.message)
-    end
+  def run
+    # Parse global options on order
+    job_argv = global_parser.order(ARGV)
+    # The first of the unparsed arguments is by definition the filename
+    # of the job.
+    job_file = job_argv[0]
+    # Manipulate ARGV so that the option handling for the job can work
+    ARGV.clear
+    job_argv[1..-1]&.each {|arg| ARGV << arg}
+    # Delete the old separator symbol for backward compatability
+    ARGV.delete_if{|arg| arg == "@@"}
+    # Finally run the job
+    run!(job_file)
+  rescue OptionParser::ParseError => e
+    error(e.message)
+  end
 
-  private
+private
 
-    def global_parser
-      @global_parser ||= OptionParser.new do |opts|
-        opts.banner = <<-BANNER.strip_heredoc
-          #{ColorizedString["Usage:"].bold}
+  def global_parser
+    @global_parser ||= OptionParser.new do |opts|
+      opts.banner = <<-BANNER.strip_heredoc
+        #{ColorizedString["Usage:"].bold}
 
-            metacrunch [options] JOB_FILE [job-options] [ARGS...]
+          metacrunch [options] JOB_FILE [job-options] [ARGS...]
 
-          #{ColorizedString["Options:"].bold}
-        BANNER
+        #{ColorizedString["Options:"].bold}
+      BANNER
 
-        opts.on("-v", "--version", "Show metacrunch version and exit") do
-          show_version
-        end
+      opts.on("-v", "--version", "Show metacrunch version and exit") do
+        show_version
       end
     end
+  end
 
-    def show_version
-      puts Metacrunch::VERSION
-      exit(0)
-    end
+  def show_version
+    puts Metacrunch::VERSION
+    exit(0)
+  end
 
-    def error(message)
-      puts ColorizedString["Error: #{message}\n"].red.bold
-      puts global_parser.help
-      exit(0)
-    end
+  def error(message)
+    puts ColorizedString["Error: #{message}\n"].red.bold
+    puts global_parser.help
+    exit(0)
+  end
 
-    def run!(job_file)
-      if job_file.blank?
-        error "You need to provide a job file."
-      elsif !File.exists?(job_file)
-        error "The file `#{job_file}` doesn't exist."
-      else
-        job_filename = File.expand_path(job_file)
-        dir = File.dirname(job_filename)
+  def run!(job_file)
+    if job_file.blank?
+      error "You need to provide a job file."
+    elsif !File.exists?(job_file)
+      error "The file `#{job_file}` doesn't exist."
+    else
+      job_filename = File.expand_path(job_file)
+      dir = File.dirname(job_filename)
 
-        Dir.chdir(dir) do
-          run_job!(job_filename)
-        end
+      Dir.chdir(dir) do
+        run_job!(job_filename)
       end
     end
+  end
 
-    def run_job!(job_filename)
-      Metacrunch::Job.define(File.read(job_filename)).run
-    end
-
+  def run_job!(job_filename)
+    Metacrunch::Job.define(File.read(job_filename)).run
   end
+
 end

data/lib/metacrunch/job.rb

@@ -1,151 +1,149 @@
-module Metacrunch
-  class Job
-    require_relative "job/dsl"
-    require_relative "job/buffer"
+class Metacrunch::Job # http://valve.github.io/blog/2013/10/26/constant-resolution-in-ruby/
+  require_relative "job/dsl"
+  require_relative "job/buffer"
 
-    attr_reader :dsl
+  attr_reader :dsl
 
-    class << self
-      def define(file_content = nil, &block)
-        self.new(file_content, &block)
-      end
+  class << self
+    def define(file_content = nil, &block)
+      self.new(file_content, &block)
     end
+  end
 
-    def initialize(file_content = nil, &block)
-      @dsl = Dsl.new(self)
-
-      @deprecator = ActiveSupport::Deprecation.new("5.0.0", "metacrunch")
+  def initialize(file_content = nil, &block)
+    @dsl = Dsl.new(self)
 
-      if file_content
-        @dsl.instance_eval(file_content, "Check your metacrunch Job at Line")
-      elsif block_given?
-        @dsl.instance_eval(&block)
-      end
-    end
+    @deprecator = ActiveSupport::Deprecation.new("5.0.0", "metacrunch")
 
-    def source
-      @source
+    if file_content
+      @dsl.instance_eval(file_content, "Check your metacrunch Job at Line")
+    elsif block_given?
+      @dsl.instance_eval(&block)
     end
+  end
 
-    def source=(source)
-      ensure_source!(source)
-      @source = source
-    end
+  def source
+    @source
+  end
 
-    def destination
-      @destination
-    end
+  def source=(source)
+    ensure_source!(source)
+    @source = source
+  end
 
-    def destination=(destination)
-      ensure_destination!(destination)
-      @destination = destination
-    end
+  def destination
+    @destination
+  end
 
-    def pre_process
-      @pre_process
-    end
+  def destination=(destination)
+    ensure_destination!(destination)
+    @destination = destination
+  end
 
-    def pre_process=(callable)
-      ensure_callable!(callable)
-      @pre_process = callable
-    end
+  def pre_process
+    @pre_process
+  end
 
-    def post_process
-      @post_process
-    end
+  def pre_process=(callable)
+    ensure_callable!(callable)
+    @pre_process = callable
+  end
 
-    def post_process=(callable)
-      ensure_callable!(callable)
-      @post_process = callable
-    end
+  def post_process
+    @post_process
+  end
 
-    def transformations
-      @transformations ||= []
-    end
+  def post_process=(callable)
+    ensure_callable!(callable)
+    @post_process = callable
+  end
 
-    def add_transformation(callable, buffer_size: nil, buffer: nil)
-      ensure_callable!(callable)
+  def transformations
+    @transformations ||= []
+  end
 
-      if buffer_size && buffer_size.is_a?(Numeric)
-        @deprecator.deprecation_warning(:buffer_size, :buffer)
-        buffer = buffer_size
-      end
+  def add_transformation(callable, buffer_size: nil, buffer: nil)
+    ensure_callable!(callable)
 
-      if buffer
-        transformations << Metacrunch::Job::Buffer.new(buffer)
-      end
+    if buffer_size && buffer_size.is_a?(Numeric)
+      @deprecator.deprecation_warning(:buffer_size, :buffer)
+      buffer = buffer_size
+    end
 
-      transformations << callable
+    if buffer
+      transformations << Metacrunch::Job::Buffer.new(buffer)
     end
 
-    def run
-      run_pre_process
+    transformations << callable
+  end
 
-      if source
-        # Run transformation for each data object available in source
-        source.each do |data|
-          data = run_transformations(data)
-          write_destination(data)
-        end
+  def run
+    run_pre_process
 
-        # Run all transformations a last time to flush existing buffers
-        data = run_transformations(nil, flush_buffers: true)
+    if source
+      # Run transformation for each data object available in source
+      source.each do |data|
+        data = run_transformations(data)
         write_destination(data)
-
-        # Close destination
-        destination.close if destination
       end
 
-      run_post_process
+      # Run all transformations a last time to flush existing buffers
+      data = run_transformations(nil, flush_buffers: true)
+      write_destination(data)
 
-      self
+      # Close destination
+      destination.close if destination
     end
 
-  private
+    run_post_process
 
-    def ensure_source!(object)
-      raise ArgumentError, "#{object} doesn't respond to #each." unless object.respond_to?(:each)
-    end
+    self
+  end
 
-    def ensure_destination!(object)
-      raise ArgumentError, "#{object} doesn't respond to #write." unless object.respond_to?(:write)
-      raise ArgumentError, "#{object} doesn't respond to #close." unless object.respond_to?(:close)
-    end
+private
 
-    def ensure_callable!(object)
-      raise ArgumentError, "#{object} doesn't respond to #call." unless object.respond_to?(:call)
-    end
+  def ensure_source!(object)
+    raise ArgumentError, "#{object} doesn't respond to #each." unless object.respond_to?(:each)
+  end
 
-    def run_pre_process
-      pre_process.call if pre_process
-    end
+  def ensure_destination!(object)
+    raise ArgumentError, "#{object} doesn't respond to #write." unless object.respond_to?(:write)
+    raise ArgumentError, "#{object} doesn't respond to #close." unless object.respond_to?(:close)
+  end
 
-    def run_post_process
-      post_process.call if post_process
-    end
+  def ensure_callable!(object)
+    raise ArgumentError, "#{object} doesn't respond to #call." unless object.respond_to?(:call)
+  end
+
+  def run_pre_process
+    pre_process.call if pre_process
+  end
+
+  def run_post_process
+    post_process.call if post_process
+  end
 
-    def run_transformations(data, flush_buffers: false)
-      transformations.each do |transformation|
-        if transformation.is_a?(Buffer)
-          buffer = transformation
-
-          if data
-            data = buffer.buffer(data)
-            data = buffer.flush if flush_buffers
-          else
-            data = buffer.flush
-          end
+  def run_transformations(data, flush_buffers: false)
+    transformations.each do |transformation|
+      if transformation.is_a?(Buffer)
+        buffer = transformation
+
+        if data
+          data = buffer.buffer(data)
+          data = buffer.flush if flush_buffers
         else
-          data = transformation.call(data) if data
+          data = buffer.flush
         end
+      else
+        data = transformation.call(data) if data
       end
-
-      data
     end
 
-    def write_destination(data)
-      destination.write(data) if destination && data
-    end
+    data
+  end
 
+  def write_destination(data)
+    destination.write(data) if destination && data
   end
+
 end

data/lib/metacrunch/version.rb

@@ -1,3 +1,3 @@
 module Metacrunch
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - René Sprotte
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport