deputy 0.1.23 → 0.1.24

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/deputy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/deputy.rb

@@ -6,7 +6,8 @@ def eval_and_fetch_constants(x)
   old = Module.constants.map{|c| c.to_s}
   eval(x)
   new = (Module.constants.map{|c| c.to_s} - old)
-  new.map{|const| const_get(const) }
+  new = new.select{|c| c.to_s =~ /^TEMP/ } # do not fetch required libs, just user-defined
+  new.map{|c| const_get(c) }
 end
 
 class Scout
@@ -75,7 +76,7 @@ class Scout
   end
 
   def self.plugin_in_container(container)
-    constants = container.constants.map{|constant_name| container.const_get(constant_name)}
+    constants = container.constants.map{|constant_name|container.const_get(constant_name)}
     constants.detect{|c| c.instance_methods.map{|m| m.to_s}.include?('build_report') }
   end
 end

data/spec/deputy_spec.rb

@@ -37,7 +37,20 @@ describe Deputy do
   end
 
   def klass(name, options={})
-    "class TEMP_#{options[:rand]||rand(11111)};def self.interval;60;end;class #{name} < Scout::Plugin; def build_report; #{options[:code]}; end; end; end"
+    <<-CODE
+      module TEMP_#{options[:rand]||rand(11111)}
+        def self.interval
+          60
+        end
+
+        class #{name} < Scout::Plugin
+          #{options[:class_eval]}
+          def build_report
+            #{options[:code]}
+          end
+        end
+      end
+    CODE
   end
 
   describe Scout do
@@ -46,9 +59,9 @@ describe Deputy do
         Scout.plugins(klass('A', :rand => 1111)).inspect.should == '[[60, TEMP_1111::A]]'
       end
 
-      it "reprots non-plugins" do
+      it "reports non-plugins" do
         Deputy.should_receive(:send_report)
-        Scout.plugins("class Foo;def self.interval;11;end;end").inspect.should == '[]'
+        Scout.plugins("module TEMP_XXX;def self.interval;60;end;class Foo;def self.interval;11;end;end;end").inspect.should == '[]'
       end
     end
 
@@ -116,6 +129,13 @@ describe Deputy do
         FooPlugin.new.send(:memory, :asdsa).should == nil
       end
     end
+
+    describe :needs do
+      it "can create plugins with needs" do
+        Scout.plugins(klass('D', :class_eval => "needs 'fastercsv'", :rand => 1112)).inspect.should == '[[60, TEMP_1112::D]]'
+        defined?(FasterCSV).should == "constant"
+      end
+    end
   end
 
   describe :run_plugins do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 23
-  version: 0.1.23
+  - 24
+  version: 0.1.24
 platform: ruby
 authors: 
 - Michael Grosser