jitsu 0.3.0 → 0.4.0

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 gem "trollop", "~> 1.16.2"
+gem "kwalify", "~> 0.7.2"
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -17,6 +17,7 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.4.6)
+    kwalify (0.7.2)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.3.0)
@@ -38,6 +39,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   cucumber
   jeweler (~> 1.5.2)
+  kwalify (~> 0.7.2)
   rcov
   rspec (~> 2.3.0)
   trollop (~> 1.16.2)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/jitsu

@@ -38,5 +38,9 @@ if not Jitsu.jitsufile
   exit 2
 end
 
-Jitsu.output(Jitsu.read(Jitsu.jitsufile))
-
+begin
+  Jitsu.work
+rescue Jitsu::JitsuError
+  warn $!
+  exit 3
+end

data/features/jitsu.feature

@@ -18,7 +18,7 @@ Feature: Build C++ programs
       """
       ---
       targets:
-        target:
+        - name: target
           type: executable
           sources:
             - main.cpp
@@ -51,13 +51,13 @@ Feature: Build C++ programs
       """
       ---
       targets:
-        hello:
+        - name: hello
           type: executable
           sources:
             - main.cpp
           dependencies:
             - lib.a
-        lib.a:
+        - name: lib.a
           type: static_library
           sources:
             - lib.cpp
@@ -98,11 +98,11 @@ Feature: Build C++ programs
       """
       ---
       targets:
-        lib.so:
+        - name: lib.so
           type: dynamic_library
           sources:
             - lib.cpp
-        blah:
+        - name: blah
           type: executable
           sources:
             - main.cpp
@@ -145,11 +145,11 @@ Feature: Build C++ programs
       """
       ---
       targets:
-        lib.la:
+        - name: lib.la
           type: libtool_library
           sources:
             - lib.cpp
-        blah:
+        - name: blah
           type: executable
           sources:
             - main.cpp
@@ -161,3 +161,14 @@ Feature: Build C++ programs
     And I run "libtool --mode=execute ./blah"
     Then the output should be "Hello World" with a newline
 
+  Scenario: Try to run on invalid build.jitsu file
+    Given a directory
+    And a file "build.jitsu" with contents
+    """
+    ---
+    blah:
+      type: executable
+      sources:
+        - main.cpp
+    """
+    Then running jitsu should produce an error

data/features/step_definitions/jitsu_steps.rb

@@ -15,7 +15,7 @@ end
 
 When /^I run jitsu$/ do
   Dir.chdir @tmpdir do |dir|
-    Jitsu.output(Jitsu.read(Jitsu.jitsufile))
+    Jitsu.work
   end
 end
 
@@ -32,3 +32,9 @@ Then /^the output should be "([^"]*)" with a newline$/ do |desired|
   @output.should == desired + "\n"
 end
 
+Then /^running jitsu should produce an error$/ do
+  Dir.chdir @tmpdir do |dir|
+    expect { Jitsu.work }.to raise_error(Jitsu::SyntaxError)
+  end
+end
+

data/features/support/hooks.rb

@@ -0,0 +1,6 @@
+require 'fileutils'
+
+After do
+  FileUtils.rm_rf @tmpdir if @tmpdir
+end
+

data/jitsu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jitsu}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilkka Laukkanen"]
-  s.date = %q{2011-02-16}
+  s.date = %q{2011-02-21}
   s.default_executable = %q{jitsu}
   s.description = %q{Jitsu is a frontend or meta build system for Ninja
 (http://github.com/martine/ninja), a lightning-fast but
@@ -39,8 +39,11 @@ buildfiles.
     "features/jitsu.feature",
     "features/step_definitions/jitsu_steps.rb",
     "features/support/env.rb",
+    "features/support/hooks.rb",
     "jitsu.gemspec",
     "lib/jitsu.rb",
+    "lib/jitsu/errors.rb",
+    "lib/schema.yaml",
     "spec/jitsu_spec.rb",
     "spec/spec_helper.rb",
     "watchr_srcipt.rb"
@@ -60,6 +63,7 @@ buildfiles.
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, ["~> 1.16.2"])
+      s.add_runtime_dependency(%q<kwalify>, ["~> 0.7.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
@@ -68,6 +72,7 @@ buildfiles.
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<trollop>, ["~> 1.16.2"])
+      s.add_dependency(%q<kwalify>, ["~> 0.7.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
@@ -77,6 +82,7 @@ buildfiles.
     end
   else
     s.add_dependency(%q<trollop>, ["~> 1.16.2"])
+    s.add_dependency(%q<kwalify>, ["~> 0.7.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])

data/lib/jitsu/errors.rb

@@ -0,0 +1,34 @@
+# Exception classes for Jitsu module
+#
+module Jitsu
+
+  # Base class for Jitsu errors.
+  # 
+  class JitsuError < StandardError
+  end
+
+  # Jitsufile syntax error.
+  #
+  class SyntaxError < JitsuError
+
+    # Construct a new SyntaxError.
+    #
+    # @param jitsufile [String] path to file where error happened.
+    # @param msg [String] error message.
+    # @param errors [Enumerable] list of errors from Kwalify, or nil.
+    def initialize(jitsufile, msg, errors=nil)
+      message = msg
+      if errors and errors.is_a?(Enumerable)and not errors.empty?
+      message << ":"
+        errors.each do |err|
+          message << "\n"
+          message << (err.filename ? err.filename : jitsufile) << ":"
+          message << (err.linenum ? "#{err.linenum}" : "0") << ":"
+          message << err.path << " -- " << err.message
+        end
+      end
+      super(message)
+    end
+  end
+
+end

data/lib/jitsu.rb

@@ -1,9 +1,24 @@
 require 'yaml'
+require 'kwalify'
 
+require 'jitsu/errors'
+
+# Main Jitsu module.
+#
+# Usage:
+#
+#   Dir.chdir 'directory-with-jitsufiles'
+#   Jitsu.work
 module Jitsu
   JITSU_FILE_NAME = 'build.jitsu'
   NINJA_FILE_NAME = 'build.ninja'
 
+  # Process jitsufiles in current directory.
+  #
+  def self.work
+    Jitsu.output(Jitsu.read(Jitsu.jitsufile))
+  end
+
   # Get path to ninja.
   #
   # @return [String] path to `ninja` or nil if ninja was not found.
@@ -32,7 +47,14 @@ module Jitsu
   # @param jitsufile [String] path to jitsu file from e.g. Jitsu::jitsufile.
   # @return [Hash] a hash of the build specification.
   def self.read(jitsufile)
-    YAML.load(File.open(jitsufile, 'r').read)
+    schema = YAML.load_file(File.join(File.dirname(__FILE__), 'schema.yaml'))
+    validator = Kwalify::Validator.new(schema)
+    parser = Kwalify::Yaml::Parser.new(validator)
+    doc = parser.parse(File.read(jitsufile))
+    if parser.errors and not parser.errors.empty?
+      raise Jitsu::SyntaxError.new(jitsufile, "Syntax errors in Jitsufile", parser.errors)
+    end
+    doc
   end
 
   # Check if any of the targets needs libtool.
@@ -40,7 +62,7 @@ module Jitsu
   # @param targets [Enum] the targets from a build specification hash.
   # @return [Boolean] true if libtool required, nil otherwise.
   def self.libtool_needed_for(targets)
-    not targets.select { |key,val| val['type'] == 'libtool_library' }.empty?
+    not targets.select { |target| target['type'] == 'libtool_library' }.empty?
   end
 
   # Output jitsu build specification as build.ninja file(s).
@@ -88,12 +110,12 @@ rule ltlink
   command = ${libtool} --quiet --mode=link ${ld} ${ldflags} -o ${out} ${in}
 EOS
       end
-      data['targets'].each do |target,conf|
+      data['targets'].each do |target|
         f.write "\n"
-        sources = conf['sources']
-        Jitsu.send "handle_#{conf['type']}".to_sym, f, target, sources, conf, data['targets']
+        sources = target['sources']
+        Jitsu.send "handle_#{target['type']}".to_sym, f, target, sources, data['targets']
       end
-      f.write("\nbuild all: phony || #{data['targets'].keys.join(' ')}\n")
+      f.write("\nbuild all: phony || #{data['targets'].map { |t| t['name'] }.join(' ')}\n")
     end
   end
 
@@ -102,10 +124,10 @@ EOS
   # @param out [IO] the output stream where output is written.
   # @param sources [Enumerable] a list of sourcefile names to output rules
   # for.
-  # @param conf [Hash] the entire build spec hash for this target.
-  def self.output_sources(out, sources, conf)
-    cxxflags = conf['cxxflags']
-    libtool = conf['type'] == 'libtool_library'
+  # @param target [Hash] the entire build spec hash for this target.
+  def self.output_sources(out, sources, target)
+    cxxflags = target['cxxflags']
+    libtool = target['type'] == 'libtool_library'
     rule = (libtool ? "ltcxx" : "cxx")
     sources.each do |src|
       object = (libtool ? source_to_ltobject(src) : source_to_object(src))
@@ -117,74 +139,70 @@ EOS
   # Output build rules for one executable target.
   #
   # @param out [IO] the output stream where output is written.
-  # @param target [String] the filename of the target.
+  # @param target [Hash] the entire build spec hash for this target.
   # @param sources [Enumerable] a list of sourcefile names to output rules
   # for.
-  # @param conf [Hash] the entire build spec hash for this target.
   # @param targets [Hash] all targets for the build
-  def self.handle_executable(out, target, sources, conf, targets)
-    output_sources(out, sources, conf)
-    libtool = libtool_needed_for targets.select { |key,val|
-      conf['dependencies'] and conf['dependencies'].include? key
+  def self.handle_executable(out, target, sources, targets)
+    output_sources(out, sources, target)
+    libtool = libtool_needed_for targets.select { |tgt|
+      target['dependencies'] and target['dependencies'].include? tgt['name']
     }
     rule = libtool ? "ltlink" : "link"
-    out.write "build #{target}: #{rule} #{sources_to_objects(sources).join ' '}"
-    out.write " #{conf['dependencies'].join(' ')}" if conf['dependencies']
+    out.write "build #{target['name']}: #{rule} #{sources_to_objects(sources).join ' '}"
+    out.write " #{target['dependencies'].join(' ')}" if target['dependencies']
     out.write "\n"
-    out.write "  ldflags = #{conf['ldflags']}\n" if conf['ldflags']
+    out.write "  ldflags = #{target['ldflags']}\n" if target['ldflags']
   end
 
   # Output build rules for one static library target.
   #
   # @param out [IO] the output stream where output is written.
-  # @param target [String] the filename of the target.
+  # @param target [Hash] the entire build spec hash for this target.
   # @param sources [Enumerable] a list of sourcefile names to output rules
   # for.
-  # @param conf [Hash] the entire build spec hash for this target.
   # @param targets [Hash] all targets for the build
-  def self.handle_static_library(out, target, sources, conf, targets)
-    output_sources(out, sources, conf)
-    out.write "build #{target}: archive #{sources_to_objects(sources).join ' '}"
-    out.write " #{conf['dependencies'].join(' ')}" if conf['dependencies']
+  def self.handle_static_library(out, target, sources, targets)
+    output_sources(out, sources, target)
+    out.write "build #{target['name']}: archive #{sources_to_objects(sources).join ' '}"
+    out.write " #{target['dependencies'].join(' ')}" if target['dependencies']
     out.write "\n"
   end
 
   # Output build rules for one dynamic library target.
   #
   # @param out [IO] the output stream where output is written.
-  # @param target [String] the filename of the target.
+  # @param target [Hash] the entire build spec hash for this target.
   # @param sources [Enumerable] a list of sourcefile names to output rules
   # for.
-  # @param conf [Hash] the entire build spec hash for this target.
   # @param targets [Hash] all targets for the build
-  def self.handle_dynamic_library(out, target, sources, conf, targets)
-    conf['cxxflags'] ||= '${cxxflags}'
-    conf['cxxflags'] += ' -fPIC'
-    output_sources(out, sources, conf)
-    out.write "build #{target}: link #{sources_to_objects(sources).join ' '}"
-    out.write " #{conf['dependencies'].join(' ')}" if conf['dependencies']
+  def self.handle_dynamic_library(out, target, sources, targets)
+    target['cxxflags'] ||= '${cxxflags}'
+    target['cxxflags'] += ' -fPIC'
+    output_sources(out, sources, target)
+    out.write "build #{target['name']}: link #{sources_to_objects(sources).join ' '}"
+    out.write " #{target['dependencies'].join(' ')}" if target['dependencies']
     out.write "\n"
-    conf['ldflags'] ||= '${ldflags}'
-    conf['ldflags'] += " -shared -Wl,-soname,#{target}"
-    out.write "  ldflags = #{conf['ldflags']}\n"
+    target['ldflags'] ||= '${ldflags}'
+    target['ldflags'] += " -shared -Wl,-soname,#{target['name']}"
+    out.write "  ldflags = #{target['ldflags']}\n"
   end
 
   # Output build rules for one libtool library target.
   #
   # @param out [IO] the output stream where output is written.
-  # @param target [String] the filename of the target.
+  # @param target [Hash] the entire build spec hash for this target.
   # @param sources [Enumerable] a list of sourcefile names to output rules
   # for.
-  # @param conf [Hash] the entire build spec hash for this target.
   # @param targets [Hash] all targets for the build
-  def self.handle_libtool_library(out, target, sources, conf, targets)
-    output_sources(out, sources, conf)
-    out.write "build #{target}: ltlink #{sources_to_ltobjects(sources).join ' '}"
-    out.write " #{conf['dependencies'].join(' ')}" if conf['dependencies']
+  def self.handle_libtool_library(out, target, sources, targets)
+    output_sources(out, sources, target)
+    out.write "build #{target['name']}: ltlink #{sources_to_ltobjects(sources).join ' '}"
+    out.write " #{target['dependencies'].join(' ')}" if target['dependencies']
     out.write "\n"
-    conf['ldflags'] ||= '${ldflags}'
-    conf['ldflags'] += " -rpath /usr/local/lib"
-    out.write "  ldflags = #{conf['ldflags']}\n"
+    target['ldflags'] ||= '${ldflags}'
+    target['ldflags'] += " -rpath /usr/local/lib"
+    out.write "  ldflags = #{target['ldflags']}\n"
   end
 
   # Convert sourcefile name to corresponding object file name.

data/lib/schema.yaml

@@ -0,0 +1,29 @@
+type: map
+mapping:
+  "targets":
+    type: seq
+    required: yes
+    sequence:
+      - type: map
+        mapping:
+          "name":
+            type: str
+            required: yes
+            unique: yes
+          "type":
+            type: str
+            required: yes
+          "sources":
+            type: seq
+            sequence:
+              - type: str
+                unique: yes
+          "dependencies":
+            type: seq
+            sequence:
+              - type: str
+                unique: yes
+          "cxxflags":
+            type: str
+          "ldflags":
+            type: str

data/spec/jitsu_spec.rb

@@ -52,13 +52,14 @@ describe "Jitsu" do
           f.write <<-EOS
 ---
 targets:
-  test1:
+  - name: test1
     type: executable
-    sources: test1.cpp
+    sources:
+      - test1.cpp
     cxxflags: -g -Wall
     dependencies:
       - test2
-  test2:
+  - name: test2
     type: static_library
     sources:
       - test2.cpp
@@ -66,7 +67,7 @@ targets:
 EOS
         end
         data = Jitsu.read Jitsu.jitsufile
-        data['targets'].keys.should == ['test1', 'test2']
+        data['targets'].map { |x| x['name'] }.should == ['test1', 'test2']
       end
     end
     Dir.mktmpdir do |dir|
@@ -75,7 +76,7 @@ EOS
           f.write <<-EOS
 ---
 targets:
-  aaa1:
+  - name: aaa1
     type: executable
     sources:
       - aaa1a.cpp
@@ -83,7 +84,7 @@ targets:
     cxxflags: -g -Wall
     dependencies:
       - aaa2
-  aaa2:
+  - name: aaa2
     type: dynamic_library
     sources:
       - aaa2.cpp
@@ -91,7 +92,7 @@ targets:
 EOS
         end
         data = Jitsu.read Jitsu.jitsufile
-        data['targets'].keys.should == ['aaa1', 'aaa2']
+        data['targets'].map { |x| x['name'] }.should == ['aaa1', 'aaa2']
       end
     end
   end
@@ -103,7 +104,7 @@ EOS
           f.write <<-EOS
 ---
 targets:
-  aaa1:
+  - name: aaa1
     type: executable
     sources:
       - aaa1a.cpp
@@ -111,12 +112,12 @@ targets:
     dependencies:
       - aaa2.a
       - aaa3.so
-  aaa2.a:
+  - name: aaa2.a
     type: static_library
     sources: 
       - aaa2.cpp
     cxxflags: -ansi -pedantic
-  aaa3.so:
+  - name: aaa3.so
     type: dynamic_library
     sources:
       - aaa3.cpp
@@ -145,27 +146,6 @@ rule archive
   description = AR ${out}
   command = ${ar} rT ${out} ${in}
 
-EOS
-        # the targets are reversed on 1.8.7 :p
-        if RUBY_VERSION.start_with? '1.8'
-          ninjafile += <<-EOS
-build aaa3.o: cxx aaa3.cpp
-  cxxflags = ${cxxflags} -fPIC
-build aaa3.so: link aaa3.o
-  ldflags = ${ldflags} -shared -Wl,-soname,aaa3.so
-
-build aaa2.o: cxx aaa2.cpp
-  cxxflags = -ansi -pedantic
-build aaa2.a: archive aaa2.o
-
-build aaa1a.o: cxx aaa1a.cpp
-build aaa1b.o: cxx aaa1b.cpp
-build aaa1: link aaa1a.o aaa1b.o aaa2.a aaa3.so
-
-build all: phony || aaa3.so aaa2.a aaa1
-EOS
-        else
-          ninjafile += <<-EOS
 build aaa1a.o: cxx aaa1a.cpp
 build aaa1b.o: cxx aaa1b.cpp
 build aaa1: link aaa1a.o aaa1b.o aaa2.a aaa3.so
@@ -181,7 +161,6 @@ build aaa3.so: link aaa3.o
 
 build all: phony || aaa1 aaa2.a aaa3.so
 EOS
-        end
         File.open('build.ninja', 'r').read.should == ninjafile
       end
     end
@@ -194,7 +173,7 @@ EOS
           f.write <<-EOS
 ---
 targets:
-  aaa1:
+  - name: aaa1
     type: executable
     sources:
       - aaa1a.cpp
@@ -202,12 +181,12 @@ targets:
     dependencies:
       - aaa2.a
       - aaa3.la
-  aaa2.a:
+  - name: aaa2.a
     type: static_library
     sources: 
       - aaa2.cpp
     cxxflags: -ansi -pedantic
-  aaa3.la:
+  - name: aaa3.la
     type: libtool_library
     sources:
       - aaa3.cpp
@@ -246,26 +225,6 @@ rule ltlink
   description = LD ${out}
   command = ${libtool} --quiet --mode=link ${ld} ${ldflags} -o ${out} ${in}
 
-EOS
-        # the targets are reversed on 1.8.7 :p
-        if RUBY_VERSION.start_with? '1.8'
-          ninjafile += <<-EOS
-build aaa3.lo: ltcxx aaa3.cpp
-build aaa3.la: ltlink aaa3.lo
-  ldflags = ${ldflags} -rpath /usr/local/lib
-
-build aaa2.o: cxx aaa2.cpp
-  cxxflags = -ansi -pedantic
-build aaa2.a: archive aaa2.o
-
-build aaa1a.o: cxx aaa1a.cpp
-build aaa1b.o: cxx aaa1b.cpp
-build aaa1: ltlink aaa1a.o aaa1b.o aaa2.a aaa3.la
-
-build all: phony || aaa3.la aaa2.a aaa1
-EOS
-        else
-          ninjafile += <<-EOS
 build aaa1a.o: cxx aaa1a.cpp
 build aaa1b.o: cxx aaa1b.cpp
 build aaa1: ltlink aaa1a.o aaa1b.o aaa2.a aaa3.la
@@ -280,7 +239,6 @@ build aaa3.la: ltlink aaa3.lo
 
 build all: phony || aaa1 aaa2.a aaa3.la
 EOS
-        end
         File.open('build.ninja', 'r').read.should == ninjafile
       end
     end

data/watchr_srcipt.rb

@@ -6,7 +6,7 @@ def run_features
   system("rake features")
 end
 
-watch('(lib|bin|spec|features)/(.*\.rb|[^.])') do |md|
-  run_specs && run_features
-end
+watch('spec/.*\.rb$') {|md| run_specs}
+watch('features/.*\.(feature|rb)$') {|md| run_features}
+watch('(bin/jitsu|lib/.*\.(rb|yaml)$)') {|md| run_specs && run_features}
 

metadata

@@ -2,7 +2,7 @@
 name: jitsu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ilkka Laukkanen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +02:00
+date: 2011-02-21 00:00:00 +02:00
 default_executable: jitsu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +25,19 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: kwalify
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,10 +45,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,10 +67,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +89,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,7 +100,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: |
   Jitsu is a frontend or meta build system for Ninja
   (http://github.com/martine/ninja), a lightning-fast but
@@ -121,8 +132,11 @@ files:
 - features/jitsu.feature
 - features/step_definitions/jitsu_steps.rb
 - features/support/env.rb
+- features/support/hooks.rb
 - jitsu.gemspec
 - lib/jitsu.rb
+- lib/jitsu/errors.rb
+- lib/schema.yaml
 - spec/jitsu_spec.rb
 - spec/spec_helper.rb
 - watchr_srcipt.rb
@@ -140,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 994791855
+      hash: 10677997
       segments: 
       - 0
       version: "0"