build-makefile 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7815ffb8535a220439eebf1541855074ed1284b
-  data.tar.gz: 1f53e68502fa586b4bc3efe950d82d234600fe29
+  metadata.gz: 19a2bc4270626fba7f02e936f01a659b5a860e90
+  data.tar.gz: be3d600846009e7baa728bc26a6c9a05043f0e74
 SHA512:
-  metadata.gz: 19dfa40f5250b111ae4facd171dce222f6f6ee7b292810312a401e0c49cce7c2c683050825a43a921cdc56253be6370e9fd97322beeda1ca5fdf3b72398bdbc9
-  data.tar.gz: bb174d3662f8a1aeffa3c74b472baf8b5640a77d3da0e410cff449f57f98262792703f667b528a632a6e53644f4cb778bb4e3c6a87b915835e40935046dba849
+  metadata.gz: f0808ec5f4a9f04d7b33cc6127625424278c3acea95fd97360b411bde8194bb3fb48bee0cecf49f5c60ecb19e616169f217408bb44d8f05c0e4727de07b285f4
+  data.tar.gz: e15c87420338fefd6c7ddcd0e5a5c332b385345149630cdcecd49209c68ebf26a6472b7d7a79bc079ee80d038b3cac98c9344159208d2583e14f6b17d90ba1f6

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/build-makefile.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "build-files", "~> 0.1.0"
+	spec.add_dependency "build-files", "~> 0.2.0"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "minitest"
+	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
 	spec.add_development_dependency "rake"
 end

data/lib/build/makefile.rb

@@ -34,15 +34,19 @@ module Build
 		attr :rules
 		
 		def [] target
-			target = Files::Path(target)
+			dependencies = @rules[target.relative_path]
 			
-			return @rules[target]
+			if dependencies
+				Files::Paths.new(
+					dependencies.collect{|dep| Files::Path.new(dep).to_absolute(target.root)}
+				)
+			end
 		end
 		
 		def include? target
-			target = Files::Path(target)
+			target = Files::Path.new(target)
 			
-			return @rules.include? target
+			@rules.include? target
 		end
 		
 		def self.load_file(path)
@@ -60,7 +64,7 @@ module Build
 					rule = [:rule]
 				
 					target = scanner[1].strip
-					rule << Files::Path(target)
+					rule << target
 				
 					# Parse dependencies:
 					dependencies = []
@@ -68,7 +72,9 @@ module Build
 						scanner.scan(/(\s|\\\n)*/)
 					
 						scanner.scan(SOURCE_PATH)
-						dependencies << Files::Path(scanner[0].gsub(/\\ /, ' '))
+						
+						# Need to remove escaped whitespace from path:
+						dependencies << scanner[0].gsub(/\\ /, ' ')
 					end
 					rule << dependencies
 				

data/lib/build/makefile/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	class Makefile
-		VERSION = "0.1.0"
+		VERSION = "0.2.0"
 	end
 end

data/{test/test_depfile.rb → spec/build/depfile_spec.rb}

@@ -18,11 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'minitest/autorun'
-
 require 'build/makefile'
 
-class TestDepfile < MiniTest::Test
+module Build::Makefile::DepfileSpec
 	DEPFILE_TEXT = <<-EOF
 		target1: source1 source2 \
 			source3
@@ -33,16 +31,18 @@ class TestDepfile < MiniTest::Test
 			source4
 	EOF
 	
-	def test_parser
-		depfile = Build::Makefile.parse(DEPFILE_TEXT)
-		
-		assert_equal 3, depfile.rules.count
-		assert_includes depfile, "target1"
-		assert_includes depfile, "target2"
-		assert_includes depfile, "target3"
-		
-		assert_equal %w{source1 source2 source3}, depfile["target1"]
-		assert_equal %w{}, depfile["target2"]
-		assert_equal %w{source4}, depfile["target3"]
+	describe Build::Makefile do
+		it "should parse sample depfile" do
+			depfile = Build::Makefile.parse(DEPFILE_TEXT)
+			
+			expect(depfile.rules.count).to be 3
+			expect(depfile).to include "target1"
+			expect(depfile).to include "target2"
+			expect(depfile).to include "target3"
+			
+			expect(depfile.rules["target1"]).to be == %w{source1 source2 source3}
+			expect(depfile.rules["target2"]).to be == %w{}
+			expect(depfile.rules["target3"]).to be == %w{source4}
+		end
 	end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: build-makefile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -73,15 +73,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - build-makefile.gemspec
 - lib/build/makefile.rb
 - lib/build/makefile/version.rb
-- test/test_depfile.rb
+- spec/build/depfile_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -92,20 +92,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Build::Makefile is a simple Makefile parser and can be used to extract dependencies
   from compiler generated depfiles.
 test_files:
-- test/test_depfile.rb
+- spec/build/depfile_spec.rb
+has_rdoc: