phrase 0.4.28 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d2d05c19674e93f05ec0aeb9beae4b98f5c3c4
-  data.tar.gz: d4674160f5add7df47c43b9a8cfb18b517022429
+  metadata.gz: 3f50629fe11a9b95170ba6be764a7f1c06329b13
+  data.tar.gz: 149c60787026183d56b8f1aa89c1cbb4e9e4ecc9
 SHA512:
-  metadata.gz: f2f714cdd9a9ee0ecfee366096f691db953faf7a4cf83fb82da380c3628f4af1f064c3609d2f11591e5a87b1b1436d8fde349b62ec61a96252fba830764b04b3
-  data.tar.gz: 18f174fe7383f8294228e02a449bf909e8bdc59d460034e221394ea6b87d83a1622f381b262727ffd9f9bdd279e98665757a83e27be58338d2864cebf2bb69dd
+  metadata.gz: 033e1d168b55edf35b2d6ae6ffd956e6ee8b88eb279e59fb77c0da377bbe566e7b01ee2f893cf29768bd103888d9c05358772b6ee56eee7fd43e6869205f2efc
+  data.tar.gz: bfaf505c644852d1cef722ff13cd08ba04e389dc78768d0e4aaf0166f35ecafdd17f350026eda104c0deeac17d5eb422167f9b424ffb62275aca938a27c6c829

data/README.md

@@ -223,6 +223,12 @@ This will pull localization files for all of your locales available in the curre
 
 	Please note that the encodings only work for a handful of formats like IOS .strings or Java .properties. The default will be UTF-8. If none is provided the default encoding of the formats is used.
 
+* `--skip-unverified-translations`
+	
+	By default all translations are downloaded. Use this flag to skip all unverified translations.
+
+	    phrase pull --skip-unverified-translations
+
 
 * `--secret`
 

data/lib/phrase/api/client.rb

@@ -87,7 +87,7 @@ class Phrase::Api::Client
     true
   end
 
-  def download_translations_for_locale(name, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil, encoding=nil)
+  def download_translations_for_locale(name, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil, encoding=nil, skip_unverified_translations=nil)
     raise "You must specify a name" if name.nil? || name.blank?
     raise "You must specify a format" if format.nil? || format.blank?
 
@@ -99,7 +99,8 @@ class Phrase::Api::Client
         updated_since: updated_since,
         include_empty_translations: include_empty_translations ? "1" : nil,
         convert_emoji: convert_emoji ? "1" : nil,
-        encoding: encoding
+        encoding: encoding,
+        skip_unverified_translations: skip_unverified_translations ? "1" : nil
       }
 
       content = perform_api_request("/translations/download", :get, params)

data/lib/phrase/tool/commands.rb

@@ -33,7 +33,8 @@ module Phrase::Tool::Commands
         updated_since: nil,
         include_empty_translations: nil,
         convert_emoji: nil,
-        encoding: nil
+        encoding: nil,
+        skip_unverified_translations: nil
       },
       tags: {
         list: true

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

@@ -17,22 +17,23 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     @updated_since = @options.get(:updated_since)
     @include_empty_translations = @options.get(:include_empty_translations)
     @convert_emoji = @options.get(:convert_emoji)
-    @encoding = @options.get(:encoding)
+    @encoding = @options.get(:encoding) || config.encoding
     @target ||= Phrase::Formats.target_directory(@format) if format_valid?(@format)
+    @skip_unverified_translations = @options.get(:skip_unverified_translations)
   end
 
   def execute!
     (print_error("Invalid format: #{@format}") and exit_command) unless format_valid?(@format)
     locales_to_download.compact.each do |locale|
       print_message "Downloading #{locale.name}..."
-      fetch_translations_for_locale(locale, @format, @tag, @updated_since, @include_empty_translations, @convert_emoji, @encoding)
+      fetch_translations_for_locale(locale, @format, @tag, @updated_since, @include_empty_translations, @convert_emoji, @encoding, @skip_unverified_translations)
     end
   end
 
 private
-  def fetch_translations_for_locale(locale, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil, encoding=nil)
+  def fetch_translations_for_locale(locale, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil, encoding=nil, skip_unverified_translations=nil)
     begin
-      content = api_client.download_translations_for_locale(locale.name, format, tag, updated_since, include_empty_translations, convert_emoji, encoding)
+      content = api_client.download_translations_for_locale(locale.name, format, tag, updated_since, include_empty_translations, convert_emoji, encoding, skip_unverified_translations)
       store_content_in_locale_file(locale, content)
     rescue Exception => e
       print_error "Failed"

data/lib/phrase/tool/config.rb

@@ -94,6 +94,15 @@ class Phrase::Tool::Config
     save_config!
   end
 
+  def encoding
+    get_setting("encoding")
+  end
+
+  def encoding=(new_encoding)
+    config["encoding"] = new_encoding
+    save_config!
+  end
+
 private
   def config
     @config ||= {}

data/lib/phrase/tool/options_factory.rb

@@ -112,6 +112,10 @@ class OptionsFactory
       set[:encoding] = encoding
     end
 
+    opts.on("--skip-unverified-translations", "Skip unverified translations in the result") do |skip_unverified_translations|
+      set[:skip_unverified_translations] = skip_unverified_translations
+    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

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.28"
+  VERSION = "0.4.29"
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.29
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: phrase allows you to edit translations in-place on the page itself. More
@@ -159,8 +159,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -252,12 +252,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []