puppetfile_editor 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c87e60bcb47337f1e82ddebb3cf63438ca86d16d469c4a7837bc179a7a2ca1c9
-  data.tar.gz: 1cdd31477c5668a7fb8170b60df48a0156a8f8e2786a575c52b56ecfadf0d563
+SHA1:
+  metadata.gz: f80e573ccac2a8b14e1802a81e148da2caf73e00
+  data.tar.gz: 9803399f5d16f23fdbcb8b95701db9352d94bbcd
 SHA512:
-  metadata.gz: 1095879f6b4423febcc3c225e944ad410622155ab4d3ed6a196b33dd96f87114d7b2d028f94ff626fa993a7492831df7d275791dc06f7abd443a6f5071872ce4
-  data.tar.gz: 84f21e96aee3e29ea6513a0b6012242aa5b41b9fd2ac1e2fba6cc85a8817d162b9c7cdaa80ad8d0c3997eab33e6b7f517f69b82e70fb660df190048cb910dbc2
+  metadata.gz: 4f932f8a8f111cf09ec710a36edf5e82f6fffd117f10ab6942ff3df5b9a96497955a198501dff84492658c50e84810def1c2324614d442eaf70dd36580bc23de
+  data.tar.gz: c181a94a1a5a6cdc150c565abb65991d33f1cb140732eae87f0d777cde6aa1187ba89809987fba9ea31049d959799f8ba4c7b3087e95e06f41d8947219177175

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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/).
 
+## [0.8.0] - 2018-07-12
+### Changed
+- [#1](https://github.com/pegasd/puppetfile_editor/issues/1): Do not downgrade modules while merging, whenever possible (see issue for more details).
+- Changed status message and color for modules not found in original Puppetfile (old one generated too much noise).
+
+
 ## [0.7.1] - 2018-02-22
 ### Fixed
 - Fix for older rubies where `Gem::Version` broke for versions like `0.1.0-dev1`.

data/lib/puppetfile_editor/cli.rb

@@ -35,7 +35,7 @@ module PuppetfileEditor
       @pfile.dump
     end
 
-    def format(_)
+    def format(_why_am_i_here)
       @pfile.dump
     end
 
@@ -113,10 +113,9 @@ module PuppetfileEditor
         updated:         "[ \e[32;1m+\e[0m ]",
         matched:         "[ \e[0;1m=\e[0m ]",
         skipped:         "[ \e[33;1m~\e[0m ]",
-        not_found:       "[ \e[31;1mx\e[0m ]",
+        not_found:       "[ \e[0;1m-\e[0m ]",
         type_mismatched: "[ \e[31;1mx\e[0m ]",
         wont_upgrade:    "[ \e[33;1m!\e[0m ]",
-        downgrade:       "[ \e[31;1m!\e[0m ]",
         warn:            "[ \e[31;1m!!\e[0m ]",
         undef:           '',
       }

data/lib/puppetfile_editor/module.rb

@@ -85,7 +85,8 @@ module PuppetfileEditor
           set_message("could not compare versions, so updating (#{full_version} to #{mod.full_version})", :updated)
         else
           if old_version > new_version
-            set_message("DOWNGRADED (#{full_version} to #{mod.full_version})", :downgrade)
+            set_message("not downgrading (#{full_version} > #{mod.full_version})", :matched)
+            return
           else
             set_message("updated (#{full_version} to #{mod.full_version})", :updated)
           end
@@ -105,7 +106,8 @@ module PuppetfileEditor
           set_message("versions match (#{full_version})", :matched)
           return
         elsif Gem::Version.new(full_version) > Gem::Version.new(mod.full_version)
-          set_message("DOWNGRADED (#{full_version} to #{mod.full_version})", :downgrade)
+          set_message("not downgrading (#{full_version} > #{mod.full_version})", :matched)
+          return
         else
           set_message("updated (#{full_version} to #{mod.full_version})", :updated)
         end
@@ -122,10 +124,10 @@ module PuppetfileEditor
         output.push "mod '#{full_title}'"
         @params.each do |param_name, param_value|
           value = if param_value == :latest
-            ':latest'
-          else
-            "'#{param_value}'"
-          end
+                    ':latest'
+                  else
+                    "'#{param_value}'"
+                  end
           param = "#{param_name}:".ljust(@indent)
           output.push "    #{param} #{value}"
         end

data/lib/puppetfile_editor/puppetfile.rb

@@ -78,16 +78,14 @@ module PuppetfileEditor
       @modules[name].set(param, value, true)
     end
 
-    def compare_with(pf)
+    def compare_with(pfile)
       diff = {}
-      pf.modules.each do |mod_name, mod|
+      pfile.modules.each do |mod_name, mod|
         next unless [:git, :hg, :forge].include? mod.type
         version_key = mod.type == :forge ? :version : :tag
 
         unless @modules.key? mod_name
-          if mod.params.key?(version_key)
-            diff[mod_name] = { new: mod.params[version_key], type: mod.type }
-          end
+          diff[mod_name] = { new: mod.params[version_key], type: mod.type } if mod.params.key?(version_key)
           next
         end
 
@@ -134,7 +132,9 @@ module PuppetfileEditor
       @librarian.update_forge_url(url)
     end
 
-    def method_missing(method, *_)
+    def respond_to_missing?(method, include_private); end
+
+    def method_missing(method, *_why_am_i_here)
       raise NoMethodError, "Unrecognized declaration: '#{method}'"
     end
   end

data/lib/puppetfile_editor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetfileEditor
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile_editor
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Eugene Piven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Parse and edit Puppetfile