puppet_module_packaging 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6dec8ec8f4760db5449a19c12c970c2fdcc1597
-  data.tar.gz: b6faeb96ae78ad45de6745118b7a90ca2f5e4db5
+  metadata.gz: dd5dba623fbe049e9833d313d879c7e1406c14f5
+  data.tar.gz: 103b9a8a5357e19a8210d1982d84f27ef6a2c0c0
 SHA512:
-  metadata.gz: 3b6af7a8e1960a0d060d3adec5d1974b7de4552b8521f86debe09b8d71c497c030ade1c7f0be84ee3f998b5865e5016909df6baa77bfa12b7cbb29bac00faf72
-  data.tar.gz: d804b951fcb7304b9f9a3453645518e76d77a8d40f7bd4bdb937ce04fce13f890e278dc292f6a5cf52d1c14f8d326d98df604302a71ac1d7ef61f8e58f41d594
+  metadata.gz: 118a93d9fc1f1cc2647fc84fb7003985f7e20d338ffb631629d9a3479023646e92aba26f508710b9f28f2bdc38f3675daaab26547ea7d5d24fdca0778046f280
+  data.tar.gz: 718a9760b856f780f6171b1acf1c45ca04f349d7253fa212c83720d89d1b8b34863af83ae309058693f83533aa56d07aa3b98964b4a3886633a7b51b402623a8

data/.travis.yml

@@ -5,8 +5,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
-  - jruby-19mode
-  - rbx
 
 cache: apt
 

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.0
+
+* Introduce :recursive option, which performs recursive dependency packaging if
+  enabled.
+
 ## 0.1.1
 
 * Fix a bug in the Modulefile parser that prevented correct dependency

data/README.md

@@ -60,6 +60,24 @@ optional and are mapped into package fields with equivalent meaning.
 **NOTE**: The module will be installed under `/usr/share/puppet/modules`, not
 into `/etc/puppet`!
 
+### Recursive packaging
+
+The library can also take care of packaging the whole dependency tree of a
+module as well, so that you don't need to manually track and package
+dependencies. To enable this feature, just specify the `:recursive` option when
+declaring the tasks:
+
+    require 'puppet_module/pkg/rake_task'
+
+    PuppetModule::Pkg::Tasks.new :recursive => true
+
+This way, the library will take care of downloading the module's dependencies,
+installing their relevant assets into a separate folder and packaging them into
+individual packages.
+
+Note that, as of now, **only dependencies downloadable from Puppet Forge are
+supported**.
+
 ## Compatibility
 
 OS compatibility resembles the one of FPM; in particular:

data/lib/puppet_module/pkg/tasks.rb

@@ -1,12 +1,11 @@
 require 'puppet_module/pkg/tasks/rake_tasks'
-
 require 'puppet_module/pkg/tasks/modulefile'
 
 module PuppetModule
   module Pkg
     class Tasks
-      def initialize
-        RakeTasks.new(Modulefile.parse("Modulefile"))
+      def initialize(options = {})
+        RakeTasks.new(Modulefile.parse("Modulefile"), options)
       end
     end
   end

data/lib/puppet_module/pkg/tasks/build.rb

@@ -1,3 +1,5 @@
+require 'puppet_module/pkg/tasks/packager'
+
 class Class
   def type(sym)
     self.class_eval <<-EOS
@@ -20,8 +22,9 @@ module PuppetModule
   module Pkg
     class Tasks
       class Build
-        def initialize(system)
+        def initialize(system, mod_finder)
           @sys = system
+          @mod_finder = mod_finder
         end
 
         def invoke(mod, opts)
@@ -29,7 +32,12 @@ module PuppetModule
           self.build_opts = opts
 
           @sys.mkdir opts.pkg_dir
-          @sys.sh("fpm #{fpm_opts} #{installed_files}")
+          @packager = Packager.new(@sys)
+          @packager.package(mod, opts.install_dir, opts.pkg_dir, type, filename)
+
+          @mod_finder.find_in(opts.dep_install_path).each do |dep|
+            @packager.package(dep, File.join(opts.dep_build_path, dep.name), opts.pkg_dir, type, filename_for(dep.name, dep.author))
+          end
         end
 
         def type
@@ -45,85 +53,8 @@ module PuppetModule
         attr_accessor :modinfo
         attr_accessor :build_opts
 
-        def fpm_opts
-          [ src_fmt,
-            dest_fmt,
-            name,
-            version,
-            arch,
-            maintainer,
-            url,
-            description,
-            license,
-            dependencies,
-            chdir,
-            output ].join " "
-        end
-
-        def pkg_name
-          "puppet-mod-#{modinfo.author}-#{modinfo.name}"
-        end
-
-        def name
-          "-n #{pkg_name}"
-        end
-
-        def version
-          "-v #{modinfo.version}"
-        end
-
-        def arch
-          "-a all"
-        end
-
-        def maintainer
-          optionally('-m', modinfo.author_full)
-        end
-
-        def url
-          optionally('--url', modinfo.project_page)
-        end
-
-        def description
-          optionally('--description', modinfo.summary)
-        end
-
-        def license
-          optionally('--license', modinfo.license)
-        end
-
-        def dependencies
-          return "" unless modinfo.dependencies
-
-          modinfo.dependencies.map do |dep|
-            dep[:versions].map do |version_constraint|
-              "-d 'puppet-mod-#{dep[:author]}-#{dep[:name]} #{version_constraint}'"
-            end
-          end
-        end
-
-        def src_fmt
-          "-s dir"
-        end
-
-        def chdir
-          "-C #{build_opts.install_dir}"
-        end
-
-        def installed_files
-          "."
-        end
-
-        def output
-          "-p #{build_opts.pkg_dir}/#{filename}"
-        end
-
-        def dest_fmt
-          "-t #{type}"
-        end
-
-        def optionally(switch, field)
-          field ? "#{switch} '#{field}'" : ""
+        def pkg_name(mod = modinfo.name, author = modinfo.author)
+          "puppet-mod-#{author}-#{mod}"
         end
       end
     end

data/lib/puppet_module/pkg/tasks/deb.rb

@@ -7,6 +7,10 @@ module PuppetModule
         type :deb
 
         filename '#{pkg_name}_VERSION_ARCH.deb'
+
+        def filename_for(mod, author)
+          "#{pkg_name(mod, author)}_VERSION_ARCH.deb"
+        end
       end
     end
   end

data/lib/puppet_module/pkg/tasks/install.rb

@@ -7,17 +7,19 @@ module PuppetModule
         end
 
         def invoke(mod, opts)
-          @mod_name = mod.name
+          @mod = mod
           @out_dir = opts.install_dir
 
           @sys.mkdir install_path
           @sys.cp assets_to_install, install_path
+
+          install_deps if opts.recursive
         end
 
         private
 
         def install_path
-          File.join(@out_dir, dest_path, @mod_name)
+          File.join(@out_dir, dest_path, @mod.name)
         end
 
         def dest_path
@@ -27,6 +29,19 @@ module PuppetModule
         def assets_to_install
           ['Modulefile','manifests','templates','lib','files']
         end
+
+        def install_deps
+          # TODO: Refactor!!! Too many hardcoded paths
+          @mod.dependencies.each do |dep|
+            @sys.sh("puppet module install -i tmp/deps_inst -v '#{dep[:versions].join(' ')}' #{dep[:author]}/#{dep[:name]}")
+          end
+
+          @sys.ls('tmp/deps_inst').each do |dep|
+            @sys.mkdir "tmp/deps_build/#{dep}#{dest_path}/#{dep}"
+            @sys.cp assets_to_install.map { |a| "tmp/deps_inst/#{dep}/#{a}" },
+              "tmp/deps_build/#{dep}#{dest_path}/#{dep}"
+          end
+        end
       end
     end
   end

data/lib/puppet_module/pkg/tasks/module_finder.rb

@@ -0,0 +1,24 @@
+module PuppetModule
+  module Pkg
+    class Tasks
+      class ModuleFinder
+        def initialize(system, parser = Modulefile)
+          @sys = system
+          @parser = parser
+        end
+
+        def find_in(path)
+          @sys.ls(path).map do |mod|
+            @parser.parse(File.join(path, mod, "Modulefile"))
+          end
+        end
+
+        class Disabled < ModuleFinder
+          def find_in(path)
+            []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/puppet_module/pkg/tasks/modulefile.rb

@@ -26,7 +26,7 @@ module PuppetModule
         private
 
         def name(s)
-          @metadata.author, @metadata.name = s.split '-'
+          @metadata.author, @metadata.name = s.split %r{[-/]}
         end
 
         def version(s)

data/lib/puppet_module/pkg/tasks/packager.rb

@@ -0,0 +1,107 @@
+module PuppetModule
+  module Pkg
+    class Tasks
+      class Packager
+        def initialize(system)
+          @sys = system
+        end
+
+        def package(mod, install_dir, pkg_dir, type, filename)
+          self.modinfo = mod
+          @install_dir = install_dir
+          @pkg_dir = pkg_dir
+
+          @type = type
+          @filename = filename
+          @sys.sh("fpm #{fpm_opts} #{installed_files}")
+        end
+
+        private
+
+        attr_accessor :modinfo
+
+        def fpm_opts
+          [ src_fmt,
+            dest_fmt,
+            name,
+            version,
+            arch,
+            maintainer,
+            url,
+            description,
+            license,
+            dependencies,
+            chdir,
+            output ].join " "
+        end
+
+        def pkg_name
+          "puppet-mod-#{modinfo.author}-#{modinfo.name}"
+        end
+
+        def name
+          "-n #{pkg_name}"
+        end
+
+        def version
+          "-v #{modinfo.version}"
+        end
+
+        def arch
+          "-a all"
+        end
+
+        def maintainer
+          optionally('-m', modinfo.author_full)
+        end
+
+        def url
+          optionally('--url', modinfo.project_page)
+        end
+
+        def description
+          optionally('--description', modinfo.summary)
+        end
+
+        def license
+          optionally('--license', modinfo.license)
+        end
+
+        def dependencies
+          return "" unless modinfo.dependencies
+
+          modinfo.dependencies.map do |dep|
+            dep[:versions].map do |version_constraint|
+              "-d 'puppet-mod-#{dep[:author]}-#{dep[:name]} #{version_constraint}'"
+            end
+          end
+        end
+
+        def src_fmt
+          "-s dir"
+        end
+
+        def chdir
+          "-C #{@install_dir}"
+        end
+
+        def installed_files
+          "."
+        end
+
+        def output
+          "-p #{@pkg_dir}/#{@filename}"
+        end
+
+        def dest_fmt
+          "-t #{@type}"
+        end
+
+        def optionally(switch, field)
+          field ? "#{switch} '#{field}'" : ""
+        end
+      end
+    end
+  end
+end
+

data/lib/puppet_module/pkg/tasks/rake_tasks.rb

@@ -1,6 +1,7 @@
 require 'rake/tasklib'
 
 require 'puppet_module/pkg/tasks/system'
+require 'puppet_module/pkg/tasks/module_finder'
 require 'puppet_module/pkg/tasks/deb'
 require 'puppet_module/pkg/tasks/rpm'
 require 'puppet_module/pkg/tasks/install'
@@ -10,11 +11,16 @@ module PuppetModule
   module Pkg
     class Tasks
       class RakeTasks < Rake::TaskLib
-        def initialize(mod_info)
+        def initialize(mod_info, custom_opts)
           sys = System.new
-          options = OpenStruct.new(
-            :install_dir => 'build',
-            :pkg_dir     => 'pkg')
+          options = OpenStruct.new({
+            :install_dir      => 'build',
+            :pkg_dir          => 'pkg',
+            :dep_install_path => 'tmp/deps_inst',
+            :dep_build_path   => 'tmp/deps_build',
+            :recursive        => false
+          }.merge(custom_opts))
+          mod_finder = (options.recursive ? ModuleFinder : ModuleFinder::Disabled).new sys
 
           desc "Install the module in a local temp dir"
           task :install => :clean do
@@ -28,12 +34,12 @@ module PuppetModule
 
           desc "Wraps the module into a Debian package"
           task :deb => :install do
-            Deb.new(sys).invoke(mod_info, options)
+            Deb.new(sys, mod_finder).invoke(mod_info, options)
           end
 
           desc "Wraps the module into a RPM package"
           task :rpm => :install do
-            RPM.new(sys).invoke(mod_info, options)
+            RPM.new(sys, mod_finder).invoke(mod_info, options)
           end
         end
       end

data/lib/puppet_module/pkg/tasks/rpm.rb

@@ -7,6 +7,10 @@ module PuppetModule
         type :rpm
 
         filename '#{pkg_name}-VERSION.ARCH.rpm'
+
+        def filename_for(mod, author)
+          "#{pkg_name(mod, author)}-VERSION_ARCH.rpm"
+        end
       end
     end
   end

data/lib/puppet_module/pkg/tasks/system.rb

@@ -15,7 +15,12 @@ module PuppetModule
         end
 
         def sh(cmd)
-          `#{cmd}`
+          # TODO: This should be supported through an external logger!
+          puts `#{cmd}`
+        end
+
+        def ls(path)
+          Dir.new(path).entries.reject { |d| d =~ /^\.*$/ }
         end
 
         private

data/lib/puppet_module/pkg/version.rb

@@ -1,5 +1,5 @@
 module PuppetModule
   module Pkg
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/puppet_module_packaging.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "fpm", "~> 0.4"
+  spec.add_runtime_dependency "puppet", "~> 3.4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/end_to_end/pkg_test.rb

@@ -5,15 +5,31 @@ describe 'deb task' do
     do_into_tmp_module('testmod', t)
   end
 
-  describe 'by default' do
-    let(:pkg) { 'pkg/puppet-mod-testdev-testmod_0.0.1_all.deb' }
+  let(:pkg) { 'pkg/puppet-mod-testdev-testmod_0.0.1_all.deb' }
 
+  describe 'by default' do
     it 'build a package into the `pkg` folder' do
       `rake deb`
 
       assert file?(pkg), "expected package #{pkg} to exist"
     end
   end
+
+  describe 'when asked to build packages for dependencies as well' do
+    let(:dep_pkgs) {[
+      'pkg/puppet-mod-puppetlabs-apache_*_all.deb',
+      'pkg/puppet-mod-puppetlabs-stdlib_*_all.deb',
+      'pkg/puppet-mod-puppetlabs-concat_*_all.deb',
+    ]}
+
+    it 'recursively builds packages for each dependency' do
+      `rake -f Rakefile.recursive deb`
+
+      dep_pkgs.each do |dep_pkg|
+        refute Dir.glob(dep_pkg).empty?, "expected package #{dep_pkg} to exist"
+      end
+    end
+  end
 end
 
 describe 'rpm task' do

data/test/fixture/testmod/Modulefile

@@ -7,7 +7,6 @@ summary 'A silly module, only useful for testing'
 description 'A long description of this silly module'
 project_page 'https://example.com/testmod/home'
 
-dependency 'user_1/mod_1', '= 1.2.3'
-dependency 'user_2/mod_2', '>= 1.0.0 <3.2'
+dependency 'puppetlabs/apache', '1.0.1'
 
 unsupported_field 'I don`t know what I am for'

data/test/fixture/testmod/Modulefile.deprecated

@@ -0,0 +1,2 @@
+name    'olddev/oldmod'
+version 'deprecated_version'

data/test/fixture/testmod/Modulefile.ok

@@ -0,0 +1,13 @@
+name    'testdev-testmod'
+version '0.0.1'
+source 'https://example.com/git/testmod'
+author 'Test Developer <test@example.com>'
+license 'Apache License, Version 2.0'
+summary 'A silly module, only useful for testing'
+description 'A long description of this silly module'
+project_page 'https://example.com/testmod/home'
+
+dependency 'user_1/mod_1', '= 1.2.3'
+dependency 'user_2/mod_2', '>= 1.0.0 <3.2'
+
+unsupported_field 'I don`t know what I am for'

data/test/fixture/testmod/Rakefile.recursive

@@ -0,0 +1,3 @@
+require 'puppet_module/pkg/tasks'
+
+PuppetModule::Pkg::Tasks.new :recursive => true

data/test/integration/modulefile_test.rb

@@ -16,7 +16,7 @@ describe PuppetModule::Pkg::Tasks::Modulefile do
   let(:parser) { PuppetModule::Pkg::Tasks::Modulefile }
 
   it 'reads a Modulefile and maps its fields to an object value' do
-    metadata = parser.parse 'Modulefile'
+    metadata = parser.parse 'Modulefile.ok'
 
     metadata.name.must_equal 'testmod'
     metadata.author.must_equal 'testdev'
@@ -49,4 +49,11 @@ describe PuppetModule::Pkg::Tasks::Modulefile do
     metadata = parser.parse 'Modulefile'
     metadata.unsupported_field.must_be_nil
   end
+
+  it 'also supports name in the old `author/name` format' do
+    metadata = parser.parse 'Modulefile.deprecated'
+    metadata.name.must_equal 'oldmod'
+    metadata.author.must_equal 'olddev'
+    metadata.version.must_equal 'deprecated_version'
+  end
 end

data/test/integration/system_test.rb

@@ -59,11 +59,27 @@ describe PuppetModule::Pkg::Tasks::System do
     end
   end
 
-  describe 'exec' do
+  describe 'sh' do
     it 'executes given command in system`s shell' do
       fs.sh 'touch test_file'
 
       assert file?('test_file'), "expected file test_file to have been created, but it was not"
     end
   end
+
+  describe 'ls' do
+    it 'returns an array with the entries of a specific folder' do
+      mkdir 'a_dir/a'
+      mkdir 'a_dir/b'
+      mkdir 'a_dir/c'
+      mkdir 'a_dir/c/d'
+
+      listing = fs.ls 'a_dir'
+
+      listing.length.must_equal 3
+      listing.must_include 'a'
+      listing.must_include 'b'
+      listing.must_include 'c'
+    end
+  end
 end

data/test/unit/build_test.rb

@@ -4,6 +4,8 @@ describe 'packaging tasks' do
   let(:deb_task)    { PuppetModule::Pkg::Tasks::Deb }
   let(:rpm_task)    { PuppetModule::Pkg::Tasks::RPM }
   let(:sys)         { stub_everything }
+  let(:mod_finder)  { stub_everything }
+
   let(:minimal_mod) { OpenStruct.new(
     :name    => 'my_mod',
     :author  => 'a_dev',
@@ -23,15 +25,21 @@ describe 'packaging tasks' do
       { :author => 'user_2', :name => 'mod_2', :versions => ['> 2.0', '<= 3.0'] },
     ])
   }
+
   let(:opts) { OpenStruct.new(
     :pkg_dir     => 'pkg',
-    :install_dir => 'some/where')
+    :install_dir => 'some/where',
+    :recursive   => false)
   }
 
+  before do
+    mod_finder.stubs(:find_in).returns([])
+  end
+
   it 'creates the output folder' do
     sys.expects(:mkdir).with(regexp_matches(/#{opts.pkg_dir}/))
 
-    deb_task.new(sys).invoke(mod, opts)
+    deb_task.new(sys, mod_finder).invoke(mod, opts)
   end
 
   it 'builds a package using all available module info' do
@@ -51,7 +59,7 @@ describe 'packaging tasks' do
       regexp_matches(/-C #{opts.install_dir}/),
       regexp_matches(/\.$/)))
 
-    deb_task.new(sys).invoke(mod, opts)
+    deb_task.new(sys, mod_finder).invoke(mod, opts)
   end
 
   it 'doesn`t complain if optional module info are missing' do
@@ -62,7 +70,7 @@ describe 'packaging tasks' do
       regexp_matches(/--license /)
     )))
 
-    deb_task.new(sys).invoke(minimal_mod, opts)
+    deb_task.new(sys, mod_finder).invoke(minimal_mod, opts)
   end
 
   describe 'deb task' do
@@ -71,7 +79,7 @@ describe 'packaging tasks' do
         regexp_matches(/-t deb/),
         regexp_matches(/-p #{opts.pkg_dir}\/puppet-mod-#{mod.author}-#{mod.name}_VERSION_ARCH.deb/)))
   
-      deb_task.new(sys).invoke(mod, opts)
+      deb_task.new(sys, mod_finder).invoke(mod, opts)
     end
   end
 
@@ -81,7 +89,52 @@ describe 'packaging tasks' do
         regexp_matches(/-t rpm/),
         regexp_matches(/-p #{opts.pkg_dir}\/puppet-mod-#{mod.author}-#{mod.name}-VERSION.ARCH.rpm/)))
   
-      rpm_task.new(sys).invoke(mod, opts)
+      rpm_task.new(sys, mod_finder).invoke(mod, opts)
+    end
+  end
+
+  describe 'when recursively building packages for module`s dependencies' do
+    let(:opts) { OpenStruct.new(
+      :pkg_dir           => 'module_pkg',
+      :install_dir       => 'some/where/else',
+      :dep_build_path    => 'some/tmp/folder',
+      :dep_install_path  => 'another/tmp/folder',
+      :recursive         => true)
+    }
+
+    let(:depmod_1) { OpenStruct.new(
+      :name    => 'mod_1',
+      :author  => 'dev_1',
+      :version => 'version_1',
+    )}
+
+    let(:depmod_2) { OpenStruct.new(
+      :name    => 'mod_2',
+      :author  => 'dev_2',
+      :version => 'version_2',
+    )}
+
+    it 'builds a package for each installed dependency' do
+      mod_finder.expects(:find_in).with(opts.dep_install_path)\
+        .returns([ depmod_1, depmod_2 ])
+
+      sys.expects(:sh)\
+        .with(all_of(
+          regexp_matches(/^fpm/),
+          regexp_matches(/-n puppet-mod-#{depmod_1.author}-#{depmod_1.name}/),
+          regexp_matches(/-v #{depmod_1.version}/),
+          regexp_matches(/-C #{opts.dep_build_path}\/#{depmod_1.name}/),
+          regexp_matches(/-p #{opts.pkg_dir}\/puppet-mod-#{depmod_1.author}-#{depmod_1.name}_VERSION_ARCH.deb/),
+          regexp_matches(/\.$/)))\
+        .with(all_of(
+          regexp_matches(/^fpm/),
+          regexp_matches(/-n puppet-mod-#{depmod_2.author}-#{depmod_2.name}/),
+          regexp_matches(/-v #{depmod_2.version}/),
+          regexp_matches(/-C #{opts.dep_build_path}\/#{depmod_2.name}/),
+          regexp_matches(/-p #{opts.pkg_dir}\/puppet-mod-#{depmod_2.author}-#{depmod_2.name}_VERSION_ARCH.deb/),
+          regexp_matches(/\.$/)))
+
+      deb_task.new(sys, mod_finder).invoke(minimal_mod, opts)
     end
   end
 end

data/test/unit/install_test.rb

@@ -3,11 +3,24 @@ require 'test_helper'
 describe PuppetModule::Pkg::Tasks::Install do
   let(:install_task) { PuppetModule::Pkg::Tasks::Install }
   let(:sys)          { stub_everything }
-  let(:mod)          { OpenStruct.new(:name => 'my_mod')}
-  let(:opts)         { OpenStruct.new(:install_dir => 'build')}
+  let(:mod) { OpenStruct.new(
+    :name    => 'my_mod',
+    :dependencies => [
+      { :author => 'user_1', :name => 'mod_1', :versions => ['< 1'] },
+      { :author => 'user_2', :name => 'mod_2', :versions => ['> 2.0', '<= 3.0'] },
+    ])
+  }
+  let(:opts) { OpenStruct.new(
+    :install_dir => 'build',
+    :recursive => false
+  )}
   let(:dest_path)    { "usr/share/puppet/modules/#{mod.name}" }
   let(:install_path) { join(opts.install_dir, dest_path) }
 
+  before do
+    sys.stubs(:ls).returns(['mod_1', 'mod_2'])
+  end
+
   it 'creates the output folder' do
     sys.expects(:mkdir).with(regexp_matches(/#{opts.install_dir}/))
 
@@ -20,7 +33,7 @@ describe PuppetModule::Pkg::Tasks::Install do
     install_task.new(sys).invoke(mod, opts)
   end
 
-  it 'installs all the relevant directories into the output folder' do
+  it 'installs all the relevant assets into the output folder' do
     sys.expects(:cp).with(
       includes(
         'Modulefile',
@@ -32,4 +45,59 @@ describe PuppetModule::Pkg::Tasks::Install do
 
     install_task.new(sys).invoke(mod, opts)
   end
+
+  it 'doesn`t install dependencies by default' do
+    sys.expects(:sh).at_most_once.with(Not(regexp_matches(/puppet module install/)))
+
+    install_task.new(sys).invoke(mod, opts)
+  end
+
+  describe 'when managing dependencies recursively' do
+    let(:opts) { OpenStruct.new(
+      :install_dir => 'build',
+      :recursive => true
+    )}
+
+    it 'asks puppet to install all the dependencies into a temp folder' do
+      sys.expects(:sh)\
+      .with(
+        regexp_matches(/puppet module install -i tmp\/deps_inst -v '< 1' user_1\/mod_1/))\
+      .with(
+        regexp_matches(/puppet module install -i tmp\/deps_inst -v '> 2.0 <= 3.0' user_2\/mod_2/))
+
+      install_task.new(sys).invoke(mod, opts)
+    end
+
+    it 'creates the build folder for each installed dependency' do
+      sys.expects(:ls).with('tmp/deps_inst').returns(['mod_1','mod_2','mod_3'])
+      sys.expects(:mkdir)\
+        .with(regexp_matches(%r{tmp/deps_build/mod_1/usr/share/puppet/modules/mod_1}))
+        .with(regexp_matches(%r{tmp/deps_build/mod_2/usr/share/puppet/modules/mod_2}))
+        .with(regexp_matches(%r{tmp/deps_build/mod_3/usr/share/puppet/modules/mod_3}))
+
+      install_task.new(sys).invoke(mod, opts)
+    end
+
+    it 'installs the relevant assets for each dependency into a separate directory' do
+      sys.expects(:cp)\
+      .with(
+        includes(
+          'tmp/deps_inst/mod_1/Modulefile',
+          'tmp/deps_inst/mod_1/manifests',
+          'tmp/deps_inst/mod_1/templates',
+          'tmp/deps_inst/mod_1/files',
+          'tmp/deps_inst/mod_1/lib'),
+        'tmp/deps_build/mod_1/usr/share/puppet/modules/mod_1')
+      .with(
+        includes(
+          'tmp/deps_inst/mod_2/Modulefile',
+          'tmp/deps_inst/mod_2/manifests',
+          'tmp/deps_inst/mod_2/templates',
+          'tmp/deps_inst/mod_2/files',
+          'tmp/deps_inst/mod_2/lib'),
+        'tmp/deps_build/mod_2/usr/share/puppet/modules/mod_2')
+
+      install_task.new(sys).invoke(mod, opts)
+    end
+  end
 end

data/test/unit/module_finder_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+describe PuppetModule::Pkg::Tasks::ModuleFinder do
+  let(:sys)           { mock }
+  let(:parser_class)  { stub_everything }
+  let(:mod_finder)    { PuppetModule::Pkg::Tasks::ModuleFinder.new sys, parser_class }
+
+  describe '#find_in' do
+    it 'parses the modulefile for each module found in the given directory' do
+      sys.expects(:ls).with('root/folder').returns(['mod_1', 'mod_2'])
+      parser_class.expects(:parse)\
+        .with('root/folder/mod_1/Modulefile')\
+        .with('root/folder/mod_2/Modulefile')\
+
+      mod_finder.find_in('root/folder')
+    end
+
+    it 'returns a list of parsed modulefiles' do
+      sys.stubs(:ls).with('root/folder').returns(['mod_3', 'mod_4'])
+      parser_class.stubs(:parse).returns(OpenStruct.new)
+
+      modules = mod_finder.find_in('root/folder')
+      modules.length.must_equal 2 
+      modules.first.must_be_kind_of OpenStruct
+    end
+  end
+
+  describe PuppetModule::Pkg::Tasks::ModuleFinder::Disabled do
+    let(:mod_finder) { PuppetModule::Pkg::Tasks::ModuleFinder::Disabled.new nil, nil}
+
+    describe '#find_in' do
+      it 'returns an empty list of dependencies, no matter the arguments' do
+        mod_finder.find_in('one/two/three').must_equal []
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_module_packaging
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefano Zanella
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - rubygems-stefanozanella.crt
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +160,9 @@ files:
 - lib/puppet_module/pkg/tasks/clean.rb
 - lib/puppet_module/pkg/tasks/deb.rb
 - lib/puppet_module/pkg/tasks/install.rb
+- lib/puppet_module/pkg/tasks/module_finder.rb
 - lib/puppet_module/pkg/tasks/modulefile.rb
+- lib/puppet_module/pkg/tasks/packager.rb
 - lib/puppet_module/pkg/tasks/rake_tasks.rb
 - lib/puppet_module/pkg/tasks/rpm.rb
 - lib/puppet_module/pkg/tasks/system.rb
@@ -159,10 +175,13 @@ files:
 - test/end_to_end/pkg_test.rb
 - test/end_to_end/tasks_test.rb
 - test/fixture/testmod/Modulefile
+- test/fixture/testmod/Modulefile.deprecated
 - test/fixture/testmod/Modulefile.no_name_or_author
 - test/fixture/testmod/Modulefile.no_version
+- test/fixture/testmod/Modulefile.ok
 - test/fixture/testmod/README.md
 - test/fixture/testmod/Rakefile
+- test/fixture/testmod/Rakefile.recursive
 - test/fixture/testmod/files/example.dat
 - test/fixture/testmod/lib/utils.rb
 - test/fixture/testmod/manifests/defined_type.pp
@@ -181,6 +200,7 @@ files:
 - test/unit/build_test.rb
 - test/unit/clean_test.rb
 - test/unit/install_test.rb
+- test/unit/module_finder_test.rb
 homepage: https://github.com/stefanozanella/puppet_module_packaging
 licenses:
 - MIT
@@ -212,10 +232,13 @@ test_files:
 - test/end_to_end/pkg_test.rb
 - test/end_to_end/tasks_test.rb
 - test/fixture/testmod/Modulefile
+- test/fixture/testmod/Modulefile.deprecated
 - test/fixture/testmod/Modulefile.no_name_or_author
 - test/fixture/testmod/Modulefile.no_version
+- test/fixture/testmod/Modulefile.ok
 - test/fixture/testmod/README.md
 - test/fixture/testmod/Rakefile
+- test/fixture/testmod/Rakefile.recursive
 - test/fixture/testmod/files/example.dat
 - test/fixture/testmod/lib/utils.rb
 - test/fixture/testmod/manifests/defined_type.pp
@@ -234,3 +257,4 @@ test_files:
 - test/unit/build_test.rb
 - test/unit/clean_test.rb
 - test/unit/install_test.rb
+- test/unit/module_finder_test.rb