puppetfile_editor 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f80e573ccac2a8b14e1802a81e148da2caf73e00
-  data.tar.gz: 9803399f5d16f23fdbcb8b95701db9352d94bbcd
+SHA256:
+  metadata.gz: c65880cea1d9c5542724d9297779007c5422d436fba0491110a338067d12a361
+  data.tar.gz: c51a9958b20477aba74ce37400601b91778f0ef03ca8e5c6e995be70347b2330
 SHA512:
-  metadata.gz: 4f932f8a8f111cf09ec710a36edf5e82f6fffd117f10ab6942ff3df5b9a96497955a198501dff84492658c50e84810def1c2324614d442eaf70dd36580bc23de
-  data.tar.gz: c181a94a1a5a6cdc150c565abb65991d33f1cb140732eae87f0d777cde6aa1187ba89809987fba9ea31049d959799f8ba4c7b3087e95e06f41d8947219177175
+  metadata.gz: d1d60910bae9716a96533f9484884db3770a1050392439bcae948b3baf93179e1e6392d59738f95d3e61c9200d14a93d78ee823c349aaea1c4b4300b1aee4044
+  data.tar.gz: 89c5ea8214da8acafcbedd302d9345632b9f5e9950238f6a1a3b5802abd5ee7b844462e38c93dfe65ee4f48186530dcf5c1739aa08753d507e05c03fade49744

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/).
 
+## [Unreleased]
+
+## [0.9.0] - 2019-08-06
+### Changed
+- Add ability to compare Puppetfiles ignoring module types (`git` vs `hg`).
+
 ## [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).

data/bin/pfile

@@ -12,7 +12,7 @@ ARGV.push('-h') if ARGV.empty?
 options = { puppetfile: 'Puppetfile' }
 
 subcommands = {
-  'edit' => OptionParser.new do |parser|
+  'edit'   => OptionParser.new do |parser|
     parser.banner = "Usage: #{filename} edit [options]"
     parser.on('-m', '--module-name NAME', 'Module name') do |setting|
       options[:name] = setting
@@ -30,7 +30,7 @@ subcommands = {
       options[:name] = setting
     end
   end,
-  'add' => OptionParser.new do |parser|
+  'add'    => OptionParser.new do |parser|
     parser.banner = "Usage: #{filename} add [options]"
     parser.on('-m', '--module-name NAME', 'Module name') do |setting|
       options[:name] = setting
@@ -53,7 +53,7 @@ subcommands = {
       end
     end
   end,
-  'merge' => OptionParser.new do |parser|
+  'merge'  => OptionParser.new do |parser|
     parser.banner = "Usage: #{filename} merge [options]"
     parser.separator '  Merge existing Puppetfile with another one from STDIN.'
     parser.separator '  Dump the result to STDOUT.'

data/lib/puppetfile_editor/cli.rb

@@ -122,11 +122,11 @@ module PuppetfileEditor
     end
 
     def log(message, message_type = :undef)
-      status = if @statuses.key? message_type
-                 @statuses[message_type]
-               else
-                 @statuses[:undef]
-               end
+      if @statuses.key? message_type
+        status = @statuses[message_type]
+      else
+        status = @statuses[:undef]
+      end
       puts "#{status} #{message}"
     end
 

data/lib/puppetfile_editor/module.rb

@@ -123,11 +123,11 @@ module PuppetfileEditor
       when :hg, :git
         output.push "mod '#{full_title}'"
         @params.each do |param_name, param_value|
-          value = if param_value == :latest
-                    ':latest'
-                  else
-                    "'#{param_value}'"
-                  end
+          if param_value == :latest
+            value = ':latest'
+          else
+            value = "'#{param_value}'"
+          end
           param = "#{param_name}:".ljust(@indent)
           output.push "    #{param} #{value}"
         end
@@ -145,6 +145,7 @@ module PuppetfileEditor
 
     def full_title
       return "#{@author}/#{@name}" if @author
+
       @name
     end
 
@@ -154,6 +155,7 @@ module PuppetfileEditor
         @params.reject { |param, _| param.eql? @type }.map { |param, value| "#{param}: #{value}" }.sort.join(', ')
       when :forge
         return @params[:version] if @params.key? :version
+
         nil
       end
     end

data/lib/puppetfile_editor/puppetfile.rb

@@ -34,14 +34,15 @@ module PuppetfileEditor
     end
 
     def load
-      puppetfile_contents = if @from_stdin
-                              $stdin.gets(nil).chomp
-                            elsif @contents
-                              @contents
-                            else
-                              raise(IOError, "'#{@puppetfile_path}' is missing or unreadable") unless File.readable?(@puppetfile_path)
-                              File.read @puppetfile_path
-                            end
+      if @from_stdin
+        puppetfile_contents = $stdin.gets(nil).chomp
+      elsif @contents
+        puppetfile_contents = @contents
+      else
+        raise(IOError, "'#{@puppetfile_path}' is missing or unreadable") unless File.readable?(@puppetfile_path)
+
+        puppetfile_contents = File.read @puppetfile_path
+      end
 
       dsl = PuppetfileEditor::DSL.new(self)
       dsl.instance_eval(puppetfile_contents)
@@ -58,6 +59,7 @@ module PuppetfileEditor
       @module_sections.each do |module_type, module_comment|
         module_list = modules.select { |_, mod| mod.type == module_type }
         next unless module_list.any?
+
         contents.push "# #{module_comment}"
         module_list.values.sort_by(&:name).each do |mod|
           contents.push mod.dump
@@ -78,11 +80,12 @@ module PuppetfileEditor
       @modules[name].set(param, value, true)
     end
 
-    def compare_with(pfile)
+    def compare_with(pfile, compare_across_types: false)
       diff = {}
       pfile.modules.each do |mod_name, mod|
         next unless [:git, :hg, :forge].include? mod.type
-        version_key = mod.type == :forge ? :version : :tag
+
+        mod.type == :forge ? version_key = :version : version_key = :tag
 
         unless @modules.key? mod_name
           diff[mod_name] = { new: mod.params[version_key], type: mod.type } if mod.params.key?(version_key)
@@ -91,9 +94,12 @@ module PuppetfileEditor
 
         local_mod = @modules[mod_name]
 
-        next unless mod.type == local_mod.type
+        unless compare_across_types
+          next unless mod.type == local_mod.type
+        end
         next unless mod.params.key?(version_key) && local_mod.params.key?(version_key)
         next if mod.params[version_key] == local_mod.params[version_key]
+
         diff[mod_name] = { old: local_mod.params[version_key], new: mod.params[version_key], type: mod.type }
       end
       diff
@@ -112,6 +118,7 @@ module PuppetfileEditor
 
     def update_forge_url(url)
       raise StandardError, "Forge URL must be a String, but it is a #{url.class}" unless url.is_a? String
+
       @forge = url
     end
   end

data/lib/puppetfile_editor/version.rb

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

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile_editor
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Eugene Piven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0'
 description: |2
       PuppetfileEditor provides an easy-to-use interface to check Puppetfile for validity,
       update module versions, add, and remove modules.
@@ -102,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Parse and edit Puppetfile