ultradns_updater 0.0.21 → 0.0.22

data/lib/ultradns_updater/strategies.rb

@@ -26,9 +26,9 @@ module UltraDNSUpdater::Strategies
 
   def self.strategy(strategy_name)
     if strategy_name.kind_of?(Array)
-      strategies = []
+      strategies = {}
       strategy_name.each do |strategy_item|
-        strategies << strategy(strategy_item)
+        strategies[strategy_item] = strategy(strategy_item)
       end
       UltraDNSUpdater::Strategies::Multiple.factory(strategies)
     else

data/lib/ultradns_updater/strategies/multiple.rb

@@ -23,8 +23,9 @@ module UltraDNSUpdater::Strategies
     def initialize(ultradns, strategy_section, logger = ::Logger.new(STDOUT))
       super(ultradns, strategy_section, logger)
       @strategy_instances = []
-      strategies.each do |strategy|
-        @strategy_instances << strategy.new(ultradns, strategy_section, logger)
+      strategies.each do |strategy_name, strategy_clazz|
+        @strategy_instances << strategy_clazz.new(ultradns, 
+          strategy_section.merge(:use => strategy_name), logger)
       end
     end
     
@@ -34,11 +35,12 @@ module UltraDNSUpdater::Strategies
     def update()
       @strategy_instances.each do |strategy|
         begin
-          strategy_config[:logger].info("Trying strategy #{strategy.class.name}") if strategy_config[:logger]
+          @logger.info("Trying strategy #{strategy.class.name}") if @logger
           result = strategy.update()
           return result if result
-        rescue
+        rescue => e
           # ignore, try next
+          @logger.debug("Failed: #{e.inspect}\n" + e.backtrace.join("\n"))
         end
       end
       nil

data/lib/ultradns_updater/strategies/openstack.rb

@@ -18,7 +18,7 @@ module UltraDNSUpdater::Strategies
     def update()
       opts = {:access_key_id => nil, 
         :secret_access_key => nil, 
-        :logger => strategy_config()[:logger]
+        :logger => @logger
       }
       ec2 = UltraDNSUpdater::Ec2.new(opts)
       

data/lib/ultradns_updater/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module UltraDNSUpdater
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/spec/lib/ip_info_spec.rb

@@ -17,6 +17,13 @@ require 'fakeweb'
 require 'yaml'
 
 describe UltraDNSUpdater::IpInfo do
+  MOCK_DATA = %Q(en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+  	ether f8:1e:df:d8:8d:a4 
+  	inet6 fe80::fa1e:dfff:fed8:8da4%en1 prefixlen 64 scopeid 0x5 
+  	inet 192.168.1.2 netmask 0xffffff00 broadcast 192.168.1.255
+  	media: autoselect
+  	status: active
+  )
   
   it "should get an ipv4 address" do
     UltraDNSUpdater::IpInfo.local_ipv4().should_not == ''
@@ -29,17 +36,20 @@ describe UltraDNSUpdater::IpInfo do
     if RUBY_PLATFORM =~ /darwin/
       iface = "en0"
     end 
-
+    UltraDNSUpdater::IpInfo.should_receive(:ifconfig).twice.with(iface).and_return(MOCK_DATA)
+    
     UltraDNSUpdater::IpInfo.ipv4_for_iface(iface).should_not == ''
     UltraDNSUpdater::IpInfo.ipv4_for_iface(iface).should match(/\d+\.\d+\.\d+\.\d+/)
   end
   
   it "should get an ipv6 address from ifconfig" do
     
+    
     iface = "eth0" # probably have eth0 on linux..
     if RUBY_PLATFORM =~ /darwin/
       iface = "en0"
-    end 
+    end
+    UltraDNSUpdater::IpInfo.should_receive(:ifconfig).twice.with(iface).and_return(MOCK_DATA)
     
     UltraDNSUpdater::IpInfo.ipv6_for_iface(iface).should_not == ''
     UltraDNSUpdater::IpInfo.ipv6_for_iface(iface).should match(/.*:.*:.*:.*:.*:/)

data/spec/lib/multiple_spec.rb

@@ -36,10 +36,12 @@ describe UltraDNSUpdater::Strategies::Multiple do
       end
 
       multiple_factory = UltraDNSUpdater::Strategies::Multiple.factory(
-        [clazz_bad, UltraDNSUpdater::Strategies::Openstack])
+        {'conf' => clazz_bad, 'openstack' => UltraDNSUpdater::Strategies::Openstack}
+      )
+        
 
       openstack_strategy = multiple_factory.new(ultradns, 
-        { :use => 'conf', :conf => {} }
+        { :use => 'conf', :conf => {}, :openstack => {} }
       )
       openstack_strategy.update().should == fake_name
     ensure

data/spec/lib/strategies_spec.rb

@@ -31,8 +31,8 @@ describe UltraDNSUpdater::Strategies do
   it "should support multiple strategies" do
     UltraDNSUpdater::Strategies.strategy(['ec2', 'openstack']).should_not == nil
     multiple = UltraDNSUpdater::Strategies.strategy(['ec2', 'openstack'])
-    multiple.new(nil, nil).strategies.should == 
-      [UltraDNSUpdater::Strategies::Ec2, UltraDNSUpdater::Strategies::Openstack]
+    multiple.new(nil, {}).strategies.should == 
+      {'ec2' => UltraDNSUpdater::Strategies::Ec2, 'openstack' => UltraDNSUpdater::Strategies::Openstack}
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultradns_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1966732010595683364
+      hash: -1167376260138909965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1966732010595683364
+      hash: -1167376260138909965
 requirements: []
 rubyforge_project: ultradns_updater
 rubygems_version: 1.8.24