require_smasher 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac111d9bf0dc715eba51bd2e16605aa38bb0701
-  data.tar.gz: 543ad99d20f42103ad511503d6d422b1325923fe
+  metadata.gz: fdab9f284685ed8ebc165e123a2f717477424723
+  data.tar.gz: f63e2686e9f04df2afa5e4913ea1d44a9203d75b
 SHA512:
-  metadata.gz: 173ba1be597b4357e215706f7f1b80131b47d2f662513af2bc066dfa84bd8b600dcca79ba1f7552e69390fb7e34577028971fd1b566d9f7f57460f37b27ea3a2
-  data.tar.gz: bc6c22c9b83c8ae46e83847716f046ae260f391dd3e22c2fbe9bc3f953640f83b254919b0d1d00fbbf5d7ebb45fcc043c00f08988075c0ca3b77399dad67a2d8
+  metadata.gz: 1a43c9ba0b76b79cfb322def2a2dc4e614bcc0aef17c9890de336b866c4a724da38e1c0ecd3ab815de8599010fc12874c043d15b612819744fc9addac7212144
+  data.tar.gz: 7054ccad4818d075bd32395079019b0ff24bd9aab1d3f94b3a6b460c04628202bdaaaa33d0372aaf4aee9b4b4ca3afad4bd460795a99e7e35c33a41f8fab3da0

data/.travis.yml

@@ -2,4 +2,8 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 1.15.4
+before_install:
+  - gem install bundler -v 1.16.3
+  - bundle install
+install:
+  - bundle exec rspec

data/lib/require_smasher/require_dir.rb

@@ -1,24 +1,28 @@
 module RequireDir
-  def self.req(directory)
-    require_files(files(directory))
+  def self.req(directories)
+    raise StandardError, 'Directory was not informed' if directories.empty?
+    require_files(files(directories))
   end
 
-  def self.files(directory)
-    raise StandardError, 'Directory was not informed' unless directory
-    raise StandardError, "Directory '#{directory}' does not exist" unless Dir.exist?(directory)
-    Dir.glob(File.join(File.expand_path("./#{directory}"), '**', '*.rb'))
+  def self.files(directories)
+    files = []
+    directories.uniq.each do |directory|
+      raise StandardError, "Directory '#{directory}' does not exist" unless Dir.exist?(directory)
+      files.concat(Dir.glob(File.join(File.expand_path("./#{directory}"), '**', '*.rb')))
+    end
+    files
   end
 
   def self.require_files(files, attempt = 0)
     files_with_error = []
     errors = []
 
-    files.each do |file|
+    files.uniq.each do |file|
       begin
         require_relative file
       rescue StandardError => error
         files_with_error << file
-        errors << { file: file, error: error.message }
+        errors << "Error while requiring file #{file}: #{error.message}"
       end
     end
 

data/lib/require_smasher/require_gem.rb

@@ -1,13 +1,12 @@
 module RequireGem
-  def self.req(gem)
-    raise StandardError, 'Gem was not informed' unless gem
+  def self.req(gems)
+    raise StandardError, 'Gem was not informed' if gems.empty?
+    gems.uniq.each { |gem| req_gem(gem) }
+  end
 
-    begin
-      require gem
-    rescue LoadError => error
-      raise error, "Error requering gem '#{gem}': #{error.message}"
-    rescue StandardError => error
-      raise StandardError, "Error requering gem '#{gem}': #{error.message}"
-    end
+  def self.req_gem(gem)
+    require gem
   end
+
+  private_class_method :req_gem
 end

data/lib/require_smasher/version.rb

@@ -1,3 +1,3 @@
 module RequireSmasher
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/require_smasher.rb

@@ -1,42 +1,35 @@
 require 'require_smasher/version'
 require 'require_smasher/require_gem'
 require 'require_smasher/require_dir'
-require 'require_smasher/require_elements'
 
 def require_all(*required_list)
-  required_list.uniq!
-  errors = []
+  directories = []
+  gems = []
 
-  required_list.each do |required|
-    begin
-      require_gems(required)
-    rescue StandardError => gem_error
-      begin
-        require_dirs(required)
-      rescue StandardError => dir_error
-        errors << gem_error.message
-        errors << dir_error.message
-      end
-    end
+  required_list.uniq.each do |required|
+    directory = Dir.exist?(required)
+    directories << required if directory
+    gems << required unless directory
   end
 
-  raise StandardError, errors unless errors.empty?
+  require_gem(gems) unless gems.empty?
+  require_dir(directories) unless directories.empty?
 end
 
-def require_gem(gem)
-  require_gems(gem)
+def require_gem(gems)
+  return RequireGem.req([gems]) if gems.instance_of?(String)
+  RequireGem.req(gems)
 end
 
-def require_dir(directory)
-  require_dirs(directory)
+def require_dir(directories)
+  return RequireDir.req([directories]) if directories.instance_of?(String)
+  RequireDir.req(directories)
 end
 
 def require_dirs(*directories)
-  raise StandardError, 'No directories was informed' if directories.empty?
-  RequireElements.require_elements(directories, RequireDir)
+  require_dir(directories)
 end
 
 def require_gems(*gems)
-  raise StandardError, 'No gems was informed' if gems.empty?
-  RequireElements.require_elements(gems, RequireGem)
+  require_gem(gems)
 end

data/todos.txt

@@ -1,6 +1,4 @@
 tratar errors especificos com classe de erros a criar
 fazer readme em portugues
 resolver ofensores restantes do rubocop
-publicar gem
 atualizar readme para informar sobre gemas e arquitetura utilizada para desenvolvimento
-resolver interdependencia de arquivos dentro da lista de diretórios

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: require_smasher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Joacir Junior
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,6 @@ files:
 - bin/setup
 - lib/require_smasher.rb
 - lib/require_smasher/require_dir.rb
-- lib/require_smasher/require_elements.rb
 - lib/require_smasher/require_gem.rb
 - lib/require_smasher/version.rb
 - require_smasher.gemspec

data/lib/require_smasher/require_elements.rb

@@ -1,21 +0,0 @@
-module RequireElements
-  def self.require_elements(elements, require_module)
-    elements.uniq!
-    errors = []
-
-    elements.each do |element|
-      begin
-        require_module.req(element)
-      rescue LoadError => error
-        errors << error.message
-      rescue StandardError => error
-        errors << error.message
-      end
-    end
-
-    return if errors.empty?
-
-    raise StandardError, errors if errors.count > 1
-    raise StandardError, errors.first unless errors.empty?
-  end
-end