@@ -1,5 +1,13 @@ # -*- coding: utf-8 -*- +2009-01-26 Cory ODaniel <warningshot@coryodaniel.com> + * Resolver.branch takes a *params now + * Added specs for Resolver.branch single & multiple branches + * DependencyResolver loops over branches + * SymlinkResolver checks symlink with File.readlink + * rbconfig is only loaded if Config::CONFIG is not defined (stops tons of warnings that show up in log) + * !IMPORTANT -> Changed public API for Writing resolvers. YourResolver#initialize should take (config,branch_name,*deps) + = 0.9.5 2009-01-22 Cory ODaniel <warningshot@coryodaniel.com> * RubyGems 1.3 Support CHANGELOG @@ -97,7 +97,7 @@ class WarningShot::GemResolver end end - def initialize(config,*params) + def initialize(config,branch_name,*params) super Gem.configuration.update_sources = !!(self.config[:update_sources]) lib/resolvers/gem_resolver.rb @@ -1,31 +1,31 @@ -# TODO It would be really sweet if there was a way for FileResolver, -# DirectoryResolver, and SymlinkResolver inherited this functionality if -# mode, user, or group is set in its config file. + +# TODO Branch should take a params of branches, here: file, directory, symlink +# TODO uid, gid should be integer or string (string for name, interger for id) +# + class WarningShot::PermissionResolver include WarningShot::Resolver order 100 branch :permission description 'Validates mode, user, and group permission on files and directories' - - module UnixPermissionsInterface;end; - module WindowsPermissionsInterface;end; - - if WarningShot.platform != :windows - include WarningShot::PermissionResolver::UnixPermissionsInterface - #http://www.ruby-doc.org/core/classes/File/Stat.html - #http://www.ruby-doc.org/stdlib/libdoc/etc/rdoc/index.html - #http://www.ruby-doc.org/stdlib/libdoc/pathname/rdoc/index.html - #http://www.ruby-doc.org/stdlib/libdoc/fileutils/rdoc/index.html - #http://www.ruby-doc.org/core/classes/File.html#M002574 - else - include WarningShot::PermissionResolver::WindowsPermissionsInterface - end - + PermissionResource = Struct.new(:path,:target_mode,:target_user,:target_group,:recursive) do def exists? File.exist? self.path end + def correct_owner! + false + end + + def correct_group! + false + end + + def correct_mode! + false + end + def correct_owner? false end lib/resolvers/permission_resolver.rb @@ -1,3 +1,6 @@ +# SHOUDL DETERMINE IF LINK EXISTS (File.stat().ftype == "link") +# and it points at proper file + class WarningShot::SymlinkResolver include WarningShot::Resolver add_dependency :core, 'fileutils' @@ -9,13 +12,18 @@ class WarningShot::SymlinkResolver SymlinkResource = Struct.new(:source,:target,:force) do def link!;FileUtils.ln_s(self.source,self.target,:force=>self.force);end; - def exists? + #Is the symlink present + def linked? self.target ? File.symlink?(self.target) : false end # Determines if link points at correct file def correct? - File.identical? self.source, self.target + !!(File.readlink(self.target) == self.source) + end + + def valid? + !!(self.linked? && self.correct?) end end @@ -29,7 +37,7 @@ class WarningShot::SymlinkResolver # If the target wasn't specified, it doesn't exist register :test do |dep| - if symlink_correct = dep.exists? && dep.correct? + if symlink_correct = dep.valid? logger.debug " ~ [PASSED] symlink #{dep.target}" else logger.warn " ~ [FAILED] symlink #{dep.target}" @@ -43,6 +51,6 @@ class WarningShot::SymlinkResolver rescue Errno::EEXIST, Errno::ENOTDIR => ex logger.error " ~ Could not create symlink #{dep.source} => #{dep.target}" end - dep.exists? + dep.valid? end end \ No newline at end of file lib/resolvers/symlink_resolver.rb @@ -2,7 +2,7 @@ require 'fileutils' require 'yaml' require 'logger' require 'set' -require 'rbconfig' +require 'rbconfig' unless defined?(::Config::CONFIG) require 'optparse' # Load core extensions lib/warningshot.rb @@ -75,42 +75,43 @@ module WarningShot WarningShot::Resolver.descendants.each do |klass| next if klass.disabled? - @logger.info "\n#{'-'*60}" + klass.logger = @logger + klass.logger.info "\n#{'-'*60}" + klass.logger.info "#{klass.name}; branch: #{klass.branch.join(',')} [TESTING]" - branch = @dependency_tree[klass.branch.to_sym] + #Process each branch for the Resolver Class (klass) + klass.branch.each do |branch_name| + branch = @dependency_tree[branch_name.to_sym] - if branch.nil? - @logger.info "[SKIPPING] #{klass}, #{klass.branch}; No machine recipes was registered" - next - elsif branch.empty? - @logger.info "[SKIPPING] #{klass}, #{klass.branch}; No dependencies in machine recipe" - next - end + if branch.nil? + klass.logger.info "[SKIPPING] #{klass}, #{branch_name}; No machine recipes were registered" + next + elsif branch.empty? + klass.logger.info "[SKIPPING] #{klass}, #{branch_name}; No dependencies in machine recipe" + next + end - klass.logger = @logger - resolver = klass.new(@config,*branch) - - @resolvers << resolver + resolver = klass.new(@config,branch_name.to_sym,*branch) + @resolvers << resolver - @logger.info "#{resolver.class}; branch: #{klass.branch} [TESTING]" - - # Start test - klass.before_filters(:test).each{|p| p.call} - resolver.test! - klass.after_filters(:test).each{|p| p.call} + # Start test + klass.before_filters(:test).each{|p| p.call} + resolver.test! + klass.after_filters(:test).each{|p| p.call} - @logger.info "Passed: #{resolver.passed.size} / Failed: #{resolver.failed.size}" + klass.logger.info "Passed: #{resolver.passed.size} / Failed: #{resolver.failed.size}" - if self[:resolve] && !klass.resolutions.empty? - @logger.info "#{resolver.class}; branch: #{klass.branch} [RESOLVING]" + if self[:resolve] && !klass.resolutions.empty? + klass.logger.info "#{resolver.class}; branch: #{resolver.current_branch} [RESOLVING]" - klass.before_filters(:resolution).each{|p| p.call} - resolver.resolve! - klass.after_filters(:resolution).each{|p| p.call} + klass.before_filters(:resolution).each{|p| p.call} + resolver.resolve! + klass.after_filters(:resolution).each{|p| p.call} - @logger.info "Resolved: #{resolver.resolved.size} / Unresolved: #{resolver.unresolved.size}" - end - end + klass.logger.info "Resolved: #{resolver.resolved.size} / Unresolved: #{resolver.unresolved.size}" + end + end #Branch Loop + end #Resolver Class Loop @logger.info "\nResults:" stats.each {|k,v| @logger.info(" ~ #{k}: \t#{v}")} lib/warningshot/dependency_resolver.rb @@ -99,11 +99,13 @@ module WarningShot # class MyResolver # include WarningShot::Resolver # branch :mock + # # Alternatively pass a set of branches you want to pull from (see PermissionResolver) + # # branch :mock, :faux, :test # end # # @api public - def branch(b=nil) - @branch = b unless b.nil? + def branch(*b) + @branch = b unless b.empty? @branch end @@ -432,6 +434,10 @@ module WarningShot end module InstanceMethods + # get the currently processed branch + def current_branch + return @current_branch + end # Loops through each dependency and runs applicable tests until one passes # @@ -511,6 +517,9 @@ module WarningShot # @param config [WarningShot::Config] # Configuration to use # + # @param branch_name [Symbol] + # Name of the branch being processed + # # @param *deps [Array] # Dependencies from YAML file # @@ -521,9 +530,10 @@ module WarningShot # resolved [Boolean] Was teh dependency resolved # # @api semi-public - def initialize(config,*deps) - @config = config - @dependencies = Set.new + def initialize(config,branch_name,*deps) + @config = config + @current_branch = branch_name + @dependencies = Set.new deps.each do |dep| # Cast YAML data as described in resolver. lib/warningshot/resolver.rb @@ -14,13 +14,13 @@ describe WarningShot::SshResolver do describe 'with heal instructions' do it 'should install the public key on the local user' do pending "rm your own pubkey from ~/.ssh/authorized_keys2 to run" - fd = WarningShot::SshResolver.new(WarningShot::Config.create,{:hostname => 'localhost', :username => ENV['USER']}) + fd = WarningShot::SshResolver.new(WarningShot::Config.create,:ssh,{:hostname => 'localhost', :username => ENV['USER']}) fd.test! fd.failed.length.should be(1) fd.resolve! fd.resolved.length.should be(1) - fd = WarningShot::SshResolver.new(WarningShot::Config.create,{:hostname => 'localhost', :username => ENV['USER']}) + fd = WarningShot::SshResolver.new(WarningShot::Config.create,:ssh,{:hostname => 'localhost', :username => ENV['USER']}) fd.test! fd.failed.length.should be(0) end @@ -29,7 +29,7 @@ describe WarningShot::SshResolver do describe 'without heal instructions' do it 'should fail if you have a bogus username' do - fd = WarningShot::SshResolver.new(WarningShot::Config.create,{:hostname => 'localhost', :username => "128nisd89hg"}) + fd = WarningShot::SshResolver.new(WarningShot::Config.create,:ssh,{:hostname => 'localhost', :username => "128nisd89hg"}) fd.test! fd.failed.length.should be(1) end more/ssh_resolver_spec.rb @@ -31,7 +31,7 @@ class WarningShot::RESOLVER_NAME end - def initialize(config,*params) + def initialize(config,branch_name,*params) super end resolver_template.txt @@ -6,7 +6,7 @@ class FauxTestResolver branch :faux_test description "A resolver for testing DependencyResolver's test functionality" - def initialize(c,*d) + def initialize(c,b,*d) super end test/data/faux_test_resolver.rb @@ -9,7 +9,7 @@ class MockResolver branch :mock description 'A mock resolver for testing' - def initialize(c,*d) + def initialize(c,b,*d) super MockResolver.logger.debug 'A mock resolver was initialized' end test/data/mock_resolver.rb @@ -15,7 +15,7 @@ describe WarningShot::CoreLibResolver do end it 'should increment #errors for unloadable core libs' do - cld = WarningShot::CoreLibResolver.new WarningShot::Config.create,'bogus_core_lib_name' + cld = WarningShot::CoreLibResolver.new WarningShot::Config.create,:core_lib,'bogus_core_lib_name' cld.test! cld.failed.length.should be(1) test/spec/unit/resolvers/core_lib_resolver_spec.rb @@ -25,7 +25,7 @@ describe WarningShot::DirectoryResolver do control_dir = File.expand_path('.') test_dir1 = @@base_path / 'test1' test_dir2 = @@base_path / 'test2' - resolver = WarningShot::DirectoryResolver.new WarningShot::Config.create, control_dir,test_dir1, test_dir2 + resolver = WarningShot::DirectoryResolver.new WarningShot::Config.create,:directory, control_dir,test_dir1, test_dir2 resolver.test! resolver.passed.length.should be(1) resolver.failed.length.should be(2) test/spec/unit/resolvers/directory_resolver_spec.rb @@ -33,7 +33,7 @@ describe WarningShot::FileResolver do that_file = @@source_path / 'that.txt' this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new(WarningShot::Config.create,{:source => "file://#{that_file}",:target => this_file}) + fd = WarningShot::FileResolver.new(WarningShot::Config.create,:file,{:source => "file://#{that_file}",:target => this_file}) fd.test! fd.failed.length.should be(1) @@ -43,7 +43,7 @@ describe WarningShot::FileResolver do that_file = @@source_path / 'that.txt' this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source => "file://#{that_file}",:target => this_file}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:source => "file://#{that_file}",:target => this_file}) fd.test! fd.failed.length.should be(1) fd.resolve! @@ -51,7 +51,7 @@ describe WarningShot::FileResolver do end it 'should heal a file from http://' do - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source => "http://www.example.com/",:target => (@@dest_path / 'internetz.html')}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:source => "http://www.example.com/",:target => (@@dest_path / 'internetz.html')}) fd.test! fd.failed.length.should be(1) fd.resolve! @@ -63,7 +63,7 @@ describe WarningShot::FileResolver do end it 'should not increment #resolved if the resolution fails' do - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source => "http://www.example.com/DOESNT.EXIST",:target => (@@dest_path / 'doesnt_exist.html')}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:source => "http://www.example.com/DOESNT.EXIST",:target => (@@dest_path / 'doesnt_exist.html')}) fd.test! fd.failed.length.should be(1) fd.resolve! @@ -76,12 +76,12 @@ describe WarningShot::FileResolver do it 'should be able to return unresolved dependencies' do this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:target => this_file}) fd.test! fd.resolve! fd.unresolved.length.should be(1) - fd = WarningShot::FileResolver.new WarningShot::Config.create, this_file + fd = WarningShot::FileResolver.new WarningShot::Config.create,:file, this_file fd.test! fd.resolve! fd.unresolved.length.should be(1) @@ -91,7 +91,7 @@ describe WarningShot::FileResolver do it 'should add dependency to #failed' do this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:target => this_file}) fd.test! fd.failed.length.should be(1) fd.resolve! @@ -108,7 +108,7 @@ describe WarningShot::FileResolver do that_file = @@source_path / 'that.txt' this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file,:source => that_file}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:target => this_file,:source => that_file}) fd.test! fd.failed.length.should be(1) end @@ -120,7 +120,7 @@ describe WarningShot::FileResolver do it 'should add dependency to #failed' do this_file = @@dest_path / 'this.txt' - fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file}) + fd = WarningShot::FileResolver.new( WarningShot::Config.create,:file,{:target => this_file}) fd.test! fd.failed.length.should be(1) end test/spec/unit/resolvers/file_resolver_spec.rb @@ -36,7 +36,7 @@ describe WarningShot::GemResolver do it 'should override Gem.path if gempath is given' do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) - WarningShot::GemResolver.new config + WarningShot::GemResolver.new config, :gem Gem.path[0].should == File.expand_path("./test/output/gems") Gem.path[1].should == File.expand_path("./test/outputs/gems2") @@ -52,7 +52,7 @@ describe WarningShot::GemResolver do # The gem name is the healing instructions, so if its provide it is the instructions it 'should install the gems when healing is enabled' do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) - resolver = WarningShot::GemResolver.new(config,{:name => "ws-dummy"}) + resolver = WarningShot::GemResolver.new(config,:gem,{:name => "ws-dummy"}) resolver.test! resolver.failed.size.should be(1) @@ -64,12 +64,12 @@ describe WarningShot::GemResolver do it 'should be able to determine if a gem is installed' do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) - resolver = WarningShot::GemResolver.new(config, {:name => "ws-dummy"}) + resolver = WarningShot::GemResolver.new(config,:gem, {:name => "ws-dummy"}) resolver.test! resolver.failed.size.should be(1) resolver.resolve! - resolver = WarningShot::GemResolver.new( config,{:name => "ws-dummy"}) + resolver = WarningShot::GemResolver.new( config,:gem,{:name => "ws-dummy"}) resolver.test! resolver.passed.size.should be(1) end @@ -78,7 +78,7 @@ describe WarningShot::GemResolver do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) dummy_gem = {:name => "ws-dummy", :version=>"= 0.2.0"} - resolver = WarningShot::GemResolver.new(config,dummy_gem) + resolver = WarningShot::GemResolver.new(config,:gem,dummy_gem) resolver.test! resolver.failed.size.should be(1) resolver.resolve! @@ -92,19 +92,19 @@ describe WarningShot::GemResolver do config = WarningShot::Config.create dummy_gem = {:name => "ws-dummy", :version=>"= 0.2.0"} - resolver = WarningShot::GemResolver.new(config,dummy_gem) + resolver = WarningShot::GemResolver.new(config,:gem,dummy_gem) resolver.test! resolver.failed.size.should be(1) resolver.resolve! resolver.resolved.size.should be(1) resolver.resolved.first.version.to_s.should == dummy_gem[:version] - WarningShot::GemResolver::GemResource.new(dummy_gem[:name],dummy_gem[:version]).uninstall! + WarningShot::GemResolver::GemResource.new(dummy_gem[:name],:gem,dummy_gem[:version]).uninstall! end it 'should be able to determine if a gem is installed in a different path (--gempath)' do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) - resolver = WarningShot::GemResolver.new(config,{:name => "ws-dummy"}) + resolver = WarningShot::GemResolver.new(config,:gem,{:name => "ws-dummy"}) resolver.test! resolver.failed.size.should be(1) @@ -113,7 +113,7 @@ describe WarningShot::GemResolver do resolver.resolved.size.should be(1) config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) - resolver = WarningShot::GemResolver.new(config,{:name => "ws-dummy"}) + resolver = WarningShot::GemResolver.new(config,:gem,{:name => "ws-dummy"}) resolver.test! resolver.passed.size.should be(1) @@ -124,12 +124,12 @@ describe WarningShot::GemResolver do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) dummy_gem = {:name => "ws-dummy", :version=>"= 0.2.0"} - resolver = WarningShot::GemResolver.new(config,dummy_gem) + resolver = WarningShot::GemResolver.new(config,:gem,dummy_gem) resolver.test! resolver.failed.size.should be(1) resolver.resolve! - resolver = WarningShot::GemResolver.new(config,dummy_gem) + resolver = WarningShot::GemResolver.new(config,:gem,dummy_gem) resolver.test! resolver.passed.size.should be(1) end @@ -138,7 +138,7 @@ describe WarningShot::GemResolver do config = WarningShot::Config.create({:gem_path => "./test/output/gems:./test/outputs/gems2"}) dummy_gem = {:name => "coryodaniel-ws-dummy", :version=>"= 1.5.0", :source => "http://gems.github.com"} - resolver = WarningShot::GemResolver.new(config,dummy_gem) + resolver = WarningShot::GemResolver.new(config,:gem,dummy_gem) resolver.test! resolver.failed.size.should be(1) resolver.resolve! test/spec/unit/resolvers/gem_resolver_spec.rb @@ -21,7 +21,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "", :sha1 => "e87c9091b6f6d30d1a05d66de1acbac6e1998121" @@ -35,7 +35,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "", :sha1 => "WRONG" @@ -49,7 +49,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "", :md5 => "WRONG" @@ -63,7 +63,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "", :md5 => "db59da6066bab8885569c012b1f6b173" @@ -77,7 +77,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "", :md5 => "WRONG", @@ -92,7 +92,7 @@ describe WarningShot::IntegrityResolver do that_file = @@source_path / 'that.txt' #These values are flipped from FileResolverRspec so that we dont # have to resolve the file dependency to check the integrity - resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,:file,{ :target => "file://#{that_file}", :source => "" }) test/spec/unit/resolvers/integrity_resolver_spec.rb @@ -17,13 +17,13 @@ describe WarningShot::PermissionResolver do _file = $test_data / 'permission_test.txt' _file2 = $test_data / 'permission_test.fake' - resolver = WarningShot::PermissionResolver.new(WarningShot::Config.create,{ + resolver = WarningShot::PermissionResolver.new(WarningShot::Config.create,:file,{ :path => _file, :mode => '0755', :user => 'www-data', :group => 'www-data', :recursive => "none" }) - resolver2 = WarningShot::PermissionResolver.new(WarningShot::Config.create,{ + resolver2 = WarningShot::PermissionResolver.new(WarningShot::Config.create,:file,{ :path => _file2, :mode => '0755', :user => 'www-data', :group => 'www-data', :recursive => "none" test/spec/unit/resolvers/permission_resolver_spec.rb @@ -32,7 +32,7 @@ describe WarningShot::SymlinkResolver do :source => @@data_path / 'mock_resolver.rb', :target => @@base_path / 'linked_mock_resolver.rb' } - resolver = WarningShot::SymlinkResolver.new WarningShot::Config.create,symlink_dep + resolver = WarningShot::SymlinkResolver.new WarningShot::Config.create,:symlink,symlink_dep resolver.test! resolver.failed.length.should be(1) test/spec/unit/resolvers/symlink_resolver_spec.rb @@ -20,27 +20,27 @@ describe WarningShot::UrlResolver do end it 'should be able to determine if an http address is reachable' do - resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"http://example.com" + resolver = WarningShot::UrlResolver.new WarningShot::Config.create,:url,"http://example.com" resolver.test! resolver.failed.length.should be(0) end it 'should be able to determine if an https address is reachable' do #Yeah, what https page to use, huh? - resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"https://www.google.com/analytics/home/" + resolver = WarningShot::UrlResolver.new WarningShot::Config.create,:url,"https://www.google.com/analytics/home/" resolver.test! resolver.failed.length.should be(0) end it 'should be able to determine if an http address is unreachable' do - resolver = WarningShot::UrlResolver.new WarningShot::Config.create, "http://example.com", "http://127.0.0.1:31337" + resolver = WarningShot::UrlResolver.new WarningShot::Config.create, :url,"http://example.com", "http://127.0.0.1:31337" resolver.test! resolver.failed.length.should be(1) resolver.passed.length.should be(1) end it 'should be able to determine if an https address is unreachable' do - resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"https://www.google.com/analytics/home/", "https://127.0.0.1:31337" + resolver = WarningShot::UrlResolver.new WarningShot::Config.create,:url,"https://www.google.com/analytics/home/", "https://127.0.0.1:31337" resolver.test! resolver.failed.length.should be(1) resolver.passed.length.should be(1) @@ -51,7 +51,7 @@ describe WarningShot::UrlResolver do config[:url_strict].should be(true) #google redirects, ever heard of no-www.org? - resolver = WarningShot::UrlResolver.new config, "http://example.com","http://google.com" + resolver = WarningShot::UrlResolver.new config, :url,"http://example.com","http://google.com" resolver.test! resolver.failed.length.should be(1) test/spec/unit/resolvers/url_resolver_spec.rb @@ -18,9 +18,15 @@ describe WarningShot::Resolver do MockResolver.instance_variable_set('@disabled',false) end - it 'should allow a resolution branch to be set' do + it 'should take a single branch' do MockResolver.branch :a_test_branch - MockResolver.branch.should == :a_test_branch + MockResolver.branch.member?(:a_test_branch).should be(true) + end + + it 'should take multiple branches' do + MockResolver.branch :a_test_branch, :another_test_branch + MockResolver.branch.member?(:a_test_branch).should be(true) + MockResolver.branch.member?(:another_test_branch).should be(true) end it 'should allow a description to be set' do @@ -274,7 +280,7 @@ describe WarningShot::Resolver do MockResolver.flush! MockResolver.register(:test,:name=>:fav_color_test) {|dep| dep.value == 'blue'} - mock_resolver = MockResolver.new(WarningShot::Config.create,'blue') + mock_resolver = MockResolver.new(WarningShot::Config.create,:mock_branch,'blue') mock_resolver.test! mock_resolver.passed.length.should be(1) end @@ -283,7 +289,7 @@ describe WarningShot::Resolver do MockResolver.flush! MockResolver.register(:test,:name=>:fav_color_test) {|dep| dep.value == 'blue'} - mock_resolver = MockResolver.new(WarningShot::Config.create,'red') + mock_resolver = MockResolver.new(WarningShot::Config.create,:mock_branch,'red') mock_resolver.test! mock_resolver.failed.length.should be(1) end @@ -296,7 +302,7 @@ describe WarningShot::Resolver do dep.value == :blue } - mock_resolver = MockResolver.new(WarningShot::Config.create,'red') + mock_resolver = MockResolver.new(WarningShot::Config.create,:mock_branch,'red') mock_resolver.test! mock_resolver.resolve! mock_resolver.resolved.length.should be(1) @@ -310,7 +316,7 @@ describe WarningShot::Resolver do dep.value == :blue } - mock_resolver = MockResolver.new(WarningShot::Config.create,'red') + mock_resolver = MockResolver.new(WarningShot::Config.create,:mock_branch,'red') mock_resolver.test! mock_resolver.resolve! mock_resolver.unresolved.length.should be(1) test/spec/unit/warningshot/resolver_spec.rb 2c6ec5ef5ca2683d89d3d676e6938cab44b33f4e Cory ODaniel contact@coryodaniel.com http://github.com/coryodaniel/warningshot/commit/f95810417d2109d8e0a086e33e25acd779c390a7 f95810417d2109d8e0a086e33e25acd779c390a7 2009-01-26T16:50:08-08:00 2009-01-26T16:50:08-08:00 * Resolver.branch takes a *params now * Added specs for Resolver.branch single & multiple branches * DependencyResolver loops over branches * SymlinkResolver checks symlink with File.readlink * rbconfig is only loaded if Config::CONFIG is not defined (stops tons of warnings that show up in log) * !IMPORTANT -> Changed public API for Writing resolvers. YourResolver#initialize should take (config,branch_name,*deps) 817766b99f77776808ae37f4511c60c27ed3cdbc Cory ODaniel contact@coryodaniel.com