remocon 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0c28fa84a9323c0c1d867d81d7b8a13b676774
-  data.tar.gz: 2637bbbec4410f90cfc2d086b55fc6340890c6ed
+  metadata.gz: ba22438936a77cbe485e6bb7ae72b0f059d5f3fa
+  data.tar.gz: 9ff3bbda91e0d622d99aef839558b6b834475a25
 SHA512:
-  metadata.gz: 3ac73ff7a2316cad4ce51836741d753b7c023bd8413c36e4c8c7bbb707a4fa7f63e8facccf2386bab7216686e824e977e61f67eaf75d329540f033fddf1319ba
-  data.tar.gz: be5f1b03a2967c35ef96be01d23dd84eb8ad5392b99bbdaa95268f39eb687dc0e84a9d140e11b0b0960473714eec132b832706802c81906b5f382d7b55b41fbd
+  metadata.gz: 49795b41a9351d77fffe996ae612a8ce804bdc0e5610dabf32b13cc1e602dc71ad1baaf52a0041f62ea7f043f304b8bc683bacaad30ae37dadcdef9b103aa234
+  data.tar.gz: 456bbde3f2091231fd43bbfcc38c2c605991f6586ad1edca5f4c72dfa60443e92965a29608fc8311c67f8dc89f6cd599b3dd9c5cc49a3772c1d1562604d020bf

data/Gemfile.lock

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

data/README.md

@@ -2,10 +2,12 @@
 
 # Remocon
 
-*remocon* is a CLI for Firebase Remote Config via its REST API.  
-Conditions and parameters are managed by YAML files.
+*remocon* is a CLI for Firebase Remote Config via its REST API. Conditions and parameters are managed by YAML files.
+The goal of this gem is Remote Config as a Code. :)
 
-*This is still in beta. A diff mode should be supported when managing configs heavily.*
+*Now conditions cannot be updated via API so that you can modify only parameters.*
+
+If you'd like to use this on CircleCI, you can use https://github.com/jmatsu/remocon-starter-kit . 
 
 ## Usage
 
@@ -41,7 +43,7 @@ FIREBASE_PROJECT_ID and REMOTE_CONFIG_ACCESS_TOKEN are supported but they are de
 
 ### Edit configs on your local
 
-Condition definitions and parameter definitions are separated. You should modify these files.
+Condition definitions and parameter definitions are separated. You need to modify these files.
 
 *parameters.yml*
 

data/lib/remocon/command/lib/interpreter_helper.rb

@@ -2,9 +2,6 @@
 
 module Remocon
   module InterpreterHelper
-    include Remocon::ConditionSorter
-    include Remocon::ParameterSorter
-
     def cmd_opts
       raise NotImplementedError
     end
@@ -25,7 +22,7 @@ module Remocon
     end
 
     def parameter_hash
-      @parameter_hash ||= sort_parameters(read_parameters.first)
+      @parameter_hash ||= read_parameters.first
     end
 
     def read_conditions
@@ -36,7 +33,7 @@ module Remocon
     end
 
     def condition_array
-      @condition_array ||= sort_conditions(read_conditions.first)
+      @condition_array ||= read_conditions.first
     end
 
     def condition_names

data/lib/remocon/command/pull_command.rb

@@ -30,6 +30,8 @@ module Remocon
       end
 
       include Remocon::InterpreterHelper
+      include Remocon::ConditionSorter
+      include Remocon::ParameterSorter
 
       attr_reader :config, :cmd_opts, :left
 

data/lib/remocon/sorter/condition_sorter.rb

@@ -2,22 +2,20 @@
 
 module Remocon
   module ConditionSorter
-    CONDITION_KEYS = %i(name expression tagColor).freeze
+    CONDITION_KEYS = %w(name expression tagColor).freeze
+
+    def comparator_of_condition_keys(left, right)
+      (CONDITION_KEYS.index(left) || 10_000) <=> (CONDITION_KEYS.index(right) || 10_000)
+    end
 
     def sort_conditions(conditions)
       conditions
-        .map(&:symbolize_keys)
-        .sort_by { |e| e[:name] }
+        .sort_by { |e| e["name"] || e[:name] }
         .map do |e|
-        arr = e.sort do |(a, _), (b, _)|
-          if !CONDITION_KEYS.include?(a) && !CONDITION_KEYS.include?(b)
-            a <=> b
-          else
-            (CONDITION_KEYS.index(a) || 10_000) <=> (CONDITION_KEYS.index(b) || 10_000)
-          end
-        end
-
-        arr.each_with_object({}) { |(k, v), h| h[k] = v }.with_indifferent_access
+        e.stringify_keys
+          .sort { |(a, _), (b, _)| comparator_of_condition_keys(a, b) }
+          .each_with_object({}) { |(k, v), acc| acc[k] = v }
+          .with_indifferent_access
       end
     end
   end

data/lib/remocon/sorter/parameter_sorter.rb

@@ -2,23 +2,39 @@
 
 module Remocon
   module ParameterSorter
-    PARAMETER_KEYS = %i(description value file normalizer conditions options).freeze
+    PARAMETER_KEYS = %w(description value file normalizer conditions options).freeze
+
+    def comparator_of_parameter_keys(left, right)
+      PARAMETER_KEYS.index(left) <=> PARAMETER_KEYS.index(right)
+    end
 
     def sort_parameters(parameters)
-      arr = parameters.sort.map do |k, v|
-        hash_arr = v.symbolize_keys.sort { |(a, _), (b, _)| PARAMETER_KEYS.index(a) <=> PARAMETER_KEYS.index(b) }
-          .map do |k1, v1|
-          {
-            k1 => k1.to_sym == :conditions ? sort_parameters(v1) : v1
-          }
+      params = parameters.with_indifferent_access
+
+      params.keys.sort.each_with_object({}) do |key, acc|
+        param = params[key]
+
+        acc[key] = param
+          .stringify_keys
+          .sort { |(a, _), (b, _)| comparator_of_parameter_keys(a, b) }
+          .each_with_object({}) do |(inside_key, _), inside_acc|
+          if inside_key == "conditions"
+            inside_acc[inside_key] = sort_conditions_of_parameters(param[inside_key])
+          else
+            inside_acc[inside_key] = param[inside_key]
+          end
         end
+      end.with_indifferent_access
+    end
 
-        {
-          k => hash_arr.each_with_object({}) { |hash, acc| acc.merge!(hash) }
-        }
+    def sort_conditions_of_parameters(conditions)
+      conditions.with_indifferent_access.to_a.each_with_object({}) do |(k, v), acc|
+        acc[k] = v.stringify_keys
+          .sort { |(a, _), (b, _)| comparator_of_parameter_keys(a, b) }
+          .each_with_object({}) do |(inside_key, _), inside_acc|
+          inside_acc[inside_key] = v[inside_key]
+        end
       end
-
-      arr.each_with_object({}) { |hash, acc| acc.merge!(hash) }.with_indifferent_access
     end
   end
 end

data/lib/remocon/version.rb

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

metadata

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