shot 1.0.2 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/shot/configuration_loader.rb +4 -4
- data/lib/shot/shot.rb +2 -2
- metadata +2 -2
@@ -20,13 +20,13 @@ class ConfigurationLoader < Loader
|
|
20
20
|
|
21
21
|
def get(config_file)
|
22
22
|
if config_folder_exists and config_file_exists config_file then
|
23
|
-
@client.config[config_file] = YAML.load File.read "./
|
23
|
+
@client.config[config_file] = YAML.load File.read "./app/config/#{config_file}.yml"
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
27
27
|
def get_all
|
28
28
|
if config_folder_exists
|
29
|
-
config_folder = Dir.new './
|
29
|
+
config_folder = Dir.new './app/config/'
|
30
30
|
|
31
31
|
config_folder.each do |file|
|
32
32
|
if file != '.' and file != '..'
|
@@ -40,10 +40,10 @@ class ConfigurationLoader < Loader
|
|
40
40
|
private
|
41
41
|
|
42
42
|
def config_folder_exists
|
43
|
-
Dir.exists? './
|
43
|
+
Dir.exists? './app/config'
|
44
44
|
end
|
45
45
|
|
46
46
|
def config_file_exists(file)
|
47
|
-
File.exists? "./
|
47
|
+
File.exists? "./app/config/#{file}.yml"
|
48
48
|
end
|
49
49
|
end
|
data/lib/shot/shot.rb
CHANGED
@@ -12,9 +12,9 @@ class Shot
|
|
12
12
|
|
13
13
|
def self.setup
|
14
14
|
$:.unshift(File.expand_path('lib/', __FILE__.gsub('app.rb', '')))
|
15
|
-
$:.unshift(File.expand_path('
|
15
|
+
$:.unshift(File.expand_path('app/', __FILE__.gsub('app.rb', '')))
|
16
16
|
|
17
17
|
$LOAD_PATH.unshift(File.expand_path('lib/', __FILE__.gsub('app.rb', '')))
|
18
|
-
$LOAD_PATH.unshift(File.expand_path('
|
18
|
+
$LOAD_PATH.unshift(File.expand_path('app/', __FILE__.gsub('app.rb', '')))
|
19
19
|
end
|
20
20
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shot
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-07-16 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: eventd
|