vedeu 0.4.42 → 0.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52cfaf13c8adfd85fb8d7f29a66133d4d12781c
-  data.tar.gz: 901409d56b30fad4859b55f5b188e44a16628b08
+  metadata.gz: cffdbe3379ae8f53f8e224ad01f554f697291aeb
+  data.tar.gz: 48dacd852a9ece5238fd2986a64897335416f0c6
 SHA512:
-  metadata.gz: 46f1892cef45301eefbea271b95a06455ce30781e4b5f793cd779adb1c81e83e2f99c833db01d97b171fbfdda163f3fe890dff977d9f6108270bd8ea229b23ba
-  data.tar.gz: 752fd49e4627635d187c7d8b73f1773f3be1b1d12a638ae2f0f15e1466a219ac4a16237a869138cb394138571c77b13b112c0b1dccb7b712b4a32f8a16ebeb56
+  metadata.gz: b36dc6810c4e595f8ddacb09f2c076c0b9d00d457b281a4d03b31cb980db8a547881b458707e6f456b4be1a5ab2c7cbdfd65a8da3b8d06fb7c2463a03b440857
+  data.tar.gz: 2709588855899d5f3d107ab9ccccc66d6b93bfb7693d59cad06865d84bff61e3be0398b8c07d532d3614ffd32bf019c1c96c576941fec30da6d075127c56f08a

data/lib/vedeu/application/application_view.rb

@@ -40,7 +40,8 @@ module Vedeu
     # @param value [String]
     # @return [String]
     def template(value)
-      @template = File.expand_path("./app/views/templates/#{value}.erb")
+      @template = Vedeu::Configuration.base_path +
+        "/app/views/templates/#{value}.erb"
     end
 
   end # ApplicationView

data/lib/vedeu/bootstrap.rb

@@ -27,13 +27,18 @@ module Vedeu
     def start
       Vedeu.configure { log('/tmp/vedeu_bootstrap.log') }
 
+      # config/configuration.rb is already loaded so don't load it twice
+      Dir[File.join(Vedeu::Configuration.base_path, 'config/**/*')].each do |f|
+        next if f =~ %r{config/configuration\.rb}
+        load f
+      end
+
       [
-        './config/**/*',
-        './app/controllers/**/*',
-        './app/helpers/**/*',
-        './app/views/**/*',
-        './app/models/keymaps/**/*',
-      ].each { |path| load(path) }
+        'app/controllers/**/*',
+        'app/helpers/**/*',
+        'app/views/**/*',
+        'app/models/keymaps/**/*',
+      ].each { |path| load(File.join(Vedeu::Configuration.base_path, path)) }
 
       entry_point
 

data/lib/vedeu/cli/generator/templates/application/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'vedeu', path: '~/gem'
+gem 'vedeu'

data/lib/vedeu/cli/generator/templates/application/application.erb

@@ -1,3 +1,4 @@
+require_relative 'config/configuration'
 require_relative 'app/controllers/some_controller'
 
 module <%= object.name_as_class %>

data/lib/vedeu/configuration/api.rb

@@ -277,6 +277,16 @@ module Vedeu
       end
       alias_method :renderers, :renderer
 
+      # Override the base path for the application (for locating templates and
+      # other resources). By default the base path is just cwd but this will
+      # not work for many applications.
+      #
+      # @param value [String]
+      # @return [String]
+      def base_path(path = nil)
+        options[:base_path] = path
+      end
+
       # Sets the value of STDIN.
       #
       # @example

data/lib/vedeu/configuration/configuration.rb

@@ -34,6 +34,13 @@ module Vedeu
 
     class << self
 
+      # Returns the base_path value
+      #
+      # @return [String]
+      def base_path
+        instance.options[:base_path]
+      end
+
       # Configure Vedeu with sensible defaults. If the client application sets
       # options, override the defaults with those, and if command-line arguments
       # are provided at application invocation, override any options with the
@@ -241,6 +248,7 @@ module Vedeu
     # @return [Hash]
     def defaults
       {
+        base_path:     set_base_path,
         colour_mode:   detect_colour_mode,
         debug:         false,
         drb:           false,
@@ -272,6 +280,10 @@ module Vedeu
       end
     end
 
+    def set_base_path
+      File.expand_path('.')
+    end
+
   end # Configuration
 
 end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.4.42'
+  VERSION = '0.4.43'
 
 end

data/test/lib/vedeu/configuration/api_test.rb

@@ -12,6 +12,13 @@ module Vedeu
       before { Configuration.reset! }
       after  { test_configuration }
 
+      describe '#base_path' do
+        it 'sets the option to the desired value' do
+          configuration = Vedeu.configure { base_path 'somewhere' }
+          configuration.base_path.must_equal('somewhere')
+        end
+      end
+
       describe '.configure' do
         it 'returns the configuration singleton' do
           Vedeu.configure do

data/test/lib/vedeu/configuration/configuration_test.rb

@@ -9,6 +9,14 @@ module Vedeu
     before { Configuration.reset! }
     after  { test_configuration }
 
+    describe '#base_path' do
+      it { described.must_respond_to(:base_path) }
+
+      it 'returns the value of the base_path option' do
+        Configuration.base_path.must_equal(Dir.pwd)
+      end
+    end
+
     describe '#debug?' do
       it { described.must_respond_to(:debug) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.42
+  version: 0.4.43
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard