require_smasher 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bccdebf2570530ade656c1205c57049d534a0a91
-  data.tar.gz: 4483d1d621beb9a742a78742f5af781a77152c2c
+  metadata.gz: 03a374a7aa18c6270297dc2c3dc06311f614d9c6
+  data.tar.gz: 23025566b07d29be47c1c6855f766d0c13331a53
 SHA512:
-  metadata.gz: b1175691f6ebbae115dac3db8c35d76a85a0a4288f80a9573fe80d287a9bc9f45f8a3aff10953d0426d6d5ad19b050cdf979d98825dadfee23b1335c9a37af29
-  data.tar.gz: f1dbb21f149d992512267d9d0e060ee9b46d6d74d819cdbce645589c9aa90158d288775f71659f4ab7c23f3e8761dc5b39d0df392a6c9017f81f1935309b9a1f
+  metadata.gz: 05b667cc4d63c1c1af21ba7d5c62340a84480675abf926cdd0a0d79addcd5b5bcc002ee5dc7408c7de36e7b83dd15cf817fff510f7866bc08a7cbe583d19ae04
+  data.tar.gz: e45106516ff3d5bb9b2540028c385292a6ca545fe0e3699fafbbf763800888be403c65b33d4aa88b1cac617f741f77fe0d0f5fb18e6765567e98af375c63d6ae

data/.travis.yml

@@ -2,8 +2,13 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
+  - 2.3.7
+  - 2.4.0
+  - 2.4.4
+  - 2.5.1
 before_install:
   - gem install bundler -v 1.16.3
   - bundle install
 install:
   - bundle exec rspec
+  - bundle exec rubocop

data/lib/require_smasher/classifier.rb

@@ -0,0 +1,27 @@
+# Classify elements in files or gems
+
+module Classifier
+  class << self
+    def classify(elements)
+      files = []
+      gems = []
+
+      elements.uniq.each do |element|
+        case element_type(element)
+        when :file then files << element
+        when :directory then files.concat(FileSmasher.files_by(element))
+        else gems << element
+        end
+      end
+      { files: files, gems: gems }
+    end
+
+    private
+
+    def element_type(element)
+      return :directory if Dir.exist?(element)
+      return :file if FileSmasher.file?(element)
+      :gem
+    end
+  end
+end

data/lib/require_smasher/file_smasher.rb

@@ -0,0 +1,28 @@
+# Find files
+
+module FileSmasher
+  class << self
+    def files_by(directory)
+      raise StandardError, "Directory '#{directory}' does not exist" unless Dir.exist?(directory)
+      Dir.glob("./#{directory}/**/*.rb")
+    end
+
+    def files(directories)
+      raise StandardError, 'Directory was not informed' if directories.empty?
+
+      files = []
+      directories.uniq.each do |directory|
+        files.concat(FileSmasher.files_by(directory))
+      end
+
+      files
+    end
+
+    def file?(element)
+      file = File.expand_path("./#{element}")
+      return true if File.file?(file)
+      return false if element.include?('.')
+      File.file?("#{file}.rb")
+    end
+  end
+end

data/lib/require_smasher/require_file.rb

@@ -1,45 +1,38 @@
-module RequireFile
-  def self.require_files(files, attempt = 0)
-    raise StandardError, 'File was not informed' if files.empty?
-    errors_list = req_files(files)
-
-    return if errors_list[:files_with_error].empty?
-    attempt += 1 if files == errors_list[:files_with_error]
+# Handle requiring files
 
-    raise StandardError, errors_list[:errors] if attempt > 1
-    require_files(errors_list[:files_with_error], attempt)
-  end
+module RequireFile
+  class << self
+    def require(files)
+      raise StandardError, 'File was not informed' if files.empty?
+      errors_list = require_files(files)
+      files_with_error = errors_list[:files_with_error]
 
-  def self.require_directories(directories)
-    raise StandardError, 'Directory was not informed' if directories.empty?
-    require_files(files(directories))
-  end
+      return if files_with_error.empty?
 
-  def self.files(directories)
-    raise StandardError, 'Directory was not informed' if directories.empty?
+      raise StandardError, errors_list[:errors] if files == files_with_error
+      require(files_with_error)
+    end
 
-    files = []
-    directories.uniq.each do |directory|
-      raise StandardError, "Directory '#{directory}' does not exist" unless Dir.exist?(directory)
-      files.concat(Dir.glob(File.join("./#{directory}", '**', '*.rb')))
+    def require_directories(directories)
+      raise StandardError, 'Directory was not informed' if directories.empty?
+      require(FileSmasher.files(directories))
     end
-    files
-  end
 
-  def self.req_files(files)
-    errors_list = { files_with_error: [], errors: [] }
+    private
+
+    def require_files(files)
+      errors_list = { files_with_error: [], errors: [] }
 
-    files.uniq.each do |file|
-      begin
-        require_relative File.expand_path("./#{file}")
-      rescue LoadError, StandardError => error
-        errors_list[:files_with_error] << file
-        errors_list[:errors] << "Error while requiring file #{file}: #{error.message}"
+      files.uniq.each do |file|
+        begin
+          require_relative File.expand_path("./#{file}")
+        rescue LoadError, StandardError => error
+          errors_list[:files_with_error] << file
+          errors_list[:errors] << "Error while requiring file #{file}: #{error.message}"
+        end
       end
-    end
 
-    errors_list
+      errors_list
+    end
   end
-
-  private_class_method :req_files
 end

data/lib/require_smasher/version.rb

@@ -1,3 +1,3 @@
 module RequireSmasher
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/lib/require_smasher.rb

@@ -1,35 +1,40 @@
 require 'require_smasher/version'
-require 'require_smasher/require_gem'
+require 'require_smasher/file_smasher'
+require 'require_smasher/classifier'
 require 'require_smasher/require_file'
-require 'require_smasher/require_all'
 
 def require_all(*required_list)
-  RequireAll.req(required_list)
+  classified = Classifier.classify(required_list)
+  gems = classified[:gems]
+  files = classified[:files]
+
+  gems.uniq.each { |gem| require gem } unless gems.empty?
+  RequireFile.require(files) unless files.empty?
 end
 
-def require_gem(gems)
-  return RequireGem.req([gems]) if gems.instance_of?(String)
-  RequireGem.req(gems)
+def require_gem(gem)
+  require gem
+  gem
 end
 
-def require_dir(directories)
-  return RequireFile.require_directories([directories]) if directories.instance_of?(String)
-  RequireFile.require_directories(directories)
+def require_dir(directory)
+  RequireFile.require_directories([directory])
 end
 
-def require_file(files)
-  return RequireFile.require_files([files]) if files.instance_of?(String)
-  RequireFile.require_files(files)
+def require_file(file)
+  require_relative File.expand_path("./#{file}")
+  nil
 end
 
 def require_dirs(*directories)
-  require_dir(directories)
+  RequireFile.require_directories(directories)
 end
 
 def require_gems(*gems)
-  require_gem(gems)
+  raise StandardError, 'Gem was not informed' if gems.empty?
+  gems.uniq.each { |gem| require gem }
 end
 
 def require_files(*files)
-  require_file(files)
+  RequireFile.require(files)
 end

data/require_smasher.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.16"
   spec.add_development_dependency "rubocop", "~> 0.58"
   spec.add_development_dependency "byebug", "~> 10.0"
+  spec.add_development_dependency "rubycritic", "~> 3.4"
 end

data/todos.txt

@@ -1,4 +1,3 @@
 tratar errors especificos com classe de erros a criar
 fazer readme em portugues
-resolver ofensores restantes do rubocop
 atualizar readme para informar sobre gemas e arquitetura utilizada para desenvolvimento

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: require_smasher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Joacir Junior
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubycritic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Require Smasher give you the power to require ruby files in a list of
   directories and their sub-directories (recursively), a list of ruby files and a
   list of gems, with just one command.
@@ -115,9 +129,9 @@ files:
 - bin/console
 - bin/setup
 - lib/require_smasher.rb
-- lib/require_smasher/require_all.rb
+- lib/require_smasher/classifier.rb
+- lib/require_smasher/file_smasher.rb
 - lib/require_smasher/require_file.rb
-- lib/require_smasher/require_gem.rb
 - lib/require_smasher/version.rb
 - require_smasher.gemspec
 - todos.txt
@@ -142,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A simple way to require ruby files in directories and in its sub-directories,

data/lib/require_smasher/require_all.rb

@@ -1,32 +0,0 @@
-module RequireAll
-  def self.req(required_list)
-    result = required_list_classified(required_list)
-
-    RequireGem.req(result[:gems]) unless result[:gems].empty?
-    RequireFile.require_files(result[:files]) unless result[:files].empty?
-  end
-
-  def self.required_list_classified(elements)
-    result = { files: [], gems: [] }
-
-    elements.uniq.each do |element|
-      is_file = file?(element)
-      is_directory = Dir.exist?(element)
-      is_gem = !(is_file || is_directory)
-
-      result[:files] << element if is_file
-      result[:files].concat(RequireFile.files([element])) if is_directory
-      result[:gems] << element if is_gem
-    end
-    result
-  end
-
-  def self.file?(element)
-    file = File.expand_path("./#{element}")
-    return true if File.file?(file)
-    return false if element.include?('.')
-    File.file?("#{file}.rb")
-  end
-
-  private_class_method :required_list_classified, :file?
-end

data/lib/require_smasher/require_gem.rb

@@ -1,6 +0,0 @@
-module RequireGem
-  def self.req(gems)
-    raise StandardError, 'Gem was not informed' if gems.empty?
-    gems.uniq.each { |gem| require gem }
-  end
-end