pompompom 1.0.2 → 1.1.0

data/.gitignore

@@ -3,3 +3,5 @@
 /.bundle
 /pkg
 /TODO
+/examples/lib
+/examples/cache

data/examples/Rakefile

@@ -0,0 +1,38 @@
+$: << File.expand_path('../../lib', __FILE__)
+
+require 'pompompom/rake'
+
+
+task :clean do
+  rm_rf 'lib'
+  rm_rf 'cache'
+end
+
+task :example1 do
+  pompompom 'org.eclipse.jetty:jetty-server:7.1.5.v20100705'
+end
+
+task :example2 do
+  repositories = %w(
+    http://repo1.maven.org/maven2
+    http://scala-tools.org/repo-releases
+    http://scala-tools.org/repo-snapshots
+  )
+
+  dependencies = %w(
+    org.eclipse.jetty:jetty-server:7.1.5.v20100705
+    org.scala-tools.testing:specs_2.8.0:1.6.5-SNAPSHOT
+    org.mockito:mockito-core:1.8.5
+    net.liftweb:lift-json:2.0-scala280-SNAPSHOT
+    log4j:log4j:1.2.16
+    org.slf4j:slf4j-log4j12:1.6.1
+    org.slf4j:slf4j-api:1.6.1
+    org.mongodb:mongo-java-driver:2.0
+  )
+
+  pompompom dependencies, :repositories => repositories, :cache_dir => 'cache'
+end
+
+task :example3 do
+  pompompom 'org.eclipse.jetty:jetty-server:7.1.5.v20100705', :logger => STDOUT, :config_file => 'config.yml', :cache_dir => 'cache'
+end

data/examples/config.yml

@@ -0,0 +1,5 @@
+--- 
+repositories: 
+- http://repo1.maven.org/maven2
+- http://scala-tools.org/repo-releases
+- http://scala-tools.org/repo-snapshots

data/lib/pompompom.rb

@@ -4,7 +4,8 @@ require 'pompompom/dependency'
 require 'pompompom/pom'
 require 'pompompom/downloader'
 require 'pompompom/resolver'
+require 'pompompom/config'
 
 module PomPomPom
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/pompompom/cli.rb

@@ -3,15 +3,13 @@ require 'yaml'
 
 module PomPomPom
   class Cli
-    STANDARD_REPOSITORIES = %w(http://repo1.maven.org/maven2)
-    DEFAULT_DESTINATION_DIR = 'lib'
-    CACHE_DIR = File.expand_path('~/.pompompom')
-    CONFIG_FILE = File.expand_path('~/.pompompomrc')
-    
-    def initialize(stdin, stdout, stderr)
+    def initialize(stdin, stdout, stderr, options={})
+      @config = Config.new(options)
+      @config.load!
       @stdin, @stdout, @stderr = stdin, stdout, stderr
       @status_logger = EchoLogger.new(@stderr)
-      @downloader = CachingDownloader.new(CACHE_DIR, Downloader.new)
+      @downloader = CachingDownloader.new(@config.cache_dir, Downloader.new)
+      @resolver = options[:resolver]
     end
     
     def run!(*args)
@@ -22,21 +20,21 @@ module PomPomPom
       
       resolver = create_resolver
     
-      create_config_file!
+      @config.create_file! unless @config.file_exists?
       create_lib_directory!
     
       @status_logger.info("Determining transitive dependencies...")
     
       dependencies = parse_dependencies(args)
       dependencies = resolver.find_transitive_dependencies(*dependencies)
-      dependencies = dependencies.reject { |d| File.exists?(File.join(destination_dir_path, d.jar_file_name)) }
+      dependencies = dependencies.reject { |d| File.exists?(File.join(@config.target_dir, d.jar_file_name)) }
     
       if dependencies.empty?
         @status_logger.info('All dependencies are met')
       else
         dependencies.each do |dependency|
           @status_logger.info(%(Downloading "#{dependency.to_dependency.to_s}"))
-          resolver.download!(destination_dir_path, false, dependency)
+          resolver.download!(@config.target_dir, false, dependency)
         end
       end
       
@@ -48,44 +46,20 @@ module PomPomPom
     
   private
   
-    def create_config_file!
-      return if File.exists?(config_file_path)
-      File.open(config_file_path, 'w') { |f| f.write(YAML.dump('repositories' => STANDARD_REPOSITORIES))}
-    end
-  
     def create_lib_directory!
-      return if File.directory?(destination_dir_path)
-      raise %(Cannot create destination, "#{destination_dir_path}" is a file!) if File.exists?(destination_dir_path)
-      Dir.mkdir(destination_dir_path)
+      return if File.directory?(@config.target_dir)
+      raise %(Cannot create destination, "#{@config.target_dir}" is a file!) if File.exists?(@config.target_dir)
+      Dir.mkdir(@config.target_dir)
     end
   
     def create_resolver
-      Resolver.new(
-        config[:repositories], 
+      @resolver ||= Resolver.new(
+        @config.repositories, 
         :logger => @status_logger, 
         :downloader => @downloader
       )
     end
     
-    def config
-      @config ||= symbolize_keys(YAML.load(File.read(config_file_path)))
-    end
-    
-    def symbolize_keys(h)
-      h.keys.inject({}) do |acc, k|
-        acc[k.to_sym] = if Hash === h[k] then symbolize_keys(h[k]) else h[k] end
-        acc
-      end
-    end
-    
-    def config_file_path
-      CONFIG_FILE
-    end
-    
-    def destination_dir_path
-      DEFAULT_DESTINATION_DIR
-    end
-  
     def parse_dependencies(args)
       args.map do |coordinate|
         begin

data/lib/pompompom/config.rb

@@ -0,0 +1,47 @@
+require 'yaml'
+
+
+module PomPomPom
+  class Config
+    REPOSITORIES = %w(http://repo1.maven.org/maven2)
+    TARGET_DIR = 'lib'
+    CACHE_DIR = File.expand_path('~/.pompompom')
+    CONFIG_FILE = File.expand_path('~/.pompompomrc')
+    
+    attr_reader :repositories, :target_dir, :cache_dir, :config_file
+    
+    def initialize(options={})
+      @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 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
+      @config_file  = options[:config_file]  || @config_file
+    end
+    
+    def file_exists?
+      File.exists?(@config_file)
+    end
+    
+    def create_file!
+      return if file_exists?
+      File.open(@config_file, 'w') do |f| 
+        f.write(YAML.dump('repositories' => @repositories))
+      end
+    end
+    
+    def symbolize_keys(h)
+      h.keys.inject({}) do |acc, k|
+        acc[k.to_sym] = if Hash === h[k] then symbolize_keys(h[k]) else h[k] end
+        acc
+      end
+    end
+  end
+end

data/lib/pompompom/rake.rb

@@ -0,0 +1,52 @@
+require 'pompompom'
+
+
+module PomPomPom
+  class SimpleLogger
+    def initialize(io)
+      @io = io
+    end
+    def info(msg)
+      @io.puts(msg)
+    end
+  end
+  
+  class NullLogger
+    def info(msg); end
+  end
+  
+  def pompompom(*args)
+    options = (Hash === args.last) ? args.pop : { }
+    dependencies = args.flatten
+    
+    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])
+      end
+    end
+    
+    config = Config.new(options)
+    config.load!
+    
+    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)) }
+  
+    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
+
+include PomPomPom

data/pompompom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pompompom}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-17}
   s.default_executable = %q{pompompom}
   s.description = %q{Ruby dependency manager for Maven repository artifacts}
   s.email = %q{theo@iconara.net}
@@ -26,21 +26,27 @@ Gem::Specification.new do |s|
      "README.mdown",
      "Rakefile",
      "bin/pompompom",
+     "examples/Rakefile",
+     "examples/config.yml",
      "lib/pom_pom_pom.rb",
      "lib/pompompom.rb",
      "lib/pompompom/cli.rb",
+     "lib/pompompom/config.rb",
      "lib/pompompom/dependency.rb",
      "lib/pompompom/downloader.rb",
      "lib/pompompom/metadata.rb",
      "lib/pompompom/pom.rb",
+     "lib/pompompom/rake.rb",
      "lib/pompompom/resolver.rb",
      "lib/pompompom/url_builder.rb",
      "pompompom.gemspec",
      "spec/pompompom/cli_spec.rb",
+     "spec/pompompom/config_spec.rb",
      "spec/pompompom/dependency_spec.rb",
      "spec/pompompom/downloader_spec.rb",
      "spec/pompompom/metadata_spec.rb",
      "spec/pompompom/pom_spec.rb",
+     "spec/pompompom/rake_spec.rb",
      "spec/pompompom/resolver_spec.rb",
      "spec/pompompom/url_builders_shared.rb",
      "spec/resources/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar",
@@ -96,10 +102,12 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby dependency manager for Maven repository artifacts}
   s.test_files = [
     "spec/pompompom/cli_spec.rb",
+     "spec/pompompom/config_spec.rb",
      "spec/pompompom/dependency_spec.rb",
      "spec/pompompom/downloader_spec.rb",
      "spec/pompompom/metadata_spec.rb",
      "spec/pompompom/pom_spec.rb",
+     "spec/pompompom/rake_spec.rb",
      "spec/pompompom/resolver_spec.rb",
      "spec/pompompom/url_builders_shared.rb",
      "spec/spec_helper.rb"

data/spec/pompompom/cli_spec.rb

@@ -13,15 +13,12 @@ module PomPomPom
       @stderr = StringIO.new
       @downloader = FilesystemDownloader.new
       @resolver = Resolver.new([@repository_path])
-      @cli = Cli.new(@stdin, @stdout, @stderr)
       @tmp_dir = File.join(Dir.tmpdir, 'pompompom')
       FileUtils.rm_rf(@tmp_dir)
       Dir.mkdir(@tmp_dir)
       Dir.chdir(@tmp_dir)
       @config_file_path = File.join(@tmp_dir, '.pompompomrc')
-      @cli.stub!(:create_resolver).and_return(@resolver)
-      @cli.stub!(:create_lib_directory!)
-      @cli.stub!(:config_file_path).and_return(@config_file_path)
+      @cli = Cli.new(@stdin, @stdout, @stderr, :resolver => @resolver, :config_file => @config_file_path)
     end
     
     after do
@@ -102,7 +99,7 @@ module PomPomPom
       it 'adds the standard repositories to the config file, if it doesn\'t exist' do
         @cli.run!('net.iconara:pompompom:1.0', 'com.example:test:9.9')
         @config = YAML.load(File.read(@config_file_path))
-        @config['repositories'].should == Cli::STANDARD_REPOSITORIES
+        @config['repositories'].should == Config::REPOSITORIES
       end
       
       it 'doesn\'t clobber an existing config file' do
@@ -117,8 +114,7 @@ module PomPomPom
         @config = {'repositories' => %w(http://example.com/repo1 http://example.com/repo2)}
         File.open(@config_file_path, 'w') { |f| f.write(YAML::dump(@config)) }
         Resolver.should_receive(:new).with(%w(http://example.com/repo1 http://example.com/repo2), an_instance_of(Hash))
-        @cli = Cli.new(@stdin, @stdout, @stderr)
-        @cli.stub!(:config_file_path).and_return(@config_file_path)
+        @cli = Cli.new(@stdin, @stdout, @stderr, :config_file => @config_file_path)
         @cli.run!('net.iconara:pompompom:1.0', 'com.example:test:9.9')
       end
     end

data/spec/pompompom/config_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require 'tmpdir'
+require 'fileutils'
+
+
+module PomPomPom
+  describe Config do
+    before do
+      @tmp_dir = File.join(Dir.tmpdir, 'pompompom')
+      FileUtils.rm_rf(@tmp_dir)
+      Dir.mkdir(@tmp_dir)
+    end
+    
+    after do
+      FileUtils.rm_rf(@tmp_dir)
+    end
+    
+    context 'defaults' do
+      subject { Config.new }
+      
+      its(:target_dir)   { should == 'lib' }
+      its(:repositories) { should == %w(http://repo1.maven.org/maven2) }
+      its(:cache_dir)    { should == File.expand_path('~/.pompompom') }
+      its(:config_file)  { should == File.expand_path('~/.pompompomrc') }
+    end
+    
+    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))) }
+        config = Config.new(:config_file => config_file)
+        config.load!
+        config.repositories.should == %w(repo1 repo2)
+      end
+    end
+    
+    describe '#file_exists?' do
+      before do
+        @config_file = File.join(@tmp_dir, '.pom3rc')
+        @config = Config.new(:config_file => @config_file)
+      end
+      
+      it 'returns true if the file exists' do
+        FileUtils.touch(@config_file)
+        @config.file_exists?.should == true
+      end
+      
+      it 'returns false if the file doesn\'t exist' do
+        @config.file_exists?.should == false
+      end
+    end
+    
+    describe '#create_file!' do
+      before do
+        @config_file = File.join(@tmp_dir, '.pom3rc')
+        @config = Config.new(:config_file => @config_file)
+      end
+      
+      after do
+        FileUtils.rm_f(@config_file)
+      end
+      
+      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)
+      end
+      
+      it 'doesn\'t clobber existing files' do
+        FileUtils.touch(@config_file)
+        @config.create_file!
+        File.read(@config_file).should == ''
+      end
+    end
+  end
+end

data/spec/pompompom/rake_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require 'tmpdir'
+require 'fileutils'
+
+
+describe 'rake' do
+  before do
+    @repository_path = File.expand_path('../../resources/repository', __FILE__)
+    @tmp_dir = File.join(Dir.tmpdir, 'pompompom')
+    FileUtils.rm_rf(@tmp_dir)
+    Dir.mkdir(@tmp_dir)
+    @lib_dir = File.join(@tmp_dir, 'lib')
+    @repo_dir = File.join(@tmp_dir, 'repo')
+    @config_file = File.join(@tmp_dir, '.pompompomrc')
+    @downloader = FilesystemDownloader.new
+    @dependencies = %w(com.rabbitmq:amqp-client:1.8.0 com.google.inject:guice:2.0)
+  end
+  
+  after do
+    FileUtils.rm_rf(@tmp_dir)
+  end
+  
+  it 'downloads dependencies' do
+    pompompom(@dependencies, :target_dir => @lib_dir, :downloader => @downloader, :repositories => [@repository_path], :config_file => @config_file)
+    jars = Dir[File.join(@lib_dir, '*.jar')].map { |f| File.basename(f) }
+    jars.should include('amqp-client-1.8.0.jar') 
+    jars.should include('guice-2.0.jar')
+  end
+  
+  it 'downloads dependencies (when specified as separate arguments)' do
+    pompompom('com.rabbitmq:amqp-client:1.8.0', 'com.google.inject:guice:2.0', :target_dir => @lib_dir, :downloader => @downloader, :repositories => [@repository_path], :config_file => @config_file)
+    jars = Dir[File.join(@lib_dir, '*.jar')].map { |f| File.basename(f) }
+    jars.should include('amqp-client-1.8.0.jar') 
+    jars.should include('guice-2.0.jar')
+  end
+
+  it 'reads the config file' do
+    File.open(@config_file, 'w') { |f| f.write(YAML.dump('repositories' => [@repository_path])) }
+    pompompom(@dependencies, :config_file => @config_file, :target_dir => @lib_dir, :downloader => @downloader)
+    jars = Dir[File.join(@lib_dir, '*.jar')].map { |f| File.basename(f) }
+    jars.should include('amqp-client-1.8.0.jar') 
+    jars.should include('guice-2.0.jar')
+  end
+  
+  context 'logging' do
+    it 'outputs status to an IO' do
+      io = StringIO.new
+      pompompom(@dependencies, :logger => io, :target_dir => @lib_dir, :downloader => @downloader, :repositories => [@repository_path], :config_file => @config_file)
+      io.string.should include('Loading amqp-client-1.8.0.jar')
+      io.string.should include('Loading guice-2.0.jar')
+      io.string.should include('Loading commons-io-1.2.jar')
+      io.string.should include('Loading commons-cli-1.1.jar')
+      io.string.should include('Loading aopalliance-1.0.jar')
+    end
+    
+    it 'logs to #info on a logger' do
+      logger = double()
+      logger.should_receive(:info).with('Loading amqp-client-1.8.0.jar')
+      logger.should_receive(:info).with('Loading guice-2.0.jar')
+      logger.should_receive(:info).with('Loading commons-io-1.2.jar')
+      logger.should_receive(:info).with('Loading commons-cli-1.1.jar')
+      logger.should_receive(:info).with('Loading aopalliance-1.0.jar')
+      pompompom(@dependencies, :logger => logger, :target_dir => @lib_dir, :downloader => @downloader, :repositories => [@repository_path], :config_file => @config_file)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,4 +2,5 @@ $: << File.expand_path('../../lib', __FILE__)
 
 require 'pompompom'
 require 'pompompom/cli'
+require 'pompompom/rake'
 require 'rubygems'

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +02:00
+date: 2010-07-17 00:00:00 +02:00
 default_executable: pompompom
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,21 +63,27 @@ files:
 - README.mdown
 - Rakefile
 - bin/pompompom
+- examples/Rakefile
+- examples/config.yml
 - lib/pom_pom_pom.rb
 - lib/pompompom.rb
 - lib/pompompom/cli.rb
+- lib/pompompom/config.rb
 - lib/pompompom/dependency.rb
 - lib/pompompom/downloader.rb
 - lib/pompompom/metadata.rb
 - lib/pompompom/pom.rb
+- lib/pompompom/rake.rb
 - lib/pompompom/resolver.rb
 - lib/pompompom/url_builder.rb
 - pompompom.gemspec
 - spec/pompompom/cli_spec.rb
+- spec/pompompom/config_spec.rb
 - spec/pompompom/dependency_spec.rb
 - spec/pompompom/downloader_spec.rb
 - spec/pompompom/metadata_spec.rb
 - spec/pompompom/pom_spec.rb
+- spec/pompompom/rake_spec.rb
 - spec/pompompom/resolver_spec.rb
 - spec/pompompom/url_builders_shared.rb
 - spec/resources/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar
@@ -162,10 +168,12 @@ specification_version: 3
 summary: Ruby dependency manager for Maven repository artifacts
 test_files: 
 - spec/pompompom/cli_spec.rb
+- spec/pompompom/config_spec.rb
 - spec/pompompom/dependency_spec.rb
 - spec/pompompom/downloader_spec.rb
 - spec/pompompom/metadata_spec.rb
 - spec/pompompom/pom_spec.rb
+- spec/pompompom/rake_spec.rb
 - spec/pompompom/resolver_spec.rb
 - spec/pompompom/url_builders_shared.rb
 - spec/spec_helper.rb