modulesync 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5fca884c7267a718852233b170a0c69c6e39499
-  data.tar.gz: 28dae495ca5daa3b95f0d1d4d3a2b9c9710192f1
+SHA256:
+  metadata.gz: 9799ba2b483f6370a71e6787b21862cf6aeab0246f1b7896be48175c37564db3
+  data.tar.gz: fccd8279e58613ac070d05175bce1a9b0f4afc292ffac78c347f343518434bc3
 SHA512:
-  metadata.gz: 9846cea6b1f68664a63a292edcadf2d7fa5ad4c27b1527e58938e1757a909955b1644bfe977e618d0812779d3b62c29b439a51c069f027f4a190b214d18c96e3
-  data.tar.gz: 98d64c9912a93f34fa1630a999b82d1f7c25267dbe67756152e85a54b781d3c40016bb24d4c359f3fe61be40c41661a21111985458b0eee62d64539433895604
+  metadata.gz: f4f4e927a0d4df8a95859c23319cb395f3418ecd0fa4dadc5c9a68209dcc767bc821b71dd2206fa4b6c482a65464940803a2958849cd1a991276342490356351
+  data.tar.gz: c5cee9698af0bea865f69f5bed772db3a881e339e7a6626c6be70968c02568de8a5899c3dcebc3cfc3620f66fe51a65fa1b6887f2d929ac56bdf66a5dab59a82

data/.rubocop.yml

@@ -16,5 +16,5 @@ Style/TrailingCommaInLiteral:
   Enabled: false
 
 # would require external library
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2017-11-03 - 0.8.2
+
+### Summary
+
+This release fixes:
+  * Bug that caused .gitignore file handle to be left open - [#131](https://github.com/voxpupuli/modulesync/pull/131).
+  * Fixed switch_branch to use current_branch instead of master - [#130](https://github.com/voxpupuli/modulesync/pull/130).
+  * Fixed bug where failed runs wouldn't return correct exit code - [#125](https://github.com/voxpupuli/modulesync/pull/125).
+  * Fix typo in README link to Voxpupuli modulesync_config [#123](https://github.com/voxpupuli/modulesync/pull/123).
+
 ## 2017-05-08 - 0.8.1
 
 ### Summary

data/README.md

@@ -363,5 +363,5 @@ As commented, files within moduleroot directory can be flat files or ERB templat
 The Templates
 -------------
 
-See [Puppet's modulesync\_configs](https://github.com/puppetlabs/modulesync_configs) and [Vox Pupuli's modulesync\_configs](https://github.com/voxpupuli/modulesync_configs)
+See [Puppet's modulesync\_configs](https://github.com/puppetlabs/modulesync_configs) and [Vox Pupuli's modulesync\_config](https://github.com/voxpupuli/modulesync_config)
 repositories for different templates currently in use.

data/features/step_definitions/git_steps.rb

@@ -16,9 +16,9 @@ Given 'a remote module repository' do
         - puppet-test
       """
   )
-  write_file('modulesync.yml', <<-EOS)
+  write_file('modulesync.yml', <<-CONFIG)
 ---
   namespace: sources
   git_base: file://#{expand_path('.')}/
-  EOS
+  CONFIG
 end

data/features/update.feature

@@ -34,6 +34,32 @@ Feature: update
     Given I run `cat modules/puppet-test/test`
     Then the output should contain "aruba"
 
+  Scenario: Adding a new file to repo without write access
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: git@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 -m "Add test" -r`
+    Then the exit status should be 1
+
   Scenario: Adding a new file, without the .erb suffix
     Given a file named "managed_modules.yml" with:
       """

data/lib/modulesync.rb

@@ -81,7 +81,7 @@ module ModuleSync
         erb = Renderer.build(templatename)
         template = Renderer.render(erb, configs)
         Renderer.sync(template, module_file(options[:project_root], module_name, filename))
-      rescue
+      rescue # rubocop:disable Lint/RescueWithoutErrorClass
         STDERR.puts "Error while rendering #{filename}"
         raise
       end
@@ -132,7 +132,7 @@ module ModuleSync
     managed_modules.each do |puppet_module, module_options|
       begin
         manage_module(puppet_module, module_files, module_options, defaults, options)
-      rescue
+      rescue # rubocop:disable Lint/RescueWithoutErrorClass
         STDERR.puts "Error while updating #{puppet_module}"
         raise unless options[:skip_broken]
         puts "Skipping #{puppet_module} as update process failed"

data/lib/modulesync/git.rb

@@ -19,7 +19,7 @@ module ModuleSync
     end
 
     def self.switch_branch(repo, branch)
-      return if repo.branch.name == branch
+      return if repo.current_branch == branch
 
       if local_branch_exists?(repo, branch)
         puts "Switching to branch #{branch}"
@@ -136,7 +136,7 @@ module ModuleSync
           puts "There were no files to update in #{name}. Not committing."
         else
           puts git_error
-          exit
+          exit(1)
         end
       end
     end
@@ -146,7 +146,7 @@ module ModuleSync
     # https://github.com/schacon/ruby-git/issues/130
     def self.untracked_unignored_files(repo)
       ignore_path = "#{repo.dir.path}/.gitignore"
-      ignored = File.exist?(ignore_path) ? File.open(ignore_path).read.split : []
+      ignored = File.exist?(ignore_path) ? File.read(ignore_path).split : []
       repo.status.untracked.keep_if { |f, _| ignored.none? { |i| File.fnmatch(i, f) } }
     end
 
@@ -162,7 +162,7 @@ module ModuleSync
       end
 
       puts 'Files added:'
-      untracked_unignored_files(repo).each do |file, _|
+      untracked_unignored_files(repo).each_key do |file|
         puts file
       end
 

data/lib/modulesync/hook.rb

@@ -12,14 +12,14 @@ module ModuleSync
     end
 
     def content(arguments)
-      <<-EOF
+      <<-CONTENT
 #!/usr/bin/env bash
 
 current_branch=\`git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,'\`
 git_dir=\`git rev-parse --show-toplevel\`
 message=\`git log -1 --format=%B\`
 msync -m "\$message" #{arguments}
-EOF
+CONTENT
     end
 
     def activate

data/modulesync.gemspec

@@ -1,11 +1,9 @@
-# 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.8.1'
+  spec.version               = '0.8.2'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -23,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.50.0'
 
   spec.add_runtime_dependency 'git', '~>1.3'
   spec.add_runtime_dependency 'puppet-blacksmith', '~>3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer