remocon 0.1.0 → 0.2.0

data/lib/remocon/command/push_command.rb

@@ -3,19 +3,10 @@
 module Remocon
   module Command
     class Push
-      attr_reader :uri
+      attr_reader :config, :cmd_opts
 
       def initialize(opts)
-        @opts = opts
-
-        @project_id = ENV.fetch('FIREBASE_PROJECT_ID')
-        @token = ENV.fetch('REMOTE_CONFIG_ACCESS_TOKEN')
-        @uri = URI.parse("https://firebaseremoteconfig.googleapis.com/v1/projects/#{@project_id}/remoteConfig")
-        @source_filepath = @opts[:source]
-        @etag = File.exist?(@opts[:etag]) ? File.open(@opts[:etag]).read : @opts[:etag] if @opts[:etag]
-        @ignore_etag = @opts[:force]
-        @dest_dir = File.join(@opts[:dest], @project_id) if @opts[:dest]
-
+        @config = Remocon::Config.new(opts)
         @cmd_opts = { validate_only: false }
       end
 
@@ -36,23 +27,27 @@ module Remocon
       def request
         return @request if @request
 
-        raise 'etag should be specified. If you want to ignore this error, then add --force option' unless @etag || @ignore_etag
+        raise "etag should be specified. If you want to ignore this error, then add --force option" unless config.etag
 
         headers = {
-          'Authorization' => "Bearer #{@token}",
-          'Content-Type' => 'application/json; UTF8'
+          "Authorization" => "Bearer #{config.token}",
+          "Content-Type" => "application/json; UTF8",
+          "If-Match" => config.etag,
         }
-        headers['If-Match'] = @etag || '*'
 
         request = Net::HTTP::Put.new(uri.request_uri, headers)
         request.body = ""
-        request.body << File.read(@source_filepath).delete("\r\n")
+        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)
 
@@ -65,28 +60,32 @@ module Remocon
         when Net::HTTPOK
           parse_success_body(response, response_body)
           # intentional behavior
-          STDERR.puts 'Updated successfully.'
+          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
+          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.'
+          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.'
+          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'
+          STDERR.puts "409 Conflict. Remote was updated. Please update your local files"
         end
+
+        response.kind_of?(Net::HTTPOK)
       end
 
       def parse_success_body(response, _success_body)
-        return unless etag = response.header["etag"]
+        etag = response.header["etag"]
+
+        return unless etag
 
-        if @dest_dir
-          File.open(File.join(@dest_dir, 'etag'), 'w+') do |f|
+        if config.project_dir_path
+          File.open(config.etag_file_path, "w+") do |f|
             f.write(etag)
             f.flush
           end
@@ -101,13 +100,13 @@ module Remocon
 
         error_body.dig(:error, :details)&.each do |k|
           # for now, see only errors below
-          next unless k['@type'] == 'type.googleapis.com/google.rpc.BadRequest'
+          next unless k["@type"] == "type.googleapis.com/google.rpc.BadRequest"
 
           k[:fieldViolations].each do |e|
-            if e[:field].start_with?('remote_config.conditions')
-              STDERR.puts 'CONDITION DEFINITION ERROR'
+            if e[:field].start_with?("remote_config.conditions")
+              STDERR.puts "CONDITION DEFINITION ERROR"
             else
-              STDERR.puts 'PARAMETER DEFINITION ERROR'
+              STDERR.puts "PARAMETER DEFINITION ERROR"
             end
 
             STDERR.puts e[:description]

data/lib/remocon/command/validate_command.rb

@@ -5,33 +5,43 @@ module Remocon
     class Validate
       include Remocon::InterpreterHelper
 
+      attr_reader :config, :cmd_opts
+
       def initialize(opts)
-        @opts = opts
+        @config = Remocon::Config.new(opts)
+        @cmd_opts = { validate_only: true }
+      end
 
-        @conditions_filepath = @opts[:conditions]
-        @parameters_filepath = @opts[:parameters]
+      def require_parameters_file_path
+        config.parameters_file_path
+      end
 
-        @cmd_opts = { validate_only: true }
+      def require_conditions_file_path
+        config.conditions_file_path
       end
 
       def run
         validate_options
 
-        if parameter_errors.empty? && condition_errors.empty?
-          STDOUT.puts 'No error was found.'
+        errors = parameter_errors + condition_errors
+
+        if errors.empty?
+          STDOUT.puts "No error was found."
         else
-          (parameter_errors + condition_errors).each do |e|
+          errors.each do |e|
             STDERR.puts "#{e.class} #{e.message}"
             STDERR.puts e.backtrace.join("\n")
           end
         end
+
+        errors.empty?
       end
 
       private
 
       def validate_options
-        raise ValidationError, 'A condition file must exist' unless File.exist?(@conditions_filepath)
-        raise ValidationError, 'A parameter file must exist' unless File.exist?(@parameters_filepath)
+        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)
       end
     end
   end

data/lib/remocon/interpreter/condition_file_interpreter.rb

@@ -2,7 +2,7 @@
 
 module Remocon
   class ConditionFileInterpreter
-    SUPPORTED_ATTRIBUTED = %i[name expression tagColor]
+    SUPPORTED_ATTRIBUTED = %i(name expression tagColor).freeze
 
     def initialize(filepath)
       # conditions should be Array
@@ -16,14 +16,16 @@ module Remocon
       keys = []
 
       @yaml.each do |hash|
-        raise Remocon::EmptyNameError, 'name must not be empty' unless hash[:name]
-        raise Remocon::EmptyExpressionError, 'expression must not be empty' unless hash[:expression]
-        raise Remocon::DuplicateKeyError, "#{hash[:name]} is duplicated" if keys.include?(hash[:name])
+        begin
+          raise Remocon::EmptyNameError, "name must not be empty" unless hash[:name]
+          raise Remocon::EmptyExpressionError, "expression must not be empty" unless hash[:expression]
+          raise Remocon::DuplicateKeyError, "#{hash[:name]} is duplicated" if keys.include?(hash[:name])
 
-        keys.push(hash[:name])
-      rescue Remocon::ValidationError => e
-        raise e unless opts[:validate_only]
-        errors.push(e)
+          keys.push(hash[:name])
+        rescue Remocon::ValidationError => e
+          raise e unless opts[:validate_only]
+          errors.push(e)
+        end
       end
 
       [json_array, errors]

data/lib/remocon/interpreter/parameter_file_interpreter.rb

@@ -9,19 +9,21 @@ module Remocon
     def read(condition_names, opts = {})
       errors = []
       json_hash = @yaml.each_with_object({}) do |(key, body), hash|
-        raise Remocon::DuplicateKeyError, "#{key} is duplicated" if hash[key]
+        begin
+          raise Remocon::DuplicateKeyError, "#{key} is duplicated" if hash[key]
 
-        hash[key] = {
-          defaultValue: {
-            value: parse_value_body(key, body)
+          hash[key] = {
+            defaultValue: {
+              value: parse_value_body(key, body)
+            }
           }
-        }
 
-        hash[key][:conditionalValues] = parse_condition_body(condition_names, key, body[:conditions]) if body[:conditions]
-        hash[key][:description] = body[:description] if body[:description]
-      rescue Remocon::ValidationError => e
-        raise e unless opts[:validate_only]
-        errors.push(e)
+          hash[key][:conditionalValues] = parse_condition_body(condition_names, key, body[:conditions]) if body[:conditions]
+          hash[key][:description] = body[:description] if body[:description]
+        rescue Remocon::ValidationError => e
+          raise e unless opts[:validate_only]
+          errors.push(e)
+        end
       end
 
       [json_hash.with_indifferent_access, errors]

data/lib/remocon/normalizer/json_normalizer.rb

@@ -7,7 +7,8 @@ module Remocon
     end
 
     def validate
-      str_content = @content.is_a?(Hash) ? @content.to_json : @content.to_s
+      str_content = @content.kind_of?(Hash) ? @content.to_json : @content.to_s
+      puts str_content
       @json = JSON.parse(str_content).to_json
     rescue JSON::ParserError => e
       raise ValidationError, e.message

data/lib/remocon/normalizer/normalizer.rb

@@ -27,7 +27,7 @@ module Remocon
     end
 
     def self.respond_symbol
-      raise Remocon::UnsupportedTypeError, 'unknown'
+      raise Remocon::UnsupportedTypeError, "unknown"
     end
   end
 end

data/lib/remocon/sorter/condition_sorter.rb

@@ -2,7 +2,7 @@
 
 module Remocon
   module ConditionSorter
-    CONDITION_KEYS = %i[name expression tagColor]
+    CONDITION_KEYS = %i(name expression tagColor).freeze
 
     def sort_conditions(conditions)
       conditions
@@ -12,7 +12,7 @@ module Remocon
           if !CONDITION_KEYS.include?(a) && !CONDITION_KEYS.include?(b)
             a <=> b
           else
-            (CONDITION_KEYS.index(a) || 10000) <=> (CONDITION_KEYS.index(b) || 10000)
+            (CONDITION_KEYS.index(a) || 10_000) <=> (CONDITION_KEYS.index(b) || 10_000)
           end
         end
 

data/lib/remocon/sorter/parameter_sorter.rb

@@ -2,14 +2,14 @@
 
 module Remocon
   module ParameterSorter
-    PARAMETER_KEYS = %i[description value file normalizer conditions options]
+    PARAMETER_KEYS = %i(description value file normalizer conditions options).freeze
 
     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) }
-                    .map do |k, v|
+          .map do |k1, v1|
           {
-            k => k.to_sym == :conditions ? sort_parameters(v) : v
+            k1 => k1.to_sym == :conditions ? sort_parameters(v1) : v1
           }
         end
 

data/lib/remocon/util/array.rb

@@ -3,9 +3,9 @@
 class Array
   def stringify_values
     map do |e|
-      if e.is_a?(Hash)
+      if e.kind_of?(Hash)
         e.stringify_values
-      elsif e.is_a?(Array)
+      elsif e.kind_of?(Array)
         e.stringify_values
       else
         e.to_s

data/lib/remocon/util/hash.rb

@@ -17,9 +17,9 @@ class Hash
 
   def stringify_values
     self.deep_merge(self) do |_, _, v|
-      if v.is_a?(Hash)
+      if v.kind_of?(Hash)
         v.stringify_values
-      elsif v.is_a?(Array)
+      elsif v.kind_of?(Array)
         v.stringify_values
       else
         v.to_s

data/lib/remocon/util/string.rb

@@ -8,6 +8,6 @@ class String
   def to_boolean
     return true if self == "true"
     return false if self == "false"
-    raise ArgumentError, 'String cannot be converted to Boolean'
+    raise ArgumentError, "String cannot be converted to Boolean"
   end
 end

data/lib/remocon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Remocon
-  VERSION = '0.1.0'
+  VERSION = "0.2.0"
 end

data/prj/config.json

@@ -0,0 +1,34 @@
+{
+  "conditions": [
+    {
+      "expression": "device.os == 'ios'",
+      "name": "condition1",
+      "tagColor": "INDIGO"
+    },
+    {
+      "expression": "device.os == 'ios'",
+      "name": "zxczx",
+      "tagColor": "CYAN"
+    }
+  ],
+  "parameters": {
+    "key1": {
+      "defaultValue": {
+        "value": "100"
+      },
+      "conditionalValues": {
+        "condition1": {
+          "value": "200"
+        },
+        "zxczx": {
+          "value": "100"
+        }
+      }
+    },
+    "key2": {
+      "defaultValue": {
+        "value": "123"
+      }
+    }
+  }
+}

data/remocon.gemspec

@@ -1,42 +1,41 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'remocon/version'
+require "remocon/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'remocon'
+  spec.name          = "remocon"
   spec.version       = Remocon::VERSION
-  spec.authors       = ['Jumpei Matsuda']
-  spec.email         = ['jmatsu.drm@gmail.com']
+  spec.authors       = ["Jumpei Matsuda"]
+  spec.email         = ["jmatsu.drm@gmail.com"]
 
-  spec.summary       = 'YAML-based firebase remote config manager'
+  spec.summary       = "YAML-based firebase remote config manager"
   spec.description   = "This gem manages RemoteConfig's key-values based on YAML configuration."
-  spec.homepage      = 'https://github.com/jmatsu/remocon'
-  spec.license       = 'MIT'
+  spec.homepage      = "https://github.com/jmatsu/remocon"
+  spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'cmd'
+  spec.bindir        = "cmd"
   spec.executables   = spec.files.grep(%r{^cmd/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor'
-  spec.add_dependency 'activesupport'
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rubocop'
+  spec.add_dependency "activesupport"
+  spec.add_dependency "thor"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: remocon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jumpei Matsuda
 autorequire: 
 bindir: cmd
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - lib/remocon.rb
 - lib/remocon/cli.rb
 - lib/remocon/command/create_command.rb
+- lib/remocon/command/lib/config.rb
 - lib/remocon/command/lib/interpreter_helper.rb
 - lib/remocon/command/pull_command.rb
 - lib/remocon/command/push_command.rb
@@ -160,6 +161,7 @@ files:
 - lib/remocon/util/hash.rb
 - lib/remocon/util/string.rb
 - lib/remocon/version.rb
+- prj/config.json
 - remocon.gemspec
 - sample/basketball-b8548/conditions.yml
 - sample/basketball-b8548/config.json
@@ -186,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: YAML-based firebase remote config manager