pompompom 1.1.1 → 1.1.2

data/Gemfile

@@ -3,9 +3,12 @@ source :rubygems
 gem 'immutable_struct'
 gem 'hpricot'
 
-group :testing do
+group :test do
   gem 'rspec'
   gem 'sdoc'
+end
+
+group :development do
   gem 'jeweler'
   gem 'rake'
 end

data/Rakefile

@@ -1,5 +1,12 @@
 $: << File.expand_path('../lib', __FILE__)
 
+unless defined?(Bundler)
+  require 'rubygems'
+  require 'bundler'
+end
+
+Bundler.setup(:default, :development, :test)
+
 require 'pompompom'
 
 task :default => :spec

data/lib/pompompom/config.rb

@@ -11,6 +11,7 @@ module PomPomPom
     attr_reader :repositories, :target_dir, :cache_dir, :config_file
     
     def initialize(options={})
+      @options_set  = options.keys
       @repositories = options[:repositories] || REPOSITORIES
       @target_dir   = options[:target_dir]   || TARGET_DIR
       @cache_dir    = options[:cache_dir]    || CACHE_DIR
@@ -20,9 +21,9 @@ module PomPomPom
     def load!
       return unless file_exists?
       options = symbolize_keys(YAML.load(File.read(@config_file)))
-      @repositories = options[:repositories] || @repositories
-      @target_dir   = options[:target_dir]   || @target_dir
-      @cache_dir    = options[:cache_dir]    || @cache_dir
+      @repositories = options[:repositories] || @repositories unless @options_set.include?(:repositories)
+      @target_dir   = options[:target_dir]   || @target_dir   unless @options_set.include?(:target_dir)
+      @cache_dir    = options[:cache_dir]    || @cache_dir    unless @options_set.include?(:cache_dir)
     end
     
     def file_exists?

data/lib/pompompom.rb

@@ -7,5 +7,5 @@ require 'pompompom/resolver'
 require 'pompompom/config'
 
 module PomPomPom
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/pompompom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pompompom}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]
-  s.date = %q{2010-07-17}
+  s.date = %q{2010-08-06}
   s.default_executable = %q{pompompom}
   s.description = %q{Ruby dependency manager for Maven repository artifacts}
   s.email = %q{theo@iconara.net}

data/spec/pompompom/cli_spec.rb

@@ -7,6 +7,7 @@ require 'yaml'
 module PomPomPom
   describe Cli do
     before do
+      @cwd = Dir.getwd
       @repository_path = File.expand_path('../../resources/repository', __FILE__)
       @stdin  = StringIO.new
       @stdout = StringIO.new
@@ -22,6 +23,7 @@ module PomPomPom
     end
     
     after do
+      Dir.chdir(@cwd)
       FileUtils.rm_rf(@tmp_dir)
     end
     

data/spec/pompompom/config_spec.rb

@@ -34,6 +34,16 @@ module PomPomPom
         config.target_dir.should == 'deps'
         config.cache_dir.should == 'cache'
       end
+      
+      it 'does not clobber options that were set in the constructor' do
+        config_file = File.join(@tmp_dir, '.pom3rc')
+        File.open(config_file, 'w') { |f| f.write(YAML::dump(:cache_dir => 'cache', :target_dir => 'deps', :repositories => %w(repo1 repo2))) }
+        config = Config.new(:config_file => config_file, :repositories => %w(repo3 repo4))
+        config.load!
+        config.repositories.should == %w(repo3 repo4)
+        config.target_dir.should == 'deps'
+        config.cache_dir.should == 'cache'
+      end
     end
     
     describe '#file_exists?' do

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 $: << File.expand_path('../../lib', __FILE__)
 
+unless defined?(Bundler)
+  require 'rubygems'
+  require 'bundler'
+end
+
+Bundler.setup(:default, :test)
+
 require 'pompompom'
 require 'pompompom/cli'
 require 'pompompom/rake'
-require 'rubygems'

data/tasks/spec.rake

@@ -13,5 +13,5 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+#task :spec => :check_dependencies
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pompompom
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: pompompom
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: immutable_struct
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: immutable_struct
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: hpricot
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,8 +45,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 description: Ruby dependency manager for Maven repository artifacts
 email: theo@iconara.net
 executables: