mvnizer 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+
+# Mvnizer 0.0.4
+
+ * Added sample servlet and JSP in new war project,
+ * Add dependency using the `mvnizer add` command.
+
+# Mvnizer 0.0.3
+
+ * Search dependencies in Maven central repo
+
+# Mvnizer 0.0.2
+
+ * Coordinate parsing
+ * Project creation depending on the project type (jar or war)
+
+# Mvnizer 0.0.1
+
+ * Basic Maven project creation

data/Gemfile

@@ -1,12 +1,13 @@
 source 'http://rubygems.org'
 
 gem 'httparty', '~> 0.9.0'
+gem 'nokogiri', '~> 1.5.5'
+
 
 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/README.md

@@ -27,6 +27,18 @@ Here are some examples of valid commands:
     mvnizer new com.example:foo:war
     mvnizer new com.example:foo:1.0:war
 
+## Add Dependency
+
+To add dependencies, you must be in the folder where the pom file you want to add the dependency to is.
+
+To add a dependency, simply pass the coordinates of the dependency, and add scope if needed (if no scope is given, `compile` is assumed):
+
+    mvnizer add org.apache.commons:commons-lang3:3.1:jar
+    mvnizer add org.mockito:mockito-core:1.9.5-rc1:jar:test
+
+The `search` features makes it easy to find the coordinates of the dependencies for you.
+
+
 ## Dependency Search
 
 You can search for dependencies in the Maven central repository with the command:

data/bin/mvnizer

@@ -17,6 +17,9 @@ Mvnizer bootstraps a Maven project without the pain of archetypes.
       mvnizer new com.example:foo:war
       mvnizer new com.example:foo:1.0:war
 
+  mvnizer add <coordinates>
+    Adds a dependency to the project.
+
   mvnizer search <text>
     Searches for artefacts in the Maven central repository.
 HELP

data/lib/mvnizer.rb

@@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__)
 require 'erb'
 
 require 'mvnizer/version'
+require 'mvnizer/exceptions'
 require 'mvnizer/erb_helper'
 require 'mvnizer/task_helper'
 require 'mvnizer/project'

data/lib/mvnizer/commands.rb

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

data/lib/mvnizer/commands/add_dependency.rb

@@ -0,0 +1,22 @@
+module Mvnizer
+  module Command
+    class AddDependency
+      include TaskHelper
+
+      def run(options)
+        raise Mvnizer::FileNotFoundError, "The pom.xml file cannot be found." unless pom_present?
+        
+        dependency = options[:name]
+        content = add_dependency([dependency])
+        File.open("pom.xml", "w") do |f|
+          f.write(content)
+        end
+      end
+
+      private
+      def pom_present?
+        File.exists?(File.join(Dir.pwd, "pom.xml"))
+      end
+    end
+  end
+end

data/lib/mvnizer/commands/new_project.rb

@@ -11,10 +11,19 @@ module Mvnizer
         create_dir("#{project.artifact_id}/src/main/java",
                    "#{project.artifact_id}/src/test/java")
 
+        coordinate_parser = CoordinateParser.new
+        get_dependencies.each { |d| project.add_dependency(coordinate_parser.parse_scoped_coordinates(d)) }
+
         generate_file(File.join(TEMPLATE_DIR, "pom.xml.erb"), 
                       "#{project.artifact_id}/pom.xml",
                       project)
       end
+
+      # Returns the list of dependencies to be added for this type of project.
+      # Override this method if extra dependencies are needed.
+      def get_dependencies
+        []
+      end
       
     end
   end

data/lib/mvnizer/commands/new_war_project.rb

@@ -8,14 +8,25 @@ module Mvnizer
 
         # web.xml is optional in Servlet 3.0
         # Do we keep its generation here?
-        generate_file(File.join(TEMPLATE_DIR, "web.xml.erb"), 
+        generate_file(File.join(TEMPLATE_DIR, "web.xml.erb"),
                       "#{project.artifact_id}/src/main/webapp/WEB-INF/web.xml",
                       project)
 
 
-        # TODO:
-        # Create sample @WebServlet?
-        # Add JEE dependencies into pom.
+        # The Java class will be generated in the groupId/artifactId folder
+        # with the dots replaced by path separators.
+        target_directory = project.package_name.gsub(/\./, File::SEPARATOR)
+
+        generate_file(File.join(TEMPLATE_DIR, "war", "ExampleServlet.java.erb"),
+                      "#{project.artifact_id}/src/main/java/#{target_directory}/ExampleServlet.java",
+                      project)
+        generate_file(File.join(TEMPLATE_DIR, "war", "index.jsp.erb"),
+                      "#{project.artifact_id}/src/main/webapp/WEB-INF/index.jsp",
+                      project)
+      end
+
+      def get_dependencies
+        ["javax:javaee-web-api:6.0:jar:provided"]
       end
     end
   end

data/lib/mvnizer/coordinate_parser.rb

@@ -20,7 +20,7 @@ module Mvnizer
     # the scope (test, compile, provided, runtime, system or import)
     def parse_scoped_coordinates(coordinates)
       p  = nil
-      if coordinates =~ /\A(([a-zA-Z][\w\.\-]+):)?([a-zA-Z][\w\.\-]+)(:(\d+\.\d+(\.\d)?(\-\w+)?))?:(war|jar|pom):(test|compile|provided|runtime|system|import)/
+      if coordinates =~ /\A(([a-zA-Z][\w\.\-]+):)?([a-zA-Z][\w\.\-]+)(:(\d+\.\d+(\.\d)?(\-\w+)?))?:(war|jar|pom):?(test|compile|provided|runtime|system|import)?/
         p = Project.new($2, $3, $5, $8, [], $9)
       end
       p

data/lib/mvnizer/exceptions.rb

@@ -0,0 +1,6 @@
+module Mvnizer
+
+  # Error thrown when the pom file cannot be found.
+  class FileNotFoundError < StandardError; end
+
+end

data/lib/mvnizer/mvnize.rb

@@ -28,6 +28,9 @@ module Mvnizer
       when "search"
         search_command = Command::SearchArtefact.new
         search_command.run(options)
+      when "add"
+        add_command = Command::AddDependency.new
+        add_command.run(options)
       else
         raise ArgumentError, "#{options[:command]} is not a valid command."
       end

data/lib/mvnizer/project.rb

@@ -27,6 +27,12 @@ module Mvnizer
        && type == project.type)
     end
 
+    def package_name
+      package = artifact_id
+      package = "#{group_id}.#{package}" unless group_id == nil
+      package.gsub(/\-/, "")
+    end
+
     # Converts project into its coordinates representation.
     def to_s
       "#{group_id}:#{artifact_id}:#{version}:#{type}:#{scope}"

data/lib/mvnizer/task_helper.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'nokogiri'
 
 module Mvnizer
   # The +TaskHelper+ provides different functions that can be used in tasks,
@@ -28,5 +29,39 @@ module Mvnizer
         f.write(ERB.new(template).result(binding.get_binding))
       end
     end
+
+    # adds a list of dependencies to the pom file whose location
+    # can be given as +pom_location+.  By default, this function 
+    # looks up the pom in the current directory.
+    def add_dependency(dependency, pom_location = File.join(Dir.pwd, "pom.xml"))
+      raise FileNotFoundError, "The pom.xml file cannot be found." unless File.exists?(pom_location)
+
+      coordinate_parser = CoordinateParser.new
+
+      pom = Nokogiri::XML(File.open(pom_location)) do |c|
+        c.noblanks
+      end
+      dependencies_node = pom.xpath("/pom:project/pom:dependencies", {"pom" => "http://maven.apache.org/POM/4.0.0"}).first
+
+      dependency.each do |d|
+        # First parse the dependency coordinates
+        dep_project = coordinate_parser.parse_scoped_coordinates(d)
+
+        Nokogiri::XML::Builder.with(dependencies_node) do |xml|
+          xml.dependency {
+            xml.groupId dep_project.group_id
+            xml.artifactId dep_project.artifact_id
+            xml.version dep_project.version
+            xml.scope dep_project.scope if dep_project.scope != nil && dep_project.scope != "compile"
+            xml.type dep_project.type if dep_project.type != "jar"
+          }
+        end
+      end
+
+      # Requires sparklemotion/nokogiri#772 to produce 
+      # identical pom files in both MRI and JRuby.
+      pom.to_xml(indent: 2)
+    end
   end
+
 end

data/lib/mvnizer/templates/_dependency.xml.erb

@@ -3,4 +3,4 @@
       <artifactId><%= artifact_id %></artifactId>
       <version><%= version %></version>
       <% if scope && scope != "compile" %><scope><%= scope %></scope><% end %>
-    </dependency>
+    </dependency>

data/lib/mvnizer/templates/war/ExampleServlet.java.erb

@@ -0,0 +1,19 @@
+package <%= package_name %>;
+
+import java.io.IOException;
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet("/hello")
+public class ExampleServlet extends GenericServlet {
+
+    @Override
+    public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+        
+        request.setAttribute("greeting", "Hello World");
+        request.getRequestDispatcher("/WEB-INF/index.jsp").forward(request, response);
+    }
+}

data/lib/mvnizer/templates/war/index.jsp.erb

@@ -0,0 +1,11 @@
+<%%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>JSP Page</title>
+    </head>
+    <body>
+        <h1>${greeting}</h1>
+    </body>
+</html>

data/lib/mvnizer/version.rb

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

data/mvnizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mvnizer"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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-25"
+  s.date = "2012-09-29"
   s.description = "Bootstrap a Maven project without the pain of archetypes."
   s.email = "sebastien@weblogism.com"
   s.executables = ["mvnizer"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "lib/mvnizer.rb",
     "lib/mvnizer/commands.rb",
+    "lib/mvnizer/commands/add_dependency.rb",
     "lib/mvnizer/commands/new_project.rb",
     "lib/mvnizer/commands/new_war_project.rb",
     "lib/mvnizer/commands/project_factory.rb",
@@ -40,24 +42,31 @@ Gem::Specification.new do |s|
     "lib/mvnizer/configuration.rb",
     "lib/mvnizer/coordinate_parser.rb",
     "lib/mvnizer/erb_helper.rb",
+    "lib/mvnizer/exceptions.rb",
     "lib/mvnizer/mvnize.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/war/ExampleServlet.java.erb",
+    "lib/mvnizer/templates/war/index.jsp.erb",
     "lib/mvnizer/templates/web.xml.erb",
     "lib/mvnizer/version.rb",
     "mvnizer.gemspec",
     "ragel/coordinate.rb",
     "ragel/coordinate.rl",
     "ragel/test_coord.rb",
+    "spec/commands/add_dependency_spec.rb",
     "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/dummy.txt.erb",
+    "spec/dummy_pom.xml",
     "spec/mvnize_spec.rb",
+    "spec/project_spec.rb",
     "spec/spec_helper.rb",
     "spec/task_helper_spec.rb"
   ]
@@ -72,27 +81,27 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.5"])
       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<nokogiri>, ["~> 1.5.5"])
       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<nokogiri>, ["~> 1.5.5"])
     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

data/spec/commands/add_dependency_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module Mvnizer
+  module Command
+    describe AddDependency do
+      let (:file) { double("file") }
+
+      subject { AddDependency.new }
+      it "checks the pom can be found in the current directory" do
+        lambda { subject.run({}) }.should raise_error(FileNotFoundError, "The pom.xml file cannot be found.")
+      end
+
+      it "adds a dependency" do
+        options = { name: "test" }
+
+        File.should_receive(:exists?).and_return(true)
+        subject.should_receive(:add_dependency).with(["test"]).and_return("out")
+        File.should_receive(:open).with("pom.xml", "w").and_yield(file)
+        file.should_receive(:write).with("out")
+
+        subject.run(options)
+      end
+    end
+  end
+end

data/spec/commands/new_project_spec.rb

@@ -4,10 +4,10 @@ require 'spec_helper'
 module Mvnizer
   module Command
     describe NewProject do
+      let(:coordinate_parser) { double("parser") }
       let(:project) {  Mvnizer::Project.new("com.example", "foobar", "1.0.0-SNAPSHOT", "war") }
       subject { Mvnizer::Command::NewProject.new }
 
-
       it "creates the project directory" do
         subject.should_receive(:generate_file)
         subject.should_receive(:create_dir).with("foobar/src/main/java", "foobar/src/test/java")
@@ -15,6 +15,18 @@ module Mvnizer
         subject.run(project)
       end
 
+      it "parses the extra dependencies and adds them" do
+        subject.should_receive(:get_dependencies).and_return(["foo:bar:1.0:jar:test"])
+        CoordinateParser.should_receive(:new).and_return(coordinate_parser)
+        coordinate_parser.should_receive(:parse_scoped_coordinates).with("foo:bar:1.0:jar:test").and_return("Blah")
+        subject.should_receive(:generate_file)
+        subject.should_receive(:create_dir)
+
+        subject.run(project)
+
+        project.dependencies.first.should == "Blah"
+      end
+
       it "generates the pom file" do
         subject.should_receive(:generate_file).with(File.join(TaskHelper::TEMPLATE_DIR, "pom.xml.erb"), "foobar/pom.xml", project)
         subject.run(project)

data/spec/commands/new_war_project_spec.rb

@@ -5,7 +5,7 @@ module Mvnizer
   module Command
     describe NewWarProject do
 
-      let(:project) { Mvnizer::Project.new(nil, "foobar", nil, nil) }
+      let(:project) { Mvnizer::Project.new("test", "foobar", nil, nil) }
       subject { Mvnizer::Command::NewWarProject.new }
 
       before do
@@ -22,24 +22,32 @@ module Mvnizer
 
       it "creates a basic project" do
         subject.should_receive(:create_dir)
-        subject.should_receive(:generate_file)
+        subject.should_receive(:generate_file).exactly(3).times
         subject.run(project)
         $run.should be_true
       end
 
       it "creates the webapp directory" do
         subject.should_receive(:create_dir).with("foobar/src/main/webapp/WEB-INF")
-        subject.should_receive(:generate_file)
+        subject.should_receive(:generate_file).exactly(3).times
         subject.run(project)
       end
 
-      it "generates the web.xml file" do
+      it "generates all the webapp files file" do
         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.should_receive(:generate_file).with(File.join(TaskHelper::TEMPLATE_DIR, "war", "ExampleServlet.java.erb"), "foobar/src/main/java/test/foobar/ExampleServlet.java", project)
+        subject.should_receive(:generate_file).with(File.join(TaskHelper::TEMPLATE_DIR, "war", "index.jsp.erb"), "foobar/src/main/webapp/WEB-INF/index.jsp", project)
+
 
         subject.run(project)
       end
 
+      it "adds the dependencies needed for a war file" do
+        deps = subject.get_dependencies
+        deps.include?("javax:javaee-web-api:6.0:jar:provided").should be_true
+      end
+
       after do
         class NewProject
           alias run old_run

data/spec/commands/project_factory_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'spec_helper'
+require 'mvnizer/commands/new_war_project'
 
 module Mvnizer
   module Command

data/spec/commands/search_artefact_spec.rb

@@ -6,11 +6,7 @@ module Mvnizer
     describe SearchArtefact do
 
       subject { SearchArtefact.new }
-      before do
-        subject.out = StringIO.new 
-
-      end
-
+      before { subject.out = StringIO.new }
 
       def httparty_response_mock(mock_response_content)
         request_object = HTTParty::Request.new Net::HTTP::Get, '/'

data/spec/coordinate_parser_spec.rb

@@ -3,67 +3,90 @@ require 'spec_helper'
 describe Mvnizer::CoordinateParser do
   subject { Mvnizer::CoordinateParser.new }
 
-  it "can read the project name" do
-    project = subject.parse("name")
-    project.artifact_id.should == "name"
-  end
+  describe "#parse" do
+    it "can read the project name" do
+      project = subject.parse("name")
+      project.artifact_id.should == "name"
+    end
 
-  it "can read the group and artifact ids" do
-    project = subject.parse("com.example:name")
-    project.artifact_id.should == "name"
-    project.group_id.should == "com.example"
-  end
+    it "can read the group and artifact ids" do
+      project = subject.parse("com.example:name")
+      project.artifact_id.should == "name"
+      project.group_id.should == "com.example"
+    end
 
-  it "can read the group and artifact ids and version and type" do
-    project = subject.parse("com.example:name:1.0.0-rc2:war")
-    project.artifact_id.should == "name"
-    project.group_id.should == "com.example"  
-    project.version.should == "1.0.0-rc2"
-    project.type.should == "war"
-  end
+    it "can read the group and artifact ids and version and type" do
+      project = subject.parse("com.example:name:1.0.0-rc2:war")
+      project.artifact_id.should == "name"
+      project.group_id.should == "com.example"  
+      project.version.should == "1.0.0-rc2"
+      project.type.should == "war"
+    end
 
-  it "can read the group and artifact ids and version" do
-    project = subject.parse("com.example:name:1.0.0-rc2")
-    project.artifact_id.should == "name"
-    project.group_id.should == "com.example"  
-    project.version.should == "1.0.0-rc2"
-  end
+    it "can read the group and artifact ids and version" do
+      project = subject.parse("com.example:name:1.0.0-rc2")
+      project.artifact_id.should == "name"
+      project.group_id.should == "com.example"  
+      project.version.should == "1.0.0-rc2"
+    end
 
-  it "can read the artifact id and version" do
-    project = subject.parse("name:1.0.0-SNAPSHOT")
-    project.artifact_id.should == "name"
-    project.version.should == "1.0.0-SNAPSHOT"
-  end
+    it "can read the artifact id and version" do
+      project = subject.parse("name:1.0.0-SNAPSHOT")
+      project.artifact_id.should == "name"
+      project.version.should == "1.0.0-SNAPSHOT"
+    end
 
-  it "can read the artifact id and type" do
-    project = subject.parse("name:jar")
-    project.artifact_id.should == "name"
-    project.type.should == "jar"
-  end
+    it "can read the artifact id and type" do
+      project = subject.parse("name:jar")
+      project.artifact_id.should == "name"
+      project.type.should == "jar"
+    end
 
-  it "can read the artifact id, version and type" do
-    project = subject.parse("name:1.0.0-rc2:war")
-    project.artifact_id.should == "name"
-    project.version.should == "1.0.0-rc2"
-    project.type.should == "war"
+    it "can read the artifact id, version and type" do
+      project = subject.parse("name:1.0.0-rc2:war")
+      project.artifact_id.should == "name"
+      project.version.should == "1.0.0-rc2"
+      project.type.should == "war"
+    end
   end
 
-  it "can parse the scope" do
-    project = subject.parse_scoped_coordinates("name:1.0.0-rc2:war:runtime")
-    project.artifact_id.should == "name"
-    project.scope.should == "runtime"
+  describe "#parse_scoped_coordinates" do
+    it "can parse the scope" do
+      project = subject.parse_scoped_coordinates("name:1.0.0-rc2:war:runtime")
+      project.artifact_id.should == "name"
+      project.scope.should == "runtime"
 
-    project = subject.parse_scoped_coordinates("com.weblogism:name:1.0.0-rc2:jar:runtime")
-    project.artifact_id.should == "name"
-    project.scope.should == "runtime"
-  end
+      project = subject.parse_scoped_coordinates("com.weblogism:name:1.0.0-rc2:jar:runtime")
+      project.artifact_id.should == "name"
+      project.scope.should == "runtime"
+    end
+
+    it "can parse the junit dependency" do
+      project = subject.parse_scoped_coordinates("junit:junit:4.10:jar:test")
+      project.group_id.should == "junit"
+      project.artifact_id.should == "junit"
+      project.version.should == "4.10"
+      project.type.should == "jar"
+      project.scope.should == "test"
+    end
+
+    it "can parse the java EE dependency" do
+      project = subject.parse_scoped_coordinates("javax:javaee-web-api:6.0:jar:provided")
+      project.group_id.should == "javax"
+      project.artifact_id.should == "javaee-web-api"
+      project.version.should == "6.0"
+      project.type.should == "jar"
+      project.scope.should == "provided"
+
+    end
 
-  it "can parse the junit dependency" do
-    project = subject.parse_scoped_coordinates("junit:junit:4.10:jar:test")
-    project.group_id.should == "junit"
-    project.artifact_id.should == "junit"
-    project.version.should == "4.10"
-    project.type.should == "jar"
-    project.scope.should == "test"
+    it "can parse a dependency without scope" do
+      project = subject.parse_scoped_coordinates("junit:junit:4.10:jar")
+      project.group_id.should == "junit"
+      project.artifact_id.should == "junit"
+      project.version.should == "4.10"
+      project.type.should == "jar"
+      project.scope.should be_nil
+    end
   end
 end

data/spec/dummy.txt.erb

@@ -0,0 +1 @@
+Test

data/spec/dummy_pom.xml

@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.weblogism</groupId>
+  <artifactIdd>dummy</artifactIdd>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

data/spec/mvnize_spec.rb

@@ -87,5 +87,14 @@ module Mvnizer
       subject.run(options)
     end
 
+    it "calls the add command when adding a dependency" do
+      options = { command:"add", name: "junit" }
+
+      Command::AddDependency.should_receive(:new).and_return(search)
+      search.should_receive(:run).with(options)
+
+      subject.run(options)
+    end
+
   end
 end

data/spec/project_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Mvnizer
+  describe Project do
+
+    describe "#package_name" do
+      it "returns the package name based on coordinates" do
+        project = Project.new("foo", "bar", nil, nil)
+        project.package_name.should == "foo.bar"
+      end
+
+      it "ignores nil group id" do
+        project = Project.new(nil, "bar", nil, nil)
+        project.package_name.should == "bar"
+      end
+
+      it "removes invalid characters in package name" do
+        project = Project.new("f-oo", "b-ar", nil, nil)
+        project.package_name.should == "foo.bar"
+      end
+    end
+  end
+end

data/spec/task_helper_spec.rb

@@ -12,13 +12,6 @@ module Mvnizer
     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")
@@ -29,12 +22,22 @@ module Mvnizer
     
     describe "#generate_file" do
       it "generates a file from a template into a given directory" do
+
+        # This checks ERB is called properly.
         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)
+        erb.should_receive(:result).and_return("Blah")
+
+        # This checks that the template is being read
+        File.should_receive(:open).with("dummy.txt.erb", "r").and_return(file)
+        file.should_receive(:read)
+
+        # This checks that the output is being written.
+        f = double("output_file")
+        File.should_receive(:open).with("foobar/dummy.txt", "w").and_yield(f)
+        f.should_receive(:write).with("Blah")
 
-        File.exists?("foobar/dummy.txt").should be_true
+        subject.generate_file("dummy.txt.erb", "foobar/dummy.txt", binding)
       end
       
       it "creates the output directory if it does not exist" do
@@ -45,9 +48,23 @@ module Mvnizer
       end
     end
 
-    after do
-      FileUtils.rm_rf("foobar")
-      FakeFS.deactivate! 
+    describe "#add_dependency" do
+
+      # This test fails because of sparklemotion/nokogiri#771
+      # Remove pending when nokogiri is fixed.
+      it "adds a new dependency to an existing pom file" do
+        pending("Awaiting sparklemotion/nokogiri#771")
+        dependencies = ["org.apache.commons:commons-lang3:3.1:jar",
+                        "org.apache.commons:commons-collections:3.2.1:jar"]
+
+        pom_location = File.join(File.dirname(__FILE__), "dummy_pom.xml")
+        output = subject.add_dependency(dependencies, pom_location)
+        output.should match("<groupId>org.apache.commons</groupId>")
+      end
+
+      it "throws an error if the pom cannot be found in the current directory" do
+        lambda { subject.add_dependency(nil) }.should raise_error(FileNotFoundError, "The pom.xml file cannot be found.")
+      end
     end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: mvnizer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sébastien Le Callonnec
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -28,66 +28,66 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 1.5.5
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 1.5.5
     none: false
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.2
+        version: 2.11.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.2
+        version: 2.11.0
     none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rspec-mocks
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.11.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.11.2
     none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fakefs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 0.4.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 0.4.0
     none: false
   prerelease: false
   type: :development
@@ -133,6 +133,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -147,6 +148,7 @@ files:
 - features/support/env.rb
 - lib/mvnizer.rb
 - lib/mvnizer/commands.rb
+- lib/mvnizer/commands/add_dependency.rb
 - lib/mvnizer/commands/new_project.rb
 - lib/mvnizer/commands/new_war_project.rb
 - lib/mvnizer/commands/project_factory.rb
@@ -154,24 +156,31 @@ files:
 - lib/mvnizer/configuration.rb
 - lib/mvnizer/coordinate_parser.rb
 - lib/mvnizer/erb_helper.rb
+- lib/mvnizer/exceptions.rb
 - lib/mvnizer/mvnize.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/war/ExampleServlet.java.erb
+- lib/mvnizer/templates/war/index.jsp.erb
 - lib/mvnizer/templates/web.xml.erb
 - lib/mvnizer/version.rb
 - mvnizer.gemspec
 - ragel/coordinate.rb
 - ragel/coordinate.rl
 - ragel/test_coord.rb
+- spec/commands/add_dependency_spec.rb
 - 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/dummy.txt.erb
+- spec/dummy_pom.xml
 - spec/mvnize_spec.rb
+- spec/project_spec.rb
 - spec/spec_helper.rb
 - spec/task_helper_spec.rb
 homepage: http://github.com/tychobrailleur/mvnizer