puppet_module_packaging 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc2278c587b1d85d0717646163e3725f8abc4a2
-  data.tar.gz: 3973f313a92372db4c5a2f9bfa136aa381392d3d
+  metadata.gz: 8a13fb00530b3fec6320d698b8703708334a4e4e
+  data.tar.gz: 90b4d60817f73b24d9eb3579df035debb83c5795
 SHA512:
-  metadata.gz: 05f80f6e6262799d7640c355f15885146962932cca63812526e5a2f852ff84996bd65f8327aa76a662fd1b2cba2c1f78079519723ae50bee34b4ec6998f8f1bb
-  data.tar.gz: d6f15dd4ba72dba9b29077feaec6a4f0e0c6e51fccd567d5309db62b45fdf1b08e2fbf131125e479df0af5d929754dbc5d3db61f482e34f9adf9cd7f7442b6b2
+  metadata.gz: 88edf75759c6982377d3dea822dbfeb19a7c780dcd67973d3bd606fe56e082f545d55fb60fd2ef3254d12538243bf8c928f274e168c48c264e38d79da8744ae4
+  data.tar.gz: 05112fc5d7f9b1d4db5ba552c233d5d304ff1fbd876367b1a0033ea684160766b753eda076f30f5cfaeae46c879a6dde467202949fb20c2e3dc8ddcf13e36c80

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+ruby-2.1

data/.travis.yml

@@ -4,9 +4,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
+  - 2.1
   - jruby-19mode
-  - rbx-19mode
+  - rbx
+
+cache: apt
 
 bundler_args: --path vendor/bundle
 

data/Changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.0
+
+* Fix a shadowed variable bug in the test suite that prevented it to work
+  correctly.
+* Added the Modulefile to the list of installed files in the final package
+* Fixed parsing of `name-author` string in Modulefile
+* Added support for translation of dependencies from Modulefile to final package
+* Minor refactoring
+
 ## 0.0.2
 
 * Fix a bug that let the tasks fail if not all the standard module directories

data/README.md

@@ -11,8 +11,7 @@ Currently, it provides tasks to build Debian and RPM packages. To do that, it
 uses excellent Jordan Sissel's [fpm](https://github.com/jordansissel/fpm).
 
 **NOTE**: at this stage, this library lacks a bunch of useful features
-(particularly, its behavior can't be customized in any way and there's no
-dependency management). Feel free to
+(particularly, its behavior can't be customized in any way). Feel free to
 submit issues or PRs if there's something that could help you out and you'd
 like to see integrated.
 

data/Vagrantfile

@@ -1,10 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu-base-oss"
-  config.vm.box_url = "http://vagrantboxes.derecom.it/boxes/ubuntu-base-oss.box"
-  config.vm.provision :puppet do |puppet|
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "puppetlabs/ubuntu-13.10-64-puppet"
+  config.vbguest.auto_update = false
+  config.vm.provision "puppet" do |puppet|
     puppet.manifests_path = "test"
     puppet.manifest_file  = "test_vm.pp"
   end

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

@@ -55,6 +55,7 @@ module PuppetModule
             url,
             description,
             license,
+            dependencies,
             chdir,
             output ].join " "
         end
@@ -91,6 +92,16 @@ module PuppetModule
           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

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

@@ -25,7 +25,7 @@ module PuppetModule
         end
 
         def assets_to_install
-          ['manifests','templates','lib','files']
+          ['Modulefile','manifests','templates','lib','files']
         end
       end
     end

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

@@ -12,6 +12,7 @@ module PuppetModule
 
         def initialize(str)
           @metadata = OpenStruct.new
+          @metadata.dependencies = []
           binding.eval str
           validate_required_fields
         end
@@ -25,7 +26,7 @@ module PuppetModule
         private
 
         def name(s)
-          @metadata.author, @metadata.name = s.split '/'
+          @metadata.author, @metadata.name = s.split '-'
         end
 
         def version(s)
@@ -56,6 +57,26 @@ module PuppetModule
           @metadata.project_page = s
         end
 
+        def dependency(mod, ver)
+          a, n = mod.split('/')
+          @metadata.dependencies << {
+            :name => n,
+            :author => a,
+            :versions => dependency_versions_for(ver),
+          }
+        end
+
+        def dependency_versions_for(versions_str)
+          versions = []
+          versions_str.split(/(>=|<=|==|=|<|>)\s+/)\
+            .select { |s| !s.empty? }\
+            .each_slice(2) { |v|
+              versions << v.map { |s| s.strip }.join(" ")
+            }
+
+          versions
+        end
+
         def validate_required_fields
           raise ArgumentError, 'Modulefile doesn`t contain name or author' unless
             @metadata.name and @metadata.author

data/lib/puppet_module/pkg/version.rb

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

data/test/end_to_end/install_test.rb

@@ -6,15 +6,21 @@ describe 'install task' do
       do_into_tmp_module('testmod', t)
     end
 
-    let(:output_dir) { 'build/usr/share/puppet/modules/testmod' }
+    let(:output_dir) { Pathname.new 'build/usr/share/puppet/modules/testmod' }
 
-    it 'installs all module dirs into the `build` subfolder' do
+    it 'installs all module dirs into the `build` subfolder, leaving out other project files' do
       `rake install`
 
       assert directory?(output_dir), "expected #{output_dir} to exist, but it didn't"
       filesystem {
+        file 'Modulefile'
+
         dir 'manifests' do
           file 'init.pp'
+          file 'defined_type.pp'
+          dir 'defined_type' do
+            file 'sub_manifest.pp'
+          end
         end
 
         dir 'files' do
@@ -29,6 +35,8 @@ describe 'install task' do
           file 'utils.rb'
         end
       }.must_exist_within output_dir
+
+      (output_dir + 'README.md').wont_exist
     end
   end
 

data/test/end_to_end/tasks_test.rb

@@ -5,7 +5,6 @@ describe 'using PuppetModule::Pkg::Tasks in a Rakefile' do
     do_into_tmp_module('testmod', t)
   end
 
-  let(:fixture_module) { File.join(fixture_dir, 'testmod') }
   let(:task_list) { `rake -T` }
 
   [:install, :clean, :deb, :rpm].each do |task|

data/test/fixture/testmod/Modulefile

@@ -1,4 +1,4 @@
-name    'testdev/testmod'
+name    'testdev-testmod'
 version '0.0.1'
 source 'https://example.com/git/testmod'
 author 'Test Developer <test@example.com>'
@@ -7,7 +7,7 @@ summary 'A silly module, only useful for testing'
 description 'A long description of this silly module'
 project_page 'https://example.com/testmod/home'
 
-## Add dependencies, if any:
-# dependency 'username/name', '>= 1.2.0'
+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/Modulefile.no_version

@@ -1 +1 @@
-name    'testdev/testmod'
+name    'testdev-testmod'

data/test/fixture/testmod_small/Modulefile

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

data/test/integration/modulefile_test.rb

@@ -29,6 +29,10 @@ describe PuppetModule::Pkg::Tasks::Modulefile do
     metadata.summary.must_equal 'A silly module, only useful for testing'
     metadata.description.must_equal 'A long description of this silly module'
     metadata.project_page.must_equal 'https://example.com/testmod/home'
+    metadata.dependencies.must_equal [
+      { :author => 'user_1', :name => 'mod_1', :versions => ['= 1.2.3'] },
+      { :author => 'user_2', :name => 'mod_2', :versions => ['>= 1.0.0', '< 3.2']},
+    ]
   end
 
   it 'raises an error if the Modulefile doesn`t contain required fields' do

data/test/test_vm.pp

@@ -1,4 +1,5 @@
 $deps = [
+  'ruby-dev',
   'libxml2',
   'libxml2-dev',
   'libxslt1.1',
@@ -21,3 +22,8 @@ package { 'bundler':
 exec { 'apt-get update':
   path => '/usr/bin',
 }
+
+user { 'vagrant':
+  ensure => present,
+  shell  => '/bin/bash',
+}

data/test/unit/build_test.rb

@@ -17,7 +17,11 @@ describe 'packaging tasks' do
     :author_full => 'a_dev <a@dev.com>',
     :project_page => 'http://a.b.c/my_mod',
     :summary => 'nothing fancy',
-    :license => 'whatever')
+    :license => 'whatever',
+    :dependencies => [
+      { :author => 'user_1', :name => 'mod_1', :versions => ['< 1'] },
+      { :author => 'user_2', :name => 'mod_2', :versions => ['> 2.0', '<= 3.0'] },
+    ])
   }
   let(:opts) { OpenStruct.new(
     :pkg_dir     => 'pkg',
@@ -38,6 +42,9 @@ describe 'packaging tasks' do
       regexp_matches(/-n puppet-mod-#{mod.author}-#{mod.name}/),
       regexp_matches(/-v #{mod.version}/),
       regexp_matches(/-m '#{mod.author_full}'/),
+      regexp_matches(/-d 'puppet-mod-user_1-mod_1 < 1'/),
+      regexp_matches(/-d 'puppet-mod-user_2-mod_2 > 2.0'/),
+      regexp_matches(/-d 'puppet-mod-user_2-mod_2 <= 3.0'/),
       regexp_matches(/--url '#{mod.project_page}'/),
       regexp_matches(/--description '#{mod.summary}'/),
       regexp_matches(/--license '#{mod.license}'/),

data/test/unit/install_test.rb

@@ -23,6 +23,7 @@ describe PuppetModule::Pkg::Tasks::Install do
   it 'installs all the relevant directories into the output folder' do
     sys.expects(:cp).with(
       includes(
+        'Modulefile',
         'manifests',
         'templates',
         'files',

metadata

@@ -1,146 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: puppet_module_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefano Zanella
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQUFADBGMRgwFgYDVQQDDA96YW5l
-  bGxhLnN0ZWZhbm8xFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
-  ARkWA2NvbTAeFw0xMzA4MDcxOTA2MDZaFw0xNDA4MDcxOTA2MDZaMEYxGDAWBgNV
-  BAMMD3phbmVsbGEuc3RlZmFubzEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYK
-  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  2JCnJCnjjs62MR/Tw/4WgSG42ruiCEqXV1ECMsXymHPE8xyHkYAwLXvBRzOkZ/IA
-  puJ1XhScduMRcUuE0ZPA5N2HBZI0WsmyyNTYBjOob8m0SNInoRZfIMloj3D8QzB7
-  /6G5HLMWNx60JEpIDgfXvIuSRKNKQ0/0+/G/H4COgj72pd3F4dYltvx+mSwPRq7Q
-  MdZsK3T5Q3d4eLBY1VSlJpq0wkwdEWTXAhR0Mfmbn1D8m9IhJfubgXuXVBY4OPO8
-  KAF/wWqTkzA6guVQlSKdZR4vwms7OpeFkotnivBKa6JwUQSXO8AZEyy53V8cSYDu
-  dbaFi53YbEwOWSMQnW8/kQIDAQABozkwNzAdBgNVHQ4EFgQUcBKkmJAvSTKfDf7z
-  LEu1wE+Rk+swCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQAD
-  ggEBAMeqfk1l4Y0iZ8jNiu0afcQ60DVqBkRtrT/rsZEqGsdOw11bntOE4yWpo4Kd
-  Y0C/kYrVQ/mIN7IGKbCSjES3aYdQftV9SRW77FA25m2KXRbnEYtJDUX35gAqSdRY
-  9IiYivsMq2dr70eKPNFrFOwWvmwhcGyEG8EDvYoXWllke7RGz1Dn/AZx6jPnShO+
-  0ru4OXsM9++md3sGXIugEFNygvo2/1yQoTe6+XiBocS+pWsJd6JZBfkxPRT4Dz4H
-  RigBD0E3/t/ABjCXkmqwp5gnAZmP8JiVUkn8rp5E0FXvC8T7nsPs2TW/TAmUV6rN
-  hK25FX8YWgT9fD9y3PpWjiYcrCo=
-  -----END CERTIFICATE-----
-date: 2013-11-13 00:00:00.000000000 Z
+- rubygems-stefanozanella.crt
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-filesystem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-around
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -152,9 +132,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE
@@ -181,9 +161,12 @@ files:
 - test/fixture/testmod/Modulefile
 - test/fixture/testmod/Modulefile.no_name_or_author
 - test/fixture/testmod/Modulefile.no_version
+- test/fixture/testmod/README.md
 - test/fixture/testmod/Rakefile
 - test/fixture/testmod/files/example.dat
 - test/fixture/testmod/lib/utils.rb
+- test/fixture/testmod/manifests/defined_type.pp
+- test/fixture/testmod/manifests/defined_type/sub_manifest.pp
 - test/fixture/testmod/manifests/init.pp
 - test/fixture/testmod/templates/config.erb
 - test/fixture/testmod_small/Modulefile
@@ -208,17 +191,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rake tasks for packaging Puppet modules
@@ -231,9 +214,12 @@ test_files:
 - test/fixture/testmod/Modulefile
 - test/fixture/testmod/Modulefile.no_name_or_author
 - test/fixture/testmod/Modulefile.no_version
+- test/fixture/testmod/README.md
 - test/fixture/testmod/Rakefile
 - test/fixture/testmod/files/example.dat
 - test/fixture/testmod/lib/utils.rb
+- test/fixture/testmod/manifests/defined_type.pp
+- test/fixture/testmod/manifests/defined_type/sub_manifest.pp
 - test/fixture/testmod/manifests/init.pp
 - test/fixture/testmod/templates/config.erb
 - test/fixture/testmod_small/Modulefile

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-P������N:�ĕ<��NV',�������X=Gd~�z���FU:M�uu��'�+b(���՞�T%"�$���Dd���Ie,)���ʗ�������Jp9Ou$ۂ|���u0�x.�絨V�d�^Q��9��"��A�W�F!�XBKK;��J>$mtS�<��cw�z�E���;��`�d����]6�қ``s�d�ڡ{�nl������5��_�[:�-!�

data.tar.gz.sig

@@ -1 +0,0 @@
-~�3��q�PjV$�z�w+�(�5Dۤʧ��x��n��QԌ%_���|M�(&�b�,
C�=J���k-�NY�A���{���&P�"�/U����#��6�	��I����v6>��5[I[���>��ob���L	!K�$d��:��CԿa���Z���?]j�A��>'�v�c��ʌ�W��6��,�e��+r�CT�A��xz���?k�+=;?�Ξ�������H�[п�[���=��C^I2�

metadata.gz.sig

@@ -1 +0,0 @@
-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���