phrase 0.4.8 → 0.4.9

data/.gitignore

@@ -17,6 +17,8 @@ test/version_tmp
 /tmp
 .phrase
 .rvmrc
+.ruby-version
+.ruby-gemset
 .DS_Store
 /phrase
 .rspec

data/lib/phrase/tool/commands.rb

@@ -1,6 +1,42 @@
 # -*- encoding : utf-8 -*-
 
 module Phrase::Tool::Commands
+  def self.possible_commands_with_options
+    {
+      default: {
+        version: false,
+        help: false
+      },
+      init: {
+        secret: "",
+        default_locale: "en",
+        domain: "phrase",
+        format: nil,
+        locale_filename: nil,
+        locale_directory: nil,
+        target_directory: nil 
+      },
+      push: {
+        tags: [],
+        recursive: false,
+        locale: nil,
+        format: nil,
+        update_translations: false
+      },
+      pull: {
+        format: nil,
+        target: nil,
+        tag: nil
+      },
+      tags: {
+        list: true
+      }
+    }
+  end
+
+  def self.possible_commands
+    self.possible_commands_with_options.keys
+  end
 end
 
 require "phrase/tool/commands/base"

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

@@ -32,8 +32,8 @@ module Phrase::Tool::Commands
       $stdout.puts msg
     end
         
-    def self.exit_command
-      exit()
+    def self.exit_command(status = false)
+      exit(status)
     end
     
   protected
@@ -70,8 +70,8 @@ module Phrase::Tool::Commands
       self.class.print_message(msg)
     end
     
-    def exit_command
-      self.class.exit_command
+    def exit_command(status = false)
+      self.class.exit_command(status)
     end
   end
 end

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

@@ -3,11 +3,11 @@
 class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
   FORMATS_CONTAINING_LOCALE = %q(po yml qph ts xlf)
   RAILS_DEFAULT_FOLDER = "./config/locales/"
-  
+
   def initialize(options, args)
     super(options, args)
     require_auth_token!
-    
+
     @file_names = @args[1..-1]
     @locale = @options.get(:locale)
     @format = @options.get(:format)
@@ -15,13 +15,13 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
     @recursive = @options.get(:recursive)
     @update_translations = @options.get(:update_translations)
   end
-  
+
   def execute!
     unless @tags.empty? or valid_tags_are_given?(@tags)
       print_error "Invalid tags: Only letters, numbers, underscores and dashes are allowed"
       exit_command
     end
-    
+
     files = choose_files_to_upload(@file_names, @recursive)
 
     if files.empty?
@@ -31,7 +31,7 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
       upload_files(files)
     end
   end
-  
+
 private
   def choose_files_to_upload(file_names, recursive=false)
     files = []
@@ -40,14 +40,14 @@ private
       if rails_default_locale_folder_available?
         file_names = [RAILS_DEFAULT_FOLDER]
         print_message "No file or directory specified, using #{RAILS_DEFAULT_FOLDER}"
-      else 
+      else
         print_error "Need either a file or directory:"
         print_error "phrase push FILE"
         print_error "phrase push DIRECTORY"
         exit_command
       end
     end
-    
+
     file_names.each do |file_name|
       if File.directory?(file_name)
         pattern = recursive ? "#{File.expand_path(file_name)}/**/*" : "#{File.expand_path(file_name)}/**"
@@ -55,13 +55,13 @@ private
       else
         files << file_name
       end
-    end 
+    end
 
-    files
+    files.reject { |file| File.directory?(file) }
   end
 
   def upload_files(files)
-    files.each do |file| 
+    files.each do |file|
       if file_exists?(file)
         upload_file(file)
       else
@@ -69,7 +69,7 @@ private
       end
     end
   end
-  
+
   def upload_file(file)
     if file_valid?(file)
       begin
@@ -91,25 +91,25 @@ private
       print_error "Notice: Could not upload #{file} (type not supported)"
     end
   end
-  
+
   def file_content(file)
     content = File.open(file).read
     content = utf16_to_utf8(content) if file_seems_to_be_utf16?(file)
     content
   end
-  
+
   def force_use_of_default_locale?(file_path)
     not Phrase::Formats.file_format_exposes_locale?(file_path)
   end
-  
+
   def utf16_to_utf8(string)
     string.encode("UTF-8", "UTF-16")
   end
-  
+
   def file_seems_to_be_utf16?(file)
     Phrase::Tool::EncodingDetector.file_seems_to_be_utf16?(file)
   end
-  
+
   def file_valid?(filepath)
     extension = filepath.split('.').last
     allowed_file_extensions.include?(extension)
@@ -118,15 +118,15 @@ private
   def file_exists?(file)
     File.exist?(file)
   end
-  
+
   def valid_tags_are_given?(tags)
     tags.all? { |tag| Phrase::Tool::TagValidator.valid?(tag) }
   end
-  
+
   def rails_default_locale_folder_available?
     File.exist?(RAILS_DEFAULT_FOLDER) && File.directory?(RAILS_DEFAULT_FOLDER)
   end
-  
+
   def detect_locale_name_from_file_path(file_path)
     Phrase::Formats.detect_locale_name_from_file_path(file_path)
   end

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

@@ -4,27 +4,23 @@ class Phrase::Tool::Commands::ShowHelp < Phrase::Tool::Commands::Base
   def initialize(options, args)
     super(options, args)
   end
-  
+
   def execute!
     show_help
   end
-  
-private
-  
-  def show_help
-    print_message <<USAGE
-usage: phrase <command> [<args>]
-
-  phrase init --secret=<YOUR SECRET> --default-locale=<DEFAULT LOCALE, e.g. en> --default-format=<FORMAT, e.g. yml> --default-target=<TARGET, default is ./phrase/locales/>
 
-  phrase push FILE [--tags=<tags>] [--locale=<locale>]
-  phrase push DIRECTORY [--tags=<tags>] [--locale=<locale>]
+private
 
-  phrase pull [LOCALE] [--target=<target-folder>] [--format=<format>] [--tag=<tag>]
+  def show_help
+    msg = "usage: phrase <command> [<args>]\n"
+    Phrase::Tool::Commands.possible_commands.each do |command, suffix| 
+      msg << "    #{extract_help(command)}\n"
+    end
 
-  phrase tags [-l, --list]
+    print_message msg
+  end
 
-  phrase --version
-USAGE
+  def extract_help(command)
+    OptionsFactory.options_for(command, {}).help
   end
 end

data/lib/phrase/tool/options.rb

@@ -5,37 +5,7 @@ require File.expand_path('../options_factory', __FILE__)
 class Phrase::Tool::Options
   def initialize(args, command="")
     @command = command
-    # specify all possible arguments here
-    @data = {
-      default: {
-        version: false,
-        help: false
-      },
-      init: {
-        secret: "",
-        default_locale: "en",
-        domain: "phrase",
-        format: nil,
-        locale_filename: nil,
-        locale_directory: nil,
-        target_directory: nil 
-      },
-      push: {
-        tags: [],
-        recursive: false,
-        locale: nil,
-        format: nil,
-        update_translations: false
-      },
-      pull: {
-        format: nil,
-        target: nil,
-        tag: nil
-      },
-      tags: {
-        list: true
-      }
-    }
+    @data = Phrase::Tool::Commands.possible_commands_with_options
     options.parse!(args)
   end
   

data/lib/phrase/tool/options_factory.rb

@@ -8,6 +8,8 @@ class OptionsFactory
   end
 
   def self.init(opts, set)
+    opts.banner = "phrase init"
+
     opts.on("--secret=YOUR_AUTH_TOKEN", String, "Your auth token") do |secret|
       set[:secret] = secret
     end
@@ -39,6 +41,8 @@ class OptionsFactory
   private_class_method :init
 
   def self.push(opts, set)
+    opts.banner = "phrase push FILE|DIRECTORY"
+
     opts.on("--tags=foo,bar", Array, "List of tags for phrase push (separated by comma)") do |tags|
       set[:tags] = tags
     end
@@ -62,6 +66,8 @@ class OptionsFactory
   private_class_method :push
 
   def self.pull(opts, set)
+    opts.banner = "phrase pull [LOCALE]"
+
     opts.on("--format=yml", String, "See documentation for list of allowed formats") do |format|
       set[:format] = format
     end
@@ -77,6 +83,8 @@ class OptionsFactory
   private_class_method :pull
 
   def self.tags(opts, set)
+    opts.banner = "phrase tags"
+
     opts.on("-l", "--list", "List all tags") do |list|
       set[:list] = list
     end
@@ -84,6 +92,8 @@ class OptionsFactory
   private_class_method :tags
   
   def self.default(opts, set)
+    opts.banner = ""
+    
     opts.on_tail("-v", "--version", "Show version number") do |version|
      set[:version] = true
     end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/phrase.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency('colorize')
   s.add_dependency('json')
+  s.add_dependency('i18n')
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
-  s.add_development_dependency('i18n')
   s.add_development_dependency('webmock')
   s.add_development_dependency('vcr')
   s.add_development_dependency('timecop')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70113365447600 !ruby/object:Gem::Requirement
+  requirement: &70209041741460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113365447600
+  version_requirements: *70209041741460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70113365447140 !ruby/object:Gem::Requirement
+  requirement: &70209041741000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113365447140
+  version_requirements: *70209041741000
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70113365446680 !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: &70209041740540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70113365446680
+  version_requirements: *70209041740540
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70113365446240 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70209041740100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365446240
+  version_requirements: *70209041740100
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70113365445720 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70209041739580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365445720
+  version_requirements: *70209041739580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70113365445220 !ruby/object:Gem::Requirement
+  requirement: &70209041739080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365445220
+  version_requirements: *70209041739080
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70113365444560 !ruby/object:Gem::Requirement
+  requirement: &70209041738420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365444560
+  version_requirements: *70209041738420
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70113365443760 !ruby/object:Gem::Requirement
+  requirement: &70209041737620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365443760
+  version_requirements: *70209041737620
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &70113365443340 !ruby/object:Gem::Requirement
+  requirement: &70209041737200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365443340
+  version_requirements: *70209041737200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70113365442920 !ruby/object:Gem::Requirement
+  requirement: &70209041736740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113365442920
+  version_requirements: *70209041736740
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email: