bleach 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d495ae25dc8b22b7f30ff8e9ccaac5267a1c435bef32903f53ae53d0b3b25da
-  data.tar.gz: 104bec8e24cf10dd466238c6c193a4ad9de47116c9d166ef217ac4042ef549c9
+  metadata.gz: d4be1129274eef3cdb72513e127a9287690939b4aa88387ba6e0400430c48b2e
+  data.tar.gz: f92030b0f9931e14d6b0115d17383f6f01f60b07fa0716a7585b6c7dd84057a4
 SHA512:
-  metadata.gz: 2237b13fcec791ac257681a9f5144dc47178bb2f79baa5ce010d0e29b05d4a08d650fbebc855a3a7c9d8d1c3337af2f743438af477ffe4e113ac9ce30cfb12a0
-  data.tar.gz: 3fa27adb09c3d254af71ff040b5d8f8dbd311ef39f22272099da4b30e12c263f3d9c5649f10dae81f93f3a3a7977face32adf100deedc69000f177e7bd938d0f
+  metadata.gz: 66579701a5c3db1dfe70a3748bba0927381213d175aaece3c324578aa054d4e6f9bf96685818b7f1322aff4a8d42c91c7aeb8736bd6e0d5fe237532e18ef8a1f
+  data.tar.gz: a364f8bfe372141df9e834d7625098e671d6a3ecf7a47dd6b4539c04fda90c3f4aee5e7f0d81ed3d3df7fe006cceab0f2c3b4650d621fb830df28dc79b9d3364

data/bin/bleach

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
-# Discover lib files to be included
-Dir.glob("#{__dir__}/../lib/**/*.rb").each do |lib_file|
-  require File.expand_path(lib_file, __dir__)
-end
-
-require 'linguist'
+require 'abstract_command'
 require 'optparse'
 require 'tmpdir'
 require 'json'
 require 'fileutils'
 require 'isna'
+require 'pathname'
+
+
+# Discover lib files to be included
+Dir.glob("#{__dir__}/../lib/**/*.rb").each do |lib_file|
+  require File.expand_path(lib_file, __dir__)
+end
 
 # OPTIONS BLOCK
 options = {}
@@ -48,12 +49,32 @@ unless File.exist?(options[:file])
   exit 1
 end
 
+# TODO: pluck these into a future config.
+def resolve_language(filepath)
+  basename = File.basename(filepath)
+  extension = File.extname(basename)
+  return 'CSS' if extension == '.css'
+  return 'JavaScript' if extension == '.js'
+  return 'Ruby' if basename == 'Gemfile'
+  return 'Ruby' if basename == 'Capfile'
+  return 'Ruby' if basename == 'Onafile'
+  return 'Ruby' if basename == 'Rakefile'
+  return 'Ruby' if basename == 'Thorfile'
+  return 'Ruby' if extension == '.rb'
+  return 'Ruby' if extension == '.gemspec'
+  return 'Ruby' if extension == '.ru'
+  return 'SCSS' if extension == '.scss'
+  return basename.inspect
+end
+
 # LANGUAGE BLOCK
-file_language = Linguist::FileBlob.new(options[:file]).language.to_s
+file_language = resolve_language(options[:file])
 
 LANGUAGE_MAP = {
+  'CSS' => 'css',
+  'JavaScript' => 'javascript',
   'Ruby' => 'ruby',
-  'JavaScript' => 'javascript'
+  'SCSS' => 'scss'
 }.freeze
 
 if LANGUAGE_MAP.keys.include?(file_language)
@@ -93,19 +114,46 @@ Dir.glob("#{__dir__}/../languages/#{LANGUAGE_MAP[file_language]}/*").each do |to
 
   # Work is done on copies of the original files inside a temp dir
   Dir.mktmpdir do |tmpdir|
+    FileUtils.cp(options[:file], tmpdir)
+    FileUtils.cp(config_file, tmpdir)
+    file_copy = File.basename(options[:file])
+
     config['requiredFiles'].each do |required_file|
-      unless File.exist?(required_file['file'])
+      config_file_stack = []
+      # File on repository root
+      if File.exist?(required_file['file'])
+        config_file_stack.push(required_file['file'])
+      end
+
+      # Search for alternate files on path to file
+      # Get path to file to be checked
+      path_stack = Pathname(options[:file]).each_filename.to_a
+      # Get rid of filename (keep directories only)
+      path_stack.pop
+      unless path_stack.empty?
+        for step in 0..(path_stack.length - 1) do
+          new_path = ''
+          for i in 0..step do
+            new_path += path_stack[i] + '/'
+          end
+          file_with_path = new_path + required_file['file']
+          if File.exist?(file_with_path)
+            config_file_stack.push(file_with_path)
+          end
+        end
+      end
+
+      if config_file_stack.empty?
+        # No file found anywhere!
         warn "#{tool} checks need a '#{required_file['file']}' file present to run."
         warn 'Check will be stopped.'
         exit 1
+      else
+        # Use config file closest to file to be checked
+        FileUtils.cp(config_file_stack.pop, tmpdir)
       end
-      FileUtils.cp(required_file['file'], tmpdir)
     end
 
-    FileUtils.cp(options[:file], tmpdir)
-    FileUtils.cp(config_file, tmpdir)
-    file_copy = File.basename(options[:file])
-
     # Verify if Docker image exists
     inspect_command = DockerCommand::DockerImageInspect.new(tag: tool)
     unless inspect_command.system

data/languages/{javascript/jshint → css/stylelint}/Dockerfile

@@ -1,4 +1,4 @@
 FROM alpine:3.12.4
 RUN apk update
 RUN apk add npm
-RUN npm install -g jshint
+RUN npm install -g stylelint stylelint-scss

data/languages/{javascript/jshint → css/stylelint}/check-file

@@ -34,10 +34,10 @@ config = JSON.parse(File.read(config_file))
 
 image_name = config['imageName']
 tool_config = config['requiredFiles'].find do |record|
-  record['type'] == 'JSHint Config'
+  record['type'] == 'Stylelint Config'
 end['file']
 
-check_command = CodeCheck::JSHint.new(
+check_command = CodeCheck::StylelintCSS.new(
   pwd: dir,
   image_name: image_name,
   config_file: tool_config,

data/languages/css/stylelint/config.json

@@ -0,0 +1,10 @@
+{
+    "imageName" : "bleach/stylelint",
+    "requiredFiles" : [
+        {
+            "type" : "Stylelint Config",
+            "file" : ".stylelintrc.js"
+        }
+    ]
+
+}

data/languages/ruby/rubocop/config.json

@@ -4,10 +4,6 @@
         {
             "type" : "Rubocop Config",
             "file" : ".rubocop.yml"
-        },
-        {
-            "type" : "Ruby Version",
-            "file" : ".ruby-version"
         }
     ]
 }

data/languages/scss/stylelint/Dockerfile

@@ -0,0 +1,4 @@
+FROM alpine:3.12.4
+RUN apk update
+RUN apk add npm
+RUN npm install -g stylelint stylelint-scss

data/languages/scss/stylelint/check-file

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Discover lib files to be included
+Dir.glob("#{__dir__}/../../../lib/**/*.rb").each do |lib_file|
+  require File.expand_path(lib_file, __dir__)
+end
+
+require 'optparse'
+require 'json'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [OPTIONS]"
+
+  opts.on('-f', '--file [STRING]', 'File.') do |value|
+    options[:file] = value
+  end
+end.parse!
+
+required_options = [:file]
+required_options.each do |option|
+  unless options[option]
+    warn "Can not run #{option} was not given."
+    exit 1
+  end
+end
+
+file = File.basename(options[:file])
+dir = File.dirname(options[:file])
+
+config_file = "#{dir}/config.json"
+config = JSON.parse(File.read(config_file))
+
+image_name = config['imageName']
+tool_config = config['requiredFiles'].find do |record|
+  record['type'] == 'Stylelint Config'
+end['file']
+
+check_command = CodeCheck::StylelintSCSS.new(
+  pwd: dir,
+  image_name: image_name,
+  config_file: tool_config,
+  source_files: "/code/#{file}"
+)
+exit 1 unless check_command.system

data/languages/scss/stylelint/config.json

@@ -0,0 +1,10 @@
+{
+    "imageName" : "bleach/stylelint",
+    "requiredFiles" : [
+        {
+            "type" : "Stylelint Config",
+            "file" : ".stylelintrc.js"
+        }
+    ]
+
+}

data/lib/command/code_check/{javascript/jshint.rb → css/stylelint.rb}

@@ -2,15 +2,16 @@
 # frozen_string_literal: true
 
 module CodeCheck
-  # Template for JSHint check
-  class JSHint < AbstractCommand
+  # Template for Stylelint CSS check
+  class StylelintCSS < AbstractCommand
     def template
       'docker run ' \
         '--rm ' \
         '--volume %<pwd>s:/code ' \
         '%<image_name>s ' \
-        'jshint ' \
+        'stylelint ' \
         '--config /code/%<config_file>s ' \
+        '--color ' \
         '%<source_files>s'
     end
   end

data/lib/command/code_check/scss/stylelint.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+module CodeCheck
+  # Template for Stylelint SCSS check
+  class StylelintSCSS < AbstractCommand
+    def template
+      'docker run ' \
+        '--rm ' \
+        '--volume %<pwd>s:/code ' \
+        '%<image_name>s ' \
+        'stylelint ' \
+        '--config /code/%<config_file>s ' \
+        '--color ' \
+        '%<source_files>s'
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bleach
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Luis Flores
 - Kazuyoshi Tlacaelel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_command
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: github-linguist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.13'
 - !ruby/object:Gem::Dependency
   name: isna
   requirement: !ruby/object:Gem::Requirement
@@ -53,8 +39,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
-description:
-email:
+description: 
+email: 
 executables:
 - bleach
 - install-bleach-git-hooks
@@ -63,23 +49,27 @@ extra_rdoc_files: []
 files:
 - "./bin/bleach"
 - "./bin/install-bleach-git-hooks"
+- "./languages/css/stylelint/Dockerfile"
+- "./languages/css/stylelint/check-file"
+- "./languages/css/stylelint/config.json"
 - "./languages/javascript/eslint/Dockerfile"
 - "./languages/javascript/eslint/check-file"
 - "./languages/javascript/eslint/config.json"
-- "./languages/javascript/jshint/Dockerfile"
-- "./languages/javascript/jshint/check-file"
-- "./languages/javascript/jshint/config.json"
 - "./languages/ruby/brakeman/Dockerfile"
 - "./languages/ruby/brakeman/check-file"
 - "./languages/ruby/brakeman/config.json"
 - "./languages/ruby/rubocop/Dockerfile"
 - "./languages/ruby/rubocop/check-file"
 - "./languages/ruby/rubocop/config.json"
+- "./languages/scss/stylelint/Dockerfile"
+- "./languages/scss/stylelint/check-file"
+- "./languages/scss/stylelint/config.json"
 - "./lib/command/check_file.rb"
+- "./lib/command/code_check/css/stylelint.rb"
 - "./lib/command/code_check/javascript/eslint.rb"
-- "./lib/command/code_check/javascript/jshint.rb"
 - "./lib/command/code_check/ruby/brakeman.rb"
 - "./lib/command/code_check/ruby/rubocop.rb"
+- "./lib/command/code_check/scss/stylelint.rb"
 - "./lib/command/docker_build.rb"
 - "./lib/command/docker_image_inspect.rb"
 - "./lib/command/docker_remove_image.rb"
@@ -91,7 +81,7 @@ homepage: https://github.com/freshout-dev/bleach
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: bleach - code check tool
 test_files: []

data/languages/javascript/jshint/config.json

@@ -1,9 +0,0 @@
-{
-    "imageName" : "bleach/jshint",
-    "requiredFiles" : [
-        {
-            "type" : "JSHint Config",
-            "file" : ".jshintrc"
-        }
-    ]
-}