chamber 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9de216ad1436860f46bcb75029b0194aa847ce2
-  data.tar.gz: 2b2a26a9aaf8e576030df7bde02f84ef05378706
+  metadata.gz: cf99ce8817120d57825c73d716c76b070ef31413
+  data.tar.gz: 8f6153eaeeea1a6dacda02669633b4a2ae540e3d
 SHA512:
-  metadata.gz: fe8ffda84ce3be57878e064f4080e75e712e8c6b09fd82362a5fd4e65dd85dd2668e620a205345d42397a91939abc242345cf9c23e1b8773c4e67c40be0b49e5
-  data.tar.gz: 3c3e50d76377142e1bf16a2a7a1d7951d69e2b4c061121428cfa4caae490185589a0c714edd1ae3c1d748c4442f514ccbaf4ce46c4641d253cab17dab4536125
+  metadata.gz: 9234a837fdab2ee4976f1123b8ad6fbbf0b6e14aaf8d53df47780ed00ac33123b9e10538cb9476f77181c7cc00f22d389367a974a19a821b2d6a40d4ebbeb02a
+  data.tar.gz: 83caf9fd9af6218c93b5917c1fc117e253499eecf264be430a7507eaf8cf81e9be028d7e4392b1d9d7cf0d6c0a12b18b7e573d8948854172c7117667fb3cd706

data/lib/chamber/file_set.rb

@@ -252,7 +252,7 @@ class   FileSet
 
   def namespaced_files
     @namespaced_files ||= all_files.select do |file|
-                            file.fnmatch? '*-*'
+                            file.basename.fnmatch? '*-*'
                           end
   end
 
@@ -261,7 +261,7 @@ class   FileSet
 
     namespaces.each do |namespace|
       file_holder << namespaced_files.select do |file|
-                       file.fnmatch? "*-#{namespace}.???"
+                       file.basename.fnmatch? "*-#{namespace}.???"
                      end
     end
 

data/lib/chamber/version.rb

@@ -1,3 +1,3 @@
 module Chamber
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/spec/lib/chamber/file_set_spec.rb

@@ -5,7 +5,8 @@ require 'fileutils'
 
 module    Chamber
 describe  FileSet do
-  before(:each) { FileUtils.mkdir '/tmp/settings' unless ::File.exist? '/tmp/settings' }
+  before(:each) { FileUtils.mkdir '/tmp/settings' unless ::File.exist? '/tmp/settings'
+                  FileUtils.mkdir '/tmp/dash-set' unless ::File.exist? '/tmp/dash-set' }
   after(:each)  { FileUtils.rm_rf '/tmp/settings' if     ::File.exist? '/tmp/settings' }
 
   it 'can consider directories containing YAML files' do
@@ -60,6 +61,19 @@ describe  FileSet do
     ::FileUtils.rm_f('/tmp/settings/settings-blue.yml')
   end
 
+  it 'does not consider non-namespaced files which have dashes in their paths as namespaced' do
+    ::File.new('/tmp/dash-set/settings.yml', 'w+')
+
+    file_set = FileSet.new files:      '/tmp/dash-set/settings*.yml',
+                           namespaces: ['blue']
+
+    expect(file_set.filenames).to eql [
+                                        '/tmp/dash-set/settings.yml'
+                                      ]
+
+    ::FileUtils.rm_r('/tmp/dash-set/settings.yml')
+  end
+
   it 'removes any duplicate files' do
     ::File.new('/tmp/settings.yml', 'w+')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - stevenhallen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor