puppetfile_editor 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd06f4116c562fe9db2c70ee918c1a178cffb2c
-  data.tar.gz: 51ef0ec280c7fbcbb2a225528579471b1451f05b
+  metadata.gz: 15d075f0af7a73918a550b8b6715625d21053027
+  data.tar.gz: af35e9d77f745314e1640640bc1bfe3047a29b63
 SHA512:
-  metadata.gz: 227795078fcb7cc4b46ba31a482aec3cfd488a92c36f8c26bc4f0e7d06e9b133854c41d37dfca389ef9410fe8f09fc247655ee4ae951a68b0ec370ad0cbda84a
-  data.tar.gz: 8e982d0e9ac8dab8851de23d0056f0a67c4741a8dec1b7ff6eecd53e43f2baef092399a44854b42a10b970683675e05f2961de67b83302dd9cd81dcdf40e6694
+  metadata.gz: bd7f060fbc0721a622949db87dc395e1f8043c7cd8c9992664bf137b8a51c7139037eb45f4783deb62b8158af769ec21e61fca2d4aff923ff78c94d450de556a
+  data.tar.gz: d0852ba1a1311a560faa38143dd0b01bf545a03c4c6e27f08cdfece923d3df1fb3aa29f0e26fa5b065d382043b387977f6501c3561d1b0c8a24a1546a49f6872

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+## [0.3.1] - 2017-10-04
+### Fixed
+- `kept at` behavior:
+  - `changeset` is now also part of the version to be kept back (`hg`, `git` modules).
+  - Various cases where the version should have been kept, but wasn't, have now been fixed.
+
 ## [0.3.0] - 2017-09-27
 ### Added
 - Puppetfile can be instantiated using provided contents.

data/lib/puppetfile_editor/module.rb

@@ -58,12 +58,14 @@ module PuppetfileEditor
     def merge_with(mod, force = false)
       unless mod.type == @type
         set_message("type mismatch ('#{@type}' vs '#{mod.type}')", :type_mismatched)
+        return
       end
       case @type
         when :hg, :git
           new = mod.params.reject { |param, _| param.eql? @type }
-          if !force && new.keys == [:tag] && (@params.key?(:branch) || @params.key?(:ref))
+          if !force && new.keys == [:tag] && (!([:branch, :ref, :changeset] & @params.keys).empty?)
             set_message("kept at #{full_version}", :wont_upgrade)
+            return
           end
           if full_version == mod.full_version
             set_message("versions match (#{full_version})", :matched)
@@ -71,13 +73,14 @@ module PuppetfileEditor
           else
             set_message("updated (#{full_version} to #{mod.full_version})", :updated)
           end
-          @params.delete_if { |param, _| [:branch, :tag, :ref].include? param }
+          @params.delete_if { |param, _| [:branch, :tag, :ref, :changeset].include? param }
           @params.merge!(new)
           calculate_indent
         when :forge
           unless force
             if mod.params.nil? or mod.params.is_a? Symbol
               set_message("won't upgrade to #{mod.full_version}", :wont_upgrade)
+              return
             end
           end
           if full_version == mod.full_version

data/lib/puppetfile_editor/version.rb

@@ -1,3 +1,3 @@
 module PuppetfileEditor
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile_editor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eugene Piven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler