freyr 0.3.13 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.4.0

data/lib/freyr/service.rb

@@ -150,7 +150,7 @@ module Freyr
           end
         end
         
-        group
+        group.empty? ? nil : group
       end
       
     end

data/lib/freyr/service_group.rb

@@ -1,8 +1,13 @@
+require 'delegate'
+
 module Freyr
-  class ServiceGroup < Array
+  class ServiceGroup < DelegateClass(Array)
+    extend Forwardable
+    service_methods = Service.instance_methods - Class.instance_methods
+    def_delegators :first, *service_methods
     
-    def initialize(*args)
-      super(*args)
+    def initialize
+      super([])
     end
     
     def find_by_name(n)

data/lib/freyr/service_info.rb

@@ -83,6 +83,7 @@ module Freyr
     class << self
       
       def from_file file
+        @file_path = file
         file = File.expand_path(file)
         return [] unless File.exist?(file)
         @added_services = []
@@ -90,8 +91,8 @@ module Freyr
         @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
@@ -101,18 +102,21 @@ module Freyr
       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)

data/lib/freyr.rb

@@ -11,6 +11,6 @@ module Freyr
   end
 end
 
-%w{version service_group service command service_info pinger process_info}.each do |f|
+%w{version service service_group command service_info pinger process_info}.each do |f|
   require File.expand_path(File.dirname(__FILE__)+"/freyr/#{f}.rb")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 13
-  version: 0.3.13
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tal Atlas