phrase 0.4.6 → 0.4.7

data/lib/phrase/api/client.rb

@@ -72,12 +72,12 @@ class Phrase::Api::Client
     true
   end
   
-  def download_translations_for_locale(name, format)
+  def download_translations_for_locale(name, format, tag=nil)
     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.#{format}", :get, {'locale' => name})
+      content = perform_api_request("/translations/download.#{format}", :get, {'locale' => name, 'tag' => tag})
       return content
     rescue Phrase::Api::Exceptions::ServerError => e
       raise "Translations #{name} could not be downloaded"
@@ -100,6 +100,11 @@ class Phrase::Api::Client
     end
     true
   end
+
+  def list_tags
+    result = perform_api_request("/tags", :get)
+    parsed(result)
+  end
   
 private
   def extract_structured_object(translation)

data/lib/phrase/tool.rb

@@ -28,6 +28,8 @@ class Phrase::Tool
         Phrase::Tool::Commands::Push.new(@options, @args)
       when /pull/
         Phrase::Tool::Commands::Pull.new(@options, @args)
+      when /tags/
+        Phrase::Tool::Commands::Tags.new(@options, @args)
       else
         if @options.get(:version)
           Phrase::Tool::Commands::ShowVersion.new(@options, @args)

data/lib/phrase/tool/commands.rb

@@ -7,5 +7,6 @@ require "phrase/tool/commands/base"
 require "phrase/tool/commands/init"
 require "phrase/tool/commands/push"
 require "phrase/tool/commands/pull"
+require "phrase/tool/commands/tags"
 require "phrase/tool/commands/show_version"
 require "phrase/tool/commands/show_help"

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

@@ -37,6 +37,10 @@ module Phrase::Tool::Commands
     end
     
   protected
+    def get_option(name)
+      options.get(name)
+    end
+
     def api_client
       Phrase::Api::Client.new(config.secret)
     end

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

@@ -25,10 +25,6 @@ class Phrase::Tool::Commands::Init < Phrase::Tool::Commands::Base
   end
   
 private
-  def get_option(symbol)
-    options.get symbol
-  end
-  
   def create_locale(name)
     begin
       api_client.create_locale(name)

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

@@ -13,6 +13,7 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     # TODO: remove DEFAULT_DOWNLOAD_FORMAT when phrase app has been updated
     @format = @options.get(:format) || config.format || DEFAULT_DOWNLOAD_FORMAT
     @target = @options.get(:target)
+    @tag = @options.get(:tag)
     @target ||= Phrase::Formats.target_directory(@format) if format_valid?(@format)
   end
   
@@ -20,14 +21,14 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     (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)
+      fetch_translations_for_locale(locale, @format, @tag)
     end
   end
   
 private
-  def fetch_translations_for_locale(locale, format)
+  def fetch_translations_for_locale(locale, format, tag=nil)
     begin
-      content = api_client.download_translations_for_locale(locale.name, format)
+      content = api_client.download_translations_for_locale(locale.name, format, tag)
       store_content_in_locale_file(locale, content)
     rescue Exception => e
       print_error "Failed"

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

@@ -20,7 +20,9 @@ usage: phrase <command> [<args>]
   phrase push FILE [--tags=<tags>] [--locale=<locale>]
   phrase push DIRECTORY [--tags=<tags>] [--locale=<locale>]
 
-  phrase pull [LOCALE] [--target=<target-folder>] [--format=<format>]
+  phrase pull [LOCALE] [--target=<target-folder>] [--format=<format>] [--tag=<tag>]
+
+  phrase tags [-l, --list]
 
   phrase --version
 USAGE

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

@@ -0,0 +1,29 @@
+# -*- encoding : utf-8 -*-
+
+class Phrase::Tool::Commands::Tags < Phrase::Tool::Commands::Base
+  def initialize(options, args)
+    super(options, args)
+    require_auth_token!
+  end
+  
+  def execute!
+    if get_option(:list)
+      list_tags
+    else
+      print_error "Unknown command"
+    end
+  end
+
+protected
+  def list_tags
+    begin
+      tags = api_client.list_tags
+      tags.each do |tag|
+        print_message "#{tag["name"]}"
+      end
+    rescue Exception => e
+      print_error "Failure while fetching tags"
+      print_server_error(e.message)
+    end
+  end
+end

data/lib/phrase/tool/options.rb

@@ -29,7 +29,11 @@ class Phrase::Tool::Options
       },
       pull: {
         format: nil,
-        target: nil
+        target: nil,
+        tag: nil
+      },
+      tags: {
+        list: true
       }
     }
     options.parse!(args)

data/lib/phrase/tool/options_factory.rb

@@ -69,8 +69,19 @@ class OptionsFactory
     opts.on("--target=./phrase/locales", String, "Target folder to store locale files") do |target|
       set[:target] = target
     end
+
+    opts.on("--tag=foo", String, "Limit results to a given tag instead of all translations") do |tag|
+      set[:tag] = tag
+    end
   end
   private_class_method :pull
+
+  def self.tags(opts, set)
+    opts.on("-l", "--list", "List all tags") do |list|
+      set[:list] = list
+    end
+  end
+  private_class_method :tags
   
   def self.default(opts, set)
     opts.on_tail("-v", "--version", "Show version number") do |version|

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372605540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372605540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372605080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372605080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372604620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372604620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372604180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372604180
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372603660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372603660
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372603160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372603160
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372602500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372602500
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372601700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372601700
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372601280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372601280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70226372600820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,12 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70226372600820
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -245,6 +195,7 @@ files:
 - lib/phrase/tool/commands/push.rb
 - lib/phrase/tool/commands/show_help.rb
 - lib/phrase/tool/commands/show_version.rb
+- lib/phrase/tool/commands/tags.rb
 - lib/phrase/tool/config.rb
 - lib/phrase/tool/encoding_detector.rb
 - lib/phrase/tool/locale.rb
@@ -274,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.