pompompom 1.1.0 → 1.1.1

data/README.mdown

@@ -1,32 +1,30 @@
-# Pom Pom Pom
+# Pom Pom Pom ♫
 
-Pom Pom Pom is a basic dependency manager for Maven repository artifacts.
+Pom Pom Pom is a dependency manager for Maven repository artifacts.
 
-The following code would download `amqp-client-1.8.0.jar` and its dependencies, `commons-cli-1.1.jar` and `commons-io-1.1.jar`, to the directory `lib`:
+The following code would download Rabbit MQ's AMQP client libraries, and Google Guice, as well as their dependencies into the directory `lib`:
 
-    dependencies = %w(com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0)
-    dependencies = dependencies.map { |d| Dependency.parse(d) }
-    repositories = %w(http://repo1.maven.org/maven2)
-    resolver = Resolver.new(repositories)
-    resolver.download('lib', true, *dependencies)
-    
-There will be less verbose ways of doing this in the future. The goal is to be able to use this with rake, like this:
+    require 'pompompom/rake'
 
     task :dependencies do
-      pompompom :artifacts => %w(com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0)
+      pompompom 'com.rabbitmq:amqp-client:1.8.0', 'com.google.inject:guice:2.0'
     end
-    
-Which would do the same as the code above.
 
-There is a command line tool that can be used to install artifacts:
+There is also a command line tool that can be used to install artifacts:
 
-    pompompom com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0
+    $ pompompom com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0
     
-It will create a directory called `lib` and download JARs into it. By default it will look in the main Maven repository, but you can add more repositories by editing ~/.pompompomrc (which is created automatically on the first run). Downloaded artifacts and POMs are cached in ~/.pompompom.
+It too will download the artifacts and their dependencies into `lib` (relative to the current dir).
+
+By default Pom Pom Pom will look in the main Maven repository, but you can add more repositories by editing `~/.pompompomrc` (which is created automatically on the first run), or passing `:repositories => [repo1, repo2]` to the `pompompom` function. 
+
+By default downloaded artifacts and POM files are cached in `~/.pompompom`. You can override the cache dir by passing `:cache_dir => 'path/somewhere'`, and the target directory (where the JAR files are saved) by passing `:target_dir => 'path/somewhere'` -- or editing the corresponding keys in the config file. 
+
+Look in the `examples` directory to see a few ways to use Pom Pom Pom in a Rakefile.
 
-## Why another dependency management tool, why not use Maven, Buildr, sbt or Ivy?
+## Why another dependency management tool, why not use Maven, Buildr, SBT or Ivy?
 
-Every time I look at Maven I cringe. Buildr is almost as bad, but hides some of the complexity. Ivy is better, but still too much noisy XML.
+Every time I look at Maven I cringe. Buildr is almost as bad, but hides some of the complexity. Simple Build Tool just isn't. Sure, they are all more than dependency managers, but that is part of the problem in my view. Ivy is better, but still too much noisy XML.
 
 Pom Pom Pom is meant to do more or less what Ivy does, but in a way that doesn't make you want to tear out your eyes.
 

data/lib/pompompom/config.rb

@@ -23,7 +23,6 @@ module PomPomPom
       @repositories = options[:repositories] || @repositories
       @target_dir   = options[:target_dir]   || @target_dir
       @cache_dir    = options[:cache_dir]    || @cache_dir
-      @config_file  = options[:config_file]  || @config_file
     end
     
     def file_exists?
@@ -33,7 +32,11 @@ module PomPomPom
     def create_file!
       return if file_exists?
       File.open(@config_file, 'w') do |f| 
-        f.write(YAML.dump('repositories' => @repositories))
+        f.write(YAML.dump(
+          'repositories' => @repositories,
+          'cache_dir' => @cache_dir,
+          'target_dir' => @target_dir
+        ))
       end
     end
     

data/lib/pompompom/rake.rb

@@ -2,51 +2,53 @@ require 'pompompom'
 
 
 module PomPomPom
-  class SimpleLogger
-    def initialize(io)
-      @io = io
-    end
-    def info(msg)
-      @io.puts(msg)
+  module Rake
+    class SimpleLogger
+      def initialize(io)
+        @io = io
+      end
+      def info(msg)
+        @io.puts(msg)
+      end
     end
-  end
   
-  class NullLogger
-    def info(msg); end
-  end
+    class NullLogger
+      def info(msg); end
+    end
   
-  def pompompom(*args)
-    options = (Hash === args.last) ? args.pop : { }
-    dependencies = args.flatten
+    def pompompom(*args)
+      options = (Hash === args.last) ? args.pop : { }
+      dependencies = args.flatten
     
-    logger = NullLogger.new
+      logger = NullLogger.new
     
-    if options[:logger]
-      if options[:logger].respond_to?(:info)
-        logger = options[:logger]
-      elsif options[:logger].respond_to?(:puts)
-        logger = SimpleLogger.new(options[:logger])
+      if options[:logger]
+        if options[:logger].respond_to?(:info)
+          logger = options[:logger]
+        elsif options[:logger].respond_to?(:puts)
+          logger = SimpleLogger.new(options[:logger])
+        end
       end
-    end
     
-    config = Config.new(options)
-    config.load!
+      config = Config.new(options)
+      config.load!
     
-    downloader   = options[:downloader]
-    downloader ||= CachingDownloader.new(config.cache_dir, Downloader.new)
+      downloader   = options[:downloader]
+      downloader ||= CachingDownloader.new(config.cache_dir, Downloader.new)
     
-    resolver     = Resolver.new(config.repositories, :downloader => downloader)
-    dependencies = dependencies.map { |d| Dependency.parse(d) }
-    dependencies = resolver.find_transitive_dependencies(*dependencies)
-    dependencies = dependencies.reject { |d| File.exists?(File.join(config.target_dir, d.jar_file_name)) }
+      resolver     = Resolver.new(config.repositories, :downloader => downloader)
+      dependencies = dependencies.map { |d| Dependency.parse(d) }
+      dependencies = resolver.find_transitive_dependencies(*dependencies)
+      dependencies = dependencies.reject { |d| File.exists?(File.join(config.target_dir, d.jar_file_name)) }
   
-    unless dependencies.empty?
-      dependencies.each do |dependency|
-        logger.info("Loading #{dependency.jar_file_name}")
-        resolver.download!(config.target_dir, false, dependency)
+      unless dependencies.empty?
+        dependencies.each do |dependency|
+          logger.info("Loading #{dependency.jar_file_name}")
+          resolver.download!(config.target_dir, false, dependency)
+        end
       end
     end
   end
 end
 
-include PomPomPom
+include PomPomPom::Rake

data/lib/pompompom.rb

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

data/pompompom.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pompompom}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]

data/spec/pompompom/config_spec.rb

@@ -27,10 +27,12 @@ module PomPomPom
     describe '#load!' do
       it 'loads the config file' do
         config_file = File.join(@tmp_dir, '.pom3rc')
-        File.open(config_file, 'w') { |f| f.write(YAML::dump(:repositories => %w(repo1 repo2))) }
+        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)
         config.load!
         config.repositories.should == %w(repo1 repo2)
+        config.target_dir.should == 'deps'
+        config.cache_dir.should == 'cache'
       end
     end
     
@@ -62,7 +64,10 @@ module PomPomPom
       
       it 'creates the file and puts the standard repository list in it' do
         @config.create_file!
-        YAML.load(File.read(@config_file))['repositories'].should == %w(http://repo1.maven.org/maven2)
+        config_data = YAML.load(File.read(@config_file))
+        config_data['repositories'].should == %w(http://repo1.maven.org/maven2)
+        config_data['cache_dir'].should == File.expand_path('~/.pompompom')
+        config_data['target_dir'].should == 'lib'
       end
       
       it 'doesn\'t clobber existing files' do

data/spec/pompompom/rake_spec.rb

@@ -12,7 +12,7 @@ describe 'rake' do
     @lib_dir = File.join(@tmp_dir, 'lib')
     @repo_dir = File.join(@tmp_dir, 'repo')
     @config_file = File.join(@tmp_dir, '.pompompomrc')
-    @downloader = FilesystemDownloader.new
+    @downloader = PomPomPom::FilesystemDownloader.new
     @dependencies = %w(com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0)
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pompompom
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Theo Hultberg