Permalink
Browse files

Remove all trailing whitespace.

  • Loading branch information...
1 parent 258837a commit 33ff505190e14bf01050604a634bf45bc3d1a22b @xaviershay xaviershay committed with Steve Conover & Xavier Shay Nov 10, 2011
View
@@ -125,7 +125,7 @@ end
def write_jetty_xml(jetty_dir)
jetty_xml_contents = ERB.new(File.read(File.join(@preflight_dir, "web/jetty.xml.erb"))).result(binding)
-
+
mkdir_p File.join(jetty_dir, "etc")
write_script(File.join(jetty_dir, "etc/jetty.xml"), jetty_xml_contents)
end
View
@@ -2,4 +2,4 @@
cd $(dirname $0)
rake build
-gem install $(ls -tr pkg/*.gem | tail -n 1)
+gem install $(ls -tr pkg/*.gem | tail -n 1)
View
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.summary = %q{Preflight prepares your jRuby project for jvm deployment.}
s.add_development_dependency "bundler"
-
+
s.files = `git ls-files`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.test_files = `git ls-files -- spec/*`.split("\n")
View
@@ -1,12 +1,12 @@
require "spec_helper"
describe "preflight - basics" do
- before(:all) do
+ before(:all) do
reset
@result = x!("bin/preflight spec/sample_projects/no_dependencies")
end
- after(:all) do
- reset
+ after(:all) do
+ reset
end
it "will put the jruby jar under vendor" do
@@ -30,12 +30,12 @@
end
describe "makes a rake script that" do
- it %{ - runs from any directory (properly cd's)
+ it %{ - runs from any directory (properly cd's)
- the ruby used is indeed jruby
- allows you to execute several tasks in a row
- shows the trace of a rake failure
- nails the GEM_PATH to within the jar so we don't go 'accidentally' loading gems and such from another ruby env, the result of which is insanity.
-
+
Asserting all this in one test to optimize for test running time.} do
absolute_script_path = File.expand_path("spec/sample_projects/no_dependencies/bin/rake project_info another_task load_path gem_path boom")
rake_result = x("cd /tmp && #{absolute_script_path} --trace")
@@ -45,7 +45,7 @@
rake_result[:stdout].should include("RUBY_PLATFORM=java")
rake_result[:stdout].should include("jruby.jar!/META-INF")
rake_result[:stdout].should include("You ran another task")
-
+
rake_result[:stderr].should include("BOOM")
rake_result[:stderr].should include("xxx")
rake_result[:stderr].should include("yyy")
@@ -66,5 +66,5 @@
(element =~ /META-INF\/jruby\.home/ || element =~ /vendor\/bundler_gem/).should >= 0
end
end
- end
-end
+ end
+end
@@ -1,6 +1,6 @@
require "spec_helper"
-describe "preflight - bundler and gems" do
+describe "preflight - bundler and gems" do
before(:all) do
reset
@@ -9,11 +9,11 @@
x!("bin/preflight spec/sample_projects/has_gems_via_bundler")
end
- after(:all) do
+ after(:all) do
rm_rf("spec/sample_projects/has_gems_via_bundler/vendor/bundle")
rm_rf("spec/sample_projects/has_gems_via_bundler/vendor/bundler_gem")
end
-
+
describe "presence of the library" do
it "installed bundler into vendor/bundler_gem." do
files = Dir["spec/sample_projects/has_gems_via_bundler/vendor/bundler_gem/**/*.rb"].to_a.map{|f|File.basename(f)}
@@ -63,4 +63,4 @@
rake_result[:exitstatus].should == 0
end
end
-end
+end
@@ -11,4 +11,4 @@ task :load_path_with_bundler do
require "rubygems"
require "bundler"
$LOAD_PATH.each{|path|puts "-- #{path}"}
-end
+end
@@ -1,6 +1,6 @@
task :project_info do
require "fileutils"
-
+
puts "Hi, I'm the no_dependencies project"
puts "RUBY_PLATFORM=#{RUBY_PLATFORM}"
puts "LOAD_PATH=#{$LOAD_PATH.join("\n")}"
@@ -1,3 +1,3 @@
source 'http://rubygems.org'
-gem "rails"
+gem "rails"
@@ -2,4 +2,4 @@ jruby: "file://<%= File.expand_path('spec/local_mirror') %>/jruby-complete-1.6.4
jetty: "file://<%= File.expand_path('spec/local_mirror') %>/jetty-hightide-7.4.5.v20110725.zip"
jruby-rack: "file://<%= File.expand_path('spec/local_mirror') %>/jruby-rack-1.0.10.jar"
http_port: 10080
-https_port: 10443
+https_port: 10443
@@ -1,6 +1,6 @@
Foo::Application.routes.draw do
match 'hello' => 'application#hello'
-
+
# The priority is based upon order of creation:
# first created -> highest priority.
View
@@ -22,7 +22,7 @@ def x!(cmd)
unless File.directory?("spec/local_mirror")
mkdir_p "spec/local_mirror"
-
+
%w(jetty-hightide-7.4.5.v20110725.zip jruby-complete-1.6.4.jar jruby-rack-1.0.10.jar).each do |file|
x! "curl --silent --show-error -o spec/local_mirror/#{file} http://mirrors.squareup.com/distfiles/#{file}"
end
@@ -46,4 +46,4 @@ def reset
config.after(:all) do
reset
end
-end
+end
View
@@ -27,10 +27,10 @@
it "runs" do
run_app
-
+
#HTTP 4443 - intended to be proxied to from something listening on 443
x!("curl https://localhost:10443/hello --insecure")[:stdout].split("<br/>").first.strip.should == "Hello World"
-
+
#HTTP 9080 - intended for internal health checking
x!("curl http://localhost:10080/hello --insecure")[:stdout].split("<br/>").first.strip.should == "Hello World"
end
@@ -50,4 +50,4 @@ def run_app
end
end
end
-end
+end
Oops, something went wrong.

0 comments on commit 33ff505

Please sign in to comment.