aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Michaels-Ober <sferik@gmail.com>2013-02-02 08:42:23 -0800
committerErik Michaels-Ober <sferik@gmail.com>2013-02-02 08:42:23 -0800
commit8db9c0a63d2b804509225696be9c102b3d50c825 (patch)
treec08100ee375d7493be0fc76416a06fbf69bad294
parent43304f75752832f7aa23b0497c34a58acc76db0d (diff)
downloadbundler-8db9c0a63d2b804509225696be9c102b3d50c825.tar.gz
Cleanup trailing whitespace
-rw-r--r--.rspec2
-rw-r--r--CONTRIBUTE.md3
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--LICENSE.md2
-rw-r--r--lib/bundler/deprecate.rb2
-rw-r--r--lib/bundler/env.rb2
-rw-r--r--lib/bundler/injector.rb2
-rw-r--r--lib/bundler/source/path/installer.rb2
-rw-r--r--lib/bundler/source/rubygems.rb2
-rw-r--r--lib/bundler/templates/newgem/LICENSE.txt.tt2
-rw-r--r--lib/bundler/templates/newgem/test/test_newgem.rb.tt2
-rw-r--r--lib/bundler/vendor/net/http/persistent.rb4
-rw-r--r--lib/bundler/vlad.rb2
-rw-r--r--spec/realworld/dependency_api_spec.rb2
-rw-r--r--spec/resolver/basic_spec.rb2
-rw-r--r--spec/resolver/platform_spec.rb2
16 files changed, 17 insertions, 18 deletions
diff --git a/.rspec b/.rspec
index 210a1d6b..8c18f1ab 100644
--- a/.rspec
+++ b/.rspec
@@ -1,2 +1,2 @@
--format documentation
---color \ No newline at end of file
+--color
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index f0d25826..cd2abe19 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -1,4 +1,3 @@
-
Great to have you here! Here are a few ways you can help out with [Bundler](http://github.com/carlhuda/bundler).
# Learn & listen
@@ -94,4 +93,4 @@ If you let someone on the core team know you wrote about Bundler, we will add yo
If you’re interested in contributing to Bundler, that’s awesome! We’d love your help.
-If you have any questions after reading this page, please feel free to contact either [@indirect](http://github.com/indirect) or [@hone](http://github.com/hone). They are both happy to provide help working through your first bugfix or thinking through the problem you’re trying to resolve. \ No newline at end of file
+If you have any questions after reading this page, please feel free to contact either [@indirect](http://github.com/indirect) or [@hone](http://github.com/hone). They are both happy to provide help working through your first bugfix or thinking through the problem you’re trying to resolve.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d719b13c..759b2dec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,4 +10,4 @@ If you'd like to discuss features, ask questions, or just engage in general Bund
If you'd like to help make Bundler better, you totally rock! Please check out the [CONTRIBUTE](https://github.com/carlhuda/bundler/blob/master/CONTRIBUTE.md) file for an introduction to the project, guidelines for contributing, and suggestions for things anyone can do that would be helpful.
-Thanks for helping us make Bundler better. \ No newline at end of file
+Thanks for helping us make Bundler better.
diff --git a/LICENSE.md b/LICENSE.md
index 4d62f8af..5e89f93c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -20,4 +20,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/bundler/deprecate.rb b/lib/bundler/deprecate.rb
index e47d609d..e6e15b69 100644
--- a/lib/bundler/deprecate.rb
+++ b/lib/bundler/deprecate.rb
@@ -12,4 +12,4 @@ module Bundler
def Deprecate.skip_during; yield; end
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
index 42290761..0f6f3153 100644
--- a/lib/bundler/env.rb
+++ b/lib/bundler/env.rb
@@ -53,4 +53,4 @@ module Bundler
end
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
index 8fdae64b..79350b5e 100644
--- a/lib/bundler/injector.rb
+++ b/lib/bundler/injector.rb
@@ -61,4 +61,4 @@ module Bundler
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb
index 3f1f79ed..1bfdeac9 100644
--- a/lib/bundler/source/path/installer.rb
+++ b/lib/bundler/source/path/installer.rb
@@ -31,4 +31,4 @@ module Bundler
end
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 1fb7d9d1..cf52085e 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -258,4 +258,4 @@ module Bundler
end
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/templates/newgem/LICENSE.txt.tt b/lib/bundler/templates/newgem/LICENSE.txt.tt
index 61dde8d1..a9f52e6b 100644
--- a/lib/bundler/templates/newgem/LICENSE.txt.tt
+++ b/lib/bundler/templates/newgem/LICENSE.txt.tt
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/bundler/templates/newgem/test/test_newgem.rb.tt b/lib/bundler/templates/newgem/test/test_newgem.rb.tt
index 4541bfdd..131d0c9c 100644
--- a/lib/bundler/templates/newgem/test/test_newgem.rb.tt
+++ b/lib/bundler/templates/newgem/test/test_newgem.rb.tt
@@ -8,4 +8,4 @@ class Test<%= config[:constant_name] %> < MiniTest::Unit::TestCase
def test_it_does_something_useful
assert false
end
-end \ No newline at end of file
+end
diff --git a/lib/bundler/vendor/net/http/persistent.rb b/lib/bundler/vendor/net/http/persistent.rb
index 2755958e..dcdc5b53 100644
--- a/lib/bundler/vendor/net/http/persistent.rb
+++ b/lib/bundler/vendor/net/http/persistent.rb
@@ -833,11 +833,11 @@ class Net::HTTP::Persistent
env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
# '*' is special case for always bypass
- return nil if env_no_proxy == '*'
+ return nil if env_no_proxy == '*'
if env_no_proxy then
uri.query = "no_proxy=#{escape(env_no_proxy)}"
- end
+ end
unless uri.user or uri.password then
uri.user = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']
diff --git a/lib/bundler/vlad.rb b/lib/bundler/vlad.rb
index 47d35b13..aaf71455 100644
--- a/lib/bundler/vlad.rb
+++ b/lib/bundler/vlad.rb
@@ -8,4 +8,4 @@ include Rake::DSL if defined? Rake::DSL
namespace :vlad do
Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
-end \ No newline at end of file
+end
diff --git a/spec/realworld/dependency_api_spec.rb b/spec/realworld/dependency_api_spec.rb
index f0469b06..b9c6b66e 100644
--- a/spec/realworld/dependency_api_spec.rb
+++ b/spec/realworld/dependency_api_spec.rb
@@ -58,4 +58,4 @@ describe "gemcutter's dependency API", :realworld => true do
end
end
-end \ No newline at end of file
+end
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb
index 177a7b0c..cd1016fd 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -17,4 +17,4 @@ describe "Resolving" do
should_resolve_as %w(actionpack-2.3.5 activesupport-2.3.5 rack-1.0)
end
-end \ No newline at end of file
+end
diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb
index 9357f87e..7608d57e 100644
--- a/spec/resolver/platform_spec.rb
+++ b/spec/resolver/platform_spec.rb
@@ -79,4 +79,4 @@ describe "Resolving platform craziness" do
should_conflict_on "baz"
end
end
-end \ No newline at end of file
+end