phrase 0.4.15 → 0.4.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNlOGM1Yzc0NmYwYTM0M2ZmMmUyMjUzN2Q3MmMzMWIwNmRlYTg2ZQ==
+    OTQyMmI5YjJkMDUxNGJhNDc0MDBjNDQ2ODc5OGUzOTQxYTJjYzliMw==
   data.tar.gz: !binary |-
-    OTE5ZDBmMGE4YWZkYWZiMjc4YzIwNDc0YTFlYjg5Y2I0NzZiNjQ1YQ==
+    OWVlZDk4MDc4OGJhZWJmOWE1MTU5Y2M3OWNjNmMzOTQzYjI3ZTIzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yzc5ZWJmMDhkOWNjNmIwYWFkNmY2YjdkNDk2YjBlN2EzOTg3MjNkMmIzMDgx
-    ODRhMmZiZjQyMjJmYjNhNDgxZGQwNjFlMzIzMzE1ZDJhZDY3MTFjMThmMmQ0
-    NmUzMjJlODRjN2E2NTMwZjg0ZTgyOTUxMDNhNTRkZDY0OTQwN2Q=
+    NThlZWM4YmFiNGI1NTBjMjdhMjYxZTAzM2FhZWI2OTI4OGY4N2IxYjM2MDdk
+    N2Y5ZGE0ZGJlOTNiOTcyMDgzMjllODE2MjM5OGUzMTc1ZTFjNzI0MDY2YTRh
+    OWY4ZTEwNDBlNjA4NDkwOTNkZTc0Y2IzYWVmODkzNjQ0YTkzZDU=
   data.tar.gz: !binary |-
-    NzA5NzkyMDU2YTJkYzMyYTcwYmYwOGIzYTE4ZTNmZTJlM2RiOGYzYmY5Mjcz
-    YzZlODI3ZjY0ZTFkYjliNjY5ZWZkOWNmNDIzMmUxYjUyNjc1YTdmNmE1YThj
-    ZWIwMmM4YmY4NjgzZDA3ZTY2MDY4YWFkNGE4OTFhMDMyNjljN2Y=
+    ZTkzNzFiMGYxNjExMjI4OWJjMDY1MTQ4Y2JmNDMzMWZiOGY4ZWYxY2Y5ZDIy
+    OTZiMTEwMDI5YmU4M2JmZTllZWMyZjk1MzliYzBkMmI2ZWUxNmU5Nzk4YjU2
+    Zjk0MzY4YWQ1ZTdlMzUxN2I3ZTlkMmJhZDRjNDQ2ZDQ3NTY3Yzc=

data/lib/phrase/formats.rb

@@ -59,12 +59,7 @@ module Phrase
       end
 
       def self.config
-        @config ||= get_config
-      end
-
-      def self.get_config
-        config = Phrase::Tool::Config.new
-        config.load
+        Phrase::Tool.config
       end
       private_class_method :config
     end
@@ -95,12 +90,7 @@ module Phrase
     }
 
     def self.config
-      @config ||= get_config
-    end
-
-    def self.get_config
-      config = Phrase::Tool::Config.new
-      config.load
+      Phrase::Tool.config
     end
 
     def self.custom_handler

data/lib/phrase/tool.rb

@@ -39,4 +39,8 @@ class Phrase::Tool
     end
     command.execute!
   end
+
+  def self.config
+    @@config_instance ||= Phrase::Tool::Config.new.load
+  end
 end

data/lib/phrase/tool/commands/base.rb

@@ -5,6 +5,7 @@ module Phrase::Tool::Commands
     def initialize(options, args=[])
       @options = options
       @args = args
+      config.overwrite!('secret', options.get('secret')) if options.set?('secret')
     end
 
     def execute!
@@ -46,12 +47,7 @@ module Phrase::Tool::Commands
     end
 
     def config
-      @config ||= get_config
-    end
-
-    def get_config
-      config = Phrase::Tool::Config.new
-      config.load
+      Phrase::Tool.config
     end
 
     def options

data/lib/phrase/tool/config.rb

@@ -4,6 +4,7 @@ require 'json'
 
 class Phrase::Tool::Config
   def load
+    @config = {}
     if File.exist?(".phrase")
       begin
         contents = File.read(".phrase")
@@ -15,8 +16,23 @@ class Phrase::Tool::Config
     self
   end
 
+  def reset!
+    @config = {}
+    @overwrites = {}
+  end
+
+  def overwrite!(var, value)
+    @overwrites ||= {}
+    @overwrites[var.to_s] = value
+  end
+
+  def overwrite_for(var)
+    @overwrites ||= {}
+    @overwrites[var.to_s]
+  end
+
   def secret
-    config["secret"]
+    get_setting("secret")
   end
 
   def secret=(new_secret)
@@ -25,7 +41,7 @@ class Phrase::Tool::Config
   end
 
   def default_locale
-    config["default_locale"]
+    get_setting("default_locale")
   end
 
   def default_locale=(new_default_locale)
@@ -34,7 +50,7 @@ class Phrase::Tool::Config
   end
 
   def domain
-    config["domain"] || 'phrase'
+    get_setting("domain") || 'phrase'
   end
 
   def domain=(new_domain)
@@ -43,7 +59,7 @@ class Phrase::Tool::Config
   end
 
   def format
-    config["format"]
+    get_setting("format")
   end
 
   def format=(new_domain)
@@ -52,7 +68,7 @@ class Phrase::Tool::Config
   end
 
   def target_directory
-    config["target_directory"]
+    get_setting("target_directory")
   end
 
   def target_directory=(new_domain)
@@ -61,7 +77,7 @@ class Phrase::Tool::Config
   end
 
   def locale_directory
-    config["locale_directory"]
+    get_setting("locale_directory")
   end
 
   def locale_directory=(new_domain)
@@ -70,7 +86,7 @@ class Phrase::Tool::Config
   end
 
   def locale_filename
-    config["locale_filename"]
+    get_setting("locale_filename")
   end
 
   def locale_filename=(new_domain)
@@ -83,6 +99,10 @@ private
     @config ||= {}
   end
 
+  def get_setting(var)
+    overwrite_for(var) || config[var]
+  end
+
   def save_config!
     File.open(".phrase", "w+") do |file|
       file.write(JSON.pretty_generate(config))

data/lib/phrase/tool/locale.rb

@@ -30,8 +30,7 @@ class Phrase::Tool::Locale
   end
 
   def self.config
-    config = Phrase::Tool::Config.new
-    config.load
+    Phrase::Tool.config
   end
   private_class_method :config
 

data/lib/phrase/tool/options.rb

@@ -11,10 +11,16 @@ class Phrase::Tool::Options
 
   def get(name)
     return @data.fetch(command_name).fetch(name.to_sym)
-  rescue => e
+  rescue => _
     $stderr.puts "Invalid or missing option \"#{name}\" for command \"#{command_name}\""
   end
 
+  def set?(name)
+    return @data.fetch(command_name)[name.to_sym]
+  rescue => _
+    $stderr.puts "Invalid command name"
+  end
+
 private
   def options
     OptionsFactory.options_for(command_name, @data)

data/lib/phrase/tool/options_factory.rb

@@ -66,6 +66,10 @@ class OptionsFactory
     opts.on("--skip-unverification", "When force updating translations, skip unverification of non-main locale translations") do |skip_unverification|
       set[:skip_unverification] = skip_unverification
     end
+
+    opts.on("--secret=YOUR_AUTH_TOKEN", String, "The Auth Token to use for this operation instead of the saved one (optional)") do |secret|
+      set[:secret] = secret
+    end
   end
   private_class_method :push
 
@@ -83,6 +87,10 @@ class OptionsFactory
     opts.on("--tag=foo", String, "Limit results to a given tag instead of all translations") do |tag|
       set[:tag] = tag
     end
+
+    opts.on("--secret=YOUR_AUTH_TOKEN", String, "The Auth Token to use for this operation instead of the saved one (optional)") do |secret|
+      set[:secret] = secret
+    end
   end
   private_class_method :pull
 

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize