phraseapp_updater 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684e0437bbf7cc86e2716aef718a30755d9062cc
-  data.tar.gz: dc6f0d1b5753e1864841448c04a376598192c3dc
+  metadata.gz: b9bfceed600065602f978bbafed9f6e6a729636c
+  data.tar.gz: 581f527db36b94cb44ab4fdf9eeaf621ecdbbf4e
 SHA512:
-  metadata.gz: e0464fa1868c7be7cb56f9aad58862f558d40df286c29c1fe078e70702e05e71d8a37cc8da7caa8e186ed5d1d65587cb8447025c4b0fdb79d1eb80f2b86ff8f7
-  data.tar.gz: e8a3f6bd658210f4a039e86de5ea1866e4ec757935f78114ea4b6f8421915e5cc65c61c9340f32dfb1d98a00e25a99676e721c0c4a3def0f87fd21a0eb3e7767
+  metadata.gz: baedaa18f216752c02e01b79c12b7236c38b624089fe54d904e75abc1f0c41e26fefdb95451eaa74b6054d9dd6d7aae2a79a4bd1175d620b3d6c195d80340d33
+  data.tar.gz: 443a35fde4d991f45e4f540539aae8ed0ee1f926efce325279a5978129dbcab8d35ec7c70e1a84cff99603cdadd0d176dba3ed9c1993ca2d9f4207bb455e73aa

data/bin/phraseapp_updater

@@ -8,11 +8,36 @@ class PhraseAppUpdaterCLI < Thor
   option :previous_locales_path,           type: :string
   option :phraseapp_api_key,               type: :string
   option :phraseapp_project_id,            type: :string
+  option :config_file_path,                type: :string
   option :store_results_path,              type: :string
   option :store_phraseapp_originals_path,  type: :string
 
   def push
+    if options[:config_file_path]
+
+      if options[:phraseapp_api_key] || options[:phraseapp_project_id]
+        raise RuntimeError.new("Provided both a path to PhraseApp config file and command line arguments. Specify only one. #{options}")
+      end
+
+      config = PhraseAppUpdater.load_config(options[:config_file_path])
+
+      phraseapp_api_key    = config.api_key
+      phraseapp_project_id = config.project_id
+    else
+      phraseapp_api_key    = options.fetch(:phraseapp_api_key, ENV["PA_API_KEY"])
+      phraseapp_project_id = options.fetch(:phraseapp_project_id, ENV["PA_PROJECT_ID"])
+    end
+
+    if phraseapp_api_key.to_s.empty?
+      raise RuntimeError.new("Must provide Phraseapp API key. --phraseapp_api_key or PA_API_KEY")
+    end
+
+    if phraseapp_project_id.to_s.empty?
+      raise RuntimeError.new("Must provide Phraseapp project ID. --phraseapp_project_id or PA_PROJECT_ID")
+    end
+
     new_locales_path = options.fetch(:new_locales_path, ENV["PA_NEW_LOCALES_PATH"])
+
     if new_locales_path.to_s.empty?
       raise RuntimeError.new("Must provide a path to the locale files to upload. --new_locales_path or PA_NEW_LOCALES_PATH")
     end
@@ -30,16 +55,6 @@ class PhraseAppUpdaterCLI < Thor
       raise RuntimeError.new("Path to locales is not a readable directory: #{previous_locales_path}")
     end
 
-    phraseapp_api_key = options.fetch(:phraseapp_api_key, ENV["PA_API_KEY"])
-    if phraseapp_api_key.to_s.empty?
-      raise RuntimeError.new("Must provide Phraseapp API key. --phraseapp_api_key or PA_API_KEY")
-    end
-
-    phraseapp_project_id = options.fetch(:phraseapp_project_id, ENV["PA_PROJECT_ID"])
-    if phraseapp_project_id.to_s.empty?
-      raise RuntimeError.new("Must provide Phraseapp project ID. --phraseapp_project_id or PA_PROJECT_ID")
-    end
-
     store_results_path = options.fetch(:store_results_path, ENV["PA_store_results_path"]).to_s
 
     if !store_results_path.empty? && (!File.writable?(store_results_path) || !File.directory?(store_results_path))

data/lib/phraseapp_updater.rb

@@ -4,6 +4,7 @@ require 'phraseapp_updater/differ'
 require 'phraseapp_updater/locale_file'
 require 'phraseapp_updater/locale_file_loader'
 require 'phraseapp_updater/phraseapp_api'
+require 'phraseapp_updater/yml_config_loader'
 
 class PhraseAppUpdater
   using IndexBy
@@ -72,6 +73,10 @@ class PhraseAppUpdater
     end
   end
 
+  def self.load_config(config_file_path)
+    YMLConfigLoader.new(config_file_path)
+  end
+
   def self.find_default_locale_file(locales, files)
     default_locale = locales.find(&:default?)
 

data/lib/phraseapp_updater/version.rb

@@ -1,3 +1,3 @@
 class PhraseAppUpdater
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/phraseapp_updater/yml_config_loader.rb

@@ -0,0 +1,21 @@
+require 'yaml'
+
+class PhraseAppUpdater
+  class YMLConfigLoader
+    attr_reader :api_key, :project_id
+    def initialize(file_path)
+      unless File.readable?(file_path)
+        raise RuntimeError.new("Can't read config file at #{file_path}")
+      end
+
+      parsed_yaml = YAML.load(File.read(file_path))
+
+      unless parsed_yaml
+        raise RuntimeError.new("Couldn't parse file contents: #{File.read(file_path)}")
+      end
+
+      @api_key    = parsed_yaml.fetch("phraseapp").fetch("access_token")
+      @project_id = parsed_yaml.fetch("phraseapp").fetch("project_id")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Griffin
@@ -177,6 +177,7 @@ files:
 - lib/phraseapp_updater/locale_file_loader.rb
 - lib/phraseapp_updater/phraseapp_api.rb
 - lib/phraseapp_updater/version.rb
+- lib/phraseapp_updater/yml_config_loader.rb
 - phraseapp_updater.gemspec
 homepage: https://app.engoo.com
 licenses:
@@ -198,8 +199,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A three-way differ for PhraseApp projects.
 test_files: []
+has_rdoc: