Merge pull request #662 from puppetlabs/modules-4506

[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config

diff --git a/Gemfile b/Gemfile
index 5d863251d66604c2b1327f1e0fb6b420dadb6076..46cb2eacec6c449052b3e1f7aad6aa8e1bbd5956 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -29,38 +29,27 @@ end
 
 # Used for gem conditionals
 supports_windows = false
+ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
+minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
 group :development do
-  gem 'puppet-lint',                        :require => false
-  gem 'metadata-json-lint',                 :require => false, :platforms => 'ruby'
-  gem 'puppet_facts',                       :require => false
-  gem 'puppet-blacksmith', '>= 3.4.0',      :require => false, :platforms => 'ruby'
-  gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
-  gem 'rspec-puppet', '>= 2.3.2',           :require => false
-  gem 'rspec-puppet-facts',                 :require => false, :platforms => 'ruby'
-  gem 'mocha', '< 1.2.0',                   :require => false
-  gem 'simplecov',                          :require => false, :platforms => 'ruby'
-  gem 'parallel_tests', '< 2.10.0',         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'parallel_tests',                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
-  gem 'rubocop', '0.41.2',                  :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'rubocop',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
-  gem 'rubocop-rspec', '~> 1.6',            :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
-  gem 'pry',                                :require => false
-  gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem 'fast_gettext', '1.1.0',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem 'fast_gettext',                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem 'rainbow', '< 2.2.0',                 :require => false
+  gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",   :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}",     :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}",       :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json_pure", '<= 2.0.1',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "fast_gettext", '1.1.0',                         :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                  :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
 end
 
 group :system_tests do
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
-  gem 'beaker-pe',                                                               :require => false
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])                
-  gem 'beaker-puppet_install_helper',                                            :require => false
-  gem 'beaker-module_install_helper',                                            :require => false
-  gem 'master_manipulator',                                                      :require => false
-  gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
-  gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
+  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem "beaker-pe",                                                               :require => false
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
+  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

diff --git a/locales/config.yaml b/locales/config.yaml
index d6bd361b78a4d70b8e0ac919ac8e1574c1218fcc..07c0b9bb919a49a3bd8d5d9fbad646df037f9fce 100644 (file)
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -22,5 +22,4 @@ gettext:
   # Patterns for +Dir.glob+ used to find all files that might contain
   # translatable content, relative to the project root directory
   source_files:
-      - 'metadata.json'
-  
\ No newline at end of file
+  

diff --git a/manifests/key.pp b/manifests/key.pp
index 148a751de60e1c419280359f4a7e3ca36089b0cb..d4a1d802adfa75089417362dd56fb15bf45e1228 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -81,8 +81,8 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} present": }
+        }
+        -> anchor { "apt_key ${_id} present": }
       }
     }
 
@@ -99,8 +99,8 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} absent": }
+        }
+        -> anchor { "apt_key ${_id} absent": }
       }
     }