easy_app_helper 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e9ce79a31fbe4f16b495bd2294ede7ba73491d2d
4
- data.tar.gz: d1acf48488b95bed0a1d738de3ff883bda3b727b
3
+ metadata.gz: 22ae50ec70059579d7f5eb77d58e492fd1d623b5
4
+ data.tar.gz: fdba239b09bd58fec2795fc86c8758b4c5c06787
5
5
  SHA512:
6
- metadata.gz: 640e370407ffa4f3e777be1891655c25ba56de8a365c693e1fa7c59839fa14146b986099b20bab3968c116a323b57e0a8dab572d9dccc2e1826fd7732c942160
7
- data.tar.gz: a9e0e012fb026e52c1715048f64612fa786db77f9ffcb3eb6909759ec38e6466c5c3c8a66ac3b95b3f982fb71fbc61dfb5c9146aa7369ff2daec9a748d80464b
6
+ metadata.gz: 58a3da7c9fe145e12320d22608d159afc8963e1407435e3f27d4ad4ee4861e39b48bb18b73c6fec05ac5d71e0b72a02c90aa53ac314168492c9f9b64803b42dc
7
+ data.tar.gz: a5d7fc90362b8a919cb4b37279f776f51fd6264d284c5cfd6d9f5ef46ef960e4822fe0949df872f88345fb13146bf48ed0e3f2ce5f34eb8822a60844ade0109c
@@ -150,7 +150,7 @@ class EasyAppHelper::Core::Config < EasyAppHelper::Core::Base
150
150
  internal_configs[layer] = {content: {}}
151
151
  filename = nil
152
152
  else
153
- if File.exists? filename_or_pattern
153
+ if File.exists? filename_or_pattern and !File.directory? filename_or_pattern
154
154
  filename = filename_or_pattern
155
155
  else
156
156
  filename = find_file POSSIBLE_PLACES[layer], filename_or_pattern
@@ -177,8 +177,8 @@ class EasyAppHelper::Core::Config < EasyAppHelper::Core::Base
177
177
  places.each do |dir|
178
178
  CONFIG_FILE_POSSIBLE_EXTENSIONS.each do |ext|
179
179
  filename_with_path = dir + '/' + filename + '.' + ext
180
- if File.exists? filename_with_path
181
- return filename_with_path
180
+ if File.exists? filename_with_path and !File.directory? filename_with_path
181
+ return filename_with_path
182
182
  else
183
183
  logger.debug "Trying \"#{filename_with_path}\" as config file."
184
184
  end
@@ -190,7 +190,7 @@ class EasyAppHelper::Core::Config < EasyAppHelper::Core::Base
190
190
  def load_config_file(conf_filename)
191
191
  conf = {}
192
192
  return conf if conf_filename.nil?
193
-
193
+
194
194
  begin
195
195
  logger.debug "Loading config file \"#{conf_filename}\""
196
196
  conf = Hash[YAML::load(open(conf_filename)).map { |k, v| [k.to_sym, v] }]
@@ -6,5 +6,5 @@
6
6
  ################################################################################
7
7
 
8
8
  module EasyAppHelper
9
- EASY_APP_HELPER_VERSION = "1.0.1"
9
+ EASY_APP_HELPER_VERSION = "1.0.2"
10
10
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: easy_app_helper
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - L.Briais
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-06-25 00:00:00.000000000 Z
11
+ date: 2013-07-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler