phrase 0.2.4 → 0.2.5

data/lib/phrase/api/client.rb

@@ -86,13 +86,14 @@ class Phrase::Api::Client
     end
   end
   
-  def upload(filename, file_content, tags=[])
+  def upload(filename, file_content, tags=[], locale=nil)
     begin
       params = {
         "filename" => filename,
         "file_content" => file_content,
         "tags[]" => tags
       }
+      params["locale_name"] = locale unless locale.nil?
       perform_api_request("/translation_keys/upload", :post, params)
     rescue Phrase::Api::Exceptions::ServerError => e
       raise "File #{filename} could not be uploaded"

data/lib/phrase/tool.rb

@@ -9,8 +9,9 @@ class Phrase::Tool
   autoload :Options, 'phrase/tool/options'
   autoload :TagValidator, 'phrase/tool/tag_validator'
   
-  ALLOWED_FILE_TYPES = %w(yml pot po)
-  ALLOWED_DOWNLOAD_FORMATS = %w(yml po)
+  ALLOWED_FILE_TYPES = %w(yml pot po xml strings json resx ts qph ini plist properties xlf)
+  ALLOWED_DOWNLOAD_FORMATS = %w(yml po xml strings json resx ts qph ini plist properties xlf)
+  FORMATS_CONTAINING_LOCALE = %q(po yml qph ts xlf)
   DEFAULT_DOWNLOAD_FORMAT = "yml"
   DEFAULT_TARGET_FOLDER = "phrase/locales/"
   
@@ -63,6 +64,8 @@ protected
   def push
     check_config_available
     tags = @options.get(:tags)
+    locale = @options.get(:locale)
+    
     unless tags.empty? or valid_tags_are_given?(tags)
       print_error "Invalid tags: Only letters, numbers, underscores and dashes are allowed"
       exit(43)
@@ -74,7 +77,7 @@ protected
       exit(43)
     end
     
-    upload_files(files, tags)
+    upload_files(files, tags, locale)
   end
 
   def pull
@@ -110,10 +113,10 @@ usage: phrase <command> [<args>]
 
   phrase init --secret=<YOUR SECRET> --default-locale=<DEFAULT LOCALE>
 
-  phrase push FILE [--tags=<tags>]
-  phrase push DIRECTORY [--tags=<tags>]
+  phrase push FILE [--tags=<tags>] [--locale=<locale>]
+  phrase push DIRECTORY [--tags=<tags>] [--locale=<locale>]
   
-  phrase pull [LOCALE] [--target=<target-folder>]
+  phrase pull [LOCALE] [--target=<target-folder>] [--format=<format>]
   
   phrase --version
 USAGE
@@ -153,13 +156,13 @@ private
     end
   end
 
-  def upload_files(files, tags=[])
+  def upload_files(files, tags=[], locale=nil)
     files.each do |file|
-      upload_file(file, tags)
+      upload_file(file, tags, locale)
     end
   end
   
-  def upload_file(file, tags=[])
+  def upload_file(file, tags=[], locale=nil)
     valid = true
     
     if File.directory?(file)
@@ -175,7 +178,7 @@ private
       begin
         tagged = " (tagged: #{tags.join(", ")})" if tags.size > 0
         print_message "Uploading #{file}#{tagged}..."
-        api_client.upload(file, File.read(file), tags)
+        api_client.upload(file, File.read(file), tags, locale)
         print_message "OK"
       rescue Exception => e
         print_message "Failed"

data/lib/phrase/tool/options.rb

@@ -17,7 +17,8 @@ class Phrase::Tool::Options
       },
       push: {
         tags: [],
-        recursive: false
+        recursive: false,
+        locale: nil
       },
       pull: {
         format: "yml",
@@ -56,6 +57,10 @@ private
           opts.on("-R", "--recursive", "Push files in subfolders as well (recursively)") do |recursive|
             @data[command_name][:recursive] = true
           end
+          
+          opts.on("--locale=en", String, "Locale of the translations your file contain (required for formats that do not include the name of the locale in the file content)") do |locale|
+            @data[command_name][:locale] = locale
+          end
         end
       when :pull
         OptionParser.new do |opts|

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70298691089780 !ruby/object:Gem::Requirement
+  requirement: &70191400504960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298691089780
+  version_requirements: *70191400504960
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70298691089320 !ruby/object:Gem::Requirement
+  requirement: &70191400504500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70298691089320
+  version_requirements: *70191400504500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70298691088940 !ruby/object:Gem::Requirement
+  requirement: &70191400504120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298691088940
+  version_requirements: *70191400504120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70298691088480 !ruby/object:Gem::Requirement
+  requirement: &70191400503660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298691088480
+  version_requirements: *70191400503660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70298691088060 !ruby/object:Gem::Requirement
+  requirement: &70191400503240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298691088060
+  version_requirements: *70191400503240
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70298691087640 !ruby/object:Gem::Requirement
+  requirement: &70191400502820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298691087640
+  version_requirements: *70191400502820
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70298691087220 !ruby/object:Gem::Requirement
+  requirement: &70191400502400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298691087220
+  version_requirements: *70191400502400
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70298691086800 !ruby/object:Gem::Requirement
+  requirement: &70191400501980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298691086800
+  version_requirements: *70191400501980
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email: