lib/freyr/service_info.rb in freyr-0.3.13 vs lib/freyr/service_info.rb in freyr-0.4.0
- old
+ new
@@ -81,39 +81,43 @@
end
class << self
def from_file file
+ @file_path = file
file = File.expand_path(file)
return [] unless File.exist?(file)
@added_services = []
instance_eval(File.open(file).read)
@added_services
end
- def method_missing *args
-
+ def method_missing name, *args
+ STDERR.puts "Freyr doesn't support #{name} as used in #{@file_path}"
end
private
def namespace name
@namespace = name
end
def group name, *services
- puts "Trying #{name.inspect} on #{services.inspect}"
services.each do |s|
- Service[s].each do |service|
- puts "Service: #{service.name}"
- service.service_info.group(name)
+ services = Service[s]
+ if services
+ services.each do |service|
+ service.service_info.group(name)
+ end
+ else
+ STDERR.puts "Service #{s} not found, can't add to group #{name} as attempted in #{@file_path}"
end
end
end
def service name=nil, &blk
name = "#{@namespace}:#{name}" if @namespace
- if service = Service[name].first
+ if service = Service[name]
service.service_info.instance_eval(&blk)
else
@added_services << new(name,&blk)
end
end
\ No newline at end of file