warningshot 0.9.4 → 0.9.5

data/test/spec/unit/resolvers/core_lib_resolver_spec.rb

@@ -15,7 +15,7 @@ describe WarningShot::CoreLibResolver do
   end
   
   it 'should increment #errors for unloadable core libs' do
-    cld = WarningShot::CoreLibResolver.new 'bogus_core_lib_name'
+    cld = WarningShot::CoreLibResolver.new WarningShot::Config.create,'bogus_core_lib_name'
     cld.test!
     
     cld.failed.length.should be(1)

data/test/spec/unit/resolvers/directory_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 control_dir,test_dir1, test_dir2
+      resolver = WarningShot::DirectoryResolver.new WarningShot::Config.create, control_dir,test_dir1, test_dir2
       resolver.test!
       resolver.passed.length.should be(1)
       resolver.failed.length.should be(2)

data/test/spec/unit/resolvers/file_resolver_spec.rb

@@ -25,10 +25,6 @@ describe WarningShot::FileResolver do
   it 'should have resolutions regsitered' do
     WarningShot::FileResolver.resolutions.empty?.should be(false)
   end
-    
-  it 'should treate relative paths as from directory specified by WarningShot::Config[:application]' do
-    pending
-  end
    
   describe 'with healing enabled' do
     describe 'with heal instructions' do
@@ -37,7 +33,7 @@ describe WarningShot::FileResolver do
           that_file = @@source_path / 'that.txt'
           this_file = @@dest_path / 'this.txt'
           
-          fd = WarningShot::FileResolver.new({:source  => "file://#{that_file}",:target => this_file})
+          fd = WarningShot::FileResolver.new(WarningShot::Config.create,{:source  => "file://#{that_file}",:target => this_file})
           fd.test!
           
           fd.failed.length.should be(1)
@@ -47,7 +43,7 @@ describe WarningShot::FileResolver do
           that_file = @@source_path / 'that.txt'
           this_file = @@dest_path / 'this.txt'
           
-          fd = WarningShot::FileResolver.new({:source  => "file://#{that_file}",:target => this_file})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source  => "file://#{that_file}",:target => this_file})
           fd.test!
           fd.failed.length.should be(1)
           fd.resolve!
@@ -55,7 +51,7 @@ describe WarningShot::FileResolver do
         end
         
         it 'should heal a file from http://' do
-          fd = WarningShot::FileResolver.new({:source  => "http://www.example.com/",:target => (@@dest_path / 'internetz.html')})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source  => "http://www.example.com/",:target => (@@dest_path / 'internetz.html')})
           fd.test!
           fd.failed.length.should be(1)
           fd.resolve!
@@ -67,7 +63,7 @@ describe WarningShot::FileResolver do
         end
                 
         it 'should not increment #resolved if the resolution fails' do
-          fd = WarningShot::FileResolver.new({:source  => "http://www.example.com/DOESNT.EXIST",:target => (@@dest_path / 'doesnt_exist.html')})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:source  => "http://www.example.com/DOESNT.EXIST",:target => (@@dest_path / 'doesnt_exist.html')})
           fd.test!
           fd.failed.length.should be(1)
           fd.resolve!
@@ -80,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({:target => this_file})
+        fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file})
         fd.test!
         fd.resolve!
         fd.unresolved.length.should be(1)
 
-        fd = WarningShot::FileResolver.new this_file
+        fd = WarningShot::FileResolver.new WarningShot::Config.create, this_file
         fd.test!
         fd.resolve!
         fd.unresolved.length.should be(1)
@@ -95,7 +91,7 @@ describe WarningShot::FileResolver do
         it 'should add dependency to #failed' do
           this_file = @@dest_path / 'this.txt'
 
-          fd = WarningShot::FileResolver.new({:target => this_file})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file})
           fd.test!
           fd.failed.length.should be(1)
           fd.resolve!
@@ -112,7 +108,7 @@ describe WarningShot::FileResolver do
           that_file = @@source_path / 'that.txt'
           this_file = @@dest_path / 'this.txt'
 
-          fd = WarningShot::FileResolver.new({:target => this_file,:source => that_file})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file,:source => that_file})
           fd.test!
           fd.failed.length.should be(1)
         end
@@ -124,7 +120,7 @@ describe WarningShot::FileResolver do
         it 'should add dependency to #failed' do
           this_file = @@dest_path / 'this.txt'
 
-          fd = WarningShot::FileResolver.new({:target => this_file})
+          fd = WarningShot::FileResolver.new( WarningShot::Config.create,{:target => this_file})
           fd.test!
           fd.failed.length.should be(1)
         end

data/test/spec/unit/resolvers/gem_resolver_spec.rb

@@ -1,5 +1,5 @@
-#Note, this fails if the gem yard is already installed, which sucks.  Waiting on rubyforge to
-# approve ws-dummy gem
+# NOTE: All tests that install/uninstall gems should use 'ws-dummy' gem.
+#   All tests for testing existance of gems should use 'warningshot' or 'ws-dummy'
 
 require "." / "lib" / "resolvers" / "gem_resolver"
 require 'fileutils'
@@ -8,10 +8,17 @@ describe WarningShot::GemResolver do
     WarningShot::GemResolver.logger = $logger
     
     FileUtils.rm_rf "./test/output/gems"
+    FileUtils.rm_rf "./test/output/gems2"
   end
   
-  after :all do
+  before :each do
+    FileUtils.mkdir_p "./test/output/gems"
+    FileUtils.mkdir_p "./test/output/gems2"
+  end
+  
+  after :each do
     FileUtils.rm_rf "./test/output/gems"
+    FileUtils.rm_rf "./test/output/gems2"
   end
 
   it 'should have tests registered' do
@@ -22,53 +29,122 @@ describe WarningShot::GemResolver do
     WarningShot::GemResolver.resolutions.empty?.should be(false)
   end
   
-  it 'should provide the command line option gem_path' do
-    WarningShot.parser.to_s.include?("Alternate gem path ':' separated to check.  First in path is where gems will be installed").should be(true)
-    WarningShot::Config.configuration.key?(:gem_path).should be(true)
+  it 'should provide the command line option --gempath' do
+    WarningShot::Config::PARSER.to_s.include?("Alternate gem path ':' separated to check.  First in path is where gems will be installed").should be(true)
+    WarningShot::Config.parse_args(['--gempath',"./test/output/gems"]).key?(:gem_path).should be(true)
   end
-  
-  it 'should provide the command line option minigems' do
-    WarningShot.parser.to_s.include?("Not supported yet.").should be(true)
-    WarningShot::Config.configuration.key?(:minigems).should be(true)
+      
+  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
+    
+    Gem.path[0].should == File.expand_path("./test/output/gems")
+    Gem.path[1].should == File.expand_path("./test/outputs/gems2")
+    Gem.path.shift
+    Gem.path.shift
   end
-  
-  it 'should override Gem.path if gem_path is given' do
-    WarningShot::Config.configuration[:gem_path] = "./test/output/gems:./test/outputs/gems2"
-    WarningShot::GemResolver.load_paths
     
-    Gem.path[0].should == "./test/output/gems"
-    Gem.path[1].should == "./test/outputs/gems2"
+  it 'should provide the command line option --update-sources' do
+    WarningShot::Config::PARSER.to_s.include?("Update gem sources before installing").should be(true)
+    WarningShot::Config.parse_args(['--update-sources']).key?(:update_sources).should be(true)
   end
-  
-  it 'should be able to determine if a gem is installed' do
-    resolver = WarningShot::GemResolver.new({:name => "rake"},{:name => "rspec",:version => ">=1.1.4"})
+      
+  # 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.test!
     
-    resolver.passed.size.should be(2)
+    resolver.failed.size.should be(1)
+    
+    resolver.resolve!
+    resolver.resolved.size.should be(1)
   end
     
-  # The gem name is the healing instructions, so if its provide, there
-  #   are instructions 
-  it 'should install the gems when healing is enabled' do
-    resolver = WarningShot::GemResolver.new({:name => "yard"})
+  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.test!
+    resolver.failed.size.should be(1)
+    resolver.resolve!
+    
+    resolver = WarningShot::GemResolver.new( config,{:name => "ws-dummy"})
+    resolver.test!
+    resolver.passed.size.should be(1)
+  end
+  
+  it 'should be able to install a specific version' 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.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]
+  end
+
+  it 'should be able to determine if a gem is installed in the default gem path' do
+    Gem.clear_paths
+    config = WarningShot::Config.create
+    dummy_gem = {:name => "ws-dummy", :version=>"= 0.2.0"}
     
+    resolver = WarningShot::GemResolver.new(config,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!
   end
   
-  it 'should check for gems in --gempath when specified' do
-    pending
+  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.test!
+    
+    resolver.failed.size.should be(1)
+    
+    resolver.resolve!
+    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.test!
+    resolver.passed.size.should be(1)
+
+    File.exist?("./test/output/gems/specifications/ws-dummy-1.5.0.gemspec").should be(true)
   end
-  
-  it 'should install gems in --gempath when specified and resolving' do
-    pending
+
+  it 'should be able to determine if a specific version is installed' 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.test!
+    resolver.failed.size.should be(1)
+    resolver.resolve!
+    
+    resolver = WarningShot::GemResolver.new(config,dummy_gem)
+    resolver.test!
+    resolver.passed.size.should be(1)
   end
+  
+  it 'should be able to install gems from an alternate source' 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.test!
+    resolver.failed.size.should be(1)
+    resolver.resolve!
     
-  it 'should use warningshot_dummy instead of the gems listed above' do
-    #it should also uninstall it before :all and after :all
-    pending
+    resolver.resolved.size.should be(1)
+    resolver.resolved.first.version.to_s.should == dummy_gem[:version]
   end
+  
 end

data/test/spec/unit/resolvers/integrity_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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :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({
+    resolver = WarningShot::IntegrityResolver.new(WarningShot::Config.create,{
       :target => "file://#{that_file}",
       :source => ""
     })

data/test/spec/unit/resolvers/permission_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({
+    resolver = WarningShot::PermissionResolver.new(WarningShot::Config.create,{
       :path => _file,       :mode   => '0755', 
       :user => 'www-data',  :group  => 'www-data', 
       :recursive => "none"
     })
     
-    resolver2 = WarningShot::PermissionResolver.new({
+    resolver2 = WarningShot::PermissionResolver.new(WarningShot::Config.create,{
       :path => _file2,      :mode   => '0755', 
       :user => 'www-data',  :group  => 'www-data', 
       :recursive => "none"

data/test/spec/unit/resolvers/symlink_resolver_spec.rb

@@ -1,4 +1,5 @@
 require "." / "lib" / "resolvers" / "symlink_resolver"
+require 'digest/md5'
 
 describe WarningShot::SymlinkResolver do
   before :all do
@@ -31,7 +32,7 @@ describe WarningShot::SymlinkResolver do
         :source => @@data_path / 'mock_resolver.rb',
         :target => @@base_path / 'linked_mock_resolver.rb'
       }
-      resolver = WarningShot::SymlinkResolver.new symlink_dep
+      resolver = WarningShot::SymlinkResolver.new WarningShot::Config.create,symlink_dep
       
       resolver.test!
       resolver.failed.length.should be(1)
@@ -41,4 +42,10 @@ describe WarningShot::SymlinkResolver do
       File.symlink?(symlink_dep[:target]).should be(true)
     end
   end # End healing enabled, instructions provided
+  
+  describe 'it should expand the target and source paths' do
+    sym = WarningShot::SymlinkResolver.yaml_to_object({:source => "./test_src_expand",:target => "../test_target_expand",:force => true})
+    sym.source.should == File.expand_path("./test_src_expand")
+    sym.target.should == File.expand_path("../test_target_expand")
+  end
 end

data/test/spec/unit/resolvers/url_resolver_spec.rb

@@ -14,44 +14,44 @@ describe WarningShot::UrlResolver do
   end
 
   it 'should extend the command line interface' do
-    WarningShot.parser.to_s.include?("Success is only for 200 instead of 2xx").should be(true)    
-    WarningShot.parser.to_s.include?("SSL Verify Peer Depth").should be(true)    
-    WarningShot.parser.to_s.include?("Path to root ca certificate").should be(true)    
+    WarningShot::Config::PARSER.to_s.include?("Success is only for 200 instead of 2xx").should be(true)    
+    WarningShot::Config::PARSER.to_s.include?("SSL Verify Peer Depth").should be(true)    
+    WarningShot::Config::PARSER.to_s.include?("Path to root ca certificate").should be(true)    
   end
 
   it 'should be able to determine if an http address is reachable' do
-    resolver = WarningShot::UrlResolver.new "http://example.com"
+    resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"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 "https://www.google.com/analytics/home/"
+    resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"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 "http://example.com", "http://127.0.0.1:31337"
+    resolver = WarningShot::UrlResolver.new WarningShot::Config.create, "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 "https://www.google.com/analytics/home/", "https://127.0.0.1:31337"
+    resolver = WarningShot::UrlResolver.new WarningShot::Config.create,"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)
   end
     
   it 'should be able to receive --strict from the command line' do
-    WarningShot::Config.configuration[:url_strict] = true
-    WarningShot::Config.configuration[:url_strict].should be(true)
+    config = WarningShot::Config.create({:url_strict=>true})
+    config[:url_strict].should be(true)
     
     #google redirects, ever heard of no-www.org?
-    resolver = WarningShot::UrlResolver.new "http://example.com","http://google.com"
+    resolver = WarningShot::UrlResolver.new config, "http://example.com","http://google.com"
 
     resolver.test!
     resolver.failed.length.should be(1)

data/test/spec/unit/warningshot/config_spec.rb

@@ -0,0 +1,57 @@
+describe WarningShot::Config do
+    
+  it 'should be able to parse an ARGV string' do
+    args = ['--very-verbose','--resolve','--environment=rspec_test','-g','-aRspecTest']
+    config = WarningShot::Config.parse_args(args)
+    config[:verbose].should be(true)
+    config[:resolve].should be(true)
+    config[:environment].should == 'rspec_test'
+    config[:growl].should be(true)
+    config[:application].should == 'RspecTest'
+  end
+  
+  it 'should provide defaults' do
+    defined?(WarningShot::Config::DEFAULTS).should == 'constant'
+    WarningShot::Config::DEFAULTS.class.should be(Hash)
+  end
+  
+  it 'should set defaults if no configuration is passed in' do
+    config = WarningShot::Config.create
+    config.should == WarningShot::Config::DEFAULTS
+  end
+  
+  it 'should allow configurations to be done with a hash and still set defaults' do
+    _config = {
+      :growl => true,
+      :environment => :rspec_test
+    }
+    config = WarningShot::Config.create _config
+    config[:growl].should be(true)
+    config[:environment].should == :rspec_test
+    config[:colorize].should be(true)
+  end
+  
+  it 'should allow configurations to be changed with a block' do
+    config = WarningShot::Config.create do|c|
+      c[:growl] = true
+      c[:resolve]= true
+    end
+    
+    config[:growl].should be(true)
+    config[:resolve].should be(true)
+    config[:colorize].should be(true)
+  end
+  
+
+  it 'should allow a hash and block to be passed, block wins' do
+    conf = WarningShot::Config.create({:environment=>"hash",:something=>true}) do |c|
+      c[:environment] = "blk"
+      c[:else] = true
+    end
+    
+    conf[:environment].should == "blk"
+    conf[:something].should be(true)
+    conf[:else].should be(true)
+    conf[:colorize].should be(true)
+   end
+end