remocon 0.3.1 → 0.4.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c79702f9f1b2f149cf70b67ad75502787d3602d
-  data.tar.gz: 072c77a91b9fd05e41434b3f98ad4171aba3e640
+  metadata.gz: fb536a401c5e10685550492b77a5cda9ac02a001
+  data.tar.gz: 51f618bb2ea5efc99a418a057ac90b1bc5965cca
 SHA512:
-  metadata.gz: a67a7225afe9bad7771de4fad15f814ce0ace4377969e506ef296744edb03db9176dae6ebe28b94eaf1cc70f1789638ef0023cc89a455222a16dfc9950136fcd
-  data.tar.gz: f295af07b3bd976cd35abbf331f32709a72a9a3dc41364e7ec872e70941137840e1f01b0fe65aaf6808f7925981af7909bf0af0f25d9c2cf63d015df9db554f7
+  metadata.gz: eb31b664990aa124faece75e0d8cd4d0f789ce3c176e0b62b4348c7a69bb8b88a0854f1bebd6afc51744f00103995d6e2b7a4d249a7d382461cf2df79117be80
+  data.tar.gz: ad58cfeee9e91c53f8a2a21927298d384a662f520de1f607b9d94b4b2561c0954904b6cbbfb3a2a7ec034b0db91e773e93361da42468a61e8055cfe601de29fb

data/.rubocop.yml

@@ -136,7 +136,7 @@ Metrics/BlockLength:
 Style/MixinGrouping:
   Enabled: false
 
-Style/FileName:
+Naming:
   Enabled: false
 
 Layout/IndentHeredoc:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remocon (0.3.1)
+    remocon (0.4.0.pre.1)
       activesupport
       googleauth
       thor

data/lib/remocon.rb

@@ -40,6 +40,7 @@ require "remocon/normalizer/type_normalizer_factory"
 
 require "remocon/command/lib/config"
 require "remocon/command/lib/interpreter_helper"
+require "remocon/command/lib/request"
 
 require "remocon/command/create_command"
 require "remocon/command/get_token_command"

data/lib/remocon/cli.rb

@@ -33,6 +33,7 @@ module Remocon
     end
 
     desc "pull", "Pull remote configs"
+    option :merge, type: :boolean, default: true, desc: "use the hash merge algorithm if true. default is true."
     option :prefix, type: :string, desc: "the directory name which will contain project-related files"
     option :token, type: :string, desc: "access token to your project"
     option :id, type: :string, desc: "your project id"

data/lib/remocon/command/lib/config.rb

@@ -82,5 +82,9 @@ module Remocon
         opts[:force] && "*" || opts[:"raw-etag"] || File.exist?(etag_file_path) && File.open(etag_file_path).read
       end
     end
+
+    def merge?
+      @merge ||= opts[:merge]
+    end
   end
 end

data/lib/remocon/command/lib/request.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Remocon
+  module Request
+    def self.push(config)
+      raise "etag should be specified. If you want to ignore this error, then please add --force option" unless config.etag
+
+      client, uri = Request.build_client(config)
+
+      headers = {
+          "Authorization" => "Bearer #{config.token}",
+          "Content-Type" => "application/json; UTF8",
+          "If-Match" => config.etag,
+      }
+
+      request = Net::HTTP::Put.new(uri.request_uri, headers)
+      request.body = +""
+      request.body << File.read(config.config_json_file_path).delete("\r\n")
+
+      response = client.request(request)
+
+      response_body = begin
+        json_str = response.try(:read_body)
+        (json_str ? JSON.parse(json_str) : {}).with_indifferent_access
+      end
+
+      return response, response_body
+    end
+
+    def self.pull(config)
+      raw_json, etag = open(config.endpoint, "Authorization" => "Bearer #{config.token}") do |io|
+        [io.read, io.meta["etag"]]
+      end
+
+      [raw_json, etag]
+    end
+
+    def self.fetch_etag(config)
+      # remote config api doesn't support head request so we need to use GET instead.
+
+      client, uri = Request.build_client(config)
+
+      headers = {
+          "Authorization" => "Bearer #{config.token}",
+          "Content-Type" => "application/json; UTF8",
+          "Content-Encoding" => "gzip",
+      }
+
+      request = Net::HTTP::Get.new(uri.request_uri, headers)
+      response = client.request(request)
+
+      response.kind_of?(Net::HTTPOK) && response.header["etag"]
+    end
+
+    def self.build_client(config)
+      uri = URI.parse(config.endpoint)
+      client = Net::HTTP.new(uri.host, uri.port)
+      client.use_ssl = true
+      return client, uri
+    end
+  end
+end

data/lib/remocon/command/pull_command.rb

@@ -3,13 +3,40 @@
 module Remocon
   module Command
     class Pull
+      class RemoteConfig
+        include Remocon::InterpreterHelper
+
+        attr_reader :config
+
+        def initialize(opts)
+          @config = Remocon::Config.new(opts)
+        end
+
+        def require_parameters_file_path
+          config.parameters_file_path
+        end
+
+        def require_conditions_file_path
+          config.conditions_file_path
+        end
+
+        def raw_conditions
+          YAML.safe_load(File.open(require_conditions_file_path).read).map(&:with_indifferent_access)
+        end
+
+        def raw_parameters
+          YAML.safe_load(File.open(require_parameters_file_path).read).with_indifferent_access
+        end
+      end
+
       include Remocon::InterpreterHelper
 
-      attr_reader :config, :cmd_opts
+      attr_reader :config, :cmd_opts, :left
 
       def initialize(opts)
         @config = Remocon::Config.new(opts)
         @cmd_opts = { validate_only: false }
+        @left = RemoteConfig.new(opts)
       end
 
       def require_parameters_file_path
@@ -21,7 +48,7 @@ module Remocon
       end
 
       def run
-        raw_json, etag = do_request
+        raw_json, etag = Remocon::Request.pull(config)
 
         raw_hash = JSON.parse(raw_json).with_indifferent_access
 
@@ -30,18 +57,100 @@ module Remocon
         conditions = raw_hash[:conditions] || []
         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)
+
+          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
+        else
+          conditions_yaml = JSON.parse(Remocon::ConditionFileDumper.new(sort_conditions(conditions)).dump.to_json).to_yaml
+          parameters_yaml = JSON.parse(Remocon::ParameterFileDumper.new(sort_parameters(parameters)).dump.to_json).to_yaml
+        end
+
+        write_to_files(conditions_yaml, parameters_yaml, etag)
+      end
+
+      def conditions_diff(left, right)
+        left_names = left.map { |c| c[:name] }
+        right_names = right.map { |c| c[:name] }
+
+        added_names = right_names - left_names
+        removed_names = left_names - right_names
+
+        added = added_names.each_with_object([]) do |k, acc|
+          acc.push(right.find { |c| c[:name] == k })
+        end
+
+        changed = []
+        unchanged = []
+
+        (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
+
+          if old == new
+            unchanged.push(old)
+          else
+            changed.push(new)
+          end
+        end
+
+        removed = []
+
+        removed_names.each do |k|
+          removed.push(left.find { |c| c[:name] == k })
+        end
+
+        [unchanged, added, changed, removed]
+      end
+
+      def parameters_diff(left, right)
+        added_keys = right.keys - left.keys
+        removed_keys = left.keys - right.keys
+
+        added = added_keys.each_with_object({}) do |k, acc|
+          acc.merge!(Remocon::ParameterFileDumper.new({ k => right[k] }).dump)
+        end
+
+        changed = {}
+        unchanged = {}
+
+        (right.keys & left.keys).each do |k|
+          old = { k => left[k] }
+          new = Remocon::ParameterFileDumper.new({ k => right[k] }).dump
+
+          if old == new
+            unchanged.merge!(old)
+          else
+            changed.merge!(new)
+          end
+        end
+
+        removed = {}
+
+        removed_keys.each do |k|
+          removed[k] = left[k]
+        end
+
+        [unchanged, added, changed, removed]
+      end
+
+      private
+
+      def write_to_files(conditions_yaml, parameters_yaml, etag)
         File.open(config.conditions_file_path, "w+") do |f|
-          f.write(JSON.parse(Remocon::ConditionFileDumper.new(sort_conditions(conditions)).dump.to_json).to_yaml)
+          f.write(conditions_yaml)
           f.flush
         end
 
         File.open(config.parameters_file_path, "w+") do |f|
-          f.write(JSON.parse(Remocon::ParameterFileDumper.new(sort_parameters(parameters)).dump.to_json).to_yaml)
+          f.write(parameters_yaml)
           f.flush
         end
 
         File.open(config.config_json_file_path, "w+") do |f|
-          f.write(JSON.pretty_generate({ conditions: sort_conditions(conditions), parameters: sort_parameters(parameters) }))
+          f.write(JSON.pretty_generate({ conditions: condition_array, parameters: parameter_hash }))
           f.flush
         end
 
@@ -50,16 +159,6 @@ module Remocon
           f.flush
         end
       end
-
-      private
-
-      def do_request
-        raw_json, etag = open(config.endpoint, "Authorization" => "Bearer #{config.token}") do |io|
-          [io.read, io.meta["etag"]]
-        end
-
-        [raw_json, etag]
-      end
     end
   end
 end

data/lib/remocon/command/push_command.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 module Remocon
   module Command
@@ -11,72 +11,23 @@ module Remocon
       end
 
       def run
-        # to prevent a real request in spec
         do_request
       end
 
-      def client
-        return @client if @client
-
-        client = Net::HTTP.new(uri.host, uri.port)
-        client.use_ssl = true
-
-        @client = client
-      end
-
-      def request
-        return @request if @request
-
-        raise "etag should be specified. If you want to ignore this error, then add --force option" unless config.etag
-
-        headers = {
-          "Authorization" => "Bearer #{config.token}",
-          "Content-Type" => "application/json; UTF8",
-          "If-Match" => config.etag,
-        }
-
-        request = Net::HTTP::Put.new(uri.request_uri, headers)
-        request.body = ""
-        request.body << File.read(config.config_json_file_path).delete("\r\n")
-
-        @request = request
-      end
-
       private
 
-      def uri
-        @uri ||= URI.parse(config.endpoint)
-      end
-
       def do_request
-        response = client.request(request)
+        response, response_body = Remocon::Request.push(config)
 
-        response_body = begin
-          json_str = response&.read_body
-          JSON.parse(json_str).with_indifferent_access if json_str
-        end
-
-        case response
-        when Net::HTTPOK
-          parse_success_body(response, response_body)
-          # intentional behavior
-          STDERR.puts "Updated successfully."
-        when Net::HTTPBadRequest
-          # sent json contains errors
-          parse_error_body(response, response_body) if response_body
-          STDERR.puts "400 but no error body" unless response_body
-        when Net::HTTPUnauthorized
-          # token was expired
-          STDERR.puts "401 Unauthorized. A token might be expired or invalid."
-        when Net::HTTPForbidden
-          # remote config api might be disabled or not yet activated
-          STDERR.puts "403 Forbidden. RemoteConfig API might not be activated or be disabled."
-        when Net::HTTPConflict
-          # local content is out-to-date
-          STDERR.puts "409 Conflict. Remote was updated. Please update your local files"
+        (response.kind_of?(Net::HTTPOK) && parse_success_body(response, response_body)).tap do |result|
+          unless result
+            if response_body.blank?
+              STDERR.puts "No error body"
+            else
+              parse_error_body(response, response_body)
+            end
+          end
         end
-
-        response.kind_of?(Net::HTTPOK)
       end
 
       def parse_success_body(response, _success_body)
@@ -84,19 +35,18 @@ module Remocon
 
         return unless etag
 
-        if config.project_dir_path
-          File.open(config.etag_file_path, "w+") do |f|
-            f.write(etag)
-            f.flush
-          end
-        else
-          STDOUT.puts etag
+        File.open(config.etag_file_path, "w+") do |f|
+          f.write(etag)
+          f.flush
         end
+
+        STDOUT.puts(etag)
+        true
       end
 
       def parse_error_body(_response, error_body)
-        STDERR.puts "Error name : #{error_body[:error][:status]}"
-        STDERR.puts "Please check your json file"
+        STDERR.puts error_body[:error][:status]
+        STDERR.puts error_body[:error][:message]
 
         error_body.dig(:error, :details)&.each do |k|
           # for now, see only errors below

data/lib/remocon/command/validate_command.rb

@@ -8,7 +8,7 @@ module Remocon
       attr_reader :config, :cmd_opts
 
       def initialize(opts)
-        @config = Remocon::Config.new(opts)
+        @config = Remocon::Config.new(opts.merge(force: false))
         @cmd_opts = { validate_only: true }
       end
 
@@ -23,18 +23,22 @@ module Remocon
       def run
         validate_options
 
-        errors = parameter_errors + condition_errors
+        errors = parameter_errors + condition_errors + etag_errors
 
+        print_errors(errors)
+
+        errors.empty?
+      end
+
+      def print_errors(errors)
         if errors.empty?
           STDOUT.puts "No error was found."
         else
           errors.each do |e|
             STDERR.puts "#{e.class} #{e.message}"
-            STDERR.puts e.backtrace.join("\n")
+            STDERR.puts e.backtrace&.join("\n")
           end
         end
-
-        errors.empty?
       end
 
       private
@@ -42,6 +46,19 @@ module Remocon
       def validate_options
         raise ValidationError, "A condition file must exist" unless File.exist?(config.conditions_file_path)
         raise ValidationError, "A parameter file must exist" unless File.exist?(config.parameters_file_path)
+        raise ValidationError, "An etag file must exist" unless File.exist?(config.etag_file_path)
+      end
+
+      def remote_etag
+        @remote_etag ||= Remocon::Request.fetch_etag(config)
+      end
+
+      def etag_errors
+        if config.etag != remote_etag
+          [ValidationError.new("#{config.etag} is found but the latest etag is #{remote_etag || 'none'}")]
+        else
+          []
+        end
       end
     end
   end

data/lib/remocon/sorter/condition_sorter.rb

@@ -6,6 +6,7 @@ module Remocon
 
     def sort_conditions(conditions)
       conditions
+        .map(&:symbolize_keys)
         .sort_by { |e| e[:name] }
         .map do |e|
         arr = e.sort do |(a, _), (b, _)|

data/lib/remocon/sorter/parameter_sorter.rb

@@ -6,7 +6,7 @@ module Remocon
 
     def sort_parameters(parameters)
       arr = parameters.sort.map do |k, v|
-        hash_arr = v.sort { |(a, _), (b, _)| PARAMETER_KEYS.index(a) <=> PARAMETER_KEYS.index(b) }
+        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

data/lib/remocon/version.rb

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

data/sample/basketball-b8548/config.json

@@ -14,19 +14,11 @@
   "parameters": {
     "key1": {
       "defaultValue": {
-        "value": "100",
-        "conditions": {
-          "condition1": {
-            "value": "200"
-          },
-          "zxczx": {
-            "value": "100"
-          }
-        }
+        "value": "100"
       },
       "conditionalValues": {
         "condition1": {
-          "value": "200"
+          "value": "400"
         },
         "zxczx": {
           "value": "100"
@@ -55,7 +47,7 @@
     },
     "key6": {
       "defaultValue": {
-        "value": "{\"value\":\"xxxx\"}"
+        "value": "{\"value\":\"234234234234234\"}"
       }
     },
     "key7": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remocon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0.pre.1
 platform: ruby
 authors:
 - Jumpei Matsuda
 autorequire: 
 bindir: cmd
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,6 +153,7 @@ files:
 - lib/remocon/command/get_token_command.rb
 - lib/remocon/command/lib/config.rb
 - lib/remocon/command/lib/interpreter_helper.rb
+- lib/remocon/command/lib/request.rb
 - lib/remocon/command/pull_command.rb
 - lib/remocon/command/push_command.rb
 - lib/remocon/command/validate_command.rb
@@ -197,9 +198,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2.3