web_translate_it 2.1.2 → 2.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
-SHA1:
+!binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJjN2UyMGRmODBlODFiZGIzMjNkNzI0ZmYyNjg2ZWMyYjhlMjdjMw==
+    ZmNkNGJiY2Y5YWU3NDQ1MzJmMjNlOTdjMmUzMzc2Zjg5Y2YyNGViOA==
   data.tar.gz: !binary |-
-    ODg4MGM3NmVmODI5ZjliZWQ5ZTk2ZDllZDBjMDViYTNhMDMyZDNlMQ==
-SHA512:
+    ZjZkOGQwNzBjNTFjOGVlMjIyYjAyZDEzNjNhZjQ0OTMyYmFhNmY5Mw==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDNjOWUxYzk2ZmUxNzhkODI5MTZjMjczNjI2M2E5YmYxNzJhYTgwNWI2Y2Ri
-    ZWM1ODRiNDY2YjM3NWY1N2NlYzczYmUyM2ZmZjM3ZjQxNDYwYjExNmQwYTVk
-    ZGJlMzE4NGJlYjUzMTNjNzYwZWM3ZmU2NGRkMmFkY2U1YzY1Yzc=
+    ZmMxN2JkYjZjMGFlZjYyNjUyMzM0MzUwNzhiMjJkY2IxMjliODE0YTkyMDE5
+    N2RlNGJmNDZjYjUwMDE4MjZjNTA4MzNjOTc0NjNhYzEyMDYzYTQ1ODM0MDM2
+    NjcwZTNkMjA0NTAyNWYxOTkwYjYyNWFmNDc4OWQ4ZGMzZWQ4ZTU=
   data.tar.gz: !binary |-
-    ZmI3MWE0OGQxYTJhMzQ1OWY4NWNhZjVmYzFiNDhmYzU3OTAwZDczODQyYWNj
-    MDFjM2E2M2VkMmM4YTgwYzRhM2NhYjg1Nzg1NDBjMWM1MmFlOTRkM2Q5YWZm
-    ZTFjMDcwNzAyNGM2MDU5MzQ4MTAwMTI1NDI2OTMwYjVjMTA4NDI=
+    NDZjMTgxNmNkYmVkMjk1MTg1OGVlNzg1ODRiYWZjZTkwOWY0MTY4ZDJkZTg0
+    NzczYTgxZjY3NzE5M2VmOWYwYzUwOGM3NDlkNjlkZWNhNjdmNzMyNGNkNzFh
+    MWU4ODkwMTFkMDI4YzY1NzRmNzdlZmViZWFmNDJlZDkzNTkxNWY=

data/bin/wti

@@ -88,7 +88,7 @@ EOS
     end
   when "init"
     Trollop::options do
-      banner "wti init - Configure your project to sync"
+      banner "wti init [api_token] - Configure your project to sync"
       opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
     end
   when "match"

data/history.md

@@ -1,3 +1,9 @@
+## Version 2.1.3 / 2013-04-25
+
+* Display more information about “unavail” error message. #97
+* New: add ability to initialize project with a one-liner: `wti init api_token`. #94
+* Catch errors when running commands in a directory not containing a .wti file. #98
+
 ## Version 2.1.2 / 2013-04-20
 
 * Update my name so it doesn’t contain accentuated characters anymore (seems to make jruby/rubygems 2.0.3 fail to install the gem). #96

data/lib/web_translate_it/command_line.rb

@@ -166,8 +166,13 @@ module WebTranslateIt
         
     def init
       puts "# Initializing project"
-      api_key = Util.ask(" Project API Key:")
-      path = Util.ask(" Path to configuration file:", '.wti')
+      if parameters.any?
+        api_key = parameters[0]
+        path = '.wti'
+      else
+        api_key = Util.ask(" Project API Key:")
+        path = Util.ask(" Path to configuration file:", '.wti')
+      end
       FileUtils.mkpath(path.split('/')[0..path.split('/').size-2].join('/')) unless path.split('/').size == 1
       project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']

data/lib/web_translate_it/configuration.rb

@@ -17,16 +17,21 @@ module WebTranslateIt
     def initialize(root_path = Rails.root, path_to_config_file = ".wti")
       self.path           = root_path
       self.logger         = logger
-      configuration       = YAML.load_file(File.expand_path(path_to_config_file, self.path))
-      self.api_key        = configuration['api_key']
-      self.before_pull    = configuration['before_pull']
-      self.after_pull     = configuration['after_pull']
-      self.before_push    = configuration['before_push']
-      self.after_push     = configuration['after_push']
-      project_info        = YAML.load WebTranslateIt::Project.fetch_info(api_key)
-      set_locales_to_ignore(configuration)
-      set_files(project_info['project'])
-      set_locales(project_info['project'])
+      if File.exists?(File.expand_path(path_to_config_file, self.path))
+        configuration       = YAML.load_file(File.expand_path(path_to_config_file, self.path))
+        self.api_key        = configuration['api_key']
+        self.before_pull    = configuration['before_pull']
+        self.after_pull     = configuration['after_pull']
+        self.before_push    = configuration['before_push']
+        self.after_push     = configuration['after_push']
+        project_info        = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+        set_locales_to_ignore(configuration)
+        set_files(project_info['project'])
+        set_locales(project_info['project'])
+      else
+        puts StringUtil.failure("\nCan't find a configuration file in #{File.expand_path(path_to_config_file, self.path)}")
+        exit(1)
+      end
     end
     
     # Set the project locales from the Project API.

data/lib/web_translate_it/util.rb

@@ -36,7 +36,7 @@ module WebTranslateIt
         return StringUtil.success("Created") if response.code.to_i == 201
         return StringUtil.success("Accepted") if response.code.to_i == 202
         return StringUtil.success("Not Modified") if response.code.to_i == 304
-        return StringUtil.failure("Unavail") if response.code.to_i == 503
+        return StringUtil.failure("Locked\n                                                    (another import in progress)") if response.code.to_i == 503
       end
     end
     

metadata

@@ -1,86 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Edouard Briere
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: trollop
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
-description:
+description: 
 email: edouard@atelierconvivialite.com
 executables:
 - wti
@@ -93,7 +93,6 @@ files:
 - license
 - readme.md
 - examples/locale.rb
-- lib/web_translate_it.rb
 - lib/web_translate_it/auto_fetch.rb
 - lib/web_translate_it/cacert.pem
 - lib/web_translate_it/command_line.rb
@@ -105,49 +104,50 @@ files:
 - lib/web_translate_it/term_translation.rb
 - lib/web_translate_it/translation.rb
 - lib/web_translate_it/translation_file.rb
-- lib/web_translate_it/util.rb
 - lib/web_translate_it/util/array_util.rb
 - lib/web_translate_it/util/hash_util.rb
 - lib/web_translate_it/util/string_util.rb
-- generators/webtranslateit/webtranslateit_generator.rb
+- lib/web_translate_it/util.rb
+- lib/web_translate_it.rb
 - generators/webtranslateit/lib/insert_commands.rb
+- generators/webtranslateit/webtranslateit_generator.rb
 - bin/wti
 - man/wti.1
 - man/wti.1.html
 - man/wti.1.ron
-- spec/spec_helper.rb
-- spec/examples/en.yml
 - spec/examples/config/translation.yml
+- spec/examples/en.yml
+- spec/spec_helper.rb
 - spec/web_translate_it/string_spec.rb
 - spec/web_translate_it/term_spec.rb
 homepage: https://webtranslateit.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - readme.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A CLI to sync locale files with webtranslateit.com.
 test_files:
-- spec/spec_helper.rb
-- spec/examples/en.yml
 - spec/examples/config/translation.yml
+- spec/examples/en.yml
+- spec/spec_helper.rb
 - spec/web_translate_it/string_spec.rb
 - spec/web_translate_it/term_spec.rb