From a64224ee81b9f1158b56ceef150ebc4851369aa3 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 20:59:15 -0400 Subject: [PATCH 1/9] added phish players and albums --- lib/locales/en/phish.yml | 389 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 388 insertions(+), 1 deletion(-) diff --git a/lib/locales/en/phish.yml b/lib/locales/en/phish.yml index e6af5c2f26..562acb791e 100644 --- a/lib/locales/en/phish.yml +++ b/lib/locales/en/phish.yml @@ -1,4 +1,391 @@ en: faker: phish: - song: ["A Song I Heard the Ocean Sing", "AC/DC Bag", "Access Me", "Acoustic Army", "Aftermath", "Albert", "All of These Dreams", "All Things Reconsidered", "Alumni Blues", "Ambient Jam", "Amidst the Peals of Laughter", "Anarchy", "And It Stoned Me", "And So To Bed", "Another One Bites the Dust", "Antelope", "Anything But Me", "Army of One", "Art Jam", "ASIHTOS", "Ass Handed", "ATR", "Axilla", "Axilla (Part II)", "Band/Crew Football Theme Song", "Bathtub Gin", "BBFCFM", "Beauty of a Broken Heart", "Big Ball Jam", "Big Black Furry Creature from Mars", "Billy Breathes", "Birds of a Feather", "Bittersweet Motel", "Black-Eyed Katy", "Blaze On", "Bliss", "BOTT", "Bouncing Around the Room", "Breath and Burning", "Brian and Robert", "Brother", "Buffalo Bill", "Bundle of Joy", "Buried Alive", "Bye Bye Foot", "Camel Walk", "Can't Always Listen", "Carini", "Carolina in the Morning", "Cars Trucks Buses", "Catapult", "Cavern", "Chalk Dust Torture", "Chalk Dust Torture Reprise", "Character Zero", "Clod", "Colonel Forbin's Ascent", "Contact", "Cool Amber and Mercury", "Costume Contest", "Couch Lady", "Crowd Control", "Dave's Energy Guide", "David Bowie", "Dear Mrs. Reagan", "Death Don't Hurt Very Long", "Demand", "Destiny Unbound", "Devotion To a Dream", "Digital Delay Loop Jam", "Dinner and a Movie", "Divided Sky", "Dog Faced Boy", "Dog Gone Dog", "Dog Log", "Dogs Stole Things", "Don't Get Me Wrong", "Doomsday", "Down with Disease", "Dr. Gabel", "Drive-In Jam", "Driver", "Eliza", "End of Session", "Esther", "Everything is Hollow", "Faht", "Farmhouse", "Fast Enough for You", "Fee", "Fikus", "Fire Up the Ganja", "Fish Bass", "Fishman's Gull Poem", "Flat Fee", "Flatbed Truck Jam", "Flip", "Fluff's Travels", "Fluffhead", "Fly Famous Mockingbird", "Foam", "Fooled by Images", "Frankie Says", "Free", "Freeworld", "Friday", "Friends", "Fuck Your Face", "Fuckerpants", "Fuego", "Gatekeeper", "Gaul Swerves and the Rest is Everything Else", "Get Back on the Train", "Ghost", "Glide", "Glide II", "Golgi Apparatus", "Grind", "Guelah Papyrus", "Gumbo", "Guy Forget", "Guyute", "Ha Ha Ha", "Halfway to the Moon", "Hall in Solace", "Halley's Comet", "Harpua", "Harry Hood", "He Ent to the Bog", "Hell's Bells", "Home", "Horn", "I Always Wanted It This Way", "I Am Hydrogen", "I Been Around", "I Didn't Know", "I Don't Care", "I Will Set You Free", "I've Turned Bad", "Icculus", "Idea", "If I Could", "In a Hole", "In a Misty Glade", "In an Intensive Care Unit", "In The Good Old Summer Time", "Infinite", "Ingest", "Insects", "Intro", "It's Ice", "Jägermeister Song", "Jennifer Dances", "Join the Band", "Joy", "Julius", "Keepin' It Real", "Keyboard Army", "Keyboard Cavalry", "Kill Devil Falls", "Killer Joe", "Kung", "Lawn Boy", "Lawn Boy Reprise", "Leaves", "Lengthwise", "Leprechaun", "Let's Go", "Letter to Jimmy Page", "Lifeboy", "Limb By Limb", "Llama", "Love Is What We Are", "Lucy Had A Lumpy Head", "Lushington", "Maggie's Revenge", "Magilla", "Makisupa Policeman", "Mallory", "Marijuana Hot Chocolate", "Martian Monster", "Maze", "McGrupp and the Watchful Hosemasters", "Meat", "Meatstick", "Melt", "Mercury", "Merry Pranksters Jam", "Metal Bagel Death", "Mexican Cousin", "Mike's Song", "Minkin", "Miss You", "MMGAMOIO", "MmmBop", "Mock Song", "Montana", "More", "Mound", "My Friend, My Friend", "My Left Toe", "My Problem Right There", "My Sweet One", "N2O", "Never", "NICU", "No Dogs Allowed", "No Men In No Man's Land", "NO2", "Norwegian Wood (This Bird Has Flown)", "Nowhere Fast", "Oblivious Fool", "Ocelot", "Olivia's Pool", "Party Time", "Passing Through", "Piano Duet", "Pigtail", "Piper", "Play by Play", "Poor Heart", "Possum", "Prep School Hippie", "Prince Caspian", "Punch Me in the Eye", "Punch You in the Eye", "PYITE", "Quadrophonic Toppling", "Reba", "Revolution", "Rhombus Narration", "Rift", "Riker's Mailbox", "Rock A William", "Rocketsled's Funky Main Man Meets Big Joe on Church Street", "Roggae", "Roll Like a Cantaloupe", "Rotation Jam", "Round Room", "Run Like an Antelope", "Runaway Jim", "Running Out of Time", "Sample in a Jar", "Sanity", "Say it to Me S.A.N.T.O.S.", "Say Something", "Scent of a Mule", "Scents and Subtle Sounds", "Secret Language Instructions", "Setting Sail", "Seven Below", "Shade", "Shafty", "Shipwreck", "Silent in the Morning", "Simple", "Sing Monica", "Skippy the Wondermouse", "Slave to the Traffic Light", "Sleep", "Sleeping Monkey", "Sleepwalk", "Snow", "SOAM", "Sparkle", "Split Open and Melt", "Spock's Brain", "Spread It 'Round", "Stash", "Stealing Time From the Faulty Plan", "Steam", "Steep", "Storage Jam", "Strange Design", "Stray Dog", "Sugar Shack", "Summer of '89", "Sunshine of Your Feeling", "Suzy Greenberg", "Swept Away", "T.V. Theme", "Talk", "Taste", "Taste That Surrounds", "Tela", "The Asse Festival", "The Birds", "The Birdwatcher", "The Chase", "The Chinese Water Torture", "The Connection", "The Curtain", "The Curtain With", "The Dickie Scotland Song", "The Divided Sky", "The Dogs", "The Final Hurrah", "The Fog That Surrounds", "The Happy Whip and Dung Song", "The Haunted House", "The Horse", "The Landlady", "The Line", "The Lizards", "The Man Who Stepped Into Yesterday", "The Mango Song", "The Moma Dance", "The Name is Slick", "The Oh Kee Pa Ceremony", "The Practical Song", "The Sloth", "The Squirming Coil", "The Unsafe Bridge", "The Very Long Fuse", "The Vibration of Life", "The Wedge", "Theme From the Bottom", "Things People Do", "Thread", "Tide Turns", "Timber", "Tiny", "Title Track", "TMWSIY", "Tomorrow's Song", "Tower Jam", "Train Song", "Tropical Hot Dog Night", "Trust Fund Baby", "TTE", "Tube", "Turtle in the Clouds", "Tweezer", "Tweezer Reprise", "Twenty Years Later", "Twist", "Two Versions of Me", "Union Federal", "Vacuum Solo", "Vultures", "Wading in the Velvet Sea", "Wait", "Waiting All Night", "Waking Up", "Waking Up Dead", "Walfredo", "Walls of the Cave", "Waste", "Water in the Sky", "Waves", "We Are Come to Outlive Our Brains", "Weekapaug Groove", "Weekly Time", "Weigh", "What Things Seem", "What You Will", "What's the Use?", "Who Do? We Do!", "Wilson", "Windham Hell", "Windy City", "Wingsuit", "Wolfman's Brother", "Wombat", "Yarmouth Road", "YEM", "You Enjoy Myself", "You Never Know", "Your Pet Cat"] + albums: ["Junta", + "Lawn Boy", + "A Picture of Nectar", + "Rift", + "Hoist", + "Billy Breathes", + "The Story of the Ghost", + "The Siket Disc", + "Farmhouse", + "Round Room", + "Undermind", + "Joy", + "Fuego", + "Big Boat", + "Sigma Oasis"] + players: [ "Jon Fishman", + "Mike Gordon", + "Page McConnell", + "Trey Anastasio"] + song: [ "A Song I Heard the Ocean Sing", + "AC/DC Bag", "Access Me", + "Acoustic Army", + "Aftermath", + "Albert", + "All of These Dreams", + "All Things Reconsidered", + "Alumni Blues", + "Ambient Jam", + "Amidst the Peals of Laughter", + "Anarchy", + "And It Stoned Me", + "And So To Bed", + "Another One Bites the Dust", + "Antelope", + "Anything But Me", + "Army of One", + "Art Jam", + "ASIHTOS", + "Ass Handed", + "ATR", + "Axilla", + "Axilla (Part II)", + "Band/Crew Football Theme Song", + "Bathtub Gin", + "BBFCFM", + "Beauty of a Broken Heart", + "Big Ball Jam", + "Big Black Furry Creature from Mars", + "Billy Breathes", + "Birds of a Feather", + "Bittersweet Motel", + "Black-Eyed Katy", + "Blaze On", + "Bliss", + "BOTT", + "Bouncing Around the Room", + "Breath and Burning", + "Brian and Robert", + "Brother", + "Buffalo Bill", + "Bundle of Joy", + "Buried Alive", + "Bye Bye Foot", + "Camel Walk", + "Can't Always Listen", + "Carini", + "Carolina in the Morning", + "Cars Trucks Buses", + "Catapult", + "Cavern", + "Chalk Dust Torture", + "Chalk Dust Torture Reprise", + "Character Zero", + "Clod", + "Colonel Forbin's Ascent", + "Contact", + "Cool Amber and Mercury", + "Costume Contest", + "Couch Lady", + "Crowd Control", + "Dave's Energy Guide", + "David Bowie", + "Dear Mrs. Reagan", + "Death Don't Hurt Very Long", + "Demand", + "Destiny Unbound", + "Devotion To a Dream", + "Digital Delay Loop Jam", + "Dinner and a Movie", + "Divided Sky", + "Dog Faced Boy", + "Dog Gone Dog", + "Dog Log", + "Dogs Stole Things", + "Don't Get Me Wrong", + "Doomsday", + "Down with Disease", + "Dr. Gabel", + "Drive-In Jam", + "Driver", + "Eliza", + "End of Session", + "Esther", + "Everything is Hollow", + "Faht", + "Farmhouse", + "Fast Enough for You", + "Fee", + "Fikus", + "Fire Up the Ganja", + "Fish Bass", + "Fishman's Gull Poem", + "Flat Fee", + "Flatbed Truck Jam", + "Flip", + "Fluff's Travels", + "Fluffhead", + "Fly Famous Mockingbird", + "Foam", + "Fooled by Images", + "Frankie Says", + "Free", + "Freeworld", + "Friday", + "Friends", + "Fuck Your Face", + "Fuckerpants", + "Fuego", + "Gatekeeper", + "Gaul Swerves and the Rest is Everything Else", + "Get Back on the Train", + "Ghost", + "Glide", + "Glide II", + "Golgi Apparatus", + "Grind", + "Guelah Papyrus", + "Gumbo", + "Guy Forget", + "Guyute", + "Ha Ha Ha", + "Halfway to the Moon", + "Hall in Solace", + "Halley's Comet", + "Harpua", + "Harry Hood", + "He Ent to the Bog", + "Hell's Bells", + "Home", + "Horn", + "I Always Wanted It This Way", + "I Am Hydrogen", + "I Been Around", + "I Didn't Know", + "I Don't Care", + "I Will Set You Free", + "I've Turned Bad", + "Icculus", + "Idea", + "If I Could", + "In a Hole", + "In a Misty Glade", + "In an Intensive Care Unit", + "In The Good Old Summer Time", + "Infinite", + "Ingest", + "Insects", + "Intro", + "It's Ice", + "Jägermeister Song", + "Jennifer Dances", + "Join the Band", + "Joy", + "Julius", + "Keepin' It Real", + "Keyboard Army", + "Keyboard Cavalry", + "Kill Devil Falls", + "Killer Joe", + "Kung", + "Lawn Boy", + "Lawn Boy Reprise", + "Leaves", + "Lengthwise", + "Leprechaun", + "Let's Go", + "Letter to Jimmy Page", + "Lifeboy", + "Limb By Limb", + "Llama", + "Love Is What We Are", + "Lucy Had A Lumpy Head", + "Lushington", + "Maggie's Revenge", + "Magilla", + "Makisupa Policeman", + "Mallory", + "Marijuana Hot Chocolate", + "Martian Monster", + "Maze", + "McGrupp and the Watchful Hosemasters", + "Meat", + "Meatstick", + "Melt", + "Mercury", + "Merry Pranksters Jam", + "Metal Bagel Death", + "Mexican Cousin", + "Mike's Song", + "Minkin", + "Miss You", + "MMGAMOIO", + "MmmBop", + "Mock Song", + "Montana", + "More", + "Mound", + "My Friend, + My Friend", + "My Left Toe", + "My Problem Right There", + "My Sweet One", + "N2O", + "Never", + "NICU", + "No Dogs Allowed", + "No Men In No Man's Land", + "NO2", + "Norwegian Wood (This Bird Has Flown)", + "Nowhere Fast", + "Oblivious Fool", + "Ocelot", + "Olivia's Pool", + "Party Time", + "Passing Through", + "Piano Duet", + "Pigtail", + "Piper", + "Play by Play", + "Poor Heart", + "Possum", + "Prep School Hippie", + "Prince Caspian", + "Punch Me in the Eye", + "Punch You in the Eye", + "PYITE", + "Quadrophonic Toppling", + "Reba", + "Revolution", + "Rhombus Narration", + "Rift", + "Riker's Mailbox", + "Rock A William", + "Rocketsled's Funky Main Man Meets Big Joe on Church Street", + "Roggae", + "Roll Like a Cantaloupe", + "Rotation Jam", + "Round Room", + "Run Like an Antelope", + "Runaway Jim", + "Running Out of Time", + "Sample in a Jar", + "Sanity", + "Say it to Me S.A.N.T.O.S.", + "Say Something", + "Scent of a Mule", + "Scents and Subtle Sounds", + "Secret Language Instructions", + "Setting Sail", + "Seven Below", + "Shade", + "Shafty", + "Shipwreck", + "Silent in the Morning", + "Simple", + "Sing Monica", + "Skippy the Wondermouse", + "Slave to the Traffic Light", + "Sleep", + "Sleeping Monkey", + "Sleepwalk", + "Snow", + "SOAM", + "Sparkle", + "Split Open and Melt", + "Spock's Brain", + "Spread It 'Round", + "Stash", + "Stealing Time From the Faulty Plan", + "Steam", + "Steep", + "Storage Jam", + "Strange Design", + "Stray Dog", + "Sugar Shack", + "Summer of '89", + "Sunshine of Your Feeling", + "Suzy Greenberg", + "Swept Away", + "T.V. Theme", + "Talk", + "Taste", + "Taste That Surrounds", + "Tela", + "The Asse Festival", + "The Birds", + "The Birdwatcher", + "The Chase", + "The Chinese Water Torture", + "The Connection", + "The Curtain", + "The Curtain With", + "The Dickie Scotland Song", + "The Divided Sky", + "The Dogs", + "The Final Hurrah", + "The Fog That Surrounds", + "The Happy Whip and Dung Song", + "The Haunted House", + "The Horse", + "The Landlady", + "The Line", + "The Lizards", + "The Man Who Stepped Into Yesterday", + "The Mango Song", + "The Moma Dance", + "The Name is Slick", + "The Oh Kee Pa Ceremony", + "The Practical Song", + "The Sloth", + "The Squirming Coil", + "The Unsafe Bridge", + "The Very Long Fuse", + "The Vibration of Life", + "The Wedge", + "Theme From the Bottom", + "Things People Do", + "Thread", + "Tide Turns", + "Timber", + "Tiny", + "Title Track", + "TMWSIY", + "Tomorrow's Song", + "Tower Jam", + "Train Song", + "Tropical Hot Dog Night", + "Trust Fund Baby", + "TTE", + "Tube", + "Turtle in the Clouds", + "Tweezer", + "Tweezer Reprise", + "Twenty Years Later", + "Twist", + "Two Versions of Me", + "Union Federal", + "Vacuum Solo", + "Vultures", + "Wading in the Velvet Sea", + "Wait", + "Waiting All Night", + "Waking Up", + "Waking Up Dead", + "Walfredo", + "Walls of the Cave", + "Waste", + "Water in the Sky", + "Waves", + "We Are Come to Outlive Our Brains", + "Weekapaug Groove", + "Weekly Time", + "Weigh", + "What Things Seem", + "What You Will", + "What's the Use?", + "Who Do? We Do!", + "Wilson", + "Windham Hell", + "Windy City", + "Wingsuit", + "Wolfman's Brother", + "Wombat", + "Yarmouth Road", + "YEM", + "You Enjoy Myself", + "You Never Know", + "Your Pet Cat"] From b7a9a3dc8baa80d6effcf4801dd381d7709d302b Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:01:52 -0400 Subject: [PATCH 2/9] updated phish readme --- doc/music/phish.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/music/phish.md b/doc/music/phish.md index 8d5c38fb15..7ca8bbf874 100644 --- a/doc/music/phish.md +++ b/doc/music/phish.md @@ -1,5 +1,9 @@ # Faker::Music::Phish ```ruby +Faker::Music::Phish.album #=> "Fuego" + +Faker::Music::Phish.player #=> "Trey Anastasio" + Faker::Music::Phish.song #=> "Tweezer" ``` From b8f8f1b8add49ef61bfc6c0022b0fbfae85a5b86 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:03:23 -0400 Subject: [PATCH 3/9] added new tests --- test/faker/music/test_faker_phish.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/faker/music/test_faker_phish.rb b/test/faker/music/test_faker_phish.rb index 700819f051..a94541d1ed 100644 --- a/test/faker/music/test_faker_phish.rb +++ b/test/faker/music/test_faker_phish.rb @@ -7,6 +7,14 @@ def setup @tester = Faker::Music::Phish end + def test_album + assert @tester.album.match(/\w+/) + end + + def test_player + assert @tester.player.match(/\w+/) + end + def test_song assert @tester.song.match(/\w+/) end From 2bbc47059e541b79d434154a2c8f00519bae3255 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:11:35 -0400 Subject: [PATCH 4/9] added new methods with documentation --- lib/faker/music/phish.rb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/faker/music/phish.rb b/lib/faker/music/phish.rb index 85ec728dfd..823efecc6a 100644 --- a/lib/faker/music/phish.rb +++ b/lib/faker/music/phish.rb @@ -4,6 +4,32 @@ module Faker class Music class Phish < Base class << self + ## + # Produces the name of a album by Phish. + # + # @return [String] + # + # @example + # Faker::Music::Phish.album #=> "Fuego" + # + # @faker.version 1.9.2 + def album + fetch('phish.song') + end + + ## + # Produces the name of a band member of Phish. + # + # @return [String] + # + # @example + # Faker::Music::Phish.player #=> "Trey Anastasio" + # + # @faker.version 1.9.2 + def album + fetch('phish.player') + end + ## # Produces the name of a song by Phish. # From b761ab435bbc376b8c2f394881347bb17a6531b2 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:16:43 -0400 Subject: [PATCH 5/9] updated phish yml to preferred formatting --- lib/locales/en/phish.yml | 780 ++++++++++++++++++++------------------- 1 file changed, 392 insertions(+), 388 deletions(-) diff --git a/lib/locales/en/phish.yml b/lib/locales/en/phish.yml index 562acb791e..3666e8b416 100644 --- a/lib/locales/en/phish.yml +++ b/lib/locales/en/phish.yml @@ -1,391 +1,395 @@ en: faker: phish: - albums: ["Junta", - "Lawn Boy", - "A Picture of Nectar", - "Rift", - "Hoist", - "Billy Breathes", - "The Story of the Ghost", - "The Siket Disc", - "Farmhouse", - "Round Room", - "Undermind", - "Joy", - "Fuego", - "Big Boat", - "Sigma Oasis"] - players: [ "Jon Fishman", - "Mike Gordon", - "Page McConnell", - "Trey Anastasio"] - song: [ "A Song I Heard the Ocean Sing", - "AC/DC Bag", "Access Me", - "Acoustic Army", - "Aftermath", - "Albert", - "All of These Dreams", - "All Things Reconsidered", - "Alumni Blues", - "Ambient Jam", - "Amidst the Peals of Laughter", - "Anarchy", - "And It Stoned Me", - "And So To Bed", - "Another One Bites the Dust", - "Antelope", - "Anything But Me", - "Army of One", - "Art Jam", - "ASIHTOS", - "Ass Handed", - "ATR", - "Axilla", - "Axilla (Part II)", - "Band/Crew Football Theme Song", - "Bathtub Gin", - "BBFCFM", - "Beauty of a Broken Heart", - "Big Ball Jam", - "Big Black Furry Creature from Mars", - "Billy Breathes", - "Birds of a Feather", - "Bittersweet Motel", - "Black-Eyed Katy", - "Blaze On", - "Bliss", - "BOTT", - "Bouncing Around the Room", - "Breath and Burning", - "Brian and Robert", - "Brother", - "Buffalo Bill", - "Bundle of Joy", - "Buried Alive", - "Bye Bye Foot", - "Camel Walk", - "Can't Always Listen", - "Carini", - "Carolina in the Morning", - "Cars Trucks Buses", - "Catapult", - "Cavern", - "Chalk Dust Torture", - "Chalk Dust Torture Reprise", - "Character Zero", - "Clod", - "Colonel Forbin's Ascent", - "Contact", - "Cool Amber and Mercury", - "Costume Contest", - "Couch Lady", - "Crowd Control", - "Dave's Energy Guide", - "David Bowie", - "Dear Mrs. Reagan", - "Death Don't Hurt Very Long", - "Demand", - "Destiny Unbound", - "Devotion To a Dream", - "Digital Delay Loop Jam", - "Dinner and a Movie", - "Divided Sky", - "Dog Faced Boy", - "Dog Gone Dog", - "Dog Log", - "Dogs Stole Things", - "Don't Get Me Wrong", - "Doomsday", - "Down with Disease", - "Dr. Gabel", - "Drive-In Jam", - "Driver", - "Eliza", - "End of Session", - "Esther", - "Everything is Hollow", - "Faht", - "Farmhouse", - "Fast Enough for You", - "Fee", - "Fikus", - "Fire Up the Ganja", - "Fish Bass", - "Fishman's Gull Poem", - "Flat Fee", - "Flatbed Truck Jam", - "Flip", - "Fluff's Travels", - "Fluffhead", - "Fly Famous Mockingbird", - "Foam", - "Fooled by Images", - "Frankie Says", - "Free", - "Freeworld", - "Friday", - "Friends", - "Fuck Your Face", - "Fuckerpants", - "Fuego", - "Gatekeeper", - "Gaul Swerves and the Rest is Everything Else", - "Get Back on the Train", - "Ghost", - "Glide", - "Glide II", - "Golgi Apparatus", - "Grind", - "Guelah Papyrus", - "Gumbo", - "Guy Forget", - "Guyute", - "Ha Ha Ha", - "Halfway to the Moon", - "Hall in Solace", - "Halley's Comet", - "Harpua", - "Harry Hood", - "He Ent to the Bog", - "Hell's Bells", - "Home", - "Horn", - "I Always Wanted It This Way", - "I Am Hydrogen", - "I Been Around", - "I Didn't Know", - "I Don't Care", - "I Will Set You Free", - "I've Turned Bad", - "Icculus", - "Idea", - "If I Could", - "In a Hole", - "In a Misty Glade", - "In an Intensive Care Unit", - "In The Good Old Summer Time", - "Infinite", - "Ingest", - "Insects", - "Intro", - "It's Ice", - "Jägermeister Song", - "Jennifer Dances", - "Join the Band", - "Joy", - "Julius", - "Keepin' It Real", - "Keyboard Army", - "Keyboard Cavalry", - "Kill Devil Falls", - "Killer Joe", - "Kung", - "Lawn Boy", - "Lawn Boy Reprise", - "Leaves", - "Lengthwise", - "Leprechaun", - "Let's Go", - "Letter to Jimmy Page", - "Lifeboy", - "Limb By Limb", - "Llama", - "Love Is What We Are", - "Lucy Had A Lumpy Head", - "Lushington", - "Maggie's Revenge", - "Magilla", - "Makisupa Policeman", - "Mallory", - "Marijuana Hot Chocolate", - "Martian Monster", - "Maze", - "McGrupp and the Watchful Hosemasters", - "Meat", - "Meatstick", - "Melt", - "Mercury", - "Merry Pranksters Jam", - "Metal Bagel Death", - "Mexican Cousin", - "Mike's Song", - "Minkin", - "Miss You", - "MMGAMOIO", - "MmmBop", - "Mock Song", - "Montana", - "More", - "Mound", - "My Friend, - My Friend", - "My Left Toe", - "My Problem Right There", - "My Sweet One", - "N2O", - "Never", - "NICU", - "No Dogs Allowed", - "No Men In No Man's Land", - "NO2", - "Norwegian Wood (This Bird Has Flown)", - "Nowhere Fast", - "Oblivious Fool", - "Ocelot", - "Olivia's Pool", - "Party Time", - "Passing Through", - "Piano Duet", - "Pigtail", - "Piper", - "Play by Play", - "Poor Heart", - "Possum", - "Prep School Hippie", - "Prince Caspian", - "Punch Me in the Eye", - "Punch You in the Eye", - "PYITE", - "Quadrophonic Toppling", - "Reba", - "Revolution", - "Rhombus Narration", - "Rift", - "Riker's Mailbox", - "Rock A William", - "Rocketsled's Funky Main Man Meets Big Joe on Church Street", - "Roggae", - "Roll Like a Cantaloupe", - "Rotation Jam", - "Round Room", - "Run Like an Antelope", - "Runaway Jim", - "Running Out of Time", - "Sample in a Jar", - "Sanity", - "Say it to Me S.A.N.T.O.S.", - "Say Something", - "Scent of a Mule", - "Scents and Subtle Sounds", - "Secret Language Instructions", - "Setting Sail", - "Seven Below", - "Shade", - "Shafty", - "Shipwreck", - "Silent in the Morning", - "Simple", - "Sing Monica", - "Skippy the Wondermouse", - "Slave to the Traffic Light", - "Sleep", - "Sleeping Monkey", - "Sleepwalk", - "Snow", - "SOAM", - "Sparkle", - "Split Open and Melt", - "Spock's Brain", - "Spread It 'Round", - "Stash", - "Stealing Time From the Faulty Plan", - "Steam", - "Steep", - "Storage Jam", - "Strange Design", - "Stray Dog", - "Sugar Shack", - "Summer of '89", - "Sunshine of Your Feeling", - "Suzy Greenberg", - "Swept Away", - "T.V. Theme", - "Talk", - "Taste", - "Taste That Surrounds", - "Tela", - "The Asse Festival", - "The Birds", - "The Birdwatcher", - "The Chase", - "The Chinese Water Torture", - "The Connection", - "The Curtain", - "The Curtain With", - "The Dickie Scotland Song", - "The Divided Sky", - "The Dogs", - "The Final Hurrah", - "The Fog That Surrounds", - "The Happy Whip and Dung Song", - "The Haunted House", - "The Horse", - "The Landlady", - "The Line", - "The Lizards", - "The Man Who Stepped Into Yesterday", - "The Mango Song", - "The Moma Dance", - "The Name is Slick", - "The Oh Kee Pa Ceremony", - "The Practical Song", - "The Sloth", - "The Squirming Coil", - "The Unsafe Bridge", - "The Very Long Fuse", - "The Vibration of Life", - "The Wedge", - "Theme From the Bottom", - "Things People Do", - "Thread", - "Tide Turns", - "Timber", - "Tiny", - "Title Track", - "TMWSIY", - "Tomorrow's Song", - "Tower Jam", - "Train Song", - "Tropical Hot Dog Night", - "Trust Fund Baby", - "TTE", - "Tube", - "Turtle in the Clouds", - "Tweezer", - "Tweezer Reprise", - "Twenty Years Later", - "Twist", - "Two Versions of Me", - "Union Federal", - "Vacuum Solo", - "Vultures", - "Wading in the Velvet Sea", - "Wait", - "Waiting All Night", - "Waking Up", - "Waking Up Dead", - "Walfredo", - "Walls of the Cave", - "Waste", - "Water in the Sky", - "Waves", - "We Are Come to Outlive Our Brains", - "Weekapaug Groove", - "Weekly Time", - "Weigh", - "What Things Seem", - "What You Will", - "What's the Use?", - "Who Do? We Do!", - "Wilson", - "Windham Hell", - "Windy City", - "Wingsuit", - "Wolfman's Brother", - "Wombat", - "Yarmouth Road", - "YEM", - "You Enjoy Myself", - "You Never Know", - "Your Pet Cat"] + albums: + - "Junta" + - "Lawn Boy" + - "A Picture of Nectar" + - "Rift" + - "Hoist" + - "Billy Breathes" + - "The Story of the Ghost" + - "The Siket Disc" + - "Farmhouse" + - "Round Room" + - "Undermind" + - "Joy" + - "Fuego" + - "Big Boat" + - "Sigma Oasis" + players: + - "Jon Fishman" + - "Mike Gordon" + - "Page McConnell" + - "Trey Anastasio" + song: + - "A Song I Heard the Ocean Sing" + - "AC/DC Bag" + - "Access Me" + - "Acoustic Army" + - "Aftermath" + - "Albert" + - "All of These Dreams" + - "All Things Reconsidered" + - "Alumni Blues" + - "Ambient Jam" + - "Amidst the Peals of Laughter" + - "Anarchy" + - "And It Stoned Me" + - "And So To Bed" + - "Another One Bites the Dust" + - "Antelope" + - "Anything But Me" + - "Army of One" + - "Art Jam" + - "ASIHTOS" + - "Ass Handed" + - "ATR" + - "Axilla" + - "Axilla (Part II)" + - "Band/Crew Football Theme Song" + - "Bathtub Gin" + - "BBFCFM" + - "Beauty of a Broken Heart" + - "Big Ball Jam" + - "Big Black Furry Creature from Mars" + - "Billy Breathes" + - "Birds of a Feather" + - "Bittersweet Motel" + - "Black-Eyed Katy" + - "Blaze On" + - "Bliss" + - "BOTT" + - "Bouncing Around the Room" + - "Breath and Burning" + - "Brian and Robert" + - "Brother" + - "Buffalo Bill" + - "Bundle of Joy" + - "Buried Alive" + - "Bye Bye Foot" + - "Camel Walk" + - "Can't Always Listen" + - "Carini" + - "Carolina in the Morning" + - "Cars Trucks Buses" + - "Catapult" + - "Cavern" + - "Chalk Dust Torture" + - "Chalk Dust Torture Reprise" + - "Character Zero" + - "Clod" + - "Colonel Forbin's Ascent" + - "Contact" + - "Cool Amber and Mercury" + - "Costume Contest" + - "Couch Lady" + - "Crowd Control" + - "Dave's Energy Guide" + - "David Bowie" + - "Dear Mrs. Reagan" + - "Death Don't Hurt Very Long" + - "Demand" + - "Destiny Unbound" + - "Devotion To a Dream" + - "Digital Delay Loop Jam" + - "Dinner and a Movie" + - "Divided Sky" + - "Dog Faced Boy" + - "Dog Gone Dog" + - "Dog Log" + - "Dogs Stole Things" + - "Don't Get Me Wrong" + - "Doomsday" + - "Down with Disease" + - "Dr. Gabel" + - "Drive-In Jam" + - "Driver" + - "Eliza" + - "End of Session" + - "Esther" + - "Everything is Hollow" + - "Faht" + - "Farmhouse" + - "Fast Enough for You" + - "Fee" + - "Fikus" + - "Fire Up the Ganja" + - "Fish Bass" + - "Fishman's Gull Poem" + - "Flat Fee" + - "Flatbed Truck Jam" + - "Flip" + - "Fluff's Travels" + - "Fluffhead" + - "Fly Famous Mockingbird" + - "Foam" + - "Fooled by Images" + - "Frankie Says" + - "Free" + - "Freeworld" + - "Friday" + - "Friends" + - "Fuck Your Face" + - "Fuckerpants" + - "Fuego" + - "Gatekeeper" + - "Gaul Swerves and the Rest is Everything Else" + - "Get Back on the Train" + - "Ghost" + - "Glide" + - "Glide II" + - "Golgi Apparatus" + - "Grind" + - "Guelah Papyrus" + - "Gumbo" + - "Guy Forget" + - "Guyute" + - "Ha Ha Ha" + - "Halfway to the Moon" + - "Hall in Solace" + - "Halley's Comet" + - "Harpua" + - "Harry Hood" + - "He Ent to the Bog" + - "Hell's Bells" + - "Home" + - "Horn" + - "I Always Wanted It This Way" + - "I Am Hydrogen" + - "I Been Around" + - "I Didn't Know" + - "I Don't Care" + - "I Will Set You Free" + - "I've Turned Bad" + - "Icculus" + - "Idea" + - "If I Could" + - "In a Hole" + - "In a Misty Glade" + - "In an Intensive Care Unit" + - "In The Good Old Summer Time" + - "Infinite" + - "Ingest" + - "Insects" + - "Intro" + - "It's Ice" + - "Jägermeister Song" + - "Jennifer Dances" + - "Join the Band" + - "Joy" + - "Julius" + - "Keepin' It Real" + - "Keyboard Army" + - "Keyboard Cavalry" + - "Kill Devil Falls" + - "Killer Joe" + - "Kung" + - "Lawn Boy" + - "Lawn Boy Reprise" + - "Leaves" + - "Lengthwise" + - "Leprechaun" + - "Let's Go" + - "Letter to Jimmy Page" + - "Lifeboy" + - "Limb By Limb" + - "Llama" + - "Love Is What We Are" + - "Lucy Had A Lumpy Head" + - "Lushington" + - "Maggie's Revenge" + - "Magilla" + - "Makisupa Policeman" + - "Mallory" + - "Marijuana Hot Chocolate" + - "Martian Monster" + - "Maze" + - "McGrupp and the Watchful Hosemasters" + - "Meat" + - "Meatstick" + - "Melt" + - "Mercury" + - "Merry Pranksters Jam" + - "Metal Bagel Death" + - "Mexican Cousin" + - "Mike's Song" + - "Minkin" + - "Miss You" + - "MMGAMOIO" + - "MmmBop" + - "Mock Song" + - "Montana" + - "More" + - "Mound" + - "My Friend + - My Friend" + - "My Left Toe" + - "My Problem Right There" + - "My Sweet One" + - "N2O" + - "Never" + - "NICU" + - "No Dogs Allowed" + - "No Men In No Man's Land" + - "NO2" + - "Norwegian Wood (This Bird Has Flown)" + - "Nowhere Fast" + - "Oblivious Fool" + - "Ocelot" + - "Olivia's Pool" + - "Party Time" + - "Passing Through" + - "Piano Duet" + - "Pigtail" + - "Piper" + - "Play by Play" + - "Poor Heart" + - "Possum" + - "Prep School Hippie" + - "Prince Caspian" + - "Punch Me in the Eye" + - "Punch You in the Eye" + - "PYITE" + - "Quadrophonic Toppling" + - "Reba" + - "Revolution" + - "Rhombus Narration" + - "Rift" + - "Riker's Mailbox" + - "Rock A William" + - "Rocketsled's Funky Main Man Meets Big Joe on Church Street" + - "Roggae" + - "Roll Like a Cantaloupe" + - "Rotation Jam" + - "Round Room" + - "Run Like an Antelope" + - "Runaway Jim" + - "Running Out of Time" + - "Sample in a Jar" + - "Sanity" + - "Say it to Me S.A.N.T.O.S." + - "Say Something" + - "Scent of a Mule" + - "Scents and Subtle Sounds" + - "Secret Language Instructions" + - "Setting Sail" + - "Seven Below" + - "Shade" + - "Shafty" + - "Shipwreck" + - "Silent in the Morning" + - "Simple" + - "Sing Monica" + - "Skippy the Wondermouse" + - "Slave to the Traffic Light" + - "Sleep" + - "Sleeping Monkey" + - "Sleepwalk" + - "Snow" + - "SOAM" + - "Sparkle" + - "Split Open and Melt" + - "Spock's Brain" + - "Spread It 'Round" + - "Stash" + - "Stealing Time From the Faulty Plan" + - "Steam" + - "Steep" + - "Storage Jam" + - "Strange Design" + - "Stray Dog" + - "Sugar Shack" + - "Summer of '89" + - "Sunshine of Your Feeling" + - "Suzy Greenberg" + - "Swept Away" + - "T.V. Theme" + - "Talk" + - "Taste" + - "Taste That Surrounds" + - "Tela" + - "The Asse Festival" + - "The Birds" + - "The Birdwatcher" + - "The Chase" + - "The Chinese Water Torture" + - "The Connection" + - "The Curtain" + - "The Curtain With" + - "The Dickie Scotland Song" + - "The Divided Sky" + - "The Dogs" + - "The Final Hurrah" + - "The Fog That Surrounds" + - "The Happy Whip and Dung Song" + - "The Haunted House" + - "The Horse" + - "The Landlady" + - "The Line" + - "The Lizards" + - "The Man Who Stepped Into Yesterday" + - "The Mango Song" + - "The Moma Dance" + - "The Name is Slick" + - "The Oh Kee Pa Ceremony" + - "The Practical Song" + - "The Sloth" + - "The Squirming Coil" + - "The Unsafe Bridge" + - "The Very Long Fuse" + - "The Vibration of Life" + - "The Wedge" + - "Theme From the Bottom" + - "Things People Do" + - "Thread" + - "Tide Turns" + - "Timber" + - "Tiny" + - "Title Track" + - "TMWSIY" + - "Tomorrow's Song" + - "Tower Jam" + - "Train Song" + - "Tropical Hot Dog Night" + - "Trust Fund Baby" + - "TTE" + - "Tube" + - "Turtle in the Clouds" + - "Tweezer" + - "Tweezer Reprise" + - "Twenty Years Later" + - "Twist" + - "Two Versions of Me" + - "Union Federal" + - "Vacuum Solo" + - "Vultures" + - "Wading in the Velvet Sea" + - "Wait" + - "Waiting All Night" + - "Waking Up" + - "Waking Up Dead" + - "Walfredo" + - "Walls of the Cave" + - "Waste" + - "Water in the Sky" + - "Waves" + - "We Are Come to Outlive Our Brains" + - "Weekapaug Groove" + - "Weekly Time" + - "Weigh" + - "What Things Seem" + - "What You Will" + - "What's the Use?" + - "Who Do? We Do!" + - "Wilson" + - "Windham Hell" + - "Windy City" + - "Wingsuit" + - "Wolfman's Brother" + - "Wombat" + - "Yarmouth Road" + - "YEM" + - "You Enjoy Myself" + - "You Never Know" + - "Your Pet Cat" From f2a87a1240821cec942bd281a21e97da850fa446 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:18:23 -0400 Subject: [PATCH 6/9] updated phish doc --- lib/faker/music/phish.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/faker/music/phish.rb b/lib/faker/music/phish.rb index 823efecc6a..0bb9390985 100644 --- a/lib/faker/music/phish.rb +++ b/lib/faker/music/phish.rb @@ -14,7 +14,7 @@ class << self # # @faker.version 1.9.2 def album - fetch('phish.song') + fetch('phish.album') end ## @@ -26,7 +26,7 @@ def album # Faker::Music::Phish.player #=> "Trey Anastasio" # # @faker.version 1.9.2 - def album + def player fetch('phish.player') end From 85cea816c0af0570b517f930988d30d8a614c72a Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 21:53:06 -0400 Subject: [PATCH 7/9] new phish albums and musicians --- doc/music/phish.md | 2 +- lib/faker/music/phish.rb | 10 +++++----- lib/locales/en/phish.yml | 4 ++-- test/faker/music/test_faker_phish.rb | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/music/phish.md b/doc/music/phish.md index 7ca8bbf874..57d34366d1 100644 --- a/doc/music/phish.md +++ b/doc/music/phish.md @@ -3,7 +3,7 @@ ```ruby Faker::Music::Phish.album #=> "Fuego" -Faker::Music::Phish.player #=> "Trey Anastasio" +Faker::Music::Phish.musician #=> "Trey Anastasio" Faker::Music::Phish.song #=> "Tweezer" ``` diff --git a/lib/faker/music/phish.rb b/lib/faker/music/phish.rb index 0bb9390985..4ab00de648 100644 --- a/lib/faker/music/phish.rb +++ b/lib/faker/music/phish.rb @@ -14,11 +14,11 @@ class << self # # @faker.version 1.9.2 def album - fetch('phish.album') + fetch('phish.albums') end ## - # Produces the name of a band member of Phish. + # Produces the name of a musician in Phish. # # @return [String] # @@ -26,8 +26,8 @@ def album # Faker::Music::Phish.player #=> "Trey Anastasio" # # @faker.version 1.9.2 - def player - fetch('phish.player') + def musician + fetch('phish.musicians') end ## @@ -40,7 +40,7 @@ def player # # @faker.version 1.9.2 def song - fetch('phish.song') + fetch('phish.songs') end end end diff --git a/lib/locales/en/phish.yml b/lib/locales/en/phish.yml index 3666e8b416..a6df1625ce 100644 --- a/lib/locales/en/phish.yml +++ b/lib/locales/en/phish.yml @@ -17,12 +17,12 @@ en: - "Fuego" - "Big Boat" - "Sigma Oasis" - players: + musicians: - "Jon Fishman" - "Mike Gordon" - "Page McConnell" - "Trey Anastasio" - song: + songs: - "A Song I Heard the Ocean Sing" - "AC/DC Bag" - "Access Me" diff --git a/test/faker/music/test_faker_phish.rb b/test/faker/music/test_faker_phish.rb index a94541d1ed..f8fcaf82ee 100644 --- a/test/faker/music/test_faker_phish.rb +++ b/test/faker/music/test_faker_phish.rb @@ -11,8 +11,8 @@ def test_album assert @tester.album.match(/\w+/) end - def test_player - assert @tester.player.match(/\w+/) + def test_musician + assert @tester.musician.match(/\w+/) end def test_song From 7e253e4166657568fbb1284bb25777d5648d8635 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Fri, 29 May 2020 22:01:44 -0400 Subject: [PATCH 8/9] fixed comment for phish musician --- lib/faker/music/phish.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/faker/music/phish.rb b/lib/faker/music/phish.rb index 4ab00de648..190b072cab 100644 --- a/lib/faker/music/phish.rb +++ b/lib/faker/music/phish.rb @@ -23,7 +23,7 @@ def album # @return [String] # # @example - # Faker::Music::Phish.player #=> "Trey Anastasio" + # Faker::Music::Phish.musician #=> "Trey Anastasio" # # @faker.version 1.9.2 def musician From 6cdf21ccfcb48893fadfe31665ef2d1e24d20534 Mon Sep 17 00:00:00 2001 From: Zachary Fine Date: Sat, 30 May 2020 10:58:47 -0400 Subject: [PATCH 9/9] updated version to next --- lib/faker/music/phish.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/faker/music/phish.rb b/lib/faker/music/phish.rb index 190b072cab..4cf47963e0 100644 --- a/lib/faker/music/phish.rb +++ b/lib/faker/music/phish.rb @@ -12,7 +12,7 @@ class << self # @example # Faker::Music::Phish.album #=> "Fuego" # - # @faker.version 1.9.2 + # @faker.version next def album fetch('phish.albums') end @@ -25,7 +25,7 @@ def album # @example # Faker::Music::Phish.musician #=> "Trey Anastasio" # - # @faker.version 1.9.2 + # @faker.version next def musician fetch('phish.musicians') end