phrase 0.2.2 → 0.2.3

data/.gitignore

@@ -16,5 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 .phrase
+.rvmrc
 .DS_Store
 /phrase

data/lib/phrase/api/client.rb

@@ -75,11 +75,12 @@ class Phrase::Api::Client
     true
   end
   
-  def download_translations_for_locale(name)
+  def download_translations_for_locale(name, format=Phrase::Tool::DEFAULT_DOWNLOAD_FORMAT)
     raise "You must specify a name" if name.nil? or name.blank?
+    raise "You must specify a format" if format.nil? or format.blank?
     
     begin
-      content = perform_api_request("/translations/download", :get, {'locale' => name})
+      content = perform_api_request("/translations/download.#{format}", :get, {'locale' => name})
       return content
     rescue Phrase::Api::Exceptions::ServerError => e
       raise "Translations #{name} could not be downloaded"

data/lib/phrase/tool.rb

@@ -9,6 +9,10 @@ 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)
+  DEFAULT_DOWNLOAD_FORMAT = "yml"
+  
   attr_accessor :config, :options
   
   def initialize(argv)
@@ -42,13 +46,13 @@ protected
   def init
     secret = @options.get(:secret)
     unless secret.present?
-      $stderr.puts "Need a secret to init, but found none."
-      $stderr.puts "Please provide the --secret=YOUR_SECRET parameter."
+      print_error "Need a secret to init, but found none."
+      print_error "Please provide the --secret=YOUR_SECRET parameter."
       exit(41)
     end
     
     @config.secret = secret
-    puts "Wrote secret to config file .phrase"
+    print_message "Wrote secret to config file .phrase"
     
     default_locale_name = @options.get(:default_locale)    
     create_locale(default_locale_name)
@@ -59,13 +63,13 @@ protected
     check_config_available
     tags = @options.get(:tags)
     unless tags.empty? or valid_tags_are_given?(tags)
-      $stderr.puts "Invalid tags: Only letters, numbers, underscores and dashes are allowed"
+      print_error "Invalid tags: Only letters, numbers, underscores and dashes are allowed"
       exit(43)
     end
     
     files = choose_files_to_upload
     if files.empty?
-      puts "Could not find any files to upload :("
+      print_message "Could not find any files to upload :("
       exit(43)
     end
     
@@ -85,9 +89,15 @@ protected
       locales = fetch_locales
     end
     
+    format = @options.get(:format) || DEFAULT_DOWNLOAD_FORMAT
+    unless ALLOWED_DOWNLOAD_FORMATS.include?(format)
+      print_error "Invalid format: #{format}"
+      exit(43)
+    end
+    
     locales.each do |locale_name|
-      print "Downloading phrase.#{locale_name}.yml..."
-      fetch_translations_for_locale(locale_name)
+      print "Downloading phrase.#{locale_name}.#{format}..."
+      fetch_translations_for_locale(locale_name, format)
     end
   end
   
@@ -107,32 +117,34 @@ USAGE
   end
   
   def print_version
-    puts "phrase version #{Phrase::VERSION}"
+    print_message "phrase version #{Phrase::VERSION}"
   end
   
 private
   def choose_files_to_upload
     file_name = args[1]
-  
+    recursive = @options.get(:recursive)
+    
     unless file_name
       if self.class.rails_default_locale_folder_is_available
         file_name = self.class.rails_default_locale_folder
-        puts "No file or directory specified, using #{self.class.rails_default_locale_folder}"
+        print_message "No file or directory specified, using #{self.class.rails_default_locale_folder}"
       else 
-        $stderr.puts "Need either a file or directory:"
-        $stderr.puts "phrase push FILE"
-        $stderr.puts "phrase push DIRECTORY"
+        print_error "Need either a file or directory:"
+        print_error "phrase push FILE"
+        print_error "phrase push DIRECTORY"
         exit(46)
       end
     end
 
     unless File.exist?(file_name)
-      $stderr.puts "The file #{file_name} could not be found."
+      print_error "The file #{file_name} could not be found."
       exit(42)
     end
 
     if File.directory?(file_name)
-      files = Dir.glob("#{File.expand_path(file_name)}/**")
+      pattern = recursive ? "#{File.expand_path(file_name)}/**/*" : "#{File.expand_path(file_name)}/**"
+      files = Dir.glob(pattern)
     else
       files = [file_name]
     end
@@ -140,44 +152,48 @@ private
 
   def upload_files(files, tags=[])
     files.each do |file|
-      proceed_with_upload = true
+      upload_file(file, tags)
+    end
+  end
+  
+  def upload_file(file, tags=[])
+    valid = true
     
-      if File.directory?(file)
-        proceed_with_upload = false
-      end
+    if File.directory?(file)
+      valid = false
+    end
     
-      if is_yaml_file(file)
-        proceed_with_upload = false
-        $stderr.puts "Notice: Could not upload #{file} (extension not supported)"
-      end
+    unless file_valid?(file)
+      valid = false
+      print_error "Notice: Could not upload #{file} (type not supported)"
+    end
     
-      if proceed_with_upload
-        begin
-          tagged = " (tagged: #{tags.join(", ")})" if tags.size > 0
-          puts "Uploading #{file}#{tagged}..."
-          api_client.upload(file, File.read(file), tags)
-          puts "OK"
-        rescue Exception => e
-          puts "Failed"
-          print_server_error(e.message, file)
-        end
+    if valid
+      begin
+        tagged = " (tagged: #{tags.join(", ")})" if tags.size > 0
+        print_message "Uploading #{file}#{tagged}..."
+        api_client.upload(file, File.read(file), tags)
+        print_message "OK"
+      rescue Exception => e
+        print_message "Failed"
+        print_server_error(e.message, file)
       end
     end
   end
 
-  def fetch_translations_for_locale(name)
+  def fetch_translations_for_locale(name, format=DEFAULT_DOWNLOAD_FORMAT)
     begin
-      content = api_client.download_translations_for_locale(name)
-      puts "OK"
-      store_translations_file(name, content)
+      content = api_client.download_translations_for_locale(name, format)
+      print_message "OK"
+      store_translations_file(name, content, format)
     rescue Exception => e
-      puts "Failed"
+      print_error "Failed"
       print_server_error(e.message)
     end
   end
   
-  def store_translations_file(name, content)
-    File.open("phrase/locales/phrase.#{name}.yml", "w") do |file|
+  def store_translations_file(name, content, format=DEFAULT_DOWNLOAD_FORMAT)
+    File.open("phrase/locales/phrase.#{name}.#{format}", "w") do |file|
       file.write(content)
     end
   end
@@ -185,10 +201,10 @@ private
   def fetch_locales
     begin
       locales = api_client.fetch_locales
-      puts "Fetched all locales"
+      print_message "Fetched all locales"
       return locales
     rescue Exception => e
-      puts "Failed"
+      print_message "Failed"
       print_server_error(e.message)
       exit(47)
     end
@@ -197,18 +213,18 @@ private
   def create_locale(name)
     begin
       api_client.create_locale(name)
-      puts "Created locale \"#{name}\""
+      print_message "Created locale \"#{name}\""
     rescue Exception => e
-      puts "Notice: Locale \"#{name}\" could not be created (maybe it already exists)"
+      print_message "Notice: Locale \"#{name}\" could not be created (maybe it already exists)"
     end
   end
   
   def make_locale_default(name)
     begin
       api_client.make_locale_default(name)
-      puts "Locale \"#{name}\" is now the default locale"
+      print_message "Locale \"#{name}\" is now the default locale"
     rescue Exception => e
-      puts "Notice: Locale \"#{name}\" could not be made the default locale"
+      print_message "Notice: Locale \"#{name}\" could not be made the default locale"
       print_server_error(e.message)
     end
   end
@@ -218,15 +234,24 @@ private
   end
 
   def print_server_error(message, filename=nil)
-    $stderr.puts "#{message} (#{filename})"
+    print_error "#{message} (#{filename})"
+  end
+  
+  def print_message(message)
+    puts message
+  end
+  
+  def print_error(message)
+    $stderr.puts message
   end
 
   def args
     @args
   end
   
-  def is_yaml_file(filepath)
-    !File.directory?(filepath) && filepath.split('.').last != 'yml'
+  def file_valid?(filepath)
+    extension = filepath.split('.').last
+    ALLOWED_FILE_TYPES.include?(extension)
   end
   
   def create_locales_folder!
@@ -235,7 +260,7 @@ private
   
   def check_config_available
     if !@config.secret || @config.secret.empty?
-      $stderr.puts "No config present. You need to initialize phrase first."
+      print_error "No config present. You need to initialize phrase first."
       exit(43)
     end
   end

data/lib/phrase/tool/options.rb

@@ -16,9 +16,11 @@ class Phrase::Tool::Options
         default_locale: "en"
       },
       push: {
-        tags: []
+        tags: [],
+        recursive: false
       },
       pull: {
+        format: "yml"
       }
     }
     options.parse!(args)
@@ -49,6 +51,16 @@ private
           opts.on("--tags=foo,bar", Array, "List of tags for phrase push (separated by comma)") do |tags|
             @data[command_name][:tags] = tags
           end
+          
+          opts.on("-R", "--recursive", "Push files in subfolders as well (recursively)") do |recursive|
+            @data[command_name][:recursive] = true
+          end
+        end
+      when :pull
+        OptionParser.new do |opts|
+          opts.on("--format=yml", String, "Allowed formats: #{Phrase::Tool::ALLOWED_DOWNLOAD_FORMATS.join(", ")}") do |format|
+            @data[command_name][:format] = format
+          end
         end
       else
         OptionParser.new do |opts|

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70280207261720 !ruby/object:Gem::Requirement
+  requirement: &70265216292960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280207261720
+  version_requirements: *70265216292960
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70280207277380 !ruby/object:Gem::Requirement
+  requirement: &70265216292500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70280207277380
+  version_requirements: *70265216292500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70280207276840 !ruby/object:Gem::Requirement
+  requirement: &70265216292120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280207276840
+  version_requirements: *70265216292120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280207276380 !ruby/object:Gem::Requirement
+  requirement: &70265216291660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280207276380
+  version_requirements: *70265216291660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70280207275960 !ruby/object:Gem::Requirement
+  requirement: &70265216291240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280207275960
+  version_requirements: *70265216291240
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70280207275520 !ruby/object:Gem::Requirement
+  requirement: &70265216290820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280207275520
+  version_requirements: *70265216290820
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70280207275080 !ruby/object:Gem::Requirement
+  requirement: &70265216290400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280207275080
+  version_requirements: *70265216290400
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email: