jscop 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a58c121a44379f5c4cf6117db6ae5034eb1ba3ce86ab5c60236ae572808136
-  data.tar.gz: 43282861b0fb49e9dac054cb014e406d9ce164d0860229209b0ace26d7c1c0ed
+  metadata.gz: ef2c93999ac0dec33666d5f5cb59a61c9ca9943212a6aba06a52aaafcccb3078
+  data.tar.gz: e2f2addb2e82e2f8d1d141f35898de484bf2356636a4cf603bce84797fa7a0e7
 SHA512:
-  metadata.gz: 7296b4d12c6d2796cdb566e322c2bcee6bad26d3e5f0abd6d0ff6191744c56ed5800a47ba0a13b34ee2c59f5410332317acb081c49c0d7aa3fd2e3f12edc8759
-  data.tar.gz: 777abcca2f151e8bbb955d241447763cc37ce9a1c0987cc7e863f8ab81b82886b6b8c51a975044dca235c27e4c55a34e82d8d227ae696bd5ec2396212bdaa3a2
+  metadata.gz: 0df7a44e87f2d82c994bcf3cfa5f21eafdcc8160413615b886d01934c27d03fff0bd427ccf1969b7ee48d15a08f87ddeb54c6a4cb3024fd774e0a083d6517e70
+  data.tar.gz: 815f17057bdf68f33c3f7b15a814d73bb249418ad419532f54bdddbc3689110b565d331a9afd373e5dc4e4d2e5922536ad00fd5de65139849507caf50a5c7e24

data/.rubocop.yml

@@ -1,10 +1,10 @@
 AllCops:
   Exclude:
     - "spec/spec_helper.rb"
+    - "lib/jscop/spacing_checker.rb"
     - "README.md"
     - "Guardfile"
     - "Rakefile"
-    - "rof_work.rb"
     - "vendor/**/*"
     - "jscop.gemspec"
 

data/.stickler.yml

@@ -6,9 +6,9 @@ linters:
 files:
   ignore:
     - "Guardfile"
+    - "lib/jscop/spacing_checker.rb"
     - "Rakefile"
     - "node_modules/**/*"
     - "spec/spec_helper.rb"
-    - "rof_work.rb"
     - "vendor/**/*"
     - "jscop.gemspec"

data/Gemfile

@@ -5,6 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in jscop.gemspec
 gemspec
 gem 'colorize', '~> 0.8.1'
+gem 'rake', '~> 12.3.3'
 gem 'rspec'
 gem 'rubocop'
 gem 'tty-font', '~> 0.5.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jscop (0.1.4)
+    jscop (0.1.5)
       colorize (~> 0.8)
       tty-font (~> 0.5)
 
@@ -16,7 +16,7 @@ GEM
     parser (2.7.1.1)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -50,7 +50,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   colorize (~> 0.8.1)
   jscop!
-  rake (~> 12.3)
+  rake (~> 12.3.3)
   rspec
   rubocop
   tty-font (~> 0.5.0)

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/jscop.svg)](https://badge.fury.io/rb/jscop) [![Run on Repl.it](https://repl.it/badge/github/codecell/js-companion)](https://repl.it/github/codecell/js-companion)
+[![Gem Version](https://badge.fury.io/rb/jscop.svg)](https://badge.fury.io/rb/jscop)  [![Build Status](https://travis-ci.org/codecell/jscop.svg?branch=development)](https://travis-ci.org/codecell/jscop)  [![Run on Repl.it](https://repl.it/badge/github/codecell/js-companion)](https://repl.it/github/codecell/js-companion)
 
 # Jscop
 

data/exe/jscop

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
-require 'jscop/version'
-require_relative '../lib/helpers/lint_ware'
 require 'tty-font'
 require 'colorize'
 
+require 'jscop/version'
+require_relative '../lib/helpers/lint_ware'
+
 def show_title
   font = TTY::Font.new
   font_messge = font.write('Jscop', letter_spacing: 1)

data/lib/jscop/spacing_checker.rb

@@ -15,27 +15,71 @@ module SpacingChecker
   end
 
   def self.found_spaces(cont)
-    spaces_before = /[\s]+(const|let|var|function|class|[\}$])[\s]+[\w]*/
-    spaces_after = /(const|let|var|function|class)[\s]{2,}[\w]+[\s]*[\=]/
-    spaced_console = /[\s]+(function|(console.log)[\(][\w]*[\)])[\s]*/
-    closing_line = /[\s]+[\}][\s]*/
+    /(?<lhs>\w+[\W]*)\s{2,}(?<rhs>\w+[\W]*)/ =~ cont
+    vsf = !Regexp.last_match.nil?
 
+    /(?<lhs>\w+\W*)\s{2,}=\s*(?<rhs>\w+\W*)/ =~ cont
+    beq = !Regexp.last_match.nil?
+
+    /(?<lhs>\w+\W*)\s*=\s{2,}(?<rhs>\w+\W*)/ =~ cont
+    aeq = !Regexp.last_match.nil?
+
+    spaced_console = /(console.log)[\s+][\(][\w\W]+[\)]/
+    spc = spaced_console.match?(cont)
     commented_line = cont.match?(%r{^\W+[\/\/]})
 
-    a = spaces_before.match?(cont)
-    b = spaces_after.match?(cont)
-    c = spaced_console.match?(cont)
+    !commented_line && (vsf || beq || aeq || spc)
+  end
+
+  def self.closing_curly_spacing(cont)
+    spaced_closing_curly = /[\s]+[\}][\s]*/
+    c = spaced_closing_curly.match(cont)
+
+    commented_line = cont.match?(%r{^\W+[\/\/]})
+
+    c && !commented_line
+  end
+
+  def self.closed_curly(cont)
+    cont.match?(/}/)
+  end
+
+  def self.open_curly(cont)
+    cont.match?(/{/)
+  end
 
-    !commented_line && (a || b || c || closing_line.match?(cont))
+  def self.line_beginining_spaces(line)
+    /^[\s+][\w\W]*/.match?(line)
   end
 
   def self.check_spaces(file)
+    seen_open = false
+    counter = 0
     lines_with_spaces = []
-    check_line = lambda { |line|
-      lines_with_spaces << line.number if found_spaces(line.content) && !lines_with_spaces.nil?
-    }
+
+    opening_tracker = 0
+    closing_tracker = 0
+
+    arr = file.lines
     err_type = 'SPACING_ERR'
-    file.lines.each(&check_line)
+
+    while counter < arr.length
+      line = arr[counter]
+
+      seen_open = true if open_curly(line.content)
+
+      opening_tracker += 1 if line.content.match?(/{/)
+      closing_tracker += 1 if line.content.match?(/}/)
+
+      lines_with_spaces << line.number if line_beginining_spaces(line.content) unless seen_open
+      opt = (opening_tracker == closing_tracker)
+      seen_open = false if closed_curly(line.content) && opt
+
+      lines_with_spaces << line.number if closing_curly_spacing(line.content) && opt
+      lines_with_spaces << line.number if found_spaces(line.content) && !lines_with_spaces.nil?
+
+      counter += 1
+    end
 
     lines_with_spaces.each { |line| raise_err(line, err_type, file.filename) if !lines_with_spaces.empty? }
   end

data/lib/jscop/unused_var_checker.rb

@@ -14,6 +14,15 @@ module UnusedVarChecker
     unused_var_err
   end
 
+  def self.check_escapable(elem)
+    escapables = [
+      '', 'var', 'let', 'const', 'constructor', 'class', 'super', 'function', 'static', 'console',
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+    ]
+
+    escapables.include?(elem)
+  end
+
   def self.extract_from_parentesis(expresn)
     /([\(][\w\W]+[\)])/ =~ expresn
     vars_match_data = Regexp.last_match
@@ -33,8 +42,15 @@ module UnusedVarChecker
   # rubocop:disable Lint/UselessAssignment
   def self.match_variable(contents)
     /(?<lhs>\w+)\s*=\s*(?<rhs>\w*\W*)/ =~ contents
+    equals_var = Regexp.last_match(:lhs)
 
-    lhs
+    /(?<lhs>(let|var|const))\s{1,}(?<rhs>[\w\-]*)/ =~ contents
+    lazy_init_var = Regexp.last_match(:rhs)
+
+    /(?<lhs>\w+)\s*(?<rhs>[\(\w+\)]*)/ =~ contents
+    func_call_var = Regexp.last_match(:lhs)
+
+    equals_var || lazy_init_var || func_call_var
   end
   # rubocop:enable Lint/UselessAssignment
 
@@ -65,21 +81,19 @@ module UnusedVarChecker
       vars_match_data = vars_match_data if !vars_match_data.nil?
       vars_match_data_str_arr = vars_match_data.to_s.split
 
-      escapables = ['var', 'let', '', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-
       vars_match_data_str_arr.collect { |var|
         /([\w\-]+)/ =~ var
         wanted = Regexp.last_match
         wanted = wanted.to_s
         lines_variables_hash[line.number] = wanted if wanted
-        variable_instances << wanted if !escapables.include?(wanted)
+        variable_instances << wanted if !check_escapable(wanted)
       }
 
       commented_line = line.content.to_s.match?(%r{^\W+[\/\/]})
 
-      detected_variable = match_variable(line.content.to_s) if !commented_line
-      lines_variables_hash[line.number] = detected_variable if detected_variable
-      variable_instances << detected_variable if detected_variable
+      detected_var = match_variable(line.content.to_s) if !commented_line
+      lines_variables_hash[line.number] = detected_var if detected_var
+      variable_instances << detected_var if !check_escapable(detected_var)
     }
 
     file.lines.each(&line_check)

data/lib/jscop/version.rb

@@ -1,3 +1,3 @@
 module Jscop
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jscop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ezaka Alfred
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize