Ensure to load project code with an order that is consistent across o…

…perating systems
hanami · Oct 22, 2016 · 68343c8 · 68343c8
1 parent 94887a6
commit 68343c8
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ unless ENV['TRAVIS']
 end
 
 gem 'i18n'
-gem 'hanami-utils',       '~> 0.8', require: false, github: 'hanami/utils',       branch: '0.8.x'
+gem 'hanami-utils',       '~> 0.8', require: false, github: 'hanami/utils',       branch: 'master'
 gem 'hanami-validations', '~> 0.6', require: false, github: 'hanami/validations', branch: 'master'
 gem 'hanami-router',      '~> 0.7', require: false, github: 'hanami/router',      branch: 'master'
 gem 'hanami-controller',  '~> 0.7', require: false, github: 'hanami/controller',  branch: '0.7.x'

diff --git a/lib/hanami/application_configuration.rb b/lib/hanami/application_configuration.rb
@@ -124,7 +124,7 @@ def force_ssl(value = nil)
     #
     # @since 0.1.0
     #
-    # @see http://www.ruby-doc.org/core-2.1.2/Dir.html#method-c-pwd
+    # @see http://www.ruby-doc.org/core/Dir.html#method-c-pwd
     #
     # @example Getting the value
     #   require 'hanami'

diff --git a/lib/hanami/assets/asset.rb b/lib/hanami/assets/asset.rb
@@ -1,3 +1,5 @@
+require 'hanami/utils/file_list'
+
 module Hanami
   module Assets
     # Requested asset
@@ -60,7 +62,7 @@ def exist?
       # @since 0.8.0
       # @api private
       def find_asset
-        Dir[PUBLIC_DIRECTORY].find do |asset|
+        Utils::FileList[PUBLIC_DIRECTORY].find do |asset|
           yield asset unless ::File.directory?(asset)
         end
       end

diff --git a/lib/hanami/commands/generate/migration.rb b/lib/hanami/commands/generate/migration.rb
@@ -1,4 +1,5 @@
 require 'hanami/commands/generate/abstract'
+require 'hanami/utils/file_list'
 
 module Hanami
   module Commands
@@ -42,7 +43,7 @@ def destination_path
         end
 
         def existing_migration_path
-          Dir.glob("#{Hanami::Model.configuration.migrations}/[0-9]*_#{underscored_name}.rb").first
+          Utils::FileList["#{Hanami::Model.configuration.migrations}/[0-9]*_#{underscored_name}.rb"].first
         end
 
         def new_migration_path

diff --git a/lib/hanami/config/load_paths.rb b/lib/hanami/config/load_paths.rb
@@ -1,4 +1,4 @@
-require 'hanami/utils/load_paths'
+require 'hanami/utils'
 
 module Hanami
   module Config
@@ -7,16 +7,14 @@ module Config
     # @since 0.1.0
     # @api private
     class LoadPaths < Utils::LoadPaths
-      PATTERN = '**/*.rb'.freeze
-
       def initialize(root)
         super()
         @root = root
       end
 
       def load!
         each do |path|
-          Dir.glob(path.join(PATTERN)).each { |file| require file }
+          Utils.require!(path)
         end
       end
 

diff --git a/lib/hanami/frameworks.rb b/lib/hanami/frameworks.rb
@@ -1,3 +1,4 @@
+require 'hanami/utils'
 require 'hanami/validations'
 require 'hanami/router'
 require 'hanami/view'

diff --git a/lib/hanami/generators/application/container/lib/project.rb.tt b/lib/hanami/generators/application/container/lib/project.rb.tt
@@ -1 +1 @@
-Dir["#{__dir__}/<%= config[:project_name] %>/**/*.rb"].each { |file| require_relative file }
+Hanami::Utils.require!("#{__dir__}/<%= config[:project_name] %>")
diff --git a/lib/hanami/generators/application/container/spec_helper.rb.rspec.tt b/lib/hanami/generators/application/container/spec_helper.rb.rspec.tt
@@ -3,8 +3,7 @@ ENV['HANAMI_ENV'] ||= 'test'
 
 require_relative '../config/environment'
 Hanami.boot
-
-Dir[__dir__ + '/support/**/*.rb'].each { |f| require f }
+Hanami::Utils.require!("#{__dir__}/support")
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

diff --git a/lib/hanami/static.rb b/lib/hanami/static.rb
@@ -53,7 +53,7 @@ def initialize(app, root: Hanami.public_directory, header_rules: HEADER_RULES)
     def _urls(root)
       return [] unless root.exist?
 
-      Dir.entries(root).map do |entry|
+      Dir.entries(root).sort.map do |entry|
         next if EXCLUDED_ENTRIES.include?(entry)
         "#{URL_PREFIX}#{entry}"
       end.compact

diff --git a/spec/integration/cli/new/test_spec.rb b/spec/integration/cli/new/test_spec.rb
@@ -75,8 +75,7 @@ class MiniTest::Spec
 
 require_relative '../config/environment'
 Hanami.boot
-
-Dir[__dir__ + '/support/**/*.rb'].each { |f| require f }
+Hanami::Utils.require!("\#{__dir__}/support")
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

diff --git a/spec/integration/cli/new_spec.rb b/spec/integration/cli/new_spec.rb
@@ -180,7 +180,7 @@
       # lib/<project>.rb
       #
       expect("lib/#{project}.rb").to have_file_content <<-END
-Dir["\#{__dir__}/#{project}/**/*.rb"].each { |file| require_relative file }
+Hanami::Utils.require!("\#{__dir__}/#{project}")
 END
 
       #

diff --git a/spec/support/shared_examples/cli/new.rb b/spec/support/shared_examples/cli/new.rb
@@ -44,7 +44,7 @@
       # lib/<project>.rb
       #
       expect("lib/#{project}.rb").to have_file_content <<-END
-Dir["\#{__dir__}/#{project}/**/*.rb"].each { |file| require_relative file }
+Hanami::Utils.require!("\#{__dir__}/#{project}")
 END
 
       #