mvnizer 0.0.2 → 0.0.3

data/Gemfile

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
+gem 'httparty', '~> 0.9.0'
+
 group :development do
   gem 'rspec', '~> 2.11.0'
   gem 'rspec-mocks', '~> 2.11.2'
   gem 'fakefs', '~> 0.4.0'
   gem 'nokogiri', '~> 1.5.5'
   gem 'jeweler', '~> 1.8.4'
+  gem 'aruba', '~> 0.4.11'
 end

data/Gemfile.lock

@@ -1,15 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.1.3)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
     diff-lcs (1.1.3)
     fakefs (0.4.0)
+    ffi (1.1.5)
+    ffi (1.1.5-java)
+    gherkin (2.11.2)
+      json (>= 1.4.6)
+    gherkin (2.11.2-java)
+      json (>= 1.4.6)
     git (1.2.5)
+    httparty (0.9.0)
+      multi_json (~> 1.0)
+      multi_xml
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.5)
+    json (1.7.5-java)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
     nokogiri (1.5.5)
     nokogiri (1.5.5-java)
     rake (0.9.2.2)
@@ -22,14 +47,16 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
+  aruba (~> 0.4.11)
   fakefs (~> 0.4.0)
+  httparty (~> 0.9.0)
   jeweler (~> 1.8.4)
   nokogiri (~> 1.5.5)
   rspec (~> 2.11.0)

data/README.md

@@ -4,7 +4,9 @@ Bootstraps a Maven project.  Because archetypes shouldn't be so complicated.
 
 Mvnizer is ideal to create a throw-away Maven project that adds junit as a dependency and sets up the Maven project structure.
 
-# Command
+# Commands
+
+## Project Creation
 
 Mvnizer is used as follows:
 
@@ -14,9 +16,24 @@ The coordinates can have the following format:
 
     <group:>artifact<:version><:type>
 
-with the values between angled brackets optional.  `type` can only have one of the following three values: `jar` (default), `war` or `pom`.
+with the values between angled brackets optional.  `type` can only have one of the following three values: `jar` (default), `war` or `pom`.  This command creates a project in the `artifact` folder, populating the proper values in the pom file.
+
+Here are some examples of valid commands:
+
+    mvnizer new foo
+    mvnizer new foo:war
+    mvnizer new foo:1.0:war
+    mvnizer new com.example:foo
+    mvnizer new com.example:foo:war
+    mvnizer new com.example:foo:1.0:war
+
+## Dependency Search
+
+You can search for dependencies in the Maven central repository with the command:
+
+    $ mvnizer search <text>
+    
 
-This command creates a project in the `artifact` folder, populating the proper values in the pom file.
 
 # License
 

data/TODO.md

@@ -1,14 +1,21 @@
-- Provide full or partial coordinates to define project coordinates. e.g. here are a list of valid values for mvnizer:
-
-    blah
-    blah:1.0.0-SNAPSHOT
-    blah:war
-    com.weblogism:blah
-    com.weblogism:blah:1.0.0-SNAPSHOT
-    com.weblogism:blah:war
+# New Project
+
 - Depending on type of artifact (jar, war, etc.), generate appropriate pom and structure.
+- Add specific options to add classic dependencies / plugins:
+
+    mvnizer new foo --slf4j
+    mvnizer new foo --shade # adds the maven-shade-plugin, and possibly a Main class.
 - Provide way to add dependency to pom given coordinates, e.g.:
 
     mvnizer add org.junit:junit:4.10
+    
+# Search
+    
 - Provide dependency search facility.
-- Support external config file (e.g. ~/.mvnizerrc) to override current defaults.
+
+    mvnizer search junit
+    
+
+# Options    
+
+- Support external config file (e.g. ~/.mvnizerrc) to override current defaults.

data/bin/mvnizer

@@ -9,6 +9,16 @@ help = <<HELP
 Mvnizer bootstraps a Maven project without the pain of archetypes.
 
   mvnizer new <project_name>
+    Creates a new project.  Example of valid project names:
+      mvnizer new foo
+      mvnizer new foo:war
+      mvnizer new foo:1.0:war
+      mvnizer new com.example:foo
+      mvnizer new com.example:foo:war
+      mvnizer new com.example:foo:1.0:war
+
+  mvnizer search <text>
+    Searches for artefacts in the Maven central repository.
 HELP
 
 options = {}

data/features/new_project.feature

@@ -0,0 +1,37 @@
+Feature: Create a new Maven project
+
+  In order to rapidly run a project
+  As a user of Mvnizer
+  I want to quickly create Maven projects
+
+  Scenario: create a jar project
+    Given a directory named "foo"
+    When I run `mvnizer new com.weblogism:foonbar`
+    Then the output should contain "success"
+    And a file named "foonbar/pom.xml" should exist
+    And "/project/groupId" in the xml file "foonbar/pom.xml" should be "com.weblogism"
+    And "/project/artifactId" in the xml file "foonbar/pom.xml" should be "foonbar"
+    And "/project/name" in the xml file "foonbar/pom.xml" should be "foonbar"
+    And "/project/version" in the xml file "foonbar/pom.xml" should be "0.0.1-SNAPSHOT"
+    And "/project/packaging" should not be in the xml file "foonbar/pom.xml"
+    And a file named "foonbar/src/main/webapp/WEB-INF/web.xml" should not exist
+
+  Scenario: create a war project
+    Given a directory named "foo"
+    When I run `mvnizer new com.weblogism:foonbar:war`
+    Then the output should contain "success"
+    And a file named "foonbar/pom.xml" should exist
+    And "/project/groupId" in the xml file "foonbar/pom.xml" should be "com.weblogism"
+    And "/project/artifactId" in the xml file "foonbar/pom.xml" should be "foonbar"
+    And "/project/name" in the xml file "foonbar/pom.xml" should be "foonbar"
+    And "/project/version" in the xml file "foonbar/pom.xml" should be "0.0.1-SNAPSHOT"
+    And "/project/packaging" in the xml file "foonbar/pom.xml" should be "war"
+    And a file named "foonbar/src/main/webapp/WEB-INF/web.xml" should exist
+    
+    Scenario: add the dependencies
+      Given a directory named "foo"
+      When I run `mvnizer new com.weblogism:foonbar`
+      Then  "/project/dependencies/dependency/groupId" in the xml file "foonbar/pom.xml" should be "junit"
+      And "/project/dependencies/dependency/artifactId" in the xml file "foonbar/pom.xml" should be "junit"
+      And "/project/dependencies/dependency/version" in the xml file "foonbar/pom.xml" should be "4.10"
+      And "/project/dependencies/dependency/scope" in the xml file "foonbar/pom.xml" should be "test"

data/features/search_artefact.feature

@@ -0,0 +1,14 @@
+Feature: Search for a Maven artefact
+
+  In order to easily find dependencies
+  As a user of Mvnizer
+  I want to search the Maven central repositories through the command line
+
+  Scenario: search for log4j
+    When I run `mvnizer search log4j`
+    Then the output should contain "log4j:log4j:"
+    And the output should contain "ant:ant-apache-log4j"
+
+  Scenario:  message when no result
+    When I run `mvnizer search ffffl`
+    Then the output should contain "No result found"    

data/features/step_definitions/pom_steps.rb

@@ -0,0 +1,18 @@
+require 'nokogiri'
+
+Then /^"([^"]+)" should not be in the xml file "([^"]+)"$/ do |xpath,path|
+  in_current_dir do
+    doc = Nokogiri::XML(File.open(path))
+    doc.remove_namespaces!
+    doc.xpath(xpath).first.should be_nil
+  end
+end
+
+
+Then /^"([^"]+)" in the xml file "([^"]+)" should be "([^"]+)"$/ do |xpath,path,value|
+  in_current_dir do
+    doc = Nokogiri::XML(File.open(path))
+    doc.remove_namespaces!
+    doc.xpath(xpath).first.text().should == value
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,24 @@
+require 'aruba/cucumber'
+require 'fileutils'
+
+root_dir = File.join(File.dirname(__FILE__), '..', '..')
+bin_dir = File.expand_path(File.join(root_dir, 'bin'))
+# FIXME: This actually doesn't work:
+# aruba doesn't find the mvnizer script unless it is added to the PATH
+# outside ruby.
+ENV['PATH'] = "#{bin_dir}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+
+
+Before do
+  @aruba_timeout_seconds = 30
+end
+
+# Aruba.configure do |config|
+#   config.before_cmd do |cmd|
+#     puts "About to run '#{cmd}' with path = #{ENV["PATH"]}"
+#   end
+# end
+
+After do
+  FileUtils.rm_rf("#{root_dir}/tmp")
+end

data/lib/mvnizer/commands/new_project.rb

@@ -2,48 +2,20 @@ module Mvnizer
   module Command
     class NewProject
       include Mvnizer::Configuration
-
-      def initialize(generator = Mvnizer::PomGenerator.new,
-                     dir_creator = Mvnizer::DirCreator.new,
-                     coordinate_parser = Mvnizer::CoordinateParser.new)
-        @generator = generator
-        @dir_creator = dir_creator
-        @coordinate_parser = coordinate_parser
-      end
+      include Mvnizer::TaskHelper
 
       # Creates the Maven project structure, and creates the pom file
       # from the options
-      def run(options)
-        @project = define_project(options)
+      def run(project)
 
-        @dir_creator.create("#{@project.artifact_id}/src/main/java",
-                            "#{@project.artifact_id}/src/test/java")
+        create_dir("#{project.artifact_id}/src/main/java",
+                   "#{project.artifact_id}/src/test/java")
 
-        File.open("#{@project.artifact_id}/pom.xml", "w") do |f|
-          f.write(@generator.generate(@project))
-        end
+        generate_file(File.join(TEMPLATE_DIR, "pom.xml.erb"), 
+                      "#{project.artifact_id}/pom.xml",
+                      project)
       end
       
-      private
-      # Creates an instance of +Project+ class populated with the coordinates
-      # set with the user’s definition, or default values if not set.
-      def define_project(options)
-        coordinates = options[:name]
-        options = conf(options)
-        
-        project = @coordinate_parser.parse(coordinates)
-        return_project = Project.new(project.group_id || options[:group_id],
-                                     project.artifact_id,
-                                     project.version || options[:version],
-                                     project.type || options[:type])
-        
-        dependencies = options[:dependencies]
-        dependencies.each do |d|
-          return_project.add_dependency(@coordinate_parser.parse_scoped_coordinates(d))
-        end if dependencies
-        
-        return_project
-      end
     end
   end
 end

data/lib/mvnizer/commands/new_war_project.rb

@@ -1,15 +1,17 @@
 module Mvnizer
   module Command
     class NewWarProject < NewProject
-      def run(options)
+      def run(project)
         super
 
-        @dir_creator.create("#{@project.artifact_id}/src/main/webapp/WEB-INF")
+        create_dir("#{project.artifact_id}/src/main/webapp/WEB-INF")
 
         # web.xml is optional in Servlet 3.0
         # Do we keep its generation here?
-        web_xml = File.join(File.dirname(__FILE__), '..', 'templates', 'web.xml.erb')
-        FileUtils.cp(web_xml, "#{@project.artifact_id}/src/main/webapp/WEB-INF/web.xml")
+        generate_file(File.join(TEMPLATE_DIR, "web.xml.erb"), 
+                      "#{project.artifact_id}/src/main/webapp/WEB-INF/web.xml",
+                      project)
+
 
         # TODO:
         # Create sample @WebServlet?

data/lib/mvnizer/commands/search_artefact.rb

@@ -0,0 +1,41 @@
+require 'httparty'
+
+module Mvnizer
+  module Command
+    class SearchArtefact
+      include HTTParty
+      MAVEN_REPO_SEARCH_URL = "http://search.maven.org/solrsearch/select?q=:q&rows=:limit&wt=json"
+
+      attr_writer :out
+      def out
+        @out ||= STDOUT
+      end
+
+      def run(options)
+        url = MAVEN_REPO_SEARCH_URL.dup
+        url[":q"] = options[:name]
+        url[":limit"] = "5"
+
+        response = self.class.get(url)
+        if response
+          if response.code != 200
+            out.puts "Error during search: #{response.code}"
+            exit(1)
+          end
+
+          if response["response"]["numFound"].to_i > 0
+            hits = response["response"]["docs"].each do |a|
+              out.puts "  #{a['g']}:#{a['a']}:#{a['latestVersion']}:#{a['p']}"
+            end
+          else
+            out.puts "  No result found."
+          end
+        end
+
+        # TODO:
+        # Error handling,
+        # Do something for "bundle" packaging (e.g. for log4j)
+      end
+    end
+  end
+end

data/lib/mvnizer/commands.rb

@@ -1,2 +1,3 @@
 require 'mvnizer/commands/new_project'
 require 'mvnizer/commands/project_factory'
+require 'mvnizer/commands/search_artefact'

data/lib/mvnizer/mvnize.rb

@@ -1,14 +1,15 @@
 module Mvnizer
   # Mvnize is the main entry point into Mvnizer.
   class Mvnize
+    include Configuration
     attr_writer :out
 
-    def out
-      @out ||= $stdout
+    def initialize(coordinate_parser = Mvnizer::CoordinateParser.new)
+      @coordinate_parser = coordinate_parser
     end
 
-    def self.new_project
-      @new_project ||= Mvnizer::Command::NewProject.new
+    def out
+      @out ||= $stdout
     end
 
     # Execute the right command depending on the :command parameter
@@ -16,21 +17,46 @@ module Mvnizer
     # If the command does not exit, throw an error.
     def run(options)
       raise ArgumentError, "Please give a name to the project." unless options[:name]
-      if options[:command] == "new"
-        # FIXME: coordinates should be parsed here to check type.
-        # and pass to the factory, rather than doing this if, 
-        # and parse coordinates later down in NewProject.
-        if options[:name] =~ /:war$/
-          project = Mvnizer::Command::ProjectFactory.create("war") 
-        else
-          project = Mvnizer::Command::ProjectFactory.create("jar")
-        end
 
-        project.run(options)
-        out.puts("Project created successfully.")
+      case options[:command]
+      when "new"
+        project_details = define_project(options)
+        project_command = Mvnizer::Command::ProjectFactory.create(project_details.type)
+
+        project_command.run(project_details)
+        out.puts("Project #{project_details.artifact_id} created successfully.")
+      when "search"
+        search_command = Command::SearchArtefact.new
+        search_command.run(options)
       else
         raise ArgumentError, "#{options[:command]} is not a valid command."
       end
     end
+
+    private
+    # Creates an instance of +Project+ class populated with the coordinates
+    # set with the user’s definition, or default values if not set.
+    def define_project(options)
+      # Get coordinates provided by the user on the CLI.
+      coordinates = options[:name]
+      # Retrieve default options
+      options = conf(options)
+      
+      # Parse user coordinates, and found values override options
+      project = @coordinate_parser.parse(coordinates)
+      return_project = Project.new(project.group_id || options[:group_id],
+                                   project.artifact_id,
+                                   project.version || options[:version],
+                                   project.type || options[:type])
+      
+
+      # Get default dependencies, and add them after having parsed their coords.
+      dependencies = options[:dependencies]
+      dependencies.each do |d|
+        return_project.add_dependency(@coordinate_parser.parse_scoped_coordinates(d))
+      end if dependencies
+      
+      return_project
+    end
   end
 end

data/lib/mvnizer/task_helper.rb

@@ -0,0 +1,32 @@
+require 'fileutils'
+
+module Mvnizer
+  # The +TaskHelper+ provides different functions that can be used in tasks,
+  # such as function to create directories, generate files from templates, etc.
+  module TaskHelper
+    # path to the template location.
+    TEMPLATE_DIR = File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+
+    # creates recursively all directories passed as a param.
+    def create_dir(*dir)
+      dir.each { |d| FileUtils.mkdir_p d }
+    end
+
+    # generates the file +destination_file+ from template +template+
+    # and object +binding+.  +binding+ must be an ERB binding. 
+    # +destination_file+ must be the aboslute location to the generated
+    # file.
+    # If the output folder in which the file gets generated does not exist,
+    # it automatically gets created.
+    def generate_file(template, destination_file, binding)
+      dir = File.dirname(destination_file)
+      create_dir(dir) unless File.exists?(dir)
+
+      template = File.open(template, 'r').read
+
+      File.open(destination_file, "w") do |f|
+        f.write(ERB.new(template).result(binding.get_binding))
+      end
+    end
+  end
+end

data/lib/mvnizer/version.rb

@@ -1,5 +1,5 @@
 module Mvnizer
   module Version
-    STRING = '0.0.2'
+    STRING = '0.0.3'
   end
 end

data/lib/mvnizer.rb

@@ -4,12 +4,10 @@ require 'erb'
 
 require 'mvnizer/version'
 require 'mvnizer/erb_helper'
+require 'mvnizer/task_helper'
 require 'mvnizer/project'
 require 'mvnizer/configuration'
 require 'mvnizer/commands'
 require 'mvnizer/coordinate_parser'
-require 'mvnizer/pom_generator'
-require 'mvnizer/dir_creator'
 require 'mvnizer/mvnize'
 
-

data/mvnizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mvnizer"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["S\u{e9}bastien Le Callonnec"]
-  s.date = "2012-09-21"
+  s.date = "2012-09-25"
   s.description = "Bootstrap a Maven project without the pain of archetypes."
   s.email = "sebastien@weblogism.com"
   s.executables = ["mvnizer"]
@@ -27,18 +27,22 @@ Gem::Specification.new do |s|
     "TODO.md",
     "bin/mvnizer",
     "conf/default.yml",
+    "features/new_project.feature",
+    "features/search_artefact.feature",
+    "features/step_definitions/pom_steps.rb",
+    "features/support/env.rb",
     "lib/mvnizer.rb",
     "lib/mvnizer/commands.rb",
     "lib/mvnizer/commands/new_project.rb",
     "lib/mvnizer/commands/new_war_project.rb",
     "lib/mvnizer/commands/project_factory.rb",
+    "lib/mvnizer/commands/search_artefact.rb",
     "lib/mvnizer/configuration.rb",
     "lib/mvnizer/coordinate_parser.rb",
-    "lib/mvnizer/dir_creator.rb",
     "lib/mvnizer/erb_helper.rb",
     "lib/mvnizer/mvnize.rb",
-    "lib/mvnizer/pom_generator.rb",
     "lib/mvnizer/project.rb",
+    "lib/mvnizer/task_helper.rb",
     "lib/mvnizer/templates/_dependency.xml.erb",
     "lib/mvnizer/templates/pom.xml.erb",
     "lib/mvnizer/templates/web.xml.erb",
@@ -50,12 +54,12 @@ Gem::Specification.new do |s|
     "spec/commands/new_project_spec.rb",
     "spec/commands/new_war_project_spec.rb",
     "spec/commands/project_factory_spec.rb",
+    "spec/commands/search_artefact_spec.rb",
     "spec/configuration_spec.rb",
     "spec/coordinate_parser_spec.rb",
-    "spec/dir_creator_spec.rb",
-    "spec/generator_spec.rb",
     "spec/mvnize_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/task_helper_spec.rb"
   ]
   s.homepage = "http://github.com/tychobrailleur/mvnizer"
   s.licenses = ["MIT"]
@@ -67,24 +71,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.9.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rspec-mocks>, ["~> 2.11.2"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.4.0"])
       s.add_development_dependency(%q<nokogiri>, ["~> 1.5.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<aruba>, ["~> 0.4.11"])
     else
+      s.add_dependency(%q<httparty>, ["~> 0.9.0"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rspec-mocks>, ["~> 2.11.2"])
       s.add_dependency(%q<fakefs>, ["~> 0.4.0"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<aruba>, ["~> 0.4.11"])
     end
   else
+    s.add_dependency(%q<httparty>, ["~> 0.9.0"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rspec-mocks>, ["~> 2.11.2"])
     s.add_dependency(%q<fakefs>, ["~> 0.4.0"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<aruba>, ["~> 0.4.11"])
   end
 end
 

data/spec/commands/new_project_spec.rb

@@ -4,65 +4,20 @@ require 'spec_helper'
 module Mvnizer
   module Command
     describe NewProject do
-      let(:options) { { name: "foobar", group_id: "com.example", version: "1.0.0", type: "jar" } }
-      let(:project) { Mvnizer::Project.new(nil, "foobar", nil, nil) }
+      let(:project) {  Mvnizer::Project.new("com.example", "foobar", "1.0.0-SNAPSHOT", "war") }
+      subject { Mvnizer::Command::NewProject.new }
 
-      let(:generator) { double("generator") }
-      let(:coordinate_parser) { double("coordinate_parser") } 
-      let(:dir_creator) { double("dir_creator") }
-      subject { Mvnizer::Command::NewProject.new(generator, dir_creator, coordinate_parser) }
-
-      before do
-        FakeFS.activate!
-        FileUtils.mkdir_p("foobar")
-      end
-
-      it "reads the configuration" do
-        generator.should_receive(:generate)
-        coordinate_parser.should_receive(:parse).and_return(project)
-        dir_creator.should_receive(:create)
-        subject.should_receive(:conf).with(options).and_return(options)
-
-        subject.run(options)
-      end
-
-      it "creates a project from the provided coordinates" do
-        o = { name: "foobar"}
-
-        subject.should_receive(:conf).with(o).and_return(options)
-        generator.should_receive(:generate)
-        dir_creator.should_receive(:create)
-
-        p = Mvnizer::Project.new("group", "foobar", "version", "type")
-        coordinate_parser.should_receive(:parse).with("foobar").and_return(p)
-
-        subject.run(o)
-      end
 
       it "creates the project directory" do
-        subject.should_receive(:conf).with(options).and_return(options)
-        coordinate_parser.should_receive(:parse).and_return(project)
-        generator.should_receive(:generate)
-        dir_creator.should_receive(:create).with("foobar/src/main/java", "foobar/src/test/java")
+        subject.should_receive(:generate_file)
+        subject.should_receive(:create_dir).with("foobar/src/main/java", "foobar/src/test/java")
 
-        subject.run(options)
+        subject.run(project)
       end
 
       it "generates the pom file" do
-        p = Mvnizer::Project.new("com.example", "foobar", "1.0.0-SNAPSHOT", "war")
-
-        subject.should_receive(:conf).with(options).and_return(options)
-        coordinate_parser.should_receive(:parse).and_return(p)
-        generator.should_receive(:generate).with(p)
-        dir_creator.should_receive(:create)
-        subject.run(options)
-
-        File.exists?("foobar/pom.xml").should be_true
-      end
-
-      after do 
-        FileUtils.rm_rf("foobar")
-        FakeFS.deactivate!
+        subject.should_receive(:generate_file).with(File.join(TaskHelper::TEMPLATE_DIR, "pom.xml.erb"), "foobar/pom.xml", project)
+        subject.run(project)
       end
     end
   end

data/spec/commands/new_war_project_spec.rb

@@ -6,54 +6,41 @@ module Mvnizer
     describe NewWarProject do
 
       let(:project) { Mvnizer::Project.new(nil, "foobar", nil, nil) }
-      let(:generator) { double("generator") }
-      let(:coordinate_parser) { double("coordinate_parser") } 
-      let(:dir_creator) { double("dir_creator") }
-
-      subject { Mvnizer::Command::NewWarProject.new(generator, dir_creator, coordinate_parser) }
+      subject { Mvnizer::Command::NewWarProject.new }
 
       before do
         $run = false
         class NewProject
           alias old_run run
-          def run(options)
+          def run(project)
             $run = true
           end
         end
 
         subject.instance_variable_set(:@project, project)
-        FakeFS.activate!
-        FileUtils.mkdir_p("foobar")
-
-        templates_dir = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'mvnizer', 'templates')
-        FileUtils.mkdir_p(templates_dir)
-        FileUtils.touch(File.join(templates_dir, "web.xml.erb"))
       end
 
       it "creates a basic project" do
-        options = {}
-        dir_creator.should_receive(:create)
-        subject.run(options)
+        subject.should_receive(:create_dir)
+        subject.should_receive(:generate_file)
+        subject.run(project)
         $run.should be_true
       end
 
       it "creates the webapp directory" do
-        options = {name: "foobar"}
-        dir_creator.should_receive(:create).with("foobar/src/main/webapp/WEB-INF")
-        subject.run(options)
+        subject.should_receive(:create_dir).with("foobar/src/main/webapp/WEB-INF")
+        subject.should_receive(:generate_file)
+        subject.run(project)
       end
 
       it "generates the web.xml file" do
-        options = {name: "foobar"}
-        dir_creator.should_receive(:create)
+        subject.should_receive(:create_dir)
+        subject.should_receive(:generate_file).with(File.join(TaskHelper::TEMPLATE_DIR, "web.xml.erb"), "foobar/src/main/webapp/WEB-INF/web.xml", project)
 
-        subject.run(options)
-        File.exists?("foobar/src/main/webapp/WEB-INF/web.xml").should be_true
+        subject.run(project)
       end
 
       after do
-        FileUtils.rm_rf("foobar")
-        FakeFS.deactivate!
         class NewProject
           alias run old_run
         end

data/spec/commands/search_artefact_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+
+module Mvnizer
+  module Command
+    describe SearchArtefact do
+
+      subject { SearchArtefact.new }
+      before do
+        subject.out = StringIO.new 
+
+      end
+
+
+      def httparty_response_mock(mock_response_content)
+        request_object = HTTParty::Request.new Net::HTTP::Get, '/'
+        response_object = Net::HTTPOK.new('1.1', 200, 'OK')
+        response_object.stub(:body => mock_response_content)
+        mock_response = HTTParty::Response.new(request_object, response_object, -> { mock_response_content })
+      end
+
+      def response_mock(klass)
+        response = klass.new('', '', '')
+        response.stub(:body)
+        response
+      end
+      
+      it "performs a search in the Maven repository" do
+        options = { command:"search", name: "junit" }
+        SearchArtefact.should_receive(:get).with("http://search.maven.org/solrsearch/select?q=junit&rows=5&wt=json")
+
+        subject.run(options)
+      end
+
+      it "displays the coordinates of the found artefacts" do
+        require 'json'
+
+        mock_response_content = JSON.parse(<<JSON)
+{
+    "response": {
+        "numFound": "1",
+        "docs": [
+            {
+                "g": "blah",
+                "a": "blah",
+                "latestVersion": "1.0",
+                "p": "jar"
+            }
+        ]
+    }
+}
+JSON
+
+        mock_response = httparty_response_mock(mock_response_content)
+        options = { command:"search", name: "junit" }
+        SearchArtefact.should_receive(:get).and_return(mock_response)
+
+        io = StringIO.new
+        subject.out = io
+
+        subject.run(options)
+
+        io.string.should =~ Regexp.new("blah:blah:1.0:jar")
+      end
+
+
+      it "displays an informative message when no result is found" do
+        mock_response_content = '{ "response": { "numFound": "0"} }'
+        mock_response = httparty_response_mock(mock_response_content)
+        
+        options = { command:"search", name: "junit" }
+        SearchArtefact.should_receive(:get).and_return(mock_response)
+        
+        io = StringIO.new
+        subject.out = io
+        
+        subject.run(options)
+        
+        io.string.should match("No result found.")
+      end
+
+      it "displays an error message when something went wrong" do
+        net_response = response_mock(Net::HTTPServerError)
+        SearchArtefact.should_receive(:get).and_return(net_response)
+
+        options = { command:"search", name: "junit" }
+        io = StringIO.new
+        subject.out = io
+        
+        lambda { subject.run(options) }.should raise_error(SystemExit)
+        
+        io.string.should match("Error during search: ")
+      end
+    end
+  end
+end
+
+

data/spec/mvnize_spec.rb

@@ -3,13 +3,50 @@ require 'spec_helper'
 module Mvnizer
   describe Mvnize do
 
+    let (:project) { Project.new(nil, "quxbaz", nil, nil) }
     let (:new_project) { double("new_project") }
-    subject { Mvnizer::Mvnize.new }
+    let (:search) { double("search") }
+
+    let(:coordinate_parser) { double("coordinate_parser") } 
+    subject { Mvnizer::Mvnize.new(coordinate_parser) }
+
+    before { subject.out = StringIO.new }
+
+    it "reads the configuration" do
+      options = {name: "foobar", command: "new"}
+      subject.should_receive(:conf).with(options).and_return(options)
+
+      p = Mvnizer::Project.new("group", "foobar", "version", "jar")
+      coordinate_parser.should_receive(:parse).and_return(project)
+      Command::ProjectFactory.should_receive(:create).and_return(new_project)
+      new_project.should_receive(:run)
+      
+      subject.run(options)
+    end
+
+    it "creates a project from the provided coordinates" do
+      options = {name: "foobar", command: "new"}
+
+      subject.should_receive(:conf).with(options).and_return(options)
+      
+      p = Mvnizer::Project.new("group", "foobar", "version", "jar")
+      coordinate_parser.should_receive(:parse).with("foobar").and_return(p)
+      Command::ProjectFactory.should_receive(:create).and_return(new_project)
+      new_project.should_receive(:run)
+      
+      subject.run(options)
+    end
 
     it "chooses what command to run depending on the options" do
       options = {name: "quxbaz", command: "new"}
-      Command::ProjectFactory.should_receive(:create).and_return(new_project)
-      new_project.should_receive(:run).with(options)
+
+      subject.should_receive(:conf).and_return(Hash.new)
+
+      p = Mvnizer::Project.new("group", "foobar", "version", "pom")
+      coordinate_parser.should_receive(:parse).and_return(p)
+      Command::ProjectFactory.should_receive(:create).with("pom").and_return(new_project)
+      new_project.should_receive(:run)
+
       subject.run(options)
     end
 
@@ -18,6 +55,7 @@ module Mvnizer
     end
 
     it "displays a success message when done" do
+      subject.should_receive(:define_project).and_return(project)
       Command::ProjectFactory.should_receive(:create).and_return(new_project)
       new_project.should_receive(:run)
 # For some obscure reason, this does not work:
@@ -35,17 +73,19 @@ module Mvnizer
       subject.run(name: "quxbaz", command: "new")
       string_io.string.should match(/success/i)
     end
-
-    it "performs war tasks if name ends with :war" do
-      options = {name: "quxbaz:war", command: "new"}
-      Command::ProjectFactory.should_receive(:create).with("war").and_return(new_project)
-      new_project.should_receive(:run).with(options)
-      subject.run(options)
-    end
-    
+   
     it "throws an error if the command to run is not valid" do
       lambda { subject.run(name: "quxbaz", command: "foobar") }.should raise_error(ArgumentError, "foobar is not a valid command.")
     end
 
+    it "calls the search command when doing a search" do
+      options = { command:"search", name: "junit" }
+
+      Command::SearchArtefact.should_receive(:new).and_return(search)
+      search.should_receive(:run).with(options)
+
+      subject.run(options)
+    end
+
   end
 end

data/spec/task_helper_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'erb'
+
+module Mvnizer
+  class Dummy
+    include TaskHelper
+  end
+
+  describe TaskHelper do
+    let (:binding) { double("binding") }
+    let (:erb) { double("erb") }
+    let (:file) { double("file") }
+    subject { Dummy.new }
+
+    # Make use of fakefs explicit by using activate! / deactivate!
+    before do
+      FakeFS.activate!
+      FileUtils.mkdir("foobar")
+      FileUtils.touch("dummy.txt.erb")
+    end
+
+    describe "#create_dir" do
+      it "creates a list of directories" do
+        subject.create_dir("/tmp/blah/blah", "/tmp/foo/bar")
+        Dir.exists?("/tmp/blah/blah").should be_true
+        Dir.exists?("/tmp/foo/bar").should be_true
+      end
+    end
+    
+    describe "#generate_file" do
+      it "generates a file from a template into a given directory" do
+        ERB.should_receive(:new).and_return(erb)
+        binding.should_receive(:get_binding)
+        erb.should_receive(:result).and_return("")
+        subject.generate_file("dummy.txt.erb", "foobar/dummy.txt", binding)
+
+        File.exists?("foobar/dummy.txt").should be_true
+      end
+      
+      it "creates the output directory if it does not exist" do
+        subject.should_receive(:create_dir).with("foo")
+        File.should_receive(:open).any_number_of_times.and_return(file)
+        file.should_receive(:read)
+        subject.generate_file("dummy.txt.erb", "foo/dummy.txt", binding)
+      end
+    end
+
+    after do
+      FileUtils.rm_rf("foobar")
+      FakeFS.deactivate! 
+    end
+  end
+end

metadata

@@ -2,15 +2,31 @@
 name: mvnizer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sébastien Le Callonnec
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: aruba
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+    none: false
+  prerelease: false
+  type: :development
 description: Bootstrap a Maven project without the pain of archetypes.
 email: sebastien@weblogism.com
 executables:
@@ -109,18 +141,22 @@ files:
 - TODO.md
 - bin/mvnizer
 - conf/default.yml
+- features/new_project.feature
+- features/search_artefact.feature
+- features/step_definitions/pom_steps.rb
+- features/support/env.rb
 - lib/mvnizer.rb
 - lib/mvnizer/commands.rb
 - lib/mvnizer/commands/new_project.rb
 - lib/mvnizer/commands/new_war_project.rb
 - lib/mvnizer/commands/project_factory.rb
+- lib/mvnizer/commands/search_artefact.rb
 - lib/mvnizer/configuration.rb
 - lib/mvnizer/coordinate_parser.rb
-- lib/mvnizer/dir_creator.rb
 - lib/mvnizer/erb_helper.rb
 - lib/mvnizer/mvnize.rb
-- lib/mvnizer/pom_generator.rb
 - lib/mvnizer/project.rb
+- lib/mvnizer/task_helper.rb
 - lib/mvnizer/templates/_dependency.xml.erb
 - lib/mvnizer/templates/pom.xml.erb
 - lib/mvnizer/templates/web.xml.erb
@@ -132,12 +168,12 @@ files:
 - spec/commands/new_project_spec.rb
 - spec/commands/new_war_project_spec.rb
 - spec/commands/project_factory_spec.rb
+- spec/commands/search_artefact_spec.rb
 - spec/configuration_spec.rb
 - spec/coordinate_parser_spec.rb
-- spec/dir_creator_spec.rb
-- spec/generator_spec.rb
 - spec/mvnize_spec.rb
 - spec/spec_helper.rb
+- spec/task_helper_spec.rb
 homepage: http://github.com/tychobrailleur/mvnizer
 licenses:
 - MIT

data/lib/mvnizer/dir_creator.rb

@@ -1,10 +0,0 @@
-require 'fileutils'
-
-module Mvnizer
-  class DirCreator
-    # creates recursively all directories passed as a param.
-    def create(*dir)
-      dir.each { |d| FileUtils.mkdir_p d }
-    end
-  end
-end

data/lib/mvnizer/pom_generator.rb

@@ -1,10 +0,0 @@
-module Mvnizer
-  # This class handles the generation of the content of the pom file.
-  class PomGenerator
-    # Creates the pom content by reading the erb template.
-    def generate(project)
-      template = File.open(File.join(File.dirname(__FILE__), 'templates', 'pom.xml.erb'), 'r').read
-      ERB.new(template).result(project.get_binding)
-    end
-  end
-end

data/spec/dir_creator_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-require 'fileutils'
-
-describe Mvnizer::DirCreator do
-  subject { Mvnizer::DirCreator.new }
-  # Make use of fakefs explicit by using activate! / deactivate!
-  before { FakeFS.activate! }
-
-  it "creates a list of directories" do
-    subject.create("/tmp/blah/blah", "/tmp/foo/bar")
-    Dir.exists?("/tmp/blah/blah").should == true
-    Dir.exists?("/tmp/foo/bar").should == true
-  end
-
-  after { FakeFS.deactivate! }
-#  after { ["/tmp/blah", "/tmp/foo"].each { |d| FileUtils.rm_rf(d) } }
-end

data/spec/generator_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'nokogiri'
-
-# TODO Refactor when dealing with packaging-specific tasks.
-module Mvnizer
-  describe PomGenerator do
-
-    let (:project) { Mvnizer::Project.new("test", "mvnizer", "1.0.0-SNAPSHOT", "jar")}
-    subject { Mvnizer::PomGenerator.new }
-
-    it "generates a pom" do
-      output = subject.generate(project)
-
-      # TODO: Ain't that a bit overkill for test?
-      doc = Nokogiri::XML(output)
-      doc.remove_namespaces!
-      doc.xpath("/project/groupId").first.text().should == "test"
-      doc.xpath("/project/artifactId").first.text().should == "mvnizer"
-      doc.xpath("/project/version").first.text().should == "1.0.0-SNAPSHOT"
-      doc.xpath("/project/name").first.text().should == "mvnizer"
-      doc.xpath("/project/packaging").first.should be_nil
-    end
-
-    it "adds the packaging when the type is not jar" do
-      project = Mvnizer::Project.new("test", "mvnizer", "1.0.0", "war")
-      output = subject.generate(project)
-
-      doc = Nokogiri::XML(output)
-      doc.remove_namespaces!
-      doc.xpath("/project/packaging").first.text().should == "war"
-    end
-
-    it "adds the dependencies" do
-      dependency = Mvnizer::Project.new("junit", "junit", "4.8.2", "jar", [], "test")
-      project.add_dependency(dependency)
-      output = subject.generate(project)
-
-      doc = Nokogiri::XML(output)
-      doc.remove_namespaces!
-      doc.xpath("/project/dependencies/dependency/groupId").first.text().should == "junit"
-      doc.xpath("/project/dependencies/dependency/artifactId").first.text().should == "junit"
-      doc.xpath("/project/dependencies/dependency/version").first.text().should == "4.8.2"
-      doc.xpath("/project/dependencies/dependency/scope").first.text().should == "test"
-    end
-  end
-end