easy_app_helper 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39557d4f84525b6de38404fecf05ce2eae6f7144
-  data.tar.gz: 454cec936616e65211a9753ca09a39b0f3923dda
+  metadata.gz: 3cff55825961e2cb5ae6ade6a3cd3c6f850e73e7
+  data.tar.gz: f371a891e6874165e647a065333fbe506dcc4bdc
 SHA512:
-  metadata.gz: 8b2bbf54f247a69dce1595dbd03006922b5c252e92818bdf04266c2cac82b0738bff5f9d15d8e1bb5ddfca4c2a81d30495b505fb9c447d55cab22ef51cc031ff
-  data.tar.gz: 6c8b3dfbfbda115b2dfa154247dedf677bcebd2b08ffe67e7a276dd5a7b7ffbb306cf7c5613f63e5aab764edde43c2110e3fd564d4e849f3fb4a6cdc2fc53e53
+  metadata.gz: 0b024e94fddf2b435053766509a8c2157eb26498fea8b2719e1663e8aec745e6908059ba007cd2a450a0254ef5080f98683f03687645ebd6e76a33288d99b3d4
+  data.tar.gz: ffc0ebaa8de0b04b7327d30616ec13e3f4203a70f1adbfd7b5e8d4d1625225485e9de03cac2403ef6b00bc88961dee238ba3dd481968e36380b61232329438b7

data/lib/easy_app_helper/core/config.rb

@@ -42,7 +42,6 @@ require 'easy_app_helper/core/merge_policies'
 
 class EasyAppHelper::Core::Config
   include EasyAppHelper::Core::HashesMergePolicies
-  include EasyAppHelper::Core::Config::Places.get_os_module
 
   ADMIN_CONFIG_FILENAME = EasyAppHelper.name
   INTRODUCED_SORTED_LAYERS = [:specific_file, :user, :global, :internal, :system]
@@ -170,9 +169,10 @@ class EasyAppHelper::Core::Config
       if File.exists? filename_or_pattern and !File.directory? filename_or_pattern
         filename = filename_or_pattern
       else
-        filename = find_file POSSIBLE_PLACES[layer], filename_or_pattern
+        places = Places.possible_config_places[layer]
+        filename = find_file places, filename_or_pattern
       end
-      internal_configs[layer] = {content: load_config_file(filename), source: filename, origin: filename_or_pattern}
+      internal_configs[layer] = {content: load_config_file(filename, layer), source: filename, origin: filename_or_pattern}
     end
   ensure
     logger.info "No config file found for layer #{layer}." if filename.nil?
@@ -204,15 +204,15 @@ class EasyAppHelper::Core::Config
     nil
   end
 
-  def load_config_file(conf_filename)
+  def load_config_file(conf_filename, layer=nil)
     conf = {}
     return conf if conf_filename.nil?
-    
+    ext = layer.nil? ? '' : " as layer #{layer}"
     begin
-      logger.debug "Loading config file \"#{conf_filename}\""
+      logger.debug "Loading config file \"#{conf_filename}\"#{ext}"
       conf = Hash[YAML::load(open(conf_filename)).map { |k, v| [k.to_sym, v] }]
     rescue => e
-      logger.error "Invalid config file \"#{conf_filename}\". Skipped as not respecting YAML syntax!\n#{e.message}"
+      logger.error "Invalid config file \"#{conf_filename}\"#{ext}. Skipped as not respecting YAML syntax!\n#{e.message}"
     end
     conf
   end

data/lib/easy_app_helper/core/merge_policies.rb

@@ -11,6 +11,9 @@ module EasyAppHelper::Core::HashesMergePolicies
   # Performs a merge at the second level of hashes.
   # simple entries and arrays are overridden.
   def hashes_second_level_merge(h1, h2)
+    return [] if h1.nil? && h2.nil?
+    return h1 if h2.nil?
+    return h2 if h1.nil?
     h2.each do |key, v|
       if h1[key] and h1[key].is_a?(Hash)
         # Merges hashes

data/lib/easy_app_helper/core/places.rb

@@ -9,76 +9,79 @@
 # that provides a list of OS dependant paths.
 # The only method that should be used is the #get_os_module method that returns this module.
 # TODO: Add equivalent for Mac
-class EasyAppHelper::Core::Config::Places
 
-  module Helper
-
-    def gem_root_path
-      spec = Gem::Specification.find_by_name("your_gem_name")
-      gem_root = spec.gem_dir
-    end
-
-    def get_internal_config_place
-      [File.expand_path('../../etc', $PROGRAM_NAME), File.expand_path('../../config', $PROGRAM_NAME)]
+module EasyAppHelper
+  module Core
+    class Config
+      module Places
+
+        OS_FLAVOURS = {
+            mingw32: :windows,
+            linux: :unix
+        }
+        DEFAULT_OS_FLAVOUR = :unix
+
+        FLAVOUR_PLACES = {
+            unix: {
+                internal: [],
+
+                system: ['/etc'],
+
+                # Where could be stored global wide configuration
+                global: %w(/etc /usr/local/etc),
+
+                # Where could be stored user configuration
+                user:  ["#{ENV['HOME']}/.config"]
+            },
+            windows: {
+                internal: [],
+
+                system: ["#{ENV['systemRoot']}/Config"],
+
+                # Where could be stored global configuration
+                global: ["#{ENV['systemRoot']}/Config",
+                         "#{ENV['ALLUSERSPROFILE']}/Application Data"],
+
+                # Where could be stored user configuration
+                user: [ENV['APPDATA']]
+            }
+        }
+
+
+        def self.os_flavour
+          flavour = OS_FLAVOURS[RbConfig::CONFIG['target_os'].to_sym]
+          flavour.nil? ? DEFAULT_OS_FLAVOUR : flavour
+        end
+
+        def self.gem_root_path(file=__FILE__)
+          file=__FILE__ if file.nil?
+          searcher = if Gem::Specification.respond_to? :find
+                       # ruby 2.0
+                       Gem::Specification
+                     elsif Gem.respond_to? :searcher
+                       # ruby 1.8/1.9
+                       Gem.searcher.init_gemspecs
+                     end
+          spec = unless searcher.nil?
+                   searcher.find do |spec|
+                     File.fnmatch(File.join(spec.full_gem_path,'*'), file)
+                   end
+                 end
+
+          spec.gem_dir
+        end
+
+
+        def self.possible_config_places(file_of_gem=nil)
+          root = gem_root_path file_of_gem
+          places = FLAVOUR_PLACES[os_flavour].dup
+          places[:internal] = %w(etc config).map do |place|
+            File.join root, place
+          end
+          places
+        end
+
+      end
     end
-
-    def possible_config_places key
-      POSSIBLE_PLACES[key]
-    end
-
-  end
-
-
-  # Defines some places for Unix machines
-  module Unix
-
-    extend Helper
-
-    POSSIBLE_PLACES = {
-
-        internal: self.get_internal_config_place,
-
-        system: ['/etc'],
-
-        # Where could be stored global wide configuration
-        global: ['/etc',
-                 '/usr/local/etc'],
-
-        # Where could be stored user configuration
-        user:  ["#{ENV['HOME']}/.config"]
-    }
-  end
-
-  # Defines some places for Windows machines
-  module Windows
-    extend Helper
-
-    POSSIBLE_PLACES = {
-
-        internal: self.get_internal_config_place,
-
-        system: ["#{ENV['systemRoot']}/Config"],
-
-        # Where could be stored global configuration
-        global: ["#{ENV['systemRoot']}/Config",
-                 "#{ENV['ALLUSERSPROFILE']}/Application Data"],
-
-        # Where could be stored user configuration
-        user: [ENV['APPDATA']]
-    }
   end
-
-  CONF = {
-      mingw32: Windows,
-      linux: Unix
-  }
-  DEFAULT = Unix
-
-
-  def self.get_os_module
-    conf = CONF[RbConfig::CONFIG['target_os'].to_sym]
-    conf.nil? ? DEFAULT : conf
-  end
-
-
-end
+end

data/lib/easy_app_helper/version.rb

@@ -6,5 +6,5 @@
 ################################################################################
 
 module EasyAppHelper
-  EASY_APP_HELPER_VERSION = "1.0.11"
+  EASY_APP_HELPER_VERSION = "1.0.12"
 end

data/spec/config_spec.rb

@@ -189,9 +189,6 @@ describe "The EasyAppHelper config object" do
 
   context "When a gem has its own :internal config file" do
     before(:all) do
-      pp = EasyAppHelper.config.class.const_get :POSSIBLE_PLACES
-      pp[:internal] = [File.expand_path('../../etc', __FILE__)]
-      EasyAppHelper.config.class.const_set :POSSIBLE_PLACES, pp
       EasyAppHelper.config.script_filename = 'test_internal'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_app_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - L.Briais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler