phrase 0.4.4 → 0.4.5

data/lib/phrase/api/client.rb

@@ -84,13 +84,14 @@ class Phrase::Api::Client
     end
   end
   
-  def upload(filename, file_content, tags=[], locale=nil, format=nil)
+  def upload(filename, file_content, tags=[], locale=nil, format=nil, update_translations=false)
     begin
       params = {
         "file_format" => format,
         "filename" => filename,
         "file_content" => file_content,
-        "tags[]" => tags
+        "tags[]" => tags,
+        "update_translations" => update_translations ? "1" : "0",
       }
       params["locale_name"] = locale unless locale.nil?
       perform_api_request("/translation_keys/upload", :post, params)

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

@@ -13,6 +13,7 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
     @format = @options.get(:format)
     @tags = @options.get(:tags)
     @recursive = @options.get(:recursive)
+    @update_translations = @options.get(:update_translations)
   end
   
   def execute!
@@ -80,7 +81,7 @@ private
           locale = Phrase::Tool::Locale.find_default_locale.try(:name)
         end
         locale = @locale if @locale
-        api_client.upload(file, file_content(file), @tags, locale, @format)
+        api_client.upload(file, file_content(file), @tags, locale, @format, @update_translations)
         print_message "OK".green
       rescue Exception => e
         print_error "Failed"

data/lib/phrase/tool/options.rb

@@ -24,7 +24,8 @@ class Phrase::Tool::Options
         tags: [],
         recursive: false,
         locale: nil,
-        format: nil
+        format: nil,
+        update_translations: false
       },
       pull: {
         format: nil,
@@ -41,7 +42,6 @@ class Phrase::Tool::Options
   end
   
 private
-  
   def options
     OptionsFactory.options_for(command_name, @data)
   end

data/lib/phrase/tool/options_factory.rb

@@ -54,6 +54,10 @@ class OptionsFactory
     opts.on("--format=yml", String, "See documentation for list of allowed formats") do |format|
       set[:format] = format
     end
+
+    opts.on("--force-update-translations", "Force update of existing translations with the file content") do |update_translations|
+      set[:update_translations] = update_translations
+    end
   end
   private_class_method :push
 

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70334535021840 !ruby/object:Gem::Requirement
+  requirement: &70272476364560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334535021840
+  version_requirements: *70272476364560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70334535021380 !ruby/object:Gem::Requirement
+  requirement: &70272476364100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334535021380
+  version_requirements: *70272476364100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70334535020960 !ruby/object:Gem::Requirement
+  requirement: &70272476363680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535020960
+  version_requirements: *70272476363680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334535020540 !ruby/object:Gem::Requirement
+  requirement: &70272476363260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535020540
+  version_requirements: *70272476363260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70334535020120 !ruby/object:Gem::Requirement
+  requirement: &70272476362840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535020120
+  version_requirements: *70272476362840
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70334535019700 !ruby/object:Gem::Requirement
+  requirement: &70272476362420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535019700
+  version_requirements: *70272476362420
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70334535019280 !ruby/object:Gem::Requirement
+  requirement: &70272476362000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535019280
+  version_requirements: *70272476362000
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70334535018860 !ruby/object:Gem::Requirement
+  requirement: &70272476361580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535018860
+  version_requirements: *70272476361580
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &70334535018440 !ruby/object:Gem::Requirement
+  requirement: &70272476361160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535018440
+  version_requirements: *70272476361160
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70334535018020 !ruby/object:Gem::Requirement
+  requirement: &70272476360740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334535018020
+  version_requirements: *70272476360740
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email: