falkorlib 0.5.6 → 0.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/falkorlib/puppet/modules.rb +1 -1
  4. data/lib/falkorlib/tasks/puppet_modules.rake +1 -1
  5. data/lib/falkorlib/version.rb +1 -1
  6. data/templates/puppet/modules/{.pmignore → .pmtignore} +0 -0
  7. data/templates/puppet/modules/.vagrant_init.rb +14 -3
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8eba86657efa15410ce5eac1bd49205f78e958d7
4
- data.tar.gz: 24c229e174aa8abe5c5675731b49b32fc3d4147a
3
+ metadata.gz: 594670018ab8236776433f498a44b26de9cd3ffe
4
+ data.tar.gz: 3e53ef37e6dceb5f8dd2b52768476196467cbf35
5
5
  SHA512:
6
- metadata.gz: 17f1c879e7c84f17b98db8f61040a780a438a82838d9fa1e9b24ed84b7066f0f312d94178523021bab6612208e94ce4409d717ddb54e0cb9ad6c20c3002f1a4e
7
- data.tar.gz: 1e74c3009789243a384893f7d9410594b81e46ada84340640600474b9fad7fe7ddc9e7a34732ea95a11bdb66b28d782b8f9f95eb8c30f0546641055069717127
6
+ metadata.gz: 4aab889e8da480ddb8f24f3a4831d7f38b3ece97f55107dc6ea09f70231d1ee92621a78693b15aa0186ca65a09d3bf033e2185a881b0ef2a4cb24cf195b90a31
7
+ data.tar.gz: 2043cf466d756a1cddeffb81307fdad18f4e9b5c945326fb9f849dcc49b27b88747ec065d1e73f09269f839026c562e0d3da05b0e52f9e0b6a9120bbc3fb3eff
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- falkorlib (0.5.6)
4
+ falkorlib (0.5.7)
5
5
  artii (>= 2.1)
6
6
  awesome_print (~> 1.2)
7
7
  configatron (~> 3.2)
data/lib/falkorlib/puppet/modules.rb CHANGED
@@ -170,7 +170,7 @@ module FalkorLib #:nodoc:
170
170
  FalkorLib::GitFlow.start('feature', "bootstrapping", moduledir)
171
171
  end
172
172
  [ 'metadata.json',
173
- 'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.pmignore',
173
+ 'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.pmtignore',
174
174
  '.ruby-version', '.ruby-gemset', 'Gemfile',
175
175
  '.vagrant_init.rb', 'Rakefile', 'Vagrantfile' ].each do |f|
176
176
  FalkorLib::Git.add(File.join(moduledir, f))
data/lib/falkorlib/tasks/puppet_modules.rake CHANGED
@@ -165,7 +165,7 @@ end # namespace module
165
165
  require 'rake/clean'
166
166
  CLEAN.add 'pkg'
167
167
 
168
- exclude_tests_paths = ['pkg/**/*','spec/**/*']
168
+ exclude_tests_paths = ['pkg/**/*','spec/**/*','manifests.old/**/*']
169
169
 
170
170
  #.........................................................................
171
171
  # puppet-lint tasks -- see http://puppet-lint.com/checks/
data/lib/falkorlib/version.rb CHANGED
@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
19
19
  # MAJOR: Defines the major version
20
20
  # MINOR: Defines the minor version
21
21
  # PATCH: Defines the patch version
22
- MAJOR, MINOR, PATCH = 0, 5, 6
22
+ MAJOR, MINOR, PATCH = 0, 5, 7
23
23
 
24
24
  module_function
25
25
 
data/templates/puppet/modules/{.pmignore → .pmtignore} RENAMED
File without changes
data/templates/puppet/modules/.vagrant_init.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  ##########################################################################
3
3
  # vagrant_init.rb
4
4
  # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
5
- # Time-stamp: <Thu 2015-05-28 14:06 svarrette>
5
+ # Time-stamp: <Tue 2015-06-02 10:36 svarrette>
6
6
  #
7
7
  # @description
8
8
  #
@@ -11,6 +11,7 @@
11
11
  ##############################################################################
12
12
 
13
13
  require 'json'
14
+ require 'yaml'
14
15
  require 'falkorlib'
15
16
 
16
17
  include FalkorLib::Common
@@ -29,13 +30,23 @@ moduledir=modulepath.split(':').first
29
30
  metadata["dependencies"].each do |dep|
30
31
  lib = dep["name"]
31
32
  shortname = lib.gsub(/^.*[\/-]/,'')
32
- action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade' : 'install'
33
+ action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
33
34
  run %{ puppet module #{action} #{lib} }
34
35
  end
35
36
 
36
-
37
37
  puts "Module path: #{modulepath}"
38
38
  puts "Moduledir: #{moduledir}"
39
39
 
40
40
  info "set symlink to the '#{basedir}' module for local developments"
41
41
  run %{ ln -s #{basedir} #{moduledir}/#{name} } unless File.exists?("#{moduledir}/#{name}")
42
+
43
+ # Prepare hiera
44
+ unless File.exists?('/etc/puppet/hiera.yaml')
45
+ run %{ ln -s /etc/hiera.yaml /etc/puppet/hiera.yaml } if File.exists?("/etc/hiera.yaml")
46
+ end
47
+ hieracfg = YAML::load_file('/etc/hiera.yaml')
48
+ [ '/vagrant/hiera', '/vagrant/tests/hiera' ].each do |d|
49
+ hieracfg[:datadir] << d if File.directory?('#{d}')
50
+ end
51
+ hieracfg[:hierarchy] << common unless hieracfg[:hierarchy].include?('common')
52
+ FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: falkorlib
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.6
4
+ version: 0.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastien Varrette
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-28 00:00:00.000000000 Z
11
+ date: 2015-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -416,7 +416,7 @@ files:
416
416
  - templates/Rakefile/rakefile_gitflow.erb
417
417
  - templates/motd/motd.erb
418
418
  - templates/puppet/modules/.gitignore
419
- - templates/puppet/modules/.pmignore
419
+ - templates/puppet/modules/.pmtignore
420
420
  - templates/puppet/modules/.vagrant_init.rb
421
421
  - templates/puppet/modules/Gemfile
422
422
  - templates/puppet/modules/README.md.erb