img-lint 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7ca6a6af39812e6438eb53872af32cbb718d35
-  data.tar.gz: da145a07ec130eb64ac94651919a8be299f6600b
+  metadata.gz: c40d6bbcc1ec9690a2d4ca2a41d1e814838dbd11
+  data.tar.gz: e14e808b66b8dfb712a99e66a88a368c244cbbdc
 SHA512:
-  metadata.gz: a3f36936ee512865675b65c7635875fb1ebe3fc670e1c0d8b6d31120683f5af870d38ba85f12d5cb5dd0e61b7611698b866f7e2301fe8f5c813b4d4f01071df2
-  data.tar.gz: 57df00b95ee7b621991fd1ce8c6e2054c5f335a95982cba16a927a005c5c4b5ce78fbdb7de2d2edda9bce58572050fb8a4dbec5770f0496ade8e00b837fc431c
+  metadata.gz: 6c5ff65e4f72daeae5c723f1a5c4f0c96fa78d261fe39bbfdc7de1ad93fbc34e8aca35f6a89fd339c52e0333e62886e529ca79ad7925a0f6f48a8558cfadaab7
+  data.tar.gz: 8b45ddbfecd0337696f450a48ecce58db87bbc5074fd192bcc99cef8a721a6a94ce7db8dac3714b6ff5732fea24f5851c3225e5d9b60720b35a26b56ecbc7721

data/bin/img-lint

@@ -1,61 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
-
 require "img_lint"
-require "img_lint/config"
-require "img_lint/linter"
-require "optparse"
-
-if ARGV.first == "install"
-  require "fileutils"
-
-  target_file = File.join(Dir.pwd, ".img-lint.yml")
-  config_file = File.join(File.expand_path(File.dirname(__FILE__)), "..", "config", "default.yml")
-
-  FileUtils.cp(config_file, target_file)
-else
-  options = {}
-  OptionParser.new do |opts|
-    def unindent(s)
-      s.gsub(/^#{s.scan(/^[ \t]+(?=\S)/).min}/, "")
-    end
-
-    opts.banner = unindent(<<-TEXT)
-      img-lint help
-
-      1. img-lint install
-
-      This will copy default config to your local .img-lint.yml file
-
-      2. img-lint [options]
-    TEXT
-
-    opts.on("-v", "--version", "Prints current version of img-lint") do |v|
-      puts IMGLint::VERSION
-      exit 0
-    end
-
-    opts.on("-p", "--path PATH", "Path to a folder with images") do |v|
-      options["path"] = v
-    end
-
-    opts.on("-m", "--max-size MAX_SIZE", "Max image size allowed, '150' by default (150Kb)") do |v|
-      options["max_file_size"] = v.to_i
-    end
-
-    opts.on("-f", "--format IMAGE_FORMATS", "Image formats, 'jpg,png,gif' by default") do |v|
-      options["image_formats"] = v
-    end
-  end.parse!
-
-  config = IMGLint::Config.load
-  config.merge!(options)
-
-  path = config.delete("path")
-
-  linter = IMGLint::Linter.new(config: config)
-  fat_images = linter.lint(path: path)
+require "img_lint/cli"
 
-  exit fat_images.empty? ? 0 : 2
-end
+exit IMGLint::CLI.new.run(ARGV)

data/lib/img_lint/cli.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "img_lint/config"
+require "img_lint/linter"
+require "optparse"
+
+$LOAD_PATH << File.expand_path(__dir__)
+
+module IMGLint
+  # CLI class
+  #
+  class CLI
+    def run(args = [])
+      if args.first == "install"
+        require "fileutils"
+
+        target_file = File.join(Dir.pwd, ".img-lint.yml")
+        config_file = File.join(File.expand_path(__dir__), "..", "config", "default.yml")
+
+        FileUtils.cp(config_file, target_file)
+
+        0
+      else
+        options = extract_options(args)
+
+        config = IMGLint::Config.load
+        config.merge!(options)
+
+        path = config.delete("path")
+
+        linter = IMGLint::Linter.new(config: config)
+        fat_images = linter.lint(path: path)
+
+        fat_images.empty? ? 0 : 2
+      end
+    end
+
+    private
+
+    def unindent(str)
+      str.gsub(/^#{str.scan(/^[ \t]+(?=\S)/).min}/, "")
+    end
+
+    def extract_options(args)
+      options = {}
+
+      OptionParser.new do |opts|
+        opts.banner = unindent(<<-TEXT)
+          img-lint help
+
+          1. img-lint install
+
+          This will copy default config to your local .img-lint.yml file
+
+          2. img-lint [options]
+        TEXT
+
+        opts.on("-v", "--version", "Prints current version of img-lint") do
+          puts IMGLint::VERSION
+          exit 0
+        end
+
+        opts.on("-p", "--path PATH", "Path to a folder with images") do |v|
+          options["path"] = v
+        end
+
+        opts.on("-m", "--max-size MAX_SIZE", "Max image size allowed, '150' by default (150Kb)") do |v|
+          options["max_file_size"] = v.to_i
+        end
+
+        opts.on("-f", "--format IMAGE_FORMATS", "Image formats, 'jpg,png,gif' by default") do |v|
+          options["image_formats"] = v
+        end
+      end.parse!(args)
+
+      options
+    end
+  end
+end

data/lib/img_lint/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "yaml"
+require "img_lint/constants"
 
 module IMGLint
   # Config class is responsible to load img-lint either a user defined config

data/lib/img_lint/constants.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IMGLint
-  IMG_LINT_HOME = File.realpath(File.join(File.dirname(__FILE__), "..", ".."))
+  IMG_LINT_HOME = File.realpath(File.join(__dir__, "..", ".."))
 end

data/lib/img_lint/linter.rb

@@ -29,11 +29,11 @@ module IMGLint
       puts "No images found in #{path}" if verbose && images.empty?
 
       images.each_with_object({}) do |file, o|
+        next if excluded_file?(file)
+
         image_size = File.new(file).size / 1024
 
-        if !excluded_file?(file) && image_size > config["max_file_size"]
-          o[file] = image_size
-        end
+        o[file] = image_size if image_size > config["max_file_size"]
       end
     end
 

data/lib/img_lint/rake_task.rb

@@ -2,6 +2,7 @@
 
 require "rake"
 require "rake/tasklib"
+require "img_lint/cli"
 
 module IMGLint
   # Rake task
@@ -21,10 +22,7 @@ module IMGLint
       task(@name) do |_task|
         require "img_lint"
 
-        linter = IMGLint::Linter.new
-        fat_images = linter.lint
-
-        exit fat_images.empty? ? 0 : 2
+        exit IMGLint::CLI.new.run
       end
     end
   end

data/lib/img_lint/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IMGLint
-  VERSION = "0.0.15".freeze
+  VERSION = "0.0.16".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: img-lint
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Anatoli Makarevich
@@ -78,6 +78,7 @@ files:
 - bin/img-lint
 - config/default.yml
 - lib/img_lint.rb
+- lib/img_lint/cli.rb
 - lib/img_lint/config.rb
 - lib/img_lint/constants.rb
 - lib/img_lint/linter.rb