yaml_normalizer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16763d1b205a80bb7f7f9c41859fc79246544a6ada2ac31b8a07dd81927bc30c
-  data.tar.gz: 13063de9b8599168a8baa498db8f0aa94ab7039af5b873994281e67fae1781e0
+  metadata.gz: 2036bed9f89b7b2aab2dcfbeeb10f2300e31832a0e9bacee0136a7078a91d574
+  data.tar.gz: b29a9f93c38c0749cf4058ed981d9533f5560a970cbd3e8f622e7a9e3ce0bb22
 SHA512:
-  metadata.gz: c31e31854ead314f718f0299896a45c6d5669896592b2f8f751ed30efa992928fea3ad327597a2d20159dea71b4be5fbe85986f15db62d263fff4f6d3639d8c1
-  data.tar.gz: '0960b79a9df709d79d37a8c68cc8829aa81d24e2355dc6ee803cbd254d48165b0160d4938378ced917536882ee481e57bdf0a8de5251bc59316aee42c2524ce6'
+  metadata.gz: ba8873fe4c0296e7ad4df98df28525d8ef23b815b385fafc39911468956c627631651729fa740845bdc1ccf3cad07d4efcaa9010142e4eaafaed3537bdcdfb22
+  data.tar.gz: 074d417f0de927bd0f24f5769eefd02733aaaaefd822b06f433aa4e21c7eb4906d6dfaef5e0c1e6a77e9f7f585d8c79ec616e1aa4ff828bf2c3304a8525512fe

data/lib/yaml_normalizer/ext/sort_by_key.rb

@@ -19,9 +19,7 @@ module YamlNormalizer
       def sort_by_key(recursive = true)
         keys.sort_by(&:to_s).each_with_object({}) do |key, seed|
           value = seed[key] = fetch(key)
-          if recursive && value.instance_of?(Hash)
-            seed[key] = value.extend(SortByKey).sort_by_key
-          end
+          seed[key] = value.extend(SortByKey).sort_by_key if recursive && value.instance_of?(Hash)
         end
       end
     end

data/lib/yaml_normalizer/helpers.rb

@@ -7,3 +7,4 @@ module YamlNormalizer
 end
 
 require 'yaml_normalizer/helpers/normalize'
+require 'yaml_normalizer/helpers/param_parser'

data/lib/yaml_normalizer/helpers/param_parser.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module YamlNormalizer
+  module Helpers
+    # Methods handling passing of additional params from CLI
+    module ParamParser
+      # Parse the params provided to the service
+      # @param [Array] args - params passed to the service
+      # @return nil
+      def parse_params(*args)
+        OptionParser.new do |opts|
+          opts.banner = "Usage: #{program_name} [options] file1, file2..."
+          opts.on('-v', '--version', 'Prints the yaml_normalizer version') { print_version }
+          opts.on('-h', '--help', 'Prints this help') { print_help(opts) }
+        end.parse(args)
+      end
+
+      # Print current version of the tool
+      def print_version
+        print("#{YamlNormalizer::VERSION}\n")
+        exit_success
+      end
+
+      # Print current version of the tool
+      # @param [Option] opts - options of opt_parser object
+      # @return nil
+      def print_help(opts)
+        print(opts)
+        exit_success
+      end
+
+      private
+
+      def program_name
+        $PROGRAM_NAME.split('/').last
+      end
+
+      def exit_success
+        exit unless ENV['ENV'] == 'test'
+      end
+    end
+  end
+end

data/lib/yaml_normalizer/services/check.rb

@@ -11,6 +11,7 @@ module YamlNormalizer
     #   result = check.call
     class Check < Base
       include Helpers::Normalize
+      include Helpers::ParamParser
 
       # files is a sorted array of file path Strings
       attr_reader :files
@@ -19,6 +20,7 @@ module YamlNormalizer
       # more Strings that are interpreted as file glob pattern.
       # @param *args [Array<String>] a list of file glob patterns
       def initialize(*args)
+        parse_params(*args)
         files = args.each_with_object([]) { |a, o| o << Dir[a.to_s] }
         @files = files.flatten.sort.uniq
       end

data/lib/yaml_normalizer/services/normalize.rb

@@ -11,6 +11,7 @@ module YamlNormalizer
     #   result = normalize.call
     class Normalize < Base
       include Helpers::Normalize
+      include Helpers::ParamParser
 
       # files is a sorted array of file path Strings
       attr_reader :files
@@ -19,6 +20,7 @@ module YamlNormalizer
       # more String that are interpreted as file glob pattern.
       # @param *args [Array<String>] a list of file glob patterns
       def initialize(*args)
+        parse_params(*args)
         files = args.each_with_object([]) { |a, o| o << Dir[a.to_s] }
         @files = files.flatten.sort.uniq
       end

data/lib/yaml_normalizer/version.rb

@@ -2,5 +2,5 @@
 
 module YamlNormalizer
   # The current Yaml Normalizer version
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: yaml_normalizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Wolfgang Teuber
+- Jan Taras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peach
@@ -311,7 +312,7 @@ description: |-
       original file and the resulting file are 100% identical to Psych (stable
       change).
 email:
-- wolfgang.teuber@sage.com
+- jan.taras@sage.com
 executables:
 - yaml_check
 - yaml_normalize
@@ -327,6 +328,7 @@ files:
 - lib/yaml_normalizer/ext/sort_by_key.rb
 - lib/yaml_normalizer/helpers.rb
 - lib/yaml_normalizer/helpers/normalize.rb
+- lib/yaml_normalizer/helpers/param_parser.rb
 - lib/yaml_normalizer/rake_task.rb
 - lib/yaml_normalizer/services.rb
 - lib/yaml_normalizer/services/base.rb
@@ -353,7 +355,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Yaml Normalizer normalizes YAML files