remocon 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba22438936a77cbe485e6bb7ae72b0f059d5f3fa
-  data.tar.gz: 9ff3bbda91e0d622d99aef839558b6b834475a25
+  metadata.gz: fb155fff5f26310779b98af6f8b97e1ef9d61875
+  data.tar.gz: 41316049cc8a0e64ce00c4326842b5e8d2071aed
 SHA512:
-  metadata.gz: 49795b41a9351d77fffe996ae612a8ce804bdc0e5610dabf32b13cc1e602dc71ad1baaf52a0041f62ea7f043f304b8bc683bacaad30ae37dadcdef9b103aa234
-  data.tar.gz: 456bbde3f2091231fd43bbfcc38c2c605991f6586ad1edca5f4c72dfa60443e92965a29608fc8311c67f8dc89f6cd599b3dd9c5cc49a3772c1d1562604d020bf
+  metadata.gz: 58f9ad9ffc5d724499b8fd3e1820011012b562b3443970b5ffd04f9c81b3a8a5166b4366ce4289b2b472db8fde956d42d9b18eca0745ff62631ce26ba6a38dc5
+  data.tar.gz: 4bd5ad66b49fcf9a5534c0c62147896ec5ed61dabca8ac0d57abf3051dd344897b45799facdbe8967dbce909efd98e46b2ace6710bafd2ee979aadce60b9f4bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remocon (0.4.2)
+    remocon (0.4.3)
       activesupport
       googleauth
       thor

data/lib/remocon/command/pull_command.rb

@@ -6,10 +6,11 @@ module Remocon
       class RemoteConfig
         include Remocon::InterpreterHelper
 
-        attr_reader :config
+        attr_reader :config, :cmd_opts
 
         def initialize(opts)
           @config = Remocon::Config.new(opts)
+          @cmd_opts = { validate_only: false }
         end
 
         def require_parameters_file_path
@@ -20,16 +21,15 @@ module Remocon
           config.conditions_file_path
         end
 
-        def raw_conditions
-          YAML.safe_load(File.open(require_conditions_file_path).read).map(&:with_indifferent_access)
+        def conditions_to_be_compared
+          JSON.parse(JSON.pretty_generate(condition_array.map { |c| c.skip_nil_values.stringify_values })).map(&:with_indifferent_access)
         end
 
-        def raw_parameters
-          YAML.safe_load(File.open(require_parameters_file_path).read).with_indifferent_access
+        def parameters_to_be_compared
+          JSON.parse(JSON.pretty_generate(parameter_hash.skip_nil_values.stringify_values)).with_indifferent_access
         end
       end
 
-      include Remocon::InterpreterHelper
       include Remocon::ConditionSorter
       include Remocon::ParameterSorter
 
@@ -41,14 +41,6 @@ module Remocon
         @left = RemoteConfig.new(opts)
       end
 
-      def require_parameters_file_path
-        config.parameters_file_path
-      end
-
-      def require_conditions_file_path
-        config.conditions_file_path
-      end
-
       def run
         raw_json, etag = Remocon::Request.pull(config)
 
@@ -60,8 +52,8 @@ module Remocon
         parameters = raw_hash[:parameters] || {}
 
         if config.merge? && File.exist?(config.parameters_file_path) && File.exist?(config.parameters_file_path)
-          unchanged_conditions, added_conditions, changed_conditions, = conditions_diff(left.raw_conditions, conditions)
-          unchanged_parameters, added_parameters, changed_parameters, = parameters_diff(left.raw_parameters, parameters)
+          unchanged_conditions, added_conditions, changed_conditions, = conditions_diff(left.conditions_to_be_compared, conditions)
+          unchanged_parameters, added_parameters, changed_parameters, = parameters_diff(left.parameters_to_be_compared, parameters)
 
           conditions_yaml = JSON.parse(sort_conditions(unchanged_conditions + added_conditions + changed_conditions).to_json).to_yaml
           parameters_yaml = JSON.parse(sort_parameters(unchanged_parameters.merge(added_parameters).merge(changed_parameters)).to_json).to_yaml
@@ -89,12 +81,12 @@ module Remocon
 
         (right_names & left_names).each do |k|
           old = left.find { |c| c[:name] == k }
-          new = Remocon::ConditionFileDumper.new(right.find { |c| c[:name] == k }).dump
+          new = right.find { |c| c[:name] == k }
 
           if old == new
             unchanged.push(old)
           else
-            changed.push(new)
+            changed.push(Remocon::ConditionFileDumper.new(new).dump)
           end
         end
 
@@ -119,20 +111,20 @@ module Remocon
         unchanged = {}
 
         (right.keys & left.keys).each do |k|
-          old = { k => left[k] }
-          new = Remocon::ParameterFileDumper.new({ k => right[k] }).dump
+          # both of left and right is config json's format
+          # comparison should be done based on the format but dumped format should be returned
+          old = left[k]
+          new = right[k]
 
           if old == new
-            unchanged.merge!(old)
+            unchanged.merge!(Remocon::ParameterFileDumper.new({ k => old }).dump)
           else
-            changed.merge!(new)
+            changed.merge!(Remocon::ParameterFileDumper.new({ k => new }).dump)
           end
         end
 
-        removed = {}
-
-        removed_keys.each do |k|
-          removed[k] = left[k]
+        removed = removed_keys.each_with_object({}) do |k, acc|
+          acc.merge!(Remocon::ParameterFileDumper.new({ k => left[k] }).dump)
         end
 
         [unchanged, added, changed, removed]

data/lib/remocon/normalizer/boolean_normalizer.rb

@@ -7,13 +7,9 @@ module Remocon
     end
 
     def validate
-      return if [FalseClass, TrueClass].include?(@content.class)
-
-      begin
-        @bool_val = @content.to_s.to_boolean
-      rescue ArgumentError => e
-        raise ValidationError, e.message
-      end
+      @bool_val = @content.to_s.to_boolean
+    rescue ArgumentError => e
+      raise ValidationError, e.message
     end
 
     def normalize

data/lib/remocon/util/hash.rb

@@ -3,7 +3,7 @@
 class Hash
   def skip_nil_values
     dup.compact.each_with_object({}) do |(k, v), acc|
-      next unless v
+      next if v.nil?
       acc[k] = case v
                when Hash
                  v.skip_nil_values

data/lib/remocon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Remocon
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remocon
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jumpei Matsuda
 autorequire: 
 bindir: cmd
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport