web_translate_it 2.0.0.rc4 → 2.0.0

data/bin/wti

@@ -42,7 +42,7 @@ EOS
       opt :locale, "ISO code of locale(s) to pull", :type => :string
       opt :all,    "Pull all files"
       opt :force,  "Force pull (bypass conditional requests to WTI)"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "push"
     Trollop::options do
@@ -58,43 +58,43 @@ EOS
       opt :ignore_missing, "Force WTI to not obsolete missing strings"
       opt :minor, "Minor Changes. When pushing a master file, prevents target translations to be flagged as `to_verify`."
       opt :label,  "Apply a label to the changes", :type => :string
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "add"
     Trollop::options do
       banner "Create and push a new master language file"
       opt :low_priority, "WTI will process this file with a low priority"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "rm"
     Trollop::options do
       banner "Delete a master language file"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "addlocale"
     Trollop::options do
       banner "Add a new locale to the project"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "rmlocale"
     Trollop::options do
       banner "Delete a locale from the project"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "status"
     Trollop::options do
       banner "Fetch and display project statistics"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "init"
     Trollop::options do
       banner "Configure your project to sync"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "match"
     Trollop::options do
       banner "Display matching of local files with File Manager"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   else
     if command.nil?

data/history.md

@@ -1,3 +1,9 @@
+## Version 2.0.0 / 2012-04-24
+
+* Add more helpers to `wti init` a project
+* Add ability to add a source locale to a project from the command line: the first `wti addlocale xx` sets the source locale.
+* `wti add`: Display if there are no new files to add.
+
 ## Version 2.0.0.rc4 / 2012-04-23
 
 * Allow instantiating `WebTranslateIt::String` and `WebTranslateIt::Term` using a Hash made of symbols or strings.

data/lib/web_translate_it/command_line.rb

@@ -64,6 +64,7 @@ module WebTranslateIt
     
     def add
       STDOUT.sync = true
+      puts "# Creating master files"
       if parameters == []
         puts StringUtil.failure("Error: You must provide the path to the master file to add.")
         puts "Usage: wti add path/to/master_file_1 path/to/master_file_2 ..."
@@ -71,12 +72,16 @@ module WebTranslateIt
       end
       WebTranslateIt::Connection.new(configuration.api_key) do |http|
 	      added = configuration.files.find_all{ |file| file.locale == configuration.source_locale}.collect {|file| File.expand_path(file.file_path) }.to_set
-        parameters.reject{ |param| added.include?(File.expand_path(param))}.each do |param|
-          file = TranslationFile.new(nil, param, nil, configuration.api_key)
-          file.create(http, command_options.low_priority)
+        to_add = parameters.reject{ |param| added.include?(File.expand_path(param))}
+        if to_add.any?
+          to_add.each do |param|
+            file = TranslationFile.new(nil, param, nil, configuration.api_key)
+            file.create(http, command_options.low_priority)
+          end
+        else
+          puts "No new master file to add."
         end
       end
-      puts StringUtil.success("Master file added.")
     end
 
     def rm
@@ -138,8 +143,9 @@ module WebTranslateIt
     end
         
     def init
-      api_key = Util.ask("Project API Key:")
-      path = Util.ask("Configuration file path:", '.wti')
+      puts "# Initializing project"
+      api_key = Util.ask(" Project API Key:")
+      path = Util.ask(" Path to configuration file:", '.wti')
       FileUtils.mkpath(path.split('/')[0..path.split('/').size-2].join('/')) unless path.split('/').count == 1
       project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
@@ -149,7 +155,28 @@ module WebTranslateIt
       end
       File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
       puts ""
-      puts "Your project was successfully setup. You can now use `wti` to push and pull your language files."
+      puts " Your project was successfully initialized."
+      if project_info["source_locale"]["code"].nil? || project_info["target_locales"].count <= 1 || project_info["project_files"].none?
+        puts ""
+        puts " There are a few more things to set up:"
+        puts ""
+      end
+      if project_info["source_locale"]["code"].nil?
+        puts " *) You don't have a source locale setup."
+        puts "    Add the source locale with: `wti addlocale <locale_code>`"
+        puts ""
+      end
+      if project_info["target_locales"].count <= 1
+        puts " *) You don't have a target locale setup."
+        puts "    Add the first target locale with: `wti addlocale <locale_code>`"
+        puts ""
+      end
+      if project_info["project_files"].none?
+        puts " *) You don't have linguistic files setup."
+        puts "    Add a master file with: `wti add <path/to/file.xml>`"
+        puts ""
+      end
+      puts "You can now use `wti` to push and pull your language files."
       puts "Check `wti --help` for help."
     end
     

data/lib/web_translate_it/util.rb

@@ -7,7 +7,7 @@ module WebTranslateIt
     # Return a string representing the gem version
     # For example "1.8.3"
     def self.version
-      IO.read(File.expand_path('../../../version', __FILE__))
+      File.read(File.expand_path('../../../version', __FILE__))
     end
             
     def self.calculate_percentage(processed, total)

data/version

@@ -1 +1 @@
-2.0.0.rc4
+2.0.0

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Édouard Brière
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -150,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23