warningshot 0.9.4 → 0.9.5

data/test/spec/unit/{warning_shot → warningshot}/dependency_resolver_spec.rb

@@ -1,10 +1,10 @@
 describe WarningShot::DependencyResolver do
   before :all do
-    @config = {
+    @config = WarningShot::Config.create({
       :config_paths => [$test_data],
       :environment => 'rspec',
       :log_path => $log_file
-    }
+    })
     
   end
   
@@ -13,13 +13,7 @@ describe WarningShot::DependencyResolver do
     pending
   end
   
-  it 'should create a dependency tree from a set of config files' do
-    @config = {
-      :config_paths => [$test_data],
-      :environment => 'rspec',
-      :log_path => $log_file
-    }
-    
+  it 'should create a dependency tree from a set of config files' do    
     dr = WarningShot::DependencyResolver.new(@config)
     
     dr.dependency_tree[:mock].empty?.should be(false)
@@ -36,7 +30,22 @@ describe WarningShot::DependencyResolver do
     dr.stats.class.should be(Hash)
   end
   
+  it 'should ignore resolvers that dont have dependencies registered' do
+    pending
+  end
+  
+  it 'should ignore disabled resolvers' do
+    pending
+  end
+  
   it 'should be able to run a set of resolvers' do
+    config = WarningShot::Config.create({
+      :config_paths => [$test_data],
+      :environment => 'rspec',
+      :log_path => $log_file,
+      :oload => :faux_test
+    })
+    
     pending
   end
   

data/test/spec/unit/{warning_shot → warningshot}/resolver_spec.rb

@@ -1,9 +1,10 @@
+require WarningShot.root / 'lib' / 'warningshot' / 'suite'
 require $test_data / 'mock_resolver'
 
 describe WarningShot::Resolver do
   it 'should provide a base set of resolvers' do
-    WarningShot::Resolver.descendents.class.should be(Array)
-    WarningShot::Resolver.descendents.empty?.should be(false)
+    WarningShot::Resolver.descendants.class.should be(Array)
+    WarningShot::Resolver.descendants.empty?.should be(false)
   end
   
   it 'should allow a resolver to set a order' do
@@ -26,25 +27,31 @@ describe WarningShot::Resolver do
     MockResolver.description "An awesome mock resolver"
     MockResolver.description.should == "An awesome mock resolver"
   end
+  
+  it 'should provide Resolver#add_dependency' do
+    pending
+  end
+  
+  it 'should disabled specified resolvers based on #add_dependency' do
+    pending
+  end
+  
+  it 'should disabled specified test & resolvers based on #add_dependency' do
+    pending
+  end
 
   it 'should allow the CLI to be extended' do
-    MockResolver.cli(
-      :short        => "-t",
-      :long         => "--test=STRING",
-      :description  => "Test extending the CLI",
-      :default      => 'whatever',
-      :name         => 'rspec_test',
-      :type         => String,
-      :default_desc => "Default: whatever"
-    )
+    MockResolver.cli("-t", "--test=STRING", "Test extending the CLI") do |val|
+      options[:rspec_test] = val
+    end
 
-    WarningShot.parser.to_s.include?("Test extending the CLI").should be(true)    
+    WarningShot::Config::PARSER.to_s.include?("Test extending the CLI").should be(true)    
   end
 
   it 'should be able to cast YAML data to an Object the resolver can work with' do
     MockDependency = Struct.new :more, :less
 
-    MockResolver.cast do |dep|
+    MockResolver.typecast do |dep|
       MockDependency.new dep[:more], dep[:less]
     end
 
@@ -81,7 +88,7 @@ describe WarningShot::Resolver do
 
   it 'should be able to register a conditional test' do
     is_test_env = lambda{ |dependency| 
-      WarningShot.environment == 'test'
+      WarningShot::Config.create()[:environment] == 'test'
     }
     MockResolver.flush_tests!
     MockResolver.register :test, :if => is_test_env do |dependency|
@@ -162,7 +169,7 @@ describe WarningShot::Resolver do
   
   it 'should be able to register a conditional resolution' do
     is_test_env = lambda{ |dependency| 
-      WarningShot.environment == 'production'
+      WarningShot::Config.create()[:environment] == 'production'
     }
     MockResolver.flush_resolutions!
     MockResolver.register :resolution, :if => is_test_env do |dependency|
@@ -263,85 +270,53 @@ describe WarningShot::Resolver do
     MockResolver.resolutions(:number_resolution1)[:unless].call.should be(true)
   end
   
-  it 'should increment #passed if the test passed' do
-    pending
-  end
-  
-  it 'should increment #failed if the test failed' do
-    pending
-  end
-  
-  it 'should increment #resolved if the resolution passed' do
-    pending
-  end
-  
-  it 'should increment #unresolved if the resolution was unresolved' do
-    pending
-  end
-
   it 'should be able to determine if a test passed' do
-    MockResolver.flush_tests!
-    MockResolver.flush_resolutions!
-
-    test_meta = {
-      :name => :process_block_test,
-      :test => lambda {|dep| dep[:fav_color] == :blue}
-    }
-    
-    dep = {:fav_color => :blue}
+    MockResolver.flush!
+    MockResolver.register(:test,:name=>:fav_color_test) {|dep| dep.value == 'blue'}
 
-    MockResolver.new.send(:process_block, :test, dep, test_meta).should be(true)
+    mock_resolver = MockResolver.new(WarningShot::Config.create,'blue')
+    mock_resolver.test!
+    mock_resolver.passed.length.should be(1)
   end
   
   it 'should be able to determine if a test failed' do
-    MockResolver.flush_tests!
-    MockResolver.flush_resolutions!
+    MockResolver.flush!
+    MockResolver.register(:test,:name=>:fav_color_test) {|dep| dep.value == 'blue'}
 
-    test_meta = {
-      :name => :process_block_test,
-      :test => lambda {|dep| dep[:fav_color] == :blue}
-    }
-    
-    dep = {:fav_color => :red}
-
-    MockResolver.new.send(:process_block, :test, dep, test_meta).should be(false)
+    mock_resolver = MockResolver.new(WarningShot::Config.create,'red')
+    mock_resolver.test!
+    mock_resolver.failed.length.should be(1)
   end
 
   it 'should be able to determine if a resolution passed' do
-    MockResolver.flush_tests!
-    MockResolver.flush_resolutions!
-
-    resolution_meta = {
-      :name => :process_block_test,
-      :resolution => lambda {|dep| 
-        dep[:fav_color] = :blue
-        dep[:fav_color] == :blue
-      }
+    MockResolver.flush!
+    
+    MockResolver.register(:resolution,:name => :det_res_passed){ |dep| 
+      dep.value = :blue
+      dep.value == :blue
     }
     
-    dep = {:fav_color => :red}
-
-    MockResolver.new.send(:process_block, :resolution, dep, resolution_meta).should be(true)
+    mock_resolver = MockResolver.new(WarningShot::Config.create,'red')
+    mock_resolver.test!
+    mock_resolver.resolve!
+    mock_resolver.resolved.length.should be(1)
   end
 
   it 'should be able to determine if a resolution failed' do
-    MockResolver.flush_tests!
-    MockResolver.flush_resolutions!
-
-    resolution_meta = {
-      :name => :process_block_test,
-      :resolution => lambda {|dep| 
-        begin
-          dep[:fav_color] = :blue
-        rescue Exception
-          # nada
-        end
-        dep[:fav_color] == :blue
-      }
+    MockResolver.flush!
+    
+    
+    MockResolver.register(:resolution,:name => :det_res_failed){ |dep| 
+      dep.value == :blue
     }
     
-    dep = {:fav_color => :red}.freeze
-
-    MockResolver.new.send(:process_block, :resolution, dep, resolution_meta).should be(false)
+    mock_resolver = MockResolver.new(WarningShot::Config.create,'red')
+    mock_resolver.test!
+    mock_resolver.resolve!
+    mock_resolver.unresolved.length.should be(1)
+  end
+  
+  it 'should not try to resolve a dependency if it has passed' do
+    pending
   end
 end

data/test/spec/unit/{warning_shot → warningshot}/template_generator_spec.rb

@@ -14,7 +14,7 @@ describe WarningShot::TemplateGenerator do
   end
   
   it "should have generate YAML config files" do
-    yaml_files = Dir[@test_path / WarningShot::ConfigExt]
+    yaml_files = Dir[@test_path / WarningShot::RecipeExt]
     yaml_files.empty?.should be(false)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warningshot
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Cory ODaniel
@@ -13,7 +13,7 @@ date: 2008-10-15 00:00:00 -07:00
 default_executable: warningshot
 dependencies: []
 
-description: WarningShot Dependency Resolution Framework.
+description: WarningShot provides a simple YAML configurable interface to define dependencies that an application or machine depends on, then it builds them for you.
 email: warningshot@coryodaniel.com.com
 executables: 
 - warningshot
@@ -34,6 +34,8 @@ files:
 - bin/ws-stage.bat
 - bin/ws-stage.sh
 - test/data
+- test/data/faux_test.yml
+- test/data/faux_test_resolver.rb
 - test/data/mock.yaml
 - test/data/mock.yml
 - test/data/mock_resolver.rb
@@ -46,11 +48,6 @@ files:
 - test/log/warningshot.log
 - test/output
 - test/spec
-- test/spec/integration
-- test/spec/integration/core_ext
-- test/spec/integration/resolvers
-- test/spec/integration/warning_shot
-- test/spec/spec.opts.zoiks
 - test/spec/spec_helper.rb
 - test/spec/unit
 - test/spec/unit/core_ext
@@ -64,13 +61,13 @@ files:
 - test/spec/unit/resolvers/permission_resolver_spec.rb
 - test/spec/unit/resolvers/symlink_resolver_spec.rb
 - test/spec/unit/resolvers/url_resolver_spec.rb
-- test/spec/unit/warning_shot
-- test/spec/unit/warning_shot/config_spec.rb
-- test/spec/unit/warning_shot/dependency_resolver_spec.rb
-- test/spec/unit/warning_shot/resolver_spec.rb
-- test/spec/unit/warning_shot/template_generator_spec.rb
-- test/spec/unit/warning_shot/version_spec.rb
-- test/spec/unit/warning_shot/warning_shot_spec.rb
+- test/spec/unit/warningshot
+- test/spec/unit/warningshot/config_spec.rb
+- test/spec/unit/warningshot/dependency_resolver_spec.rb
+- test/spec/unit/warningshot/resolver_spec.rb
+- test/spec/unit/warningshot/template_generator_spec.rb
+- test/spec/unit/warningshot/version_spec.rb
+- test/spec/unit/warningshot/warning_shot_spec.rb
 - lib/core_ext
 - lib/core_ext/hash.rb
 - lib/core_ext/kernel.rb
@@ -86,15 +83,16 @@ files:
 - lib/resolvers/permission_resolver.rb
 - lib/resolvers/symlink_resolver.rb
 - lib/resolvers/url_resolver.rb
-- lib/warning_shot
-- lib/warning_shot/config.rb
-- lib/warning_shot/dependency_resolver.rb
-- lib/warning_shot/growl.rb
-- lib/warning_shot/logger.rb
-- lib/warning_shot/resolver.rb
-- lib/warning_shot/template_generator.rb
-- lib/warning_shot/version.rb
-- lib/warning_shot/warning_shot.rb
+- lib/warningshot
+- lib/warningshot/config.rb
+- lib/warningshot/dependency_resolver.rb
+- lib/warningshot/growl.rb
+- lib/warningshot/logger.rb
+- lib/warningshot/resolver.rb
+- lib/warningshot/suite.rb
+- lib/warningshot/template_generator.rb
+- lib/warningshot/version.rb
+- lib/warningshot/warning_shot.rb
 - lib/warningshot.rb
 - tasks/gemspec.rb
 - tasks/rpsec.rb
@@ -114,7 +112,7 @@ files:
 - images/warningshot_green.png
 - images/warningshot_red.png
 has_rdoc: true
-homepage: http://warningshot.lighthouseapp.com
+homepage: http://github.com/coryodaniel/warningshot
 post_install_message: 
 rdoc_options: []
 
@@ -135,9 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: WarningShot Dependency Resolution Framework.
+summary: WarningShot provides a simple YAML configurable interface to define dependencies that an application or machine depends on, then it builds them for you.
 test_files: []
 

data/lib/warning_shot/config.rb

@@ -1,132 +0,0 @@
-# I pretty much goinked this from merb, you love merb, merb loves you.
-# http://merbivore.com
-
-module WarningShot
-  class Config
-  
-    class << self
-      def defaults
-        @defaults ||= {
-          :environment  => 'development',
-          :resolve      => false,
-          :config_paths => ['.'  / 'config' / 'warningshot', '~' / '.warningshot'],
-          :application  => '.',
-          :log_path     => '.' / 'log' / 'warningshot.log',
-          :log_level    => :info,
-          :growl        => false,
-          :verbose      => false,
-          :colorize     => true,
-          :resolvers    => ['~' / '.warningshot' / '*.rb']
-        }
-      end
-    
-      def use
-        @configuration ||= {}
-        yield @configuration
-        @configuration = defaults.merge(@configuration)
-      end
-    
-      def [](key)
-        (@configuration||={})[key]
-      end
-
-      def []=(key,val)
-        (@configuration||={})[key] = val
-        #@configuration[key] = val
-      end
-    
-      def setup(settings = {})
-        @configuration = defaults.merge(settings)
-      end
-    
-      attr_accessor :configuration
-    
-      def parse_args(argv = ARGV)
-        @configuration ||= {}
-        options = {}
-        options[:environment] = ENV["WARNING_SHOT_ENV"] if ENV["WARNING_SHOT_ENV"]
-      
-        WarningShot.parser.banner = <<-BANNER
-WarningShot v. #{WarningShot::VERSION}
-Dependency Resolution Framework
-
-Usage: warningshot [options]
-BANNER
-        WarningShot.parser.separator '*'*80
-        
-        WarningShot.parser.on("-e", "--environment=STRING", String, "Environment to test in","Default: #{defaults[:environment]}") do |env|
-          options[:environment] = env
-        end
-        WarningShot.parser.on("--resolve","Resolve missing dependencies (run as sudo)") do |resolve|
-          options[:resolve] = resolve
-        end
-        WarningShot.parser.on("-a","--app=PATH", String, "Path to application", "Default: #{defaults[:application]}") do |app|
-          options[:application] = app
-        end
-        WarningShot.parser.on("-c","--configs=PATH", String,"Path to config directories (':' seperated)","Default: #{defaults[:config_paths].join(':')}") do |config|
-          options[:config_paths] = config.split(':')
-        end
-        WarningShot.parser.on("-r","--resolvers=PATH", String,"Path to add'l resolvers (':' seperated)","Default: #{defaults[:resolvers].join(':')}") do |config|
-          options[:resolvers] = config.split(':')
-        end
-        WarningShot.parser.on("-t","--templates=PATH", String, "Generate template files", "Default: False") do |template_path|
-          template_path = options[:config_paths].first if template_path.nil? || template_path.empty?
-          WarningShot::TemplateGenerator.create(template_path)
-          exit
-        end
-        WarningShot.parser.on("-l","--log LOG", String, "Path to log file", "Default: #{defaults[:log_path]}") do |log_path|        
-          options[:log_path] = log_path
-        end
-        WarningShot.parser.on("--loglevel [LEVEL]",[:debug, :info, :warn, :error, :fatal], "Default: #{defaults[:log_level]}") do |log_level|
-          options[:log_level] = log_level
-        end
-        WarningShot.parser.on("-g", "--growl", "Output results via growl (Requires growlnotify)") do |growl|
-          options[:growl] = growl
-        end
-        WarningShot.parser.on("-v", "--[no-]verbose", "Output verbose information") do |verbose|
-          options[:verbose] = verbose
-        end
-        WarningShot.parser.on("-p", "--[no-]prettycolors", "Colorize output") do |colorize|
-          options[:colorize] = colorize
-        end
-        WarningShot.parser.on_tail("--version", "Show version"){ 
-          WarningShot.parser.parse!(argv)
-          WarningShot::Config.setup(options)
-          
-          WarningShot.load_app
-          WarningShot.load_addl_resolvers
-          
-          puts "WarningShot v. #{WarningShot::VERSION}"
-          puts "Installed resolvers:"
-            Resolver.descendents.each { |klass| 
-              puts "\n"
-              puts klass
-              puts "  Tests: #{klass.tests.length}, Resolutions: #{klass.resolutions.length} [#{klass.resolutions.empty? ? 'irresolvable' : 'resolvable'}]"
-              puts "  #{klass.description}" 
-              puts "  Command Line Options: #{klass.raw_cli_ext.inject([]){|m,c| m << c[:long]}.join(',')}" if klass.raw_cli_ext
-            }
-          exit
-        }
-        WarningShot.parser.on_tail("-h", "--help","Show this help message") { puts WarningShot.parser; exit } 
-        WarningShot.parser.on_tail("--debugger","Enable debugging") do
-          begin
-            require "ruby-debug"
-            Debugger.start
-            Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
-            puts "Debugger enabled"
-          rescue LoadError => ex
-            puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
-            exit
-          end
-        end
-        
-        WarningShot.parser.parse!(argv)
-        WarningShot::Config.setup(options)
-      rescue OptionParser::InvalidOption, OptionParser::InvalidArgument => op
-        puts op
-        puts WarningShot.parser #; exit;
-      end
-      
-    end #End self
-  end #End Config
-end#End WarningShot