require_smasher 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da408037a9f85eef8e4be1eba320ad78b171cb7
-  data.tar.gz: 73a52007125c2917af67bc41ac0a94fcdbc5d656
+  metadata.gz: 3fb7ce1c8f8213d9683665307a4cf1675b056db9
+  data.tar.gz: 251e377b2e8d74f0e0068981671fec2d741dff29
 SHA512:
-  metadata.gz: 0ac054876926170e918282c9a801b106afaf51f2d91fee508e3936d80400e359cddda3a522d353b35f367a7c39205ff69adf63294a028faf1a1fadec4a662f8e
-  data.tar.gz: 23ec690f227c6d15b8bddf9dc51f7d3c17124fb648e003666f0471cf1cfeb48fb2207db36eebd1d9d56008aaef723d928fcea9535875e69d2ea69080a2ab5af6
+  metadata.gz: 839c625191357ccf0242d667d0970c09d2f05197ee6b7a8b6a95880f0ca66f6161d5741e4bf5aa5b970268f552e1f7d1505a5cb670e793d2082f411d2edcd555
+  data.tar.gz: 1c4da1a0f07bce36bbf66c247301608162c91673697c846e2d84c527443b1d6a33585e63e0641903891f6296de3f8a4decc8c052f045e5bb11f5ee5492cc1dcf

data/README.md

@@ -7,7 +7,9 @@ This project was born just to solve a problem: require ruby files **recursively*
 - require ruby files recursively in a list of directories and their sub-directories, trying to resolve interdependent files (`require_dirs`)
 - require a gem (`require_gem`)
 - require a list of gems (`require_gems`)
-- require a **list of gems** and ruby files in a **list of directories** and their sub-directories with just **one command** (`require_all`)
+- require a ruby file (`require_file`)
+- require a list of ruby files (`require_files`)
+- require a **list of gems**, ruby files in a **list of directories** and their sub-directories and a **list of files** with just **one command** (`require_all`)
 
 ## Installation
 
@@ -30,9 +32,11 @@ Or install it yourself as:
 ### Require All
 
 ```ruby
-require_all 'directory_1', 'directory_2/sub-directory', 'gem_1', 'gem_2'
+require_all 'directory_1', 'directory_2/sub-directory', 'gem_1', 'gem_2', 'directory_3/filename_1', 'filename_2'
 ```
-This command will require all ruby files found in directory `directory_1` and its sub-directories, all ruby files in directory `directory_2/sub-directory` and in its sub-directories, gem `gem_1` and gem `gem_2`.
+This command will require all ruby files found in directory `directory_1` and its sub-directories, all ruby files in directory `directory_2/sub-directory` and in its sub-directories, gem `gem_1` and gem `gem_2`, and files `directory_3/filename_1.rb` and `filename_2.rb`.
+
+**Note**: the order of elements is not important, because Require Smasher will try to resolve any dependences among them.
 
 ### Require Dir
 
@@ -62,6 +66,20 @@ require_gems 'gem_1', 'gem_2'
 ```
 This command accept a list of gems and it will require gems `gem_1` and `gem_2`.
 
+### Require File
+
+```ruby
+require_file 'filename'
+```
+This command will require the file `filename.rb`. You don't have to inform Ruby extension file (**rb**), if you want.
+
+### Require Files
+
+```ruby
+require_gems 'filename_1', 'directory/filename_2', 'directory/filename_3.rb'
+```
+This command accept a list of files and it will require files `filename_1.rb`, `directory/filename_2.rb` and `directory/filename_3.rb`. You don't have to inform Ruby extension file (**rb**), if you want.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/require_smasher.rb

@@ -1,19 +1,10 @@
 require 'require_smasher/version'
 require 'require_smasher/require_gem'
-require 'require_smasher/require_dir'
+require 'require_smasher/require_file'
+require 'require_smasher/require_all'
 
 def require_all(*required_list)
-  directories = []
-  gems = []
-
-  required_list.uniq.each do |required|
-    directory = Dir.exist?(required)
-    directories << required if directory
-    gems << required unless directory
-  end
-
-  require_gem(gems) unless gems.empty?
-  require_dir(directories) unless directories.empty?
+  RequireAll.req(required_list)
 end
 
 def require_gem(gems)
@@ -22,8 +13,13 @@ def require_gem(gems)
 end
 
 def require_dir(directories)
-  return RequireDir.req([directories]) if directories.instance_of?(String)
-  RequireDir.req(directories)
+  return RequireFile.require_directories([directories]) if directories.instance_of?(String)
+  RequireFile.require_directories(directories)
+end
+
+def require_file(files)
+  return RequireFile.require_files([files]) if files.instance_of?(String)
+  RequireFile.require_files(files)
 end
 
 def require_dirs(*directories)
@@ -33,3 +29,7 @@ end
 def require_gems(*gems)
   require_gem(gems)
 end
+
+def require_files(*files)
+  require_file(files)
+end

data/lib/require_smasher/require_all.rb

@@ -0,0 +1,32 @@
+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_file.rb

@@ -0,0 +1,45 @@
+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]
+
+    raise StandardError, errors_list[:errors] if attempt > 1
+    require_files(errors_list[:files_with_error], attempt)
+  end
+
+  def self.require_directories(directories)
+    raise StandardError, 'Directory was not informed' if directories.empty?
+    require_files(files(directories))
+  end
+
+  def self.files(directories)
+    raise StandardError, 'Directory was not informed' if directories.empty?
+
+    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')))
+    end
+    files
+  end
+
+  def self.req_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}"
+      end
+    end
+
+    errors_list
+  end
+
+  private_class_method :req_files
+end

data/lib/require_smasher/version.rb

@@ -1,3 +1,3 @@
 module RequireSmasher
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: require_smasher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Joacir Junior
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,8 @@ files:
 - bin/console
 - bin/setup
 - lib/require_smasher.rb
-- lib/require_smasher/require_dir.rb
+- lib/require_smasher/require_all.rb
+- lib/require_smasher/require_file.rb
 - lib/require_smasher/require_gem.rb
 - lib/require_smasher/version.rb
 - require_smasher.gemspec

data/lib/require_smasher/require_dir.rb

@@ -1,38 +0,0 @@
-module RequireDir
-  def self.req(directories)
-    raise StandardError, 'Directory was not informed' if directories.empty?
-    require_files(files(directories))
-  end
-
-  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.uniq.each do |file|
-      begin
-        require_relative file
-      rescue StandardError => error
-        files_with_error << file
-        errors << "Error while requiring file #{file}: #{error.message}"
-      end
-    end
-
-    return if files_with_error.empty?
-
-    attempt += 1 if files == files_with_error
-
-    raise StandardError, errors if attempt > 1
-    require_files(files_with_error, attempt)
-  end
-
-  private_class_method :files, :require_files
-end