rconfig 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c485c69a2d0b78cc4a9228b8e57c9ff0c8dfefc
-  data.tar.gz: b6b478faf25cd377bf068f655d013fdfebb47005
+  metadata.gz: 2f6c63a184f6c78b4eaa52eb6f72925806ac738e
+  data.tar.gz: cb06566e303bdb434d39e26a1a7bde66d145a9ba
 SHA512:
-  metadata.gz: 8fbdec9ede9ef81a41690184d92231eeb2d9311d438a047597a43f022cc2565a96fca1c461e1cf3120ef4eed443ea1c0057c365a6d1410cce8e39d324b87bcc5
-  data.tar.gz: a3d7a1ba27d736348b52783a4afa06492e57183d39a33c1a401a02bff511f696febf4e465304a9008ab588409fd1da71671f2e3f500f4864b9075235b829f30c
+  metadata.gz: c39fd812ef68b0c926dd696c581fc0eee4f1fb0bddc092a0ea61c162373eec3a4131747d69a3527c84993f3dc835757ea522a4c17dc74402d0a4379fba231d11
+  data.tar.gz: da16510336c89949f74a5b485b430a74581e5329343a4f20dec36dc51eb09711b4cb8bb7b5283ab77b3856c3b635281a7accc97659655a069197576b39049a8a

data/.ruby-gemset

@@ -0,0 +1 @@
+rconfig

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/ChangeLog

@@ -1,7 +1,19 @@
+0.5.4
+=====
+* Added support for windows paths
+* Updated tests specs so that they can run on windows
+* Updated gem dependencies so thay can install on ruby 2.2.x
+* Removed overriden HashWithIndifferentAccess#convert_value.
+
+0.5.3
+=====
+* Removed .rvmrc (which was wrong anyway), in favor of .ruby-version and .ruby-gemset
+
 0.5.2
 =====
 * Fixed Typo
 * Updated from jrhorn424/rconfig (See github commit #0bc5f9741c1f066d0dee4aa40eccbf81ad7caf11)
+* Removed
 
 0.5.1
 =====

data/Gemfile

@@ -1,10 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'activesupport', '> 3.0', :require => 'active_support'
+gem 'activesupport', '~> 3.2', require: 'active_support'
+gem 'json', '> 1.8.1'
 
 group :development do
+  gem 'rake',    '~> 11.2'
+  gem 'rack',    '~> 1.4.2'
   gem 'rspec',   '> 2.3.0'
   gem 'bundler', '> 1.0.0'
   gem 'jeweler', '> 1.6.4'
-  gem 'i18n',    '> 0.6.0'
+  gem 'i18n'
 end

data/Gemfile.lock

@@ -1,25 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
+    activesupport (3.2.22.4)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
+    addressable (2.4.0)
     builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    git (1.2.6)
-    github_api (0.4.10)
-      faraday (~> 0.7.6)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.0)
-      oauth2 (~> 0.5.2)
-    hashie (1.2.0)
-    highline (1.6.20)
-    i18n (0.6.9)
-    jeweler (2.0.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.14.5)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.4)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -28,34 +30,51 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    mini_portile (0.5.2)
-    multi_json (1.1.0)
-    multipart-post (1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    rack (1.5.2)
-    rake (10.1.1)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+      semver
+    json (2.0.2)
+    jwt (1.5.4)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
+    rack (1.4.7)
+    rake (11.2.2)
+    rdoc (4.1.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (> 3.0)
+  activesupport (~> 3.2)
   bundler (> 1.0.0)
-  i18n (> 0.6.0)
+  i18n
   jeweler (> 1.6.4)
+  json (> 1.8.1)
+  rack (~> 1.4.2)
+  rake (~> 11.2)
   rspec (> 2.3.0)

data/README.rdoc

@@ -1,3 +1,4 @@
+dogs
 
 = RConfig 
 

data/lib/rconfig.rb

@@ -65,7 +65,7 @@ require 'rconfig/core_ext/hash'
 require 'rconfig/core_ext/nil'
 
 module RConfig
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 
   autoload :Socket,                    'socket'
   autoload :YAML,                      'yaml'

data/lib/rconfig/config.rb

@@ -76,12 +76,5 @@ module RConfig
 
     protected
 
-    ##
-    # Override HashWithIndifferentAccess#convert_value
-    # return instance of Config for Hash values.
-    def convert_value(value, options = {})
-      value.is_a?(Hash) ? self.class.new(value).freeze : super
-    end
-
   end # class Config
 end

data/lib/rconfig/load_paths.rb

@@ -30,13 +30,21 @@ module RConfig
     ##
     # If the paths are made up of a delimited string, then parse out the
     # individual paths. Verify that each path is valid.
+    #
+    # - If windows path separators are ';' and '!'
+    # - otherwise the path separators are ';' and ':'
+    #
+    # This is necessary so windows paths can be correctly processed
     def parse_load_paths(paths)
+
       if paths.is_a? String
-        path_sep = (paths =~ /;/) ? ';' : ':'
-        paths = paths.split(/#{path_sep}+/)
+        path_separators = get_path_separators
+        paths = paths.split(/#{path_separators}+/)
       end
+
       raise ArgumentError, "Path(s) must be a String or an Array [#{paths.inspect}]" unless paths.is_a? Array
       raise ArgumentError, "Must provide at least one load path: [#{paths.inspect}]" if paths.empty?
+
       paths.each do |dir|
         dir = CONFIG_ROOT if dir == 'CONFIG_ROOT'
         raise InvalidLoadPathError, "This directory is invalid: [#{dir.inspect}]" unless Dir.exists?(dir)
@@ -51,5 +59,20 @@ module RConfig
       not load_paths.blank?
     end
 
+
+    private
+
+    def get_path_separators
+      is_windows = Gem.win_platform?
+      if is_windows
+        path_sep = (paths =~ /;/) ? ';' : '!'
+      else
+        path_sep = (paths =~ /;/) ? ';' : ':'
+      end
+
+      path_sep
+
+    end
+
   end
 end

data/rconfig.gemspec

@@ -24,12 +24,15 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Dependencies
-  s.add_dependency 'activesupport',       '>   3.0'
+  s.add_dependency 'activesupport',       '~>   3.2'
+  s.add_dependency 'json',                '>  1.8.1'
 
   # Development Dependencies
-  s.add_development_dependency 'rspec',   '> 2.3.0'
-  s.add_development_dependency 'bundler', '> 1.0.0'
-  s.add_development_dependency 'jeweler', '> 1.6.4'
-  s.add_development_dependency 'i18n'
+  s.add_development_dependency 'rake',    '~>  11.2'
+  s.add_development_dependency 'rack',    '~> 1.4.2'
+  s.add_development_dependency 'rspec',   '>  2.3.0'
+  s.add_development_dependency 'bundler', '>  1.0.0'
+  s.add_development_dependency 'jeweler', '>  1.6.4'
+  s.add_development_dependency 'i18n'  
 end
 

data/spec/rconfig/load_paths_spec.rb

@@ -8,7 +8,7 @@ describe RConfig do
   context 'load paths' do
     it 'should have a valid load path' do
       RConfig.load_paths.should_not be_blank
-      RConfig.load_paths.all?{|path| File.exists?(path) }.should be_true
+      RConfig.load_paths.all?{|path| File.exists?(path) }.should be_truthy
     end
 
     it 'should allow multiple load paths' do

data/spec/rconfig/reload_spec.rb

@@ -13,17 +13,17 @@ describe RConfig do
 
     it 'should reload if reload enabled' do
       RConfig.enable_reload = true
-      RConfig.reload.should be_true
+      RConfig.reload.should be_truthy
     end
 
     it 'should not reload if reload disabled' do
       RConfig.enable_reload = false
-      RConfig.reload.should be_false
+      RConfig.reload.should be_falsey
     end
 
     it 'should reload if forced' do
       RConfig.enable_reload = false
-      RConfig.reload(true).should be_true
+      RConfig.reload(true).should be_truthy
     end
 
     it 'should flush cache on reload' do

data/spec/spec_helper.rb

@@ -5,9 +5,10 @@ CONF_DIR = File.join(ROOT_DIR, 'config')
 ENV['CONFIG_ENV'] = 'test'
 
 # Host-specific config to test cascade logic
-cascade_host_file = "spec/config/cascade2_#{Socket.gethostname}.yml"
+cascade_host_file = File.join(File.dirname(__FILE__),'config',"cascade2_#{Socket.gethostname}.yml")
 unless File.exist?(cascade_host_file)
-  %x[ cp spec/config/cascade2_host.yml #{cascade_host_file}]
+   cascade_original_file = File.join(File.dirname(__FILE__),'config','cascade2_host.yml')
+   FileUtils.copy(cascade_original_file, cascade_host_file)
 end
 
 # Loads the rconfig library

metadata

@@ -1,83 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rconfig
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Rahmal Conda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Configuration management library for Ruby applications.
@@ -87,9 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ChangeLog
 - Credits
 - Gemfile
@@ -194,17 +237,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: The complete solution for Ruby Configuration Management. RConfig is a Ruby

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.0.0-p247@socialpro --create