web_translate_it 1.8.2.3 → 1.8.3

data/bin/wti

@@ -39,6 +39,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"
     end
   when "push"
     Trollop::options do
@@ -52,14 +53,19 @@ EOS
       opt :merge,  "Force WTI to merge this file"
       opt :ignore_missing, "Force WTI to not obsolete missing strings"
       opt :label,  "Apply a label to the changes", :type => :string
+      opt :config, "Path to a translation.yml 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"
     end
   when "addlocale"
-    Trollop::options { banner "Add a new locale to the project" }
+    Trollop::options do
+      banner "Add a new locale to the project"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   when "server"
     Trollop::options do
       banner <<-EOS
@@ -68,14 +74,24 @@ Start a synchronisation server
 EOS
       opt :port, "Run server on a specific port", :default => 4000, :short => "-p"
       opt :host, "Run server on a specific host", :default => "0.0.0.0", :short => "-h"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
   when "status"
-    Trollop::options { banner "Fetch and display project statistics" }
   when "st"
+    Trollop::options do
+      banner "Fetch and display project statistics"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   when "init"
-    Trollop::options { banner "Configure your project to sync" }
+    Trollop::options do
+      banner "Configure your project to sync"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   when "match"
-    Trollop::options { banner "Display matching of local files with File Manager" }
+    Trollop::options do
+      banner "Display matching of local files with File Manager"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   else
     Trollop::die "Unknown subcommand #{command.inspect}"
   end

data/history.md

@@ -1,3 +1,8 @@
+## Version 1.8.3 / 2011-11-14
+
+* Bring back `-c` option to specify a configuration file with a specific name. `wti pull -c config/translations.yml` for instance. See #67 and #71.
+* `web_translate_it` rubygem now respects [semantic versioning](http://semver.org/). #72.
+
 ## Version 1.8.2.3 / 2011-11-09
 
 * Remove `sanitize_locale`. This method was replacing locale codes like `en_US` by `en-US`.

data/lib/web_translate_it/command_line.rb

@@ -91,13 +91,16 @@ module WebTranslateIt
         
     def init
       api_key = Util.ask("Project API Key:")
+      path = Util.ask("Configuration file path:", '.wti')
+      puts path.split('/')[0..path.split('/').size-2].join('/')
+      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']
-      if File.exists?('.wti') && !File.writable?('.wti')
-        puts StringUtil.failure("Error: `.wti` file is not writable.")
+      if File.exists?(path) && !File.writable?(path)
+        puts StringUtil.failure("Error: `#{path}` file is not writable.")
         exit
       end
-      File.open('.wti', 'w'){ |file| file << generate_configuration(api_key, project_info) }
+      File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
       puts ""
       puts "Done! You can now use `wti` to push and pull your language files."
       puts "Check `wti --help` for help."
@@ -167,21 +170,26 @@ module WebTranslateIt
     end
     
     def configuration_file_path
-      if File.exists?('config/translation.yml')
-        puts "Warning: `config/translation.yml` is deprecated in favour of a `.wti` file."
-        if Util.ask_yes_no("Would you like to migrate your configuration now?", true)
-          require 'fileutils'
-          if FileUtils.mv('config/translation.yml', '.wti')
-            return '.wti'
+      if self.command_options.config
+        puts self.command_options.config
+        return self.command_options.config
+      else
+        if File.exists?('config/translation.yml')
+          puts "Warning: `config/translation.yml` is deprecated in favour of a `.wti` file."
+          if Util.ask_yes_no("Would you like to migrate your configuration now?", true)
+            require 'fileutils'
+            if FileUtils.mv('config/translation.yml', '.wti')
+              return '.wti'
+            else
+              puts "Couldn’t move `config/translation.yml`."
+              return false
+            end
           else
-            puts "Couldn’t move `config/translation.yml`."
-            return false
+            return 'config/translation.yml'
           end
         else
-          return 'config/translation.yml'
+          return '.wti'
         end
-      else
-        return '.wti'
       end
     end
     

data/lib/web_translate_it/util.rb

@@ -9,10 +9,10 @@ module WebTranslateIt
   class Util
     
     # Return a string representing the gem version
-    # For example "1.4.4.1"
+    # For example "1.8.3"
     def self.version
       hash = YAML.load_file File.expand_path('../../../version.yml', __FILE__)
-      [hash[:major], hash[:minor], hash[:tiny], hash[:patch]].join('.')
+      [hash[:major], hash[:minor], hash[:patch]].join('.')
     end
     
     # Yields a HTTP connection over SSL to Web Translate It.

data/readme.md

@@ -59,6 +59,7 @@ Execute `wti --help` to see the usage:
     See `wti <command> --help` for more information on a specific command.
   
     [options] are:
+      --config, -c <s>:   Path to a translation.yml file (default: .wti)
          --version, -v:   Print version and exit
             --help, -h:   Show this message
 

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 8
-:tiny: 2
 :patch: 3
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.8.2.3
+  version: 1.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70355353286620 !ruby/object:Gem::Requirement
+  requirement: &70137380190740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70355353286620
+  version_requirements: *70137380190740
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70355353286060 !ruby/object:Gem::Requirement
+  requirement: &70137380190240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70355353286060
+  version_requirements: *70137380190240
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70355353324140 !ruby/object:Gem::Requirement
+  requirement: &70137380189780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70355353324140
+  version_requirements: *70137380189780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355353323660 !ruby/object:Gem::Requirement
+  requirement: &70137380189320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70355353323660
+  version_requirements: *70137380189320
 description: 
 email: edouard@atelierconvivialite.com
 executables: