localeapp 0.9.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE3NjhiMTdlMzc4MDkzMjFmOGY2NmUyZWY3MzFiZDBjMTEwYmQwMg==
+    YjQ2MmQ4NGMzNzQ0ZGQwNzJjNzkwZTU0ZjU5MGU3MmU0YTI0Y2E5ZA==
   data.tar.gz: !binary |-
-    NGM5MTM5YTlhOWE2ODBjYzEwOGIxYTQ0M2UxMzdiNGFmMzUzZWJjNA==
+    Mjg1ZGY4ZTdkNjdhZGQ2NjBmNThiOTE1NzExNjU0M2UyYzBkZGUyYg==
 SHA512:
   metadata.gz: !binary |-
-    ZmRhNGNhYmMwYTY3OGI5NzY0MGFjZjNjMDYyMjZlMGVkY2ZiNWFjNzRlMTU2
-    OTBmODA1YjExNTFhZGUzNGU1MzgxNTQyODJhNjZjZWViZmIzYjhiYWJhOWJi
-    NjVkZWE3NjNlZjEzMGU0NGQzMzU4NGM5YjMyZmMzNjUzZmFjOWU=
+    Zjg1OGEzMWMyMWI5Y2E3YzhiNWUxYTY4YjVjMTEyYmZlZDQ4MGVhZDM2NzIw
+    OWJhYzRkN2RlMGI2OTNlNTZhMWIzNDlkNWRmYjk3NDhjZGE1NjVmYjg0ZWYy
+    Yjc4ZjNiMjk2MmZmYzhlZmI0OWFlOTQ0ZTZkMTE1OTRlMmIzZTI=
   data.tar.gz: !binary |-
-    MGU5NTdhNjU5ZWExYTBkZDIzZjk4MjUzNmU3M2YwMGJjMWFlNmU2MzdmYzU5
-    ZDhjZGExNmUxZDc3MDZkZjk1NDQyMGNhMjBiOTZmMWY3OGE5MTM4NzViZjUx
-    N2VlYWE3MDQ0Y2Q5OTk0MzllY2M1ZmYzNTIwOGI5MmZiOTA4NWI=
+    NGU5ZDBkOWQyZDE4ZGIxMTU4NTcyODg3MjBmNmYzYWM3NDczMTExNWQ1MDYy
+    NDhmMmY0YzNiOGUzNWYwNmVkZmQyYzVlNDY4NTgwYmY3NDU2ZDc1MTBjMTg3
+    Y2I5NGRiNDczNDFiNWI3ZDY1YmQxMmY0OGM0YmY2NTJiMjQzNGM=

data/.travis.yml

@@ -1,8 +1,10 @@
+before_install:
+  - gem update bundler
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - jruby
   - jruby-head
 gemfile:
@@ -15,5 +17,7 @@ matrix:
       gemfile: Gemfile.i18n_037
     - rvm: 2.1.0
       gemfile: Gemfile.i18n_037
+    - rvm: 2.2.0
+      gemfile: Gemfile.i18n_037
     - rvm: jruby-head
       gemfile: Gemfile.i18n_037

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # master
 
+# Version 1.0
+
+* Drop support for Ruby 1.9.2
+* Adopt semantic versioning
+* Upgrade test frameworks to RSpec 3 and Cucumber 2
+
+# Version 0.9.3
+
+* Support multilines translations content in `localeapp add`
+
 # Version 0.9.2
 
 * Refactor which monkeypatch/backported-bugfix is loaded for which Rails version

data/README.md

@@ -14,14 +14,14 @@ Though the i18n gem uses YAML as it's default file format it doesn't require ser
 
 ## Installation
 
-### Rails 3
+### Rails 3+
 
 Add the localeapp gem to your `Gemfile` and install it:
 
     echo "gem 'localeapp'" >> Gemfile
     bundle install
 
-Create a project on localeapp.com and get the api key. Then run:
+Create a project on [Locale](https://localeapp.com) and get the api key. Then run:
 
     bundle exec localeapp install <YOUR_API_KEY>
 

data/bin/localeapp

@@ -5,12 +5,14 @@ require 'localeapp'
 
 # Don't connect to the net if we're running under cucumber for testing
 # Use FakeWeb to simulate api.localeapp.com
-if ENV['FAKE_WEB_DURING_CUCUMBER_RUN'] && fake_data_as_json = ENV['FAKE_WEB_FAKES']
+if ENV['FAKE_WEB_DURING_CUCUMBER_RUN']
   require 'fakeweb'
   FakeWeb.allow_net_connect = false
-  fakes = JSON.parse(fake_data_as_json)
-  fakes.each do |fake|
-    FakeWeb.register_uri fake['method'].to_sym, fake['uri'], { :body => fake['body'], :status => fake['status'] }.merge(fake['headers'])
+  if fake_data_as_json = ENV['FAKE_WEB_FAKES']
+    fakes = JSON.parse(fake_data_as_json)
+    fakes.each do |fake|
+      FakeWeb.register_uri fake['method'].to_sym, fake['uri'], { :body => fake['body'], :status => fake['status'] }.merge(fake['headers'])
+    end
   end
 end
 

data/features/add.feature

@@ -2,8 +2,8 @@ Feature: Adding a translation from the command line
 
   Scenario: Running add
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an initializer file
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an initializer file
     When I run `localeapp add foo.baz en:"test en content" es:"test es content"`
     Then the output should contain:
     """
@@ -15,8 +15,8 @@ Feature: Adding a translation from the command line
 
   Scenario: Running add with no arguments
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an initializer file
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an initializer file
     When I run `localeapp add`
     Then the output should contain:
     """
@@ -25,8 +25,8 @@ Feature: Adding a translation from the command line
 
   Scenario: Running add with just a key name
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an initializer file
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an initializer file
     When I run `localeapp add foo.bar`
     Then the output should contain:
     """
@@ -35,7 +35,7 @@ Feature: Adding a translation from the command line
 
   Scenario: Running add with no initializer file, passing the key on the command line
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
     When I run `localeapp -k MYAPIKEY add foo.baz en:"test en content"`
     Then the output should contain:
     """
@@ -47,8 +47,8 @@ Feature: Adding a translation from the command line
 
   Scenario: Running add with no initializer file, passing the key via an ENV variable
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    When I have a LOCALEAPP_API_KEY env variable set to "MYAPIKEY"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And I have a LOCALEAPP_API_KEY env variable set to "MYAPIKEY"
     When I run `localeapp add foo.baz en:"test en content"`
     Then the output should contain:
     """
@@ -57,12 +57,11 @@ Feature: Adding a translation from the command line
     Sending key: foo.baz
     Success!
     """
-    Then I clear the LOCALEAPP_API_KEY env variable
 
   Scenario: Running add with no initializer file, passing the key via a .env file
     In order to add a key and translation content
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    When I have a .env file containing the api key "MYAPIKEY"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And I have a .env file containing the api key "MYAPIKEY"
     When I run `localeapp add foo.baz en:"test en content"`
     Then the output should contain:
     """

data/features/install.feature

@@ -2,8 +2,8 @@ Feature: Installation
 
   Scenario: Running Rails install
     In order to configure my project and check my api key is correct
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And I run `localeapp install MYAPIKEY`
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+    When I run `localeapp install MYAPIKEY`
     Then the output should contain:
     """
     Localeapp Install
@@ -13,14 +13,14 @@ Feature: Installation
     Project: Test Project
     Default Locale: en (English)
     """
-    And help should not be displayed
-    And a file named "config/initializers/localeapp.rb" should exist
-    And the exit status should be 0
+      And help should not be displayed
+      And a file named "config/initializers/localeapp.rb" should exist
+      And the exit status should be 0
 
   Scenario: Running standalone install
     In order to configure my non rails project and check my api key is correct
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And I run `localeapp install --standalone MYAPIKEY`
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+    When I run `localeapp install --standalone MYAPIKEY`
     Then the output should contain:
     """
     Localeapp Install
@@ -32,14 +32,14 @@ Feature: Installation
     Writing configuration file to .localeapp/config.rb
     WARNING: please create the locales directory. Your translation data will be stored there.
     """
-    And help should not be displayed
-    And a file named ".localeapp/config.rb" should exist
-    And the exit status should be 0
+      And help should not be displayed
+      And a file named ".localeapp/config.rb" should exist
+      And the exit status should be 0
 
   Scenario: Running github install
     In order to configure my public github project and check my api key is correct
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And I run `localeapp install --github MYAPIKEY`
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+    When I run `localeapp install --github MYAPIKEY`
     Then the output should contain:
     """
     Localeapp Install
@@ -50,16 +50,16 @@ Feature: Installation
     NOTICE: you probably want to add .localeapp to your .gitignore file
     Writing configuration file to .localeapp/config.rb
     """
-    And help should not be displayed
-    And a file named ".localeapp/config.rb" should exist
-    And a file named ".gitignore" should exist
-    And a file named "README.md" should exist
-    And the exit status should be 0
+      And help should not be displayed
+      And a file named ".localeapp/config.rb" should exist
+      And a file named ".gitignore" should exist
+      And a file named "README.md" should exist
+      And the exit status should be 0
 
   Scenario: Running heroku install with no api key
     In order to configure my project to use localeapp as a heroku addon
-    When I have a valid heroku project
-    And I run `localeapp install --heroku`
+    Given I have a valid heroku project
+    When I run `localeapp install --heroku`
     Then the output should contain:
     """
     Localeapp Install
@@ -73,15 +73,15 @@ Feature: Installation
     Project: Test Project
     Default Locale: en (English)
     """
-    And help should not be displayed
-    And a file named "config/initializers/localeapp.rb" should exist
-    And the file "config/initializers/localeapp.rb" should contain "config.api_key = ENV['LOCALEAPP_API_KEY']"
-    And the exit status should be 0
+      And help should not be displayed
+      And a file named "config/initializers/localeapp.rb" should exist
+      And the file "config/initializers/localeapp.rb" should contain "config.api_key = ENV['LOCALEAPP_API_KEY']"
+      And the exit status should be 0
 
   Scenario: Running install with bad api key
     In order to configure my project and check my api key is correct
-    When I have a valid project on localeapp.com but an incorrect api key "BADAPIKEY"
-    And I run `localeapp install BADAPIKEY`
+    Given I have a valid project on localeapp.com but an incorrect api key "BADAPIKEY"
+    When I run `localeapp install BADAPIKEY`
     Then the output should contain:
     """
     Localeapp Install
@@ -89,6 +89,6 @@ Feature: Installation
     Checking API key: BADAPIKEY
     ERROR: Project not found
     """
-    And help should not be displayed
-    And a file named "config/initializers/localeapp.rb" should not exist
-    And the exit status should not be 0
+      And help should not be displayed
+      And a file named "config/initializers/localeapp.rb" should not exist
+      And the exit status should not be 0

data/features/mv.feature

@@ -2,8 +2,8 @@ Feature: Renaming a translation from the command line
 
   Scenario: Running mv
     In order to rename an existing key
-    When I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
-    And an initializer file
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
+      And an initializer file
     When I run `localeapp mv foo.bar foo.baz`
     Then the output should contain:
     """

data/features/pull.feature

@@ -3,8 +3,8 @@ Feature: Pulling all translation
   Scenario: Running pull
     In order to retrieve my translations
     Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
-    And an initializer file
-    And a directory named "config/locales"
+      And an initializer file
+      And a directory named "config/locales"
     When I run `localeapp pull`
     Then the output should contain:
     """
@@ -15,13 +15,13 @@ Feature: Pulling all translation
     Updating backend:
     Success!
     """
-    And help should not be displayed
-    And a file named "config/locales/en.yml" should exist
+      And help should not be displayed
+      And a file named "config/locales/en.yml" should exist
 
   Scenario: Running pull without having a locales dir
     In order to retreive my translations
     Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
-    And an initializer file
+      And an initializer file
     When I run `localeapp pull`
     Then the output should contain:
     """
@@ -31,7 +31,7 @@ Feature: Pulling all translation
   Scenario: Running pull with no initializer file, passing the key on the command line
     In order to retrieve my translations
     Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
-    And a directory named "config/locales"
+      And a directory named "config/locales"
     When I run `localeapp -k MYAPIKEY pull`
     Then the output should contain:
     """
@@ -42,5 +42,5 @@ Feature: Pulling all translation
     Updating backend:
     Success!
     """
-    And help should not be displayed
-    And a file named "config/locales/en.yml" should exist
+      And help should not be displayed
+      And a file named "config/locales/en.yml" should exist

data/features/push.feature

@@ -2,9 +2,9 @@ Feature: Pushing existing translation to localeapp
 
   Scenario: Running push on a file
     In order to send my translations
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an initializer file
-    And an empty file named "config/locales/en.yml"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an initializer file
+      And an empty file named "config/locales/en.yml"
     When I run `localeapp push config/locales/en.yml`
     Then the output should contain:
     """
@@ -15,14 +15,14 @@ Feature: Pushing existing translation to localeapp
 
     config/locales/en.yml queued for processing.
     """
-    And help should not be displayed
+      And help should not be displayed
 
   Scenario: Running push on a directory
     In order to send my translations
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an initializer file
-    And an empty file named "config/locales/en.yml"
-    And an empty file named "config/locales/es.yml"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an initializer file
+      And an empty file named "config/locales/en.yml"
+      And an empty file named "config/locales/es.yml"
     When I run `localeapp push config/locales`
     Then the output should contain:
     """
@@ -38,12 +38,12 @@ Feature: Pushing existing translation to localeapp
 
     config/locales/es.yml queued for processing.
     """
-    And help should not be displayed
+      And help should not be displayed
 
   Scenario: Running push on a file with no initializer file, passing the key on the command line
     In order to send my translations
-    When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And an empty file named "config/locales/en.yml"
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY"
+      And an empty file named "config/locales/en.yml"
     When I run `localeapp -k MYAPIKEY push config/locales/en.yml`
     Then the output should contain:
     """
@@ -54,4 +54,4 @@ Feature: Pushing existing translation to localeapp
 
     config/locales/en.yml queued for processing.
     """
-    And help should not be displayed
+      And help should not be displayed

data/features/rm.feature

@@ -2,8 +2,8 @@ Feature: Removing a translation from the command line
 
   Scenario: Running rm
     In order to remove an existing key
-    When I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
-    And an initializer file
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
+      And an initializer file
     When I run `localeapp rm foo.bar`
     Then the output should contain:
     """

data/features/step_definitions/cli_steps.rb

@@ -13,7 +13,7 @@ When /^I have a valid heroku project/ do
   uri = "https://api.localeapp.com/v1/projects/MYAPIKEY.json"
   body = valid_project_data.to_json
   add_fake_web_uri(:get, uri, ['200', 'OK'], body)
-  ENV['CUCUMBER_HEROKU_TEST_API_KEY'] = 'MYAPIKEY'
+  set_environment_variable 'CUCUMBER_HEROKU_TEST_API_KEY', 'MYAPIKEY'
 end
 
 When /^I have a valid project on localeapp\.com but an incorrect api key "([^"]*)"$/ do |bad_api_key|
@@ -47,11 +47,7 @@ When /^I have a valid project on localeapp\.com with api key "([^"]*)" and the t
 end
 
 When /^I have a LOCALEAPP_API_KEY env variable set to "(.*?)"$/ do |api_key|
-  ENV['LOCALEAPP_API_KEY'] = api_key
-end
-
-Then /^I clear the LOCALEAPP_API_KEY env variable$/ do
-  ENV['LOCALEAPP_API_KEY'] = nil
+  set_environment_variable 'LOCALEAPP_API_KEY', api_key
 end
 
 When /^I have a \.env file containing the api key "(.*?)"$/ do |api_key|

data/features/support/env.rb

@@ -1,14 +1,12 @@
 require 'aruba/cucumber'
-require 'aruba/jruby'
+require 'aruba/config/jruby'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../../spec/support/localeapp_integration_data'))
 World(LocaleappIntegrationData)
 
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-
 module FakeWebHelper
   def add_fake_web_uri(method, uri, status, body, headers = {})
-    fakes = JSON.parse(ENV['FAKE_WEB_FAKES'] || '[]')
+    fakes = JSON.parse(aruba.environment['FAKE_WEB_FAKES'] || '[]')
     fakes << {
       'method' => method,
       'uri' => uri,
@@ -16,7 +14,7 @@ module FakeWebHelper
       'body' => body,
       'headers' => headers
     }
-    ENV['FAKE_WEB_FAKES'] = fakes.to_json
+    set_environment_variable 'FAKE_WEB_FAKES', fakes.to_json
   end
 end
 World(FakeWebHelper)

data/features/support/hooks.rb

@@ -1,11 +1,11 @@
 Before do
-  ENV['FAKE_WEB_DURING_CUCUMBER_RUN'] = '1'
+  set_environment_variable 'FAKE_WEB_DURING_CUCUMBER_RUN', '1'
   @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 60 : 15
 end
 
 # Globally @announce-cmd to track down slow cmd.
 Aruba.configure do |config|
-  config.before_cmd do |cmd|
-    puts "$ '#{cmd}'"
+  config.before :command do |cmd|
+    puts "$ #{cmd.commandline}"
   end
 end