Cleanup dirs

adambeynon · adambeynon · commit 96b353ce3dff · 2014-11-25T10:02:53.000Z
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -1,5 +1,5 @@
-require 'opal/path_reader'
-require 'opal/builder_processors'
+require 'opal/builder/path_reader'
+require 'opal/builder/processors'
 require 'opal/builder/cached_asset'
 require 'set'
 
diff --git a/lib/opal/builder/hike_path_finder.rb b/lib/opal/builder/hike_path_finder.rb
diff --git a/lib/opal/builder/path_reader.rb b/lib/opal/builder/path_reader.rb
@@ -1,4 +1,4 @@
-require 'opal/hike_path_finder'
+require 'opal/builder/hike_path_finder'
 
 module Opal
   class PathReader
diff --git a/lib/opal/builder/processors.rb b/lib/opal/builder/processors.rb
diff --git a/spec/lib/builder/hike_path_finder_spec.rb b/spec/lib/builder/hike_path_finder_spec.rb
@@ -1,10 +1,10 @@
 require 'lib/spec_helper'
 require 'lib/shared/path_finder_shared'
-require 'opal/hike_path_finder'
+require 'opal/builder/hike_path_finder'
 
 describe Opal::HikePathFinder do
   subject(:path_finder) { described_class.new(root) }
-  let(:root) { File.expand_path('..', __FILE__) }
+  let(:root) { File.expand_path('../..', __FILE__) }
   let(:path) { 'fixtures/opal_file' }
   let(:full_path) { File.join(root, path + ext) }
   let(:ext) { '.rb' }
diff --git a/spec/lib/builder/path_reader_spec.rb b/spec/lib/builder/path_reader_spec.rb
@@ -1,14 +1,13 @@
 require 'lib/spec_helper'
 require 'lib/shared/path_reader_shared'
 require 'lib/shared/path_finder_shared'
-require 'opal/path_reader'
-
+require 'opal/builder/path_reader'
 
 describe Opal::PathReader do
   subject(:file_reader) { described_class.new(path_finder) }
   let(:path_finder) { double('path_finder') }
   let(:path) { 'opal_file' }
-  let(:full_path) { File.expand_path('../fixtures/opal_file.rb', __FILE__) }
+  let(:full_path) { File.expand_path('../../fixtures/opal_file.rb', __FILE__) }
   let(:contents) { File.read(full_path) }
 
   before do
diff --git a/spec/lib/builder/processors_spec.rb b/spec/lib/builder/processors_spec.rb
@@ -1,5 +1,5 @@
 require 'lib/spec_helper'
-require 'opal/builder_processors'
+require 'opal/builder/processors'
 
 describe Opal::Builder::RubyProcessor do
   it 'compiles ruby to js' do

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'opal/hike_path_finder'`
	`1`	`+require 'opal/builder/hike_path_finder'`
`2`	`2`
`3`	`3`	`module Opal`
`4`	`4`	`class PathReader`