Skip to content

Commit

Permalink
Merge pull request #437 from mariusbutuc/prefer-single-quoted-strings
Browse files Browse the repository at this point in the history
Prefer single-quoted strings
  • Loading branch information
rafaelfranca committed Oct 3, 2015
2 parents 521090c + 7188863 commit 354637f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ code into relevant existing executables. The snippet looks like this:

``` ruby
begin
load File.expand_path("../spring", __FILE__)
load File.expand_path('../spring', __FILE__)
rescue LoadError
end
```
Expand Down Expand Up @@ -295,7 +295,7 @@ settings. Note that `~/.spring.rb` is loaded *before* bundler, but
projects without having to be added to the project's Gemfile, require
them in your `~/.spring.rb`.

`config/spring_client.rb` is also loaded before bundler and before a
`config/spring_client.rb` is also loaded before bundler and before a
server process is started, it can be used to add new top-level commands.

### Application root
Expand Down
12 changes: 6 additions & 6 deletions lib/spring/client/binstub.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Binstub < Command
# should cause the "unsprung" version of the command to run.
LOADER = <<CODE
begin
load File.expand_path("../spring", __FILE__)
load File.expand_path('../spring', __FILE__)
rescue LoadError
end
CODE
Expand All @@ -33,13 +33,13 @@ class Binstub < Command
# It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring)
require "rubygems"
require "bundler"
require 'rubygems'
require 'bundler'
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"
Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem 'spring', match[1]
require 'spring/binstub'
end
end
CODE
Expand Down

0 comments on commit 354637f

Please sign in to comment.