puppet_module_packaging 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355d955a3532b7fd7bec451b8177c3220247f5f1
-  data.tar.gz: 6d8e077720efe12fe7c556dd77af6cf09a3a62ae
+  metadata.gz: ccc2278c587b1d85d0717646163e3725f8abc4a2
+  data.tar.gz: 3973f313a92372db4c5a2f9bfa136aa381392d3d
 SHA512:
-  metadata.gz: c19b218cdeafa6f4f11362842c3e4e4198905bf62da25cb415decf44094c8bdcaf03abdc2397719dfa2412b768be61a04ede7815a91fd301b158eabaf65c692c
-  data.tar.gz: 9dac89efa58e82ac8e090f9f8fdc3bcafc8a87f5ffbca2e3875f1045206ee5e4095e9d65d5dd128243b584c9cb6c0073601da3d8270bb50562b71faf2f04db7c
+  metadata.gz: 05f80f6e6262799d7640c355f15885146962932cca63812526e5a2f852ff84996bd65f8327aa76a662fd1b2cba2c1f78079519723ae50bee34b4ec6998f8f1bb
+  data.tar.gz: d6f15dd4ba72dba9b29077feaec6a4f0e0c6e51fccd567d5309db62b45fdf1b08e2fbf131125e479df0af5d929754dbc5d3db61f482e34f9adf9cd7f7442b6b2

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.2
+
+* Fix a bug that let the tasks fail if not all the standard module directories
+  were present (see #1).
+
 ## 0.0.1
 
 * Add `rpm`, `deb`, `install` and `clean` tasks.

data/README.md

@@ -1,6 +1,8 @@
 # Puppet Module Packaging
 
 [![Build Status](https://travis-ci.org/stefanozanella/puppet_module_packaging.png?branch=master)](https://travis-ci.org/stefanozanella/puppet_module_packaging)
+[![Gem Version](https://badge.fury.io/rb/puppet_module_packaging.png)](http://badge.fury.io/rb/puppet_module_packaging)
+[![Dependency Status](https://gemnasium.com/stefanozanella/puppet_module_packaging.png)](https://gemnasium.com/stefanozanella/puppet_module_packaging)
 
 Provides Rake tasks to ease shipping of Puppet modules as proper system
 packages.
@@ -31,9 +33,11 @@ Or install it yourself as:
 ## Usage
 
 To have the shipped Rake tasks available for your module, just add the
-following line to your `Rakefile`:
+following lines to your `Rakefile`:
 
-    require 'puppet_module_packaging/rake_task'
+    require 'puppet_module/pkg/rake_task'
+
+    PuppetModule::Pkg::Tasks.new
 
 This will add the following tasks to your set:
 

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

@@ -7,9 +7,7 @@ module PuppetModule
         end
 
         def cp(src, dest)
-          sanitized_src = src.is_a?(Range) ? src.to_a : src
-
-          FileUtils.cp_r sanitized_src, dest
+          FileUtils.cp_r only_existing_entries_of(ensure_array(src)), dest
         end
 
         def rm(path)
@@ -19,6 +17,16 @@ module PuppetModule
         def sh(cmd)
           `#{cmd}`
         end
+
+        private
+
+        def ensure_array(src)
+          src.is_a?(Range) ? src.to_a : src
+        end
+
+        def only_existing_entries_of(src)
+          src.select { |f| File.exists? f }
+        end
       end
     end
   end

data/lib/puppet_module/pkg/version.rb

@@ -1,5 +1,5 @@
 module PuppetModule
   module Pkg
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/end_to_end/install_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
 
 describe 'install task' do
-  around do |t|
-    do_into_tmp_module('testmod', t)
-  end
-
   describe 'by default' do
+    around do |t|
+      do_into_tmp_module('testmod', t)
+    end
+
     let(:output_dir) { 'build/usr/share/puppet/modules/testmod' }
 
     it 'installs all module dirs into the `build` subfolder' do
@@ -31,4 +31,28 @@ describe 'install task' do
       }.must_exist_within output_dir
     end
   end
+
+  # Issue #1
+  describe 'when not all standard module directories are present' do
+    around do |t|
+      do_into_tmp_module('testmod_small', t)
+    end
+
+    let(:output_dir) { 'build/usr/share/puppet/modules/testmod_small' }
+
+    it 'installs the module anyway' do
+      `rake install`
+
+      assert directory?(output_dir), "expected #{output_dir} to exist, but it didn't"
+      filesystem {
+        dir 'manifests' do
+          file 'init.pp'
+        end
+
+        dir 'templates' do
+          file 'config.erb'
+        end
+      }.must_exist_within output_dir
+    end
+  end
 end

data/test/fixture/testmod_small/Modulefile

@@ -0,0 +1,2 @@
+name    'testdev/testmod_small'
+version '0.0.1'

data/test/fixture/testmod_small/Rakefile

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

data/test/integration/system_test.rb

@@ -38,6 +38,16 @@ describe PuppetModule::Pkg::Tasks::System do
         assert file?(join 'out', dir, "test_#{dir}"), "expected file out/#{dir}/test_#{dir} to exist"
       end
     end
+
+    it 'doesn`t complain if some directories are not found' do
+      mkdir 'directory'
+      mkdir 'out'
+
+      fs.cp(['directory', 'not', 'found'], 'out')
+
+      refute exists?(join 'out', 'not')
+      refute exists?(join 'out', 'found')
+    end
   end
 
   describe 'rm' do

data/test/test_helper.rb

@@ -64,6 +64,10 @@ def rpmbuild_found?
   return $? == 0
 end
 
+def exists?(f)
+  File.exists? f
+end
+
 def directory?(d)
   File.directory? d
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_module_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stefano Zanella
@@ -186,6 +186,10 @@ files:
 - test/fixture/testmod/lib/utils.rb
 - test/fixture/testmod/manifests/init.pp
 - test/fixture/testmod/templates/config.erb
+- test/fixture/testmod_small/Modulefile
+- test/fixture/testmod_small/Rakefile
+- test/fixture/testmod_small/manifests/init.pp
+- test/fixture/testmod_small/templates/config.erb
 - test/integration/modulefile_test.rb
 - test/integration/system_test.rb
 - test/test_helper.rb
@@ -232,6 +236,10 @@ test_files:
 - test/fixture/testmod/lib/utils.rb
 - test/fixture/testmod/manifests/init.pp
 - test/fixture/testmod/templates/config.erb
+- test/fixture/testmod_small/Modulefile
+- test/fixture/testmod_small/Rakefile
+- test/fixture/testmod_small/manifests/init.pp
+- test/fixture/testmod_small/templates/config.erb
 - test/integration/modulefile_test.rb
 - test/integration/system_test.rb
 - test/test_helper.rb

metadata.gz.sig

@@ -1,2 +1 @@
-#�El�l��4�;�6�_����hQ�H����7*�2$��E$ߌ�׭�p4C2�O,c*DVQ���a檞f�h�y�?/=���(�`�;_82-�2������$G<�������E���͡���^_J�jٴ��,�q �\�jOvH��B�J�h��%k5A�==�7��~ؗD��2�[����Z�ؒ�
-Z��s�@0�h����F�����h@>.��T�-�?���t���N�?q̢�����i�q!ݙ
+5��R
�h�i��}gg�A���"Q��d5@��}?�Sg�Z�+�m$t��9x!��@^�R�����ҟ��e�ڂͨ^��Ь��a�6�΄)ŝyR�5F�iDz���֊�3fl�ԅ�L����[Q����g)m��١,Yh~���v^c���k��2����r�(�(��F�mcG��z�6�Gv2���