modulesync 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd5e56a7370a3eb358c9a6d1fdf28aab8078ba9
-  data.tar.gz: 444ba255257e89d604065e066978f028d798907d
+  metadata.gz: 68055a15d6cb04e09aa817ca80d02daaa18d871e
+  data.tar.gz: 734cb292972fb267ed1e5139caf970d8a5678d2e
 SHA512:
-  metadata.gz: fa110f5ccfaa83e13be484e0d443cbddc50b97706dda6fa9b6080bb9bf509fbff0ecc7953dfd1014b40bae0baf5a5c214d49ec96cb640b5a1b1d13269cf51d8c
-  data.tar.gz: 8629e474f0b8998f5707954204a37ab94006d056640f2f438bca92fa6c4694238e7a4657281c8c2d0bf35c810da5fb26176da0da5a3e77472fb242743fb3063c
+  metadata.gz: 2eed0ed67ad09ac3a2fe29e7d0acb516c7f07cd6626a9d1390258aa8ca18653f1c8744ed84a1107753855eb7557f52e45404fead5012b198119deb2ef3f5eb8e
+  data.tar.gz: 6530399b6eebe0c779c41995f39a7e4e3d2fab6a562a525b02b05e76ae75a7df885e8822f9b30bfdc2b9ee2c46b15fa4d0ee069012ef9e6773335521887c11d6

data/.rubocop.yml

@@ -1,16 +1,20 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 1.9
+  TargetRubyVersion: 2.0
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'
     - 'pkg/**/*'
+    - 'lib/monkey_patches.rb'
 
-# we still support ruby 1.8
 Style/HashSyntax:
   Enabled: false
 
 # dealbreaker:
 Style/TrailingCommaInLiteral:
   Enabled: false
+
+# would require external library
+Style/IndentHeredoc:
+  Enabled: false

data/.travis.yml

@@ -2,17 +2,19 @@
 sudo: false
 language: ruby
 cache: bundler
+dist: trusty
 before_install:
   - gem update --system
   - gem install bundler
 script: 'bundle exec rake test'
 rvm:
-  - 1.9.3
   - 2.0
-  - 2.1
-  - 2.2
+  - 2.1.9
+  - 2.2.6
   - 2.3.3
   - 2.4.0
+notifications:
+  email: false
 deploy:
   provider: rubygems
   api_key:

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 2017-05-05 - 0.8.0
+
+### Summary
+
+This release now prefers `.erb` suffixes on template files. To convert your moduleroot directory, run this command in your configs repo:
+
+        find moduleroot/ -type f -exec git mv {} {}.erb \;
+
+Note that any `.erb`-suffixed configuration keys in `config_defaults.yml`, and `.sync.yml` need to be removed by hand. (This was unreleased functionality, will not affect most users.)
+
+#### Refactoring
+
+- Prefer `.erb` suffixes on template files, issue deprecation warning for templates without the extension
+- Require Ruby 2.0 or higher
+
+#### Bugfixes
+
+- Fix dependency on `git` gem for diff functionality
+- Fix error from `git` gem when diff contained line ending changes
+
 ## 2017-02-13 - 0.7.2
 
 Fixes an issue releasing 0.7.1, no functional changes.

data/Gemfile

@@ -1,8 +1,3 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-if ENV['TRAVIS_RUBY_VERSION'] && ENV['TRAVIS_RUBY_VERSION'] == '1.9.3'
-  gem 'json_pure', '~> 1.0'
-  gem 'rubocop', '< 0.42.0'
-end
-
 gemspec

data/README.md

@@ -27,7 +27,7 @@ Puppet Labs module engineers manage the zoo of Puppet modules on GitHub, and
 has now been restructured and generalized to be used within other
 organizations. Puppet modules within an organization tend to have a number of
 meta-files that are identical or very similar between modules, such as the
-Gemfile, .travis.yml, .gitignore, or spec\_helper.rb. If a file needs to
+`Gemfile`, `.travis.yml`, `.gitignore`, or `spec\_helper.rb`. If a file needs to
 change in one module, it likely needs to change in the same way in every other
 module that the organization manages.
 
@@ -60,22 +60,24 @@ of this configuration directory. [The configuration for the Puppet Labs
 modules](https://github.com/puppetlabs/modulesync\_configs), can be used as an
 example for your own configuration. The configuration directory contains a
 directory called moduleroot which mirrors the structure of a module. The files
-in the moduleroot could be flat files or ERB templates. The templates are
-rendered using values from a file called config\_defaults.yml in the root (not
+in the moduleroot are ERB templates, and MUST be named after the target file,
+with `.erb.` appended. The templates are
+rendered using values from a file called `config\_defaults.yml` in the root (not
 moduleroot) of the configuration directory. The default values can be
-overridden or extended by adding a file called .sync.yml to the module itself.
+overridden or extended by adding a file called `.sync.yml` to the module itself.
 This allows us to, for example, have a set of "required" gems that are added
 to all Gemfiles, and a set of "optional" gems that a single module might add.
 
 Within the templates, values can be accessed in the `@configs` hash, which is
-merged from the values under the keys `:global` and the current file name.
+merged from the values under the keys `:global` and the target file name (no
+`.erb` suffix).
 
-The list of modules to manage is in managed\_modules.yml in the configuration
+The list of modules to manage is in `managed\_modules.yml` in the configuration
 directory. This lists just the names of the modules to be managed.
 
 ModuleSync can be called from the command line with parameters to change the
 branch you're working on or the remote to clone from and push to. You can also
-define these parameters in a file named modulesync.yml in the configuration
+define these parameters in a file named `modulesync.yml` in the configuration
 directory.
 
 Installing
@@ -122,6 +124,7 @@ msync update --noop
 ```
 
 #### Offline support
+
 The --offline flag was added to allow a user to disable git support within
 msync. One reason for this is because the user wants to control git commands
 external to msync.  Note, when using this command, msync assumes you have
@@ -359,6 +362,5 @@ As commented, files within moduleroot directory can be flat files or ERB templat
 The Templates
 -------------
 
-See the [modulesync\_configs](https://github.com/puppetlabs/modulesync_configs)
-repository for an explanation of the templates that Puppet Labs uses on its
-modules.
+See [Puppet's modulesync\_configs](https://github.com/puppetlabs/modulesync_configs) and [Vox Pupuli's modulesync\_configs](https://github.com/voxpupuli/modulesync_configs)
+repositories for different templates currently in use.

data/Rakefile

@@ -18,4 +18,4 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts << '--format pretty'
 end
 
-task :test => [:clean, :spec, :cucumber, :rubocop]
+task :test => %i[clean spec cucumber rubocop]

data/features/update.feature

@@ -2,6 +2,39 @@ Feature: update
   ModuleSync needs to update module boilerplate
 
   Scenario: Adding a new file
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test.erb" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+
+  Scenario: Adding a new file, without the .erb suffix
     Given a file named "managed_modules.yml" with:
       """
       ---
@@ -26,6 +59,115 @@ Feature: update
       """
     When I run `msync update --noop`
     Then the exit status should be 0
+    And the output should match:
+      """
+      Warning: using './moduleroot//test' as template without '.erb' suffix
+      """
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+
+  Scenario: Adding a new file using global values
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      :global:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test.erb" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+
+  Scenario: Adding a new file overriding global values
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      :global:
+        name: global
+
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test.erb" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+
+  Scenario: Adding a new file ignoring global values
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      :global:
+        key: global
+
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test.erb" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
     And the output should match:
       """
       Files added:
@@ -53,7 +195,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <% @configs.each do |c| -%>
         <%= c['name'] %>
@@ -81,7 +223,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <% @configs.each do |c| -%>
         <%= c['name'] %>
@@ -109,7 +251,7 @@ Feature: update
         gem_source: https://somehost.com
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/Gemfile" with:
+    And a file named "moduleroot/Gemfile.erb" with:
       """
       source '<%= @configs['gem_source'] %>'
       """
@@ -136,7 +278,7 @@ Feature: update
         gem_source: https://somehost.com
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/Gemfile" with:
+    And a file named "moduleroot/Gemfile.erb" with:
       """
       source '<%= @configs['gem_source'] %>'
       """
@@ -168,7 +310,7 @@ Feature: update
         unmanaged: true
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/Gemfile" with:
+    And a file named "moduleroot/Gemfile.erb" with:
       """
       source '<%= @configs['gem_source'] %>'
       """
@@ -208,7 +350,7 @@ Feature: update
         delete: true
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/Gemfile" with:
+    And a file named "moduleroot/Gemfile.erb" with:
       """
       source '<%= @configs['gem_source'] %>'
       """
@@ -262,7 +404,7 @@ Feature: update
         unmanaged: true
       """
     And a directory named "moduleroot/spec"
-    And a file named "moduleroot/spec/spec_helper.rb" with:
+    And a file named "moduleroot/spec/spec_helper.rb.erb" with:
       """
       some spec_helper fud
       """
@@ -303,7 +445,7 @@ Feature: update
         require:
           - puppetlabs_spec_helper/module_helper
       """
-    And a file named "moduleroot/spec/spec_helper.rb" with:
+    And a file named "moduleroot/spec/spec_helper.rb.erb" with:
       """
       <% @configs['require'].each do |required| -%>
         require '<%= required %>'
@@ -341,7 +483,7 @@ Feature: update
         require:
           - puppetlabs_spec_helper/module_helper
       """
-    And a file named "moduleroot/spec/spec_helper.rb" with:
+    And a file named "moduleroot/spec/spec_helper.rb.erb" with:
       """
       <% @configs['require'].each do |required| -%>
         require '<%= required %>'
@@ -369,7 +511,7 @@ Feature: update
         require:
           - puppetlabs_spec_helper/module_helper
       """
-    And a file named "moduleroot/spec/spec_helper.rb" with:
+    And a file named "moduleroot/spec/spec_helper.rb.erb" with:
       """
       <% @configs['require'].each do |required| -%>
         require '<%= required %>'
@@ -434,7 +576,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <%= @configs['name'] %>
       """
@@ -469,7 +611,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <%= @configs['name'] %>
       """
@@ -505,7 +647,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <%= @configs['name'] %>
       """
@@ -538,7 +680,7 @@ Feature: update
         require:
           - puppetlabs_spec_helper/module_helper
       """
-    And a file named "moduleroot/spec/spec_helper.rb" with:
+    And a file named "moduleroot/spec/spec_helper.rb.erb" with:
       """
       <% @configs['require'].each do |required| -%>
         require '<%= required %>'
@@ -591,7 +733,7 @@ Feature: update
         name: aruba
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/test" with:
+    And a file named "moduleroot/test.erb" with:
       """
       <%= @configs['name'] %>
       """
@@ -607,7 +749,7 @@ Feature: update
     Given I run `cat modules/puppet-lib-file_concat/.git/config`
     Then the output should contain "url = https://github.com/electrical/puppet-lib-file_concat.git"
 
-  Scenario: Modifying an existing file with values expoxed by the module
+  Scenario: Modifying an existing file with values exposed by the module
     Given a file named "managed_modules.yml" with:
       """
       ---
@@ -625,7 +767,7 @@ Feature: update
       README.md:
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/README.md" with:
+    And a file named "moduleroot/README.md.erb" with:
       """
       echo '<%= @configs[:git_base] + @configs[:namespace] %>'
       """
@@ -652,7 +794,7 @@ Feature: update
         gem_source: https://somehost.com
       """
     And a directory named "moduleroot"
-    And a file named "moduleroot/Gemfile" with:
+    And a file named "moduleroot/Gemfile.erb" with:
       """
       source '<%= @configs['gem_source'] %>'
       """

data/lib/modulesync/git.rb

@@ -147,7 +147,7 @@ module ModuleSync
     def self.untracked_unignored_files(repo)
       ignore_path = "#{repo.dir.path}/.gitignore"
       ignored = File.exist?(ignore_path) ? File.open(ignore_path).read.split : []
-      repo.status.untracked.keep_if { |f, _| !ignored.any? { |i| File.fnmatch(i, f) } }
+      repo.status.untracked.keep_if { |f, _| ignored.none? { |i| File.fnmatch(i, f) } }
     end
 
     def self.update_noop(name, options)

data/lib/modulesync/renderer.rb

@@ -9,10 +9,16 @@ module ModuleSync
       end
     end
 
-    def self.build(from_erb_template)
-      erb_obj = ERB.new(File.read(from_erb_template), nil, '-')
-      erb_obj.filename = from_erb_template.chomp('.erb')
-      erb_obj.def_method(ForgeModuleFile, 'render()')
+    def self.build(target_name)
+      template_file = if !File.exist?("#{target_name}.erb") && File.exist?(target_name)
+                        STDERR.puts "Warning: using '#{target_name}' as template without '.erb' suffix"
+                        target_name
+                      else
+                        "#{target_name}.erb"
+                      end
+      erb_obj = ERB.new(File.read(template_file), nil, '-')
+      erb_obj.filename = template_file
+      erb_obj.def_method(ForgeModuleFile, 'render()', template_file)
       erb_obj
     end
 
@@ -24,10 +30,10 @@ module ModuleSync
       ForgeModuleFile.new(configs).render
     end
 
-    def self.sync(template, to_file)
-      path = to_file.rpartition('/').first
+    def self.sync(template, target_name)
+      path = target_name.rpartition('/').first
       FileUtils.mkdir_p(path) unless path.empty?
-      File.open(to_file, 'w') do |file|
+      File.open(target_name, 'w') do |file|
         file.write(template)
       end
     end

data/lib/modulesync/settings.rb

@@ -1,6 +1,7 @@
 
 module ModuleSync
   # Encapsulate a configs for a module, providing easy access to its parts
+  # All configs MUST be keyed by the relative target filename
   class Settings
     attr_reader :global_defaults, :defaults, :module_defaults, :module_configs, :additional_settings
 
@@ -12,28 +13,36 @@ module ModuleSync
       @additional_settings = additional_settings
     end
 
-    def build_file_configs(filename)
-      global_defaults.merge(defaults[filename] || {}).merge(module_defaults).merge(module_configs[filename] || {}).merge(additional_settings)
+    def lookup_config(hash, target_name)
+      hash[target_name] || {}
     end
 
-    def managed?(filename)
-      Pathname.new(filename).ascend do |v|
+    def build_file_configs(target_name)
+      file_def = lookup_config(defaults, target_name)
+      file_md  = lookup_config(module_defaults, target_name)
+      file_mc  = lookup_config(module_configs, target_name)
+
+      global_defaults.merge(file_def).merge(file_md).merge(file_mc).merge(additional_settings)
+    end
+
+    def managed?(target_name)
+      Pathname.new(target_name).ascend do |v|
         configs = build_file_configs(v.to_s)
         return false if configs['unmanaged']
       end
       true
     end
 
-    # given a list of existing files in the repo, return everything that we might want to act on
-    def managed_files(file_list)
-      (file_list | defaults.keys | module_configs.keys).select do |f|
+    # given a list of templates in the repo, return everything that we might want to act on
+    def managed_files(target_name_list)
+      (target_name_list | defaults.keys | module_configs.keys).select do |f|
         (f != ModuleSync::GLOBAL_DEFAULTS_KEY) && managed?(f)
       end
     end
 
-    # returns a list of files that should not be touched
-    def unmanaged_files(file_list)
-      (file_list | defaults.keys | module_configs.keys).select do |f|
+    # returns a list of templates that should not be touched
+    def unmanaged_files(target_name_list)
+      (target_name_list | defaults.keys | module_configs.keys).select do |f|
         (f != ModuleSync::GLOBAL_DEFAULTS_KEY) && !managed?(f)
       end
     end

data/lib/modulesync.rb

@@ -7,6 +7,7 @@ require 'modulesync/hook'
 require 'modulesync/renderer'
 require 'modulesync/settings'
 require 'modulesync/util'
+require 'monkey_patches'
 
 module ModuleSync
   include Constants
@@ -30,7 +31,8 @@ module ModuleSync
 
   def self.local_files(path)
     if File.exist?(path)
-      local_files = Find.find(path).collect { |file| file unless File.directory?(file) }.compact
+      # only select *.erb files, and strip the extension. This way all the code will only have to handle bare paths, except when reading the actual ERB text
+      local_files = Find.find(path).find_all { |p| p =~ /.erb$/ && !File.directory?(p) }.collect { |p| p.chomp('.erb') }.to_a
     else
       puts "#{path} does not exist. Check that you are working in your module configs directory or that you have passed in the correct directory with -c."
       exit
@@ -48,7 +50,7 @@ module ModuleSync
       exit
     end
     managed_modules.select! { |m| m =~ Regexp.new(filter) } unless filter.nil?
-    managed_modules.select! { |m| m !~ Regexp.new(negative_filter) } unless negative_filter.nil?
+    managed_modules.reject! { |m| m =~ Regexp.new(negative_filter) } unless negative_filter.nil?
     managed_modules
   end
 
@@ -88,7 +90,7 @@ module ModuleSync
 
   def self.manage_module(puppet_module, module_files, module_options, defaults, options)
     puts "Syncing #{puppet_module}"
-    namespace, module_name = self.module_name(puppet_module, options[:namespace])
+    namespace, module_name = module_name(puppet_module, options[:namespace])
     unless options[:offline]
       git_base = options[:git_base]
       git_uri = "#{git_base}#{namespace}"

data/lib/monkey_patches.rb

@@ -0,0 +1,40 @@
+module Git
+  class Diff
+    # Monkey patch process_full_diff until https://github.com/schacon/ruby-git/issues/326 is resolved
+    def process_full_diff
+      defaults = {
+        :mode => '',
+        :src => '',
+        :dst => '',
+        :type => 'modified'
+      }
+      final = {}
+      current_file = nil
+      full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
+    :invalid => :replace,
+    :undef => :replace
+  })
+      full_diff_utf8_encoded.split("\n").each do |line|
+        if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
+          current_file = m[1]
+          final[current_file] = defaults.merge({:patch => line, :path => current_file})
+        elsif !current_file.nil?
+          if m = /^index (.......)\.\.(.......)( ......)*/.match(line)
+            final[current_file][:src] = m[1]
+            final[current_file][:dst] = m[2]
+            final[current_file][:mode] = m[3].strip if m[3]
+          end
+          if m = /^([[:alpha:]]*?) file mode (......)/.match(line)
+            final[current_file][:type] = m[1]
+            final[current_file][:mode] = m[2]
+          end
+          if m = /^Binary files /.match(line)
+            final[current_file][:binary] = true
+          end
+          final[current_file][:patch] << "\n" + line
+        end
+      end
+      final.map { |e| [e[0], DiffFile.new(@base, e[1])] }
+    end
+  end
+end

data/modulesync.gemspec

@@ -1,16 +1,18 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = 'modulesync'
-  spec.version       = '0.7.2'
-  spec.authors       = ['Vox Pupuli']
-  spec.email         = ['voxpupuli@groups.io']
-  spec.summary       = 'Puppet Module Synchronizer'
-  spec.description   = 'Utility to synchronize common files across puppet modules in Github.'
-  spec.homepage      = 'http://github.com/voxpupuli/modulesync'
-  spec.license       = 'Apache-2.0'
+  spec.name                  = 'modulesync'
+  spec.version               = '0.8.0'
+  spec.authors               = ['Vox Pupuli']
+  spec.email                 = ['voxpupuli@groups.io']
+  spec.summary               = 'Puppet Module Synchronizer'
+  spec.description           = 'Utility to synchronize common files across puppet modules in Github.'
+  spec.homepage              = 'http://github.com/voxpupuli/modulesync'
+  spec.license               = 'Apache-2.0'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'aruba'
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_runtime_dependency 'git', '~>1.2'
+  spec.add_runtime_dependency 'git', '~>1.3'
   spec.add_runtime_dependency 'puppet-blacksmith', '~>3.0'
   spec.add_runtime_dependency 'thor'
 end

data/spec/unit/modulesync/settings_spec.rb

@@ -19,7 +19,7 @@ describe ModuleSync::Settings do
   it { expect(subject.managed?('Gemfile')).to eq true }
   it { expect(subject.managed?('Gemfile/foo')).to eq true }
   it { expect(subject.managed_files([])).to eq ['Gemfile'] }
-  it { expect(subject.managed_files(%w(Rakefile Gemfile other_file))).to eq %w(Gemfile other_file) }
+  it { expect(subject.managed_files(%w[Rakefile Gemfile other_file])).to eq %w[Gemfile other_file] }
   it { expect(subject.unmanaged_files([])).to eq ['Rakefile'] }
-  it { expect(subject.unmanaged_files(%w(Rakefile Gemfile other_file))).to eq ['Rakefile'] }
+  it { expect(subject.unmanaged_files(%w[Rakefile Gemfile other_file])).to eq ['Rakefile'] }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,7 @@ files:
 - lib/modulesync/renderer.rb
 - lib/modulesync/settings.rb
 - lib/modulesync/util.rb
+- lib/monkey_patches.rb
 - modulesync.gemspec
 - spec/spec_helper.rb
 - spec/unit/modulesync/settings_spec.rb
@@ -170,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer