Skip to content

Commit

Permalink
Revert "Trim trailing white space throughout the project (faker-ruby#…
Browse files Browse the repository at this point in the history
…2257)"

This reverts commit d7a814b.
  • Loading branch information
fcolacilli committed Feb 11, 2021
1 parent 989ce9b commit f67dc6b
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Issue#
Issue#
------

Example:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:

- name: Run Rubocop
run: bundle exec rake rubocop
test:
test:
name: Ruby ${{ matrix.ruby }}
runs-on: ubuntu-latest
strategy:
fail-fast: false # don't fail all matrix builds if one fails
matrix:
ruby:
- '2.5'
- '2.6'
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- 'head'
Expand All @@ -50,13 +50,13 @@ jobs:

- name: Install dependencies
run: bundle install

- name: Setup Code Climate test-reporter
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter before-build
- name: Run tests
run: bundle exec rake test

Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ We love pull requests. Here's a quick guide:

2. Run the tests. We only take pull requests with passing tests, and it's great to know that you have a clean slate: `bundle && bundle exec rake`

3. We are using [Rubocop](https://github.com/bbatsov/rubocop) because we love static code analyzers.
3. We are using [Rubocop](https://github.com/bbatsov/rubocop) because we love static code analyzers.
* Ways to run Rubocop:
- `bundle exec rubocop`
- `bundle exec rake` would run the test suite and after that it runs the Ruby static code analyzer.
Expand All @@ -19,7 +19,7 @@ We love pull requests. Here's a quick guide:

8. When removing a method, don't forget to deprecate it. You can `extend Gem::Deprecate` and use the `deprecate` method to accomplish this task.

9. Methods with optional arguments should use keyword rather than positional arguments. An exception to this could be a method that takes only one optional argument, and it's unlikely that that method would ever take more than one optional argument.
9. Methods with optional arguments should use keyword rather than positional arguments. An exception to this could be a method that takes only one optional argument, and it's unlikely that that method would ever take more than one optional argument.

10. Push to your fork and submit a pull request.

Expand Down Expand Up @@ -55,13 +55,13 @@ Include [YARD] style docs for all methods that includes:
```ruby
##
# Produces a random string of alphabetic characters, (no digits)
#
#
# @param char_count [Integer] The length of the string to generate
#
# @return [String]
#
#
# @example
# Faker::Alphanumeric.alpha #=> "kgdpxlgwjirlqhwhrebvuomdcjjpeqlq"
# Faker::Alphanumeric.alpha #=> "kgdpxlgwjirlqhwhrebvuomdcjjpeqlq"
# Faker::Alphanumeric.alpha(number: 10) #=> "zlvubkrwga"
#
# @faker.version next
Expand All @@ -82,7 +82,7 @@ Please follow these guidelines when adding new code:

#### YAML
Please use dash syntax for yaml arrays:
```Yaml
```Yaml
# instead of these
b_things: [small_thing, big_thing, other_thing]
c_things: [
Expand All @@ -102,6 +102,6 @@ a_things:
### Tips

* Use the `rake console` task to start a session with Faker loaded.
* Use `bundle exec yard server -r` to launch the YARD Doc server
* Use `bundle exec yard server -r` to launch the YARD Doc server

[YARD]: (https://www.rubydoc.info/gems/yard/file/README.md)
8 changes: 4 additions & 4 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
## v1.6.0 (2015-11-23)
* Lots of bug fixes -- most notably, a fix for email addresses and domains in non-en locales
* Updated locales: de, en-AU, en-NZ, en-SG, en-US, en-au-ocker, en, es, fr, he, it, ja, nb-NO, pl, pt-BR, sk, and zh-CN
* Updated classes: Address, Avatar, Book, Code, Commerce, Company, Hipster, IDNumber, Internet, Number, Placeholdit, Shakespeare, and Time
* Updated classes: Address, Avatar, Book, Code, Commerce, Company, Hipster, IDNumber, Internet, Number, Placeholdit, Shakespeare, and Time

## v1.5.0 (2015-08-17)
* Added logos
Expand Down Expand Up @@ -83,7 +83,7 @@
* 1 major change:
* Removed deprecated methods from Address: earth_country, us_state, us_state_abbr, uk_postcode, uk_county
* Many minor changes (please see github pull requests for credits)
* Added many localizations
* Added many localizations
* Added range and array support for Lorem

## v1.0.1 (2011-09-27)
Expand Down Expand Up @@ -117,7 +117,7 @@
* Added Canadian translation [igbanam]
* Added Norwegian translation [kytrinyx]
* Lots of translation-related cleanup [kytrinyx]


## v0.9.5 (2011-01-27)
* 1 minor bug fix:
Expand Down Expand Up @@ -159,7 +159,7 @@
* 3 major enhancements:
* Added Lorem to generate fake Latin
* Added secondary_address to Address, and made inclusion of
secondary address in street_address optional (false by
secondary address in street_address optional (false by
default).
* Added UK address methods [Caius Durling]

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

![logotype a happy-07](https://user-images.githubusercontent.com/36028424/40263395-4318481e-5b44-11e8-92e5-3dcc1ce169b3.png)

# Faker
Expand Down
2 changes: 1 addition & 1 deletion doc/books/lovecraft.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Faker::Books::Lovecraft.word #=> "furtive"
Faker::Books::Lovecraft.sentence #=> "Furtive antiquarian squamous dank cat loathsome amorphous lurk."
Faker::Books::Lovecraft.sentence(word_count: 3) #=> "Daemoniac antediluvian fainted squamous comprehension gambrel nameless singular."
Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 1) #=> "Amorphous indescribable tenebrous."
Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 0, open_compounds_allowed: true) #=> "Effulgence unmentionable gambrel."
Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 0, open_compounds_allowed: true) #=> "Effulgence unmentionable gambrel."

# Keyword arguments: number, spaces_allowed
Faker::Books::Lovecraft.words #=> ["manuscript", "abnormal", "singular"]
Expand Down
2 changes: 1 addition & 1 deletion doc/default/bank.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Faker::Bank.name #=> "ABN AMRO CORPORATE FINANCE LIMITED"

Faker::Bank.routing_number #=> "729343831"

Faker::Bank.swift_bic #=> "AAFMGB21"
Faker::Bank.swift_bic #=> "AAFMGB21"
```
4 changes: 2 additions & 2 deletions doc/default/crypto_coin.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Faker::CryptoCoin.coin_name #=> "Bitcoin"

Faker::CryptoCoin.acronym #=> "BTC"

Faker::CryptoCoin.url_logo #=> "https://i.imgur.com/EFz61Ei.png"
Faker::CryptoCoin.url_logo #=> "https://i.imgur.com/EFz61Ei.png"

Faker::CryptoCoin.coin_array #=> ["Dash", "DASH", "https://i.imgur.com/2uX91cb.png"]

Faker::CryptoCoin.coin_hash {:name=>"Ethereum", :acronym=>"ETH", :url_logo=>"https://i.imgur.com/uOPFCXj.png"}
Faker::CryptoCoin.coin_hash {:name=>"Ethereum", :acronym=>"ETH", :url_logo=>"https://i.imgur.com/uOPFCXj.png"}
```
4 changes: 2 additions & 2 deletions doc/default/date.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ Faker::Date.birthday(min_age: 18, max_age: 65) #=> "Mar, 28 Mar 1986"
Faker::Date.in_date_period #=> #<Date: 2019-09-01>

# Random date for range of year 2018 and month 2
# Keyword arguments: year, month
# Keyword arguments: year, month
Faker::Date.in_date_period(year: 2018, month: 2) #=> #<Date: 2018-02-26>

# Random date for range of current year and month 2
# Keyword arguments: month
# Keyword arguments: month
Faker::Date.in_date_period(month: 2) #=> #<Date: 2019-02-26>

```
4 changes: 2 additions & 2 deletions doc/default/device.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Faker::Device.manufacturer #=> "Apple"

Faker::Device.model_name #=> "iPhone 4"

Faker::Device.platform #=> "webOS"
Faker::Device.platform #=> "webOS"

Faker::Device.serial #=> "ejfjnRNInxh0363JC2WM"
Faker::Device.serial #=> "ejfjnRNInxh0363JC2WM"

Faker::Device.version #=> "4"
```
2 changes: 1 addition & 1 deletion doc/default/invoice.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ https://en.wikipedia.org/wiki/Creditor_Reference
```ruby
Faker::Invoice.reference #=> "45656646957845"

Faker::Invoice.creditor_reference #=> "RF34118592570724925498"
Faker::Invoice.creditor_reference #=> "RF34118592570724925498"
```
8 changes: 4 additions & 4 deletions doc/games/street_fighter.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

```ruby

# Generate random playable character from Street Fighter
# Generate random playable character from Street Fighter
Faker::Games::StreetFighter.character # => "Ryu"

# Generate random stage from Street Fighter
# Generate random stage from Street Fighter
Faker::Games::StreetFighter.stage # => "Volcanic Rim"

# Generate random quote from Street Fighter
# Generate random quote from Street Fighter
Faker::Games::StreetFighter.quote # => "Go home and be a family man."

# Generate random move from Street Fighter
# Generate random move from Street Fighter
Faker::Games::StreetFighter.move # => "Shoryuken"

0 comments on commit f67dc6b

Please sign in to comment.