fedux_org-stdlib 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b6e5b0a8844650a7c3f699de39d887ce0bef7f
-  data.tar.gz: 146d493c4cf59f78bf3521bb1120741b52a91709
+  metadata.gz: 38a7a8abc9d4d7cf4c50f92c9b70e5ea646fcdc6
+  data.tar.gz: 357914ff9e53a7e399355cfd3ea5d5993b8b5c0a
 SHA512:
-  metadata.gz: a3bc38e44a075d95df064299b41b550496925fa2a9cdcfe169b39099e0422682d1b497757433dc2c2ef18e255c56c51bc300b86d4a6cfd609ac1ef44fa969e2a
-  data.tar.gz: 038ce7657927a8dbebcfcd82ea546733c2019180a021b1c0dec8a5dc6d847dc5f39b3445b03dedf735ee607bf5668b9f63bee2fe11ce7bfb9889d1425d44d9ae
+  metadata.gz: ac9ea48663fca754aa7abc3df0f488db467bc75510c7febb8644cc43db1349c90f018b4428beb3bd11625acc2a22163569b61d3217c1277cee966551da2b232e
+  data.tar.gz: 98fc091c17ba1e341a7e7451ae774630cff1292f32bc777bb08fa952572e64b5088eb4cbf9588547141734196259ae14a3147b11899f3e1987458f6ede501e08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.10.4)
+    fedux_org-stdlib (0.10.5)
       activesupport
 
 PATH
@@ -79,7 +79,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    minitest (5.4.2)
+    minitest (5.4.3)
     multi_json (1.10.1)
     multi_test (0.1.1)
     netrc (0.8.0)

data/lib/fedux_org_stdlib/template_directory.rb

@@ -154,10 +154,10 @@ module FeduxOrgStdlib
     def allowed_template_directory_paths
       paths = []
 
-      paths << resolve_path(working_directory, 'templates', template_directory)
-      paths << resolve_path('~', '.config', application_name, 'templates', template_directory)
-      paths << resolve_path('~', format('.%s', application_name), 'templates', template_directory)
-      paths << resolve_path('/etc', application_name, 'templates', template_directory)
+      paths << resolve_path(working_directory, template_directory)
+      paths << resolve_path('~', '.config', application_name, template_directory)
+      paths << resolve_path('~', format('.%s', application_name), template_directory)
+      paths << resolve_path('/etc', application_name, template_directory)
       paths << resolve_path(fallback_template_directory, template_directory) if fallback_template_directory
 
       paths

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.10.5'
+  VERSION = '0.10.6'
 end

data/spec/template_directory_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe TemplateDirectory do
 
   context '#preferred_template_directory' do
     it 'has a default template file which is the preferred place to store the template' do
-      touch_file '.config/my_application/templates/tests.d/test.tt'
+      touch_file '.config/my_application/tests.d/test.tt'
 
       template_klass = Class.new(TemplateDirectory) do
         def class_name
@@ -20,12 +20,12 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.preferred_template_directory).to eq File.expand_path('~/.config/my_application/templates/tests.d')
+        expect(template.preferred_template_directory).to eq File.expand_path('~/.config/my_application/tests.d')
       end
     end
 
     it 'works with nested module names' do
-      touch_file '.config/my_application/my_sub/templates/tests.d/test.tt'
+      touch_file '.config/my_application/my_sub/tests.d/test.tt'
 
       template_klass = Class.new(TemplateDirectory) do
         def class_name
@@ -39,14 +39,14 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.preferred_template_directory).to eq File.expand_path('~/.config/my_application/my_sub/templates/tests.d')
+        expect(template.preferred_template_directory).to eq File.expand_path('~/.config/my_application/my_sub/tests.d')
       end
     end
   end
 
   context 'template files' do
-    it 'looks at ~/.config/my_application/templates/tests.d/test.tt' do
-      write_file '.config/my_application/templates/tests.d/test.tt', <<-EOS.strip_heredoc
+    it 'looks at ~/.config/my_application/tests.d/test.tt' do
+      write_file '.config/my_application/tests.d/test.tt', <<-EOS.strip_heredoc
         <%= hello world %>
       EOS
 
@@ -62,12 +62,12 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.template_files).to include absolute_path('.config/my_application/templates/tests.d/test.tt')
+        expect(template.template_files).to include absolute_path('.config/my_application/tests.d/test.tt')
       end
     end
 
-    it 'looks at ~/.my_application/templates/tests.d/test.tt' do
-      write_file '.my_application/templates/tests.d/test.tt', <<-EOS.strip_heredoc
+    it 'looks at ~/.my_application/tests.d/test.tt' do
+      write_file '.my_application/tests.d/test.tt', <<-EOS.strip_heredoc
         <%= hello world %>
       EOS
 
@@ -83,12 +83,12 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.template_files).to include absolute_path('.my_application/templates/tests.d/test.tt')
+        expect(template.template_files).to include absolute_path('.my_application/tests.d/test.tt')
       end
     end
 
     it 'returns templates in subdirectories as well' do
-      write_file '.my_application/templates/tests.d/blub/test.tt', <<-EOS.strip_heredoc
+      write_file '.my_application/tests.d/blub/test.tt', <<-EOS.strip_heredoc
         <%= hello world %>
       EOS
 
@@ -104,18 +104,18 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.template_files).to include absolute_path('.my_application/templates/tests.d/blub/test.tt')
+        expect(template.template_files).to include absolute_path('.my_application/tests.d/blub/test.tt')
       end
     end
   end
 
   context '#template_files' do
     it 'returns template_files in template directory' do
-      write_file '.my_application/templates/tests.d/test1.tt', <<-EOS.strip_heredoc
+      write_file '.my_application/tests.d/test1.tt', <<-EOS.strip_heredoc
         <%= hello world %>
       EOS
 
-      write_file '.my_application/templates/tests.d/test2.tt', <<-EOS.strip_heredoc
+      write_file '.my_application/tests.d/test2.tt', <<-EOS.strip_heredoc
         <%= hello world %>
       EOS
 
@@ -131,8 +131,8 @@ RSpec.describe TemplateDirectory do
 
       with_env 'HOME' => absolute_path('.') do
         template = template_klass.new
-        expect(template.template_files).to include absolute_path('.my_application/templates/tests.d/test1.tt')
-        expect(template.template_files).to include absolute_path('.my_application/templates/tests.d/test2.tt')
+        expect(template.template_files).to include absolute_path('.my_application/tests.d/test1.tt')
+        expect(template.template_files).to include absolute_path('.my_application/tests.d/test2.tt')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport