Skip to content

Commit

Permalink
Merge branch 'master' into geoffhull03
Browse files Browse the repository at this point in the history
  • Loading branch information
vbrazo committed May 21, 2018
2 parents a5e1489 + 77b9f58 commit 8556b5a
Show file tree
Hide file tree
Showing 336 changed files with 4,348 additions and 1,659 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
pkg/*

# Ignore Bundle folder
.bundle/*

# Ignore Coveralls files
coverage/*

# Ignore Vim backup files.
*~

Expand Down
25 changes: 25 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Lint/AmbiguousBlockAssociation:
Enabled: false
Lint/UnifiedInteger:
Enabled: false

Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/LineLength:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false

Style/DateTime:
Enabled: false
Style/Documentation:
Enabled: false
18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
env:
global:
- CC_TEST_REPORTER_ID=c9b8356df2031a5a72462555fe898245cf24d83c7bb82c40ddb5c6c6976c4319
sudo: false
language: ruby
cache: bundler
rvm:
- 2.1.10
- 2.2.7
- 2.3.4
- 2.4.1
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1
- ruby-head
script: bundle exec rake test
before_script:
- 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
script: bundle exec rake
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
matrix:
allow_failures:
- rvm: ruby-head
72 changes: 67 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,68 @@
# Change Log

## HEAD Unreleased
### Latest update: 2018-05-18

**Additions**

- [PR #1129](https://github.com/stympy/faker/pull/1129) Added SingularSiegler quotes ([splashinn](https://github.com/splashinn))
- [PR #1144](https://github.com/stympy/faker/pull/1144) Added polish_register_of_national_economy and polish_taxpayer_identification_number ([rafalpetryka](https://github.com/rafalpetryka))
- [PR #1232](https://github.com/stympy/faker/pull/1144) Fix file permissions ([tagliala](https://github.com/tagliala))
- [PR #246](https://github.com/stympy/faker/pull/246) latitude and longitude should be float instead of string. ([zeitnot](https://github.com/zeitnot))
- [PR #1117](https://github.com/stympy/faker/pull/1117) Added Ukrainian entries to yml ([RomanIsko](https://github.com/RomanIsko))
- [PR #1201](https://github.com/stympy/faker/pull/1201) Adding Currency Symbol to Faker ([SaimonL](https://github.com/SaimonL))
- [PR #1230](https://github.com/stympy/faker/pull/1230) Add Faker::SwordArtOnline ([lnchambers](https://github.com/lnchambers))
- [PR #1205](https://github.com/stympy/faker/pull/1205) Show the type of field that violated a uniqueness constraint [@AndrewRayCode](https://github.com/AndrewRayCode)
- [PR #1134](https://github.com/stympy/faker/pull/792) Add Faker::FamousLastWords ([susiirwin](https://github.com/susiirwin))
- [PR #1229](https://github.com/stympy/faker/pull/1229) sv.yml: Typos [@olleolleolle](https://github.com/olleolleolle)
- [PR #1228](https://github.com/stympy/faker/pull/1228) Added Japanese color to yml [@katao](https://github.com/katao)
- [PR #1227](https://github.com/stympy/faker/pull/1227) Update RuboCop to 0.56.0 [@tagliala](https://github.com/tagliala)
- [PR #1225](https://github.com/stympy/faker/pull/1225) Test against latest Ruby versions [@tagliala](https://github.com/tagliala)
- [PR #1134](https://github.com/stympy/faker/pull/1134) Test against latest Ruby versions [@tagliala](https://github.com/tagliala)
- [PR #794](https://github.com/stympy/faker/pull/794) Adding country code + minor locale updates [@vveliev](https://github.com/vveliev)
- [PR #1108](https://github.com/stympy/faker/pull/1108) Update Faker::Dessert [@natalietate](https://github.com/natalietate)
- [PR #1223](https://github.com/stympy/faker/pull/1223) Fix minitest warnings [@vbrazo](https://github.com/vbrazo)
- [PR #1174](https://github.com/stympy/faker/pull/1174) Dota2 API: Str Heroes, heroes quotes, Items, Teams, Players [@felipesousafs](https://github.com/darylf)
- [PR #974](https://github.com/stympy/faker/pull/974) Specify version number each class was introduced [@darylf](https://github.com/darylf)
- [PR #1221](https://github.com/stympy/faker/pull/1221) Updated the Readme file with the new logo [@tobaloidee](https://github.com/tobaloidee)
- [PR #439](https://github.com/stympy/faker/pull/439) Remove Eichmann surname [@jonahwh](https://github.com/jonahwh)
- [PR #1220](https://github.com/stympy/faker/pull/1220) Updates for Faker::Myst [@SpyMaster356](https://github.com/SpyMaster356)
- [PR #1128](https://github.com/stympy/faker/pull/1128) Use ruby syntax highlighting in Omniauth doc [@swrobel](https://github.com/swrobel)
- [PR #1204](https://github.com/stympy/faker/pull/1204) Update sample output of `Faker::App.version` [@joshuapinter](https://github.com/joshuapinter)
- [PR #1218](https://github.com/stympy/faker/pull/1218) Add Faker::Myst [@SpyMaster356](https://github.com/SpyMaster356)
- [PR #1192](https://github.com/stympy/faker/pull/1192) Space: Added space launch vehicule [@gauth-ier](https://github.com/Gauth-ier)
- [PR #1211](https://github.com/stympy/faker/pull/1211) Add bands, genres, and albums to Music [@jmkoni](https://github.com/jmkoni)
- [PR #1198](https://github.com/stympy/faker/pull/1135) Rename methods on Faker::Types to avoid shadowing ruby standard methods [@MarcPer](https://github.com/MarcPer)
- [PR #1135](https://github.com/stympy/faker/pull/1135) Added documentation for dumb and dumber [@cnharris10](https://github.com/cnharris10)
- [PR #1142](https://github.com/stympy/faker/pull/1142) Missing i18n jobs fix [@PuZZleDucK](https://github.com/PuZZleDucK)
- [PR #1213](https://github.com/stympy/faker/pull/1213) Add missing tests after adding Coveralls [@vbrazo](https://github.com/vbrazo)
- [PR #1215](https://github.com/stympy/faker/pull/1215) Added Nato Phonetic Alphabet [@timcustard](https://github.com/timcustard)
- [PR #1212](https://github.com/stympy/faker/pull/1212) Coveralls should ignore test folder [@vbrazo](https://github.com/timcustard)
- [PR #1209](https://github.com/stympy/faker/pull/1209) Add Faker::Source [@graciano](https://github.com/graciano)
- [PR #1181](https://github.com/stympy/faker/pull/1181) Fix: Moved the Google Omniauth key id_info from root into extra [@SirRawlins](https://github.com/SirRawlins)
- [PR #1210](https://github.com/stympy/faker/pull/1210) Add coveralls [@vbrazo](https://github.com/vbrazo)
- [PR #1147](https://github.com/stympy/faker/pull/1147) Add Spanish citizen id and docs [@PuZZleDucK](https://github.com/PuZZleDucK)
- [PR #1207](https://github.com/stympy/faker/pull/1207) use default rake task [@stephengroat](https://github.com/stephengroat)
- [PR #1136](https://github.com/stympy/faker/pull/1136) Modify Faker::Internet.slug [@philduffen](https://github.com/philduffen)
- [PR #924](https://github.com/stympy/faker/pull/924) Rubocop + fixes [@stephengroat](https://github.com/stephengroat)
- [PR #1189](https://github.com/stympy/faker/pull/1189) Add Faker::Football [@AlexGascon](https://github.com/AlexGascon)
- [PR #1202](https://github.com/stympy/faker/pull/1202) adds both inclusive and binary gender option [@jmkoni](https://github.com/jmkoni)
- [PR #1124](https://github.com/stympy/faker/pull/1124) Fix ranges for Brazilian zip codes [@lucasqueiroz](https://github.com/lucasqueiroz)
- [PR #1122](https://github.com/stympy/faker/pull/1122) Fix formatting for Brazilian phone and cell phone numbers [@lucasqueiroz](https://github.com/lucasqueiroz)
- [PR #1138](https://github.com/stympy/faker/pull/1138) Update locales - Faker::Overwatch [@tanner0101](https://github.com/tanner0101)
- [PR #1203](https://github.com/stympy/faker/pull/1203) Finnish locale has 50 most common male, female, and last names [@Glenf](https://github.com/Glenf)
- [PR #1183](https://github.com/stympy/faker/pull/1183) Correct the spelling of Gringotts [@rhoen](https://github.com/rhoen)
- [PR #1170](https://github.com/stympy/faker/pull/1170) First_name and last_name should use the parse method - :ru locale [@vbrazo](https://github.com/vbrazo)
- [PR #1190](https://github.com/stympy/faker/pull/1190) Add Nation object, its specs and docs [@gkunwar](https://github.com/gkunwar)
- [PR #1197](https://github.com/stympy/faker/pull/1197) Fixes NL postcode [@JonathanWThom](https://github.com/JonathanWThom)
- [PR #1177](https://github.com/stympy/faker/pull/1177) Update Faker::Number.between docs [@SpyMaster356](https://github.com/SpyMaster356)
- [PR #1172](https://github.com/stympy/faker/pull/1172) Fix Fixnum reference warning [@vbrazo](https://github.com/vbrazo)
- [PR #1173](https://github.com/stympy/faker/pull/1173) Fix tests warning [@vbrazo](https://github.com/vbrazo)
- [PR #1193](https://github.com/stympy/faker/pull/1193) Add Faker::MichaelScott API [@snayrouz](https://github.com/snayrouz)
- [PR #818](https://github.com/stympy/faker/pull/818) LoremFlickr support [@mrstebo](https://github.com/mrstebo)
- [PR #1179](https://github.com/stympy/faker/pull/1179) Random color with Placeholdit [@nicolas-brousse](https://github.com/nicolas-brousse)
- New collaborator - Vitor Oliveira [@vbrazo](https://github.com/vbrazo)

## [v1.8.7](https://github.com/stympy/faker/tree/v1.8.7) (2017-12-22)
[Full Changelog](https://github.com/stympy/faker/compare/v1.8.6...v1.8.7)

Expand Down Expand Up @@ -321,7 +384,6 @@
- undefined method `Number' for Faker:Module [\#153](https://github.com/stympy/faker/issues/153)

**Merged pull requests:**

- Refactors code in Faker::Color [\#777](https://github.com/stympy/faker/pull/777) ([tiagofsilva](https://github.com/tiagofsilva))
- Add Faker::TwinPeaks \[fixed\] [\#775](https://github.com/stympy/faker/pull/775) ([pedantic-git](https://github.com/pedantic-git))
- Added wookie\_sentence method documentation to README [\#772](https://github.com/stympy/faker/pull/772) ([toddnestor](https://github.com/toddnestor))
Expand Down Expand Up @@ -451,7 +513,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 @@ -501,7 +563,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 @@ -535,7 +597,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 @@ -577,7 +639,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
44 changes: 38 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,59 @@ 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. Add a test for your change. Only refactoring and documentation changes
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.
If you want to try to fix the rubocop violations, you should run `bundle exec rubocop -a` to try to autocorrect the issues. If this last command doesn't solve the violations, you'll need to google.

If you are not familiar with Rubocop, spend some time studying their page and a few study cases on the internet.

4. Please add a test for your change. Only refactoring and documentation changes
require no new tests. If you are adding functionality or fixing a bug, we need
a test!
a test! We use [Minitest](https://github.com/seattlerb/minitest) in this project. If you're not familiar with Minitest and are comfortable with Rspec, please ask a collaborator to review your PR.

4. Make the test pass. Always use `sample`, `shuffle`, and `rand` from
5. Make the test pass. Always use `sample`, `shuffle`, and `rand` from
the Base class (just like the rest of the code) rather than
`Array#sample`, `Array#shuffle` and `Kernel#rand` to preserve the
deterministic feature.

5. When adding a new class, add a new yaml file to
6. When adding a new class, add a new yaml file to
`lib/locales/en` rather than adding translations to
`lib/locales/en.yml`. For example, if you add Faker::MyThing,
put your translations in `lib/locales/en/my_thing.yml`. See [the locale
README](./lib/locales/en/README.md) for more info.

6. Methods with optional arguments should use keyword rather than positional
7. 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.

7. Push to your fork and submit a pull request.
8. If you need to update your branch with master before merging, you should follow these steps:
```ruby
# GitHub ID: vbrazo
# Branch: fixes/fix-warnings

git remote -v # Show all Remote Branches
git remote add faker git@github.com:stympy/faker.git # if you don't have the faker remote address yet
git checkout master # switch to the master branch
git reset --hard HEAD~50 # because your branch master might have things that don't need anymore
git pull faker master # now you're good to go
git push -f [your remote address] master # now your master is updated
# in this case it would be git push -f vbrazo master

# if you want to update your fixes/fix-warnings branch after updating your master:
git checkout fixes/fix-warnings
git merge --no-ff master
git status # to see what files have conflicts. Fix the conflicts and commit them
git add .
git commit -m 'Fix merge conflicts with master'
git push -f [your remote address] fixes/fix-warnings
# in this case it would be git push -f vbrazo fixes/fix-warnings
```

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

Syntax:

Expand Down
9 changes: 1 addition & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
source "https://rubygems.org"
source 'https://rubygems.org'

# Specify your gem's dependencies in faker.gemspec
gemspec

group :development, :test do
gem "test-unit"
gem "rake"
gem "minitest"
gem "timecop"
end
33 changes: 32 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,43 @@ PATH
GEM
remote: https://rubygems.org/
specs:
ansi (1.5.0)
ast (2.4.0)
concurrent-ruby (1.0.5)
docile (1.3.0)
hirb (0.7.3)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
minitest (5.10.3)
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
power_assert (1.1.1)
powerpack (0.1.1)
rainbow (3.0.0)
rake (12.3.0)
rubocop (0.56.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-console (0.4.2)
ansi
hirb
simplecov
simplecov-html (0.10.2)
test-unit (3.2.6)
power_assert
timecop (0.9.1)
unicode-display_width (1.3.2)

PLATFORMS
ruby
Expand All @@ -24,8 +52,11 @@ DEPENDENCIES
faker!
minitest
rake
rubocop
simplecov
simplecov-console
test-unit
timecop

BUNDLED WITH
1.16.0
1.16.1
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Faker [![Build Status](https://travis-ci.org/stympy/faker.svg?branch=master)](https://travis-ci.org/stympy/faker) [![Gem Version](https://badge.fury.io/rb/faker.svg)](https://badge.fury.io/rb/faker)
![logotype a happy-07](https://user-images.githubusercontent.com/36028424/40263395-4318481e-5b44-11e8-92e5-3dcc1ce169b3.png)

# Faker [![Build Status](https://travis-ci.org/stympy/faker.svg?branch=master)](https://travis-ci.org/stympy/faker) [![Gem Version](https://badge.fury.io/rb/faker.svg)](https://badge.fury.io/rb/faker) [![Test Coverage](https://api.codeclimate.com/v1/badges/ef54c7f9df86e965d64b/test_coverage)](https://codeclimate.com/github/stympy/faker/test_coverage) [![Maintainability](https://api.codeclimate.com/v1/badges/ef54c7f9df86e965d64b/maintainability)](https://codeclimate.com/github/stympy/faker/maintainability)

This gem is a port of Perl's Data::Faker library that generates fake data.

Expand Down Expand Up @@ -51,8 +52,10 @@ Contents
- [Faker::Demographic](doc/demographic.md)
- [Faker::Dessert](doc/dessert.md)
- [Faker::Dog](doc/dog.md)
- [Faker::Dota](doc/dota.md)
- [Faker::DragonBall](doc/dragon_ball.md)
- [Faker::DrWho](doc/dr_who.md)
- [Faker::DumbAndDumber](doc/dumb_and_dumber.md)
- [Faker::Dune](doc/dune.md)
- [Faker::Educator](doc/educator.md)
- [Faker::ElderScrolls](doc/elder_scrolls.md)
Expand All @@ -61,20 +64,24 @@ Contents
- [Faker::File](doc/file.md)
- [Faker::Fillmurray](doc/fillmurray.md)
- [Faker::Food](doc/food.md)
- [Faker::Football](doc/football.md)
- [Faker::Friends](doc/friends.md)
- [Faker::GameOfThrones](doc/game_of_thrones.md)
- [Faker::Gender](doc/gender.md)
- [Faker::Hacker](doc/hacker.md)
- [Faker::HarryPotter](doc/harry_potter.md)
- [Faker::HeyArnold](doc/hey_arnold.md)
- [Faker::Hipster](doc/hipster.md)
- [Faker::Hobbit](doc/hobbit.md)
- [Faker::HowIMetYourMother](doc/how_i_met_your_mother.md)
- [Faker::HitchhikersGuideToTheGalaxy](doc/hitchhikers_guide_to_the_galaxy.md)
- [Faker::IDNumber](doc/id_number.md)
- [Faker::Internet](doc/internet.md)
- [Faker::Job](doc/job.md)
- [Faker::Kpop](doc/kpop.md)
- [Faker::LeagueOfLegends](doc/league_of_legends.md)
- [Faker::LordOfTheRings](doc/lord_of_the_rings.md)
- [Faker::LoremFlickr](doc/lorem_flickr.md)
- [Faker::LoremPixel](doc/lorem_pixel.md)
- [Faker::Lorem](doc/lorem.md)
- [Faker::Lovecraft](doc/lovecraft.md)
Expand All @@ -84,11 +91,16 @@ Contents
- [Faker::MostInterestingManInTheWorld](doc/most_interesting_man_in_the_world.md)
- [Faker::Movie](doc/movie.md)
- [Faker::Music](doc/music.md)
- [Faker::Myst](doc/myst.md)
- [Faker::Name](doc/name.md)
- [Faker::Nation](doc/nation.md)
- [Faker::NatoPhoneticAlphabet](doc/nato_phonetic_alphabet.md)
- [Faker::NewGirl](doc/new_girl.md)
- [Faker::Number](doc/number.md)
- [Faker::Omniauth](doc/omniauth.md)
- [Faker::OnePiece](doc/one_piece.md)
- [Faker::Overwatch](doc/overwatch.md)
- [Faker::ParksAndRec](doc/parks_and_rec.md)
- [Faker::PhoneNumber](doc/phone_number.md)
- [Faker::Placeholdit](doc/placeholdit.md)
- [Faker::Pokemon](doc/pokemon.md)
Expand All @@ -101,15 +113,19 @@ Contents
- [Faker::Seinfeld](doc/seinfeld.md)
- [Faker::SiliconValley](doc/silicon_valley.md)
- [Faker::Simpsons](doc/simpsons.md)
- [Faker::SingularSiegler](doc/singular_siegler.md)
- [Faker::SlackEmoji](doc/slack_emoji.md)
- [Faker::Source](doc/source.md)
- [Faker::Space](doc/space.md)
- [Faker::StarTrek](doc/star_trek.md)
- [Faker::StarWars](doc/star_wars.md)
- [Faker::String](doc/string.md)
- [Faker::Stripe](doc/stripe.md)
- [Faker::Superhero](doc/superhero.md)
- [Faker::SwordArtOnline](doc/sword_art_online.md)
- [Faker::Team](doc/team.md)
- [Faker::TheFreshPrinceOfBelAir](doc/the_fresh_prince_of_bel_air.md)
- [Faker::TheITCrowd](doc/the_it_crowd.md)
- [Faker::TheThickOfIt](doc/the_thick_of_it.md)
- [Faker::Time](doc/time.md)
- [Faker::TwinPeaks](doc/twin_peaks.md)
Expand Down
Loading

0 comments on commit 8556b5a

Please sign in to comment.