lib/stickler/configuration.rb @@ -3,4 +3,5 @@ pkg log doc coverage - +*.swp +*.swo .gitignore @@ -1,5 +1,7 @@ # -# Stickler Respository configuration +# Stickler Respository configuration, this is a superset of a Gem configuration +# file so it has the same keys as Gem::ConfigFile plus some more used by +# Stickler # # The source that other rubygems installations will use to access the gems @@ -7,5 +9,12 @@ downstream_source: "http://gems.collectiveintellect.com/" # The upstream locations that stickler should look for gems. -upstream_sources: - - "http://gems.rubyforge.org/" +sources: + - http://gems.rubyforge.org + +# default configuration values that exist in Gem::ConfigFile +bulk_threshold: 1000 +benchmark: false +verbose: true +update_sources: true +backtrace: false data/stickler.yml @@ -24,7 +24,6 @@ Stickler::GEM_SPEC = Gem::Specification.new do |spec| spec.add_development_dependency( 'rake', "~> 0.8" ) spec.add_development_dependency( 'rspec', "~> 1.1" ) spec.add_development_dependency( 'configuration', "~> 0.0" ) - pkg = Configuration.for('packaging') spec.files = pkg.files.all gemspec.rb @@ -6,6 +6,7 @@ require 'stickler' require 'fileutils' +require 'stickler/configuration' module Stickler # @@ -32,6 +33,9 @@ module Stickler # The repository directory. the directory containing the stickler.yml file attr_reader :directory + # The configuration + attr_reader :configuration + def self.other_dir_names %w[ gem_dir log_dir specification_dir dist_dir ] end @@ -40,6 +44,10 @@ module Stickler @directory = File.expand_path( opts['directory'] ) enhance_logging( opts ) if File.directory?( log_dir ) @overwrite = opts['force'] + + # this must be loaded early so it overrites the global Gem.configuration + load_configuration if File.exist?( config_file ) + end # @@ -73,18 +81,17 @@ module Stickler end # - # return a handle to the repository configuration found in stickler.yml + # return a handle to the repository configuration found in stickler.yml. + # Set this to be the global Gem.configuration # - def configuration - unless @configuration - begin - @configuration = YAML.load_file( config_file ) - rescue => e - logger.error "Failure to load configuration #{e}" - exit 1 - end + def load_configuration + begin + @configuration = Configuration.new( config_file ) + ::Gem.configuration = @configuration + rescue => e + logger.error "Failure to load configuration #{e}" + exit 1 end - return @configuration end # @@ -210,6 +217,9 @@ module Stickler logger.info "configuration file #{config_file} already exists" end + # load the configuration for the repo + load_configuration + rescue => e logger.error "Unable to setup the respository" logger.error e @@ -222,12 +232,43 @@ module Stickler # def info return unless valid? - Stickler.tee "Configuration settings:" - cfg_params = %w[ upstream gem_server_home ] - max_width = cfg_params.collect { |cp| cp.length }.max - cfg_params.sort.each do |param| - Stickler.tee " #{param.rjust(max_width)} : #{configuration.send(param)}" + Stickler.tee "Configuration settings" + Stickler.tee "----------------------" + Stickler.tee "" + keys = configuration.keys + max_width = keys.collect { |k| k.length }.max + + Stickler.tee " #{"downstream_source".rjust( max_width )} : #{configuration['downstream_source']}" + Stickler.tee " #{"sources".rjust( max_width )} : #{configuration.sources.first}" + + configuration.sources[1..-1].each do |source| + Stickler.tee " #{"".rjust( max_width )} #{source}" end + + Stickler.tee "" + + keys = keys.sort - %w[ downstream_source sources ] + keys.each do |key| + Stickler.tee " #{key.rjust( max_width )} : #{configuration[ key ]}" + end + end + + def sources + unless @sources + s = {} + configuration.sources.each do |upstream_uri| + src = Source.new( upstream_uri ) + @sources << Sources.new( upstream_uri ) + end + end + return @sources + end + + # + # Add a source to the repository + # + def add_source( source_uri ) + sources << Source.new( source_uri ) end end end lib/stickler/repository.rb @@ -25,8 +25,8 @@ describe Stickler::Repository do it "setup creates a default stickler.yml file" do s_yml = File.join( @top_dir, 'stickler.yml' ) s = YAML.load_file( s_yml ) - s['upstream_sources'].size.should == 1 - s['upstream_sources'].first.should == "http://gems.rubyforge.org/" + s['sources'].size.should == 1 + s['sources'].first.should == "http://gems.rubyforge.org" end end @@ -49,7 +49,12 @@ describe Stickler::Repository do end it "creates a configuration" do - @repo.configuration['upstream_sources'].size.should == 1 - @repo.configuration['upstream_sources'].first.should == "http://gems.rubyforge.org/" + @repo.configuration['sources'].size.should == 1 + @repo.configuration['sources'].first.should == "http://gems.rubyforge.org" end + + it "sets itself as the global Gem.configuration" do + @repo.configuration.should == Gem.configuration + end + end spec/repository_spec.rb b351621dec187be61d60e77ddf35d7ad72126cf4 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/stickler/commit/1456ba818d41b3fffd9dde089962bcc0a16cb180 1456ba818d41b3fffd9dde089962bcc0a16cb180 2008-09-20T23:27:12-07:00 2008-09-20T23:27:12-07:00 Added Configuration as an impelmentation of Gem::ConfigFile bcc4b50585f2f8ff2291d6c62b6f528690d7dff4 Jeremy Hinegardner jeremy@hinegardner.org