Merge branch 'rs-gems' into 'master'

Update ffaker gem

Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.

Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR.

Also updates `spring` version and the binstubs, just for kicks.

See merge request !686

16 files changed, 41 insertions, 45 deletions

diff --git a/Gemfile b/Gemfile
index 5bf71b871e9..8eb1f04000c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -239,7 +239,7 @@ group :development, :test do
   gem 'minitest', '~> 5.3.0'
 
   # Generate Fake data
-  gem "ffaker"
+  gem 'ffaker', '~> 2.0.0'
 
   # Guard
   gem 'guard-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4aa56cc7a9a..80e4a44c1da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,7 +176,7 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
-    ffaker (1.22.1)
+    ffaker (2.0.0)
     ffi (1.9.8)
     fog (1.21.0)
       fog-brightbox
@@ -547,9 +547,9 @@ GEM
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    seed-fu (2.3.1)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    seed-fu (2.3.5)
+      activerecord (>= 3.1, < 4.3)
+      activesupport (>= 3.1, < 4.3)
     select2-rails (3.5.2)
       thor (~> 0.14)
     settingslogic (2.0.9)
@@ -589,7 +589,7 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spring (1.3.3)
+    spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-spinach (1.0.0)
@@ -713,7 +713,7 @@ DEPENDENCIES
   email_spec
   enumerize
   factory_girl_rails
-  ffaker
+  ffaker (~> 2.0.0)
   fog (~> 1.14)
   font-awesome-rails (~> 4.2)
   foreman
diff --git a/bin/rake b/bin/rake
index 8017a0271d2..0fb4e07e13a 100755
--- a/bin/rake
+++ b/bin/rake
@@ -3,6 +3,5 @@ begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
+require 'bundler/setup'
+load Gem.bin_path('rake', 'rake')
diff --git a/bin/spring b/bin/spring
index 253ec37c345..7b45d374fcd 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end
diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index ae4c0550a4f..87839770924 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -23,7 +23,7 @@ Sidekiq::Testing.inline! do
           name: group_path.titleize,
           path: group_path
         )
-        group.description = Faker::Lorem.sentence
+        group.description = FFaker::Lorem.sentence
         group.save
 
         group.add_owner(User.first)
@@ -35,7 +35,7 @@ Sidekiq::Testing.inline! do
         import_url: url,
         namespace_id: group.id,
         name: project_path.titleize,
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         visibility_level: Gitlab::VisibilityLevel.values.sample
       }
 
diff --git a/db/fixtures/development/05_users.rb b/db/fixtures/development/05_users.rb
index 24952a1f661..378354efd5a 100644
--- a/db/fixtures/development/05_users.rb
+++ b/db/fixtures/development/05_users.rb
@@ -2,9 +2,9 @@ Gitlab::Seeder.quiet do
   (2..20).each  do |i|
     begin
       User.create!(
-        username: Faker::Internet.user_name,
-        name: Faker::Name.name,
-        email: Faker::Internet.email,
+        username: FFaker::Internet.user_name,
+        name: FFaker::Name.name,
+        email: FFaker::Internet.email,
         confirmed_at: DateTime.now,
         password: '12345678'
       )
diff --git a/db/fixtures/development/07_milestones.rb b/db/fixtures/development/07_milestones.rb
index 2296821e528..a43116829d9 100644
--- a/db/fixtures/development/07_milestones.rb
+++ b/db/fixtures/development/07_milestones.rb
@@ -3,7 +3,7 @@ Gitlab::Seeder.quiet do
     (1..5).each  do |i|
       milestone_params = {
         title: "v#{i}.0",
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
       }
 
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb
index e8b01b46d22..c636e96381c 100644
--- a/db/fixtures/development/09_issues.rb
+++ b/db/fixtures/development/09_issues.rb
@@ -2,8 +2,8 @@ Gitlab::Seeder.quiet do
   Project.all.each do |project|
     (1..10).each  do |i|
       issue_params = {
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentence,
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
         milestone: project.milestones.sample,
         assignee: project.team.users.sample
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index f9b2fd8b05f..0825776ffaa 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -10,8 +10,8 @@ Gitlab::Seeder.quiet do
       params = {
         source_branch: source_branch,
         target_branch: target_branch,
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentences(3).join(" "),
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentences(3).join(" "),
         milestone: project.milestones.sample,
         assignee: project.team.users.sample
       }
diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index b3a6f39c7d5..3bd4b442ade 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -28,8 +28,8 @@ eos
     PersonalSnippet.seed(:id, [{
       id: i,
       author_id: user.id,
-      title: Faker::Lorem.sentence(3),
-      file_name:  Faker::Internet.domain_word + '.rb',
+      title: FFaker::Lorem.sentence(3),
+      file_name:  FFaker::Internet.domain_word + '.rb',
       visibility_level: Gitlab::VisibilityLevel.values.sample,
       content: content,
     }])
diff --git a/db/fixtures/development/13_comments.rb b/db/fixtures/development/13_comments.rb
index d37be53c7b9..566c0705638 100644
--- a/db/fixtures/development/13_comments.rb
+++ b/db/fixtures/development/13_comments.rb
@@ -6,7 +6,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'Issue',
         noteable_id: issue.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute
@@ -21,7 +21,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'MergeRequest',
         noteable_id: mr.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index 4b135202593..d06905285fe 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -23,7 +23,7 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   end
 
   step 'I submit new hook' do
-    @url = Faker::Internet.uri("http")
+    @url = FFaker::Internet.uri("http")
     fill_in "hook_url", with: @url
     expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
   end
diff --git a/spec/factories.rb b/spec/factories.rb
index 26e8a795fa4..b7b2a1dac8e 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,23 +2,23 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   sequence :sentence, aliases: [:title, :content] do
-    Faker::Lorem.sentence
+    FFaker::Lorem.sentence
   end
 
   sequence :name do
-    Faker::Name.name
+    FFaker::Name.name
   end
 
   sequence :file_name do
-    Faker::Internet.user_name
+    FFaker::Internet.user_name
   end
 
-  sequence(:url) { Faker::Internet.uri('http') }
+  sequence(:url) { FFaker::Internet.uri('http') }
 
   factory :user, aliases: [:author, :assignee, :owner, :creator] do
-    email { Faker::Internet.email }
+    email { FFaker::Internet.email }
     name
-    sequence(:username) { |n| "#{Faker::Internet.user_name}#{n}" }
+    sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
     password "12345678"
     confirmed_at { Time.now }
     confirmation_token { nil }
@@ -122,12 +122,12 @@ FactoryGirl.define do
   factory :email do
     user
     email do
-      Faker::Internet.email('alias')
+      FFaker::Internet.email('alias')
     end
 
     factory :another_email do
       email do
-        Faker::Internet.email('another.alias')
+        FFaker::Internet.email('another.alias')
       end
     end
   end
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 25862614d28..00906e8087a 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -26,7 +26,7 @@ describe "Admin::Hooks", feature: true do
 
   describe "New Hook" do
     before do
-      @url = Faker::Internet.uri("http")
+      @url = FFaker::Internet.uri("http")
       visit admin_hooks_path
       fill_in "hook_url", with: @url
       expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 37607b55eb1..c40ae7b5703 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -185,7 +185,7 @@ describe Notify do
 
       context 'for issues' do
         let(:issue) { create(:issue, author: current_user, assignee: assignee, project: project) }
-        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: Faker::Lorem.sentence) }
+        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: FFaker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
@@ -273,7 +273,7 @@ describe Notify do
       context 'for merge requests' do
         let(:merge_author) { create(:user) }
         let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
-        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: Faker::Lorem.sentence) }
+        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: FFaker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index aada7febf6c..46cd26eb927 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -165,7 +165,7 @@ describe API::API, api: true  do
     it "should assign attributes to project" do
       project = attributes_for(:project, {
         path: 'camelCasePath',
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false
@@ -274,7 +274,7 @@ describe API::API, api: true  do
 
     it 'should assign attributes to project' do
       project = attributes_for(:project, {
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false