bloc 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.0.7
+
+* test results are included in validation now, but only if a patch exists
+
 ### 0.0.6
 
 * manifest class, plus Course and Chapter models

data/lib/bloc/command/validate.rb

@@ -8,6 +8,8 @@ module Bloc
       VALID_DEFAULT_CHAPTER_FILE = "Default file for chapter exists (OK): %s".green
       INVALID_DEFAULT_CHAPTER_FILE = "Default file for chapter does not exist: %s (expected %s)".red
       NO_SUCH_PATCH = "Patch not found: %s".red
+      TEST_FAILURE = "Failed test:\n%s".red
+      TEST_PASSED = "Passed: %s".green
 
       def self.run(*args)
         manifest = Manifest.parse
@@ -52,13 +54,19 @@ module Bloc
           `git add .`
           `git commit -m "initial"`
           manifest.chapters.each do |chapter|
-            patch = chapter.patch
-            unless patch.nil? # technically this should be validated earlier
-              unless File.exists?("bloc/#{patch}")
-                raise NO_SUCH_PATCH % patch
+            unless chapter.patch_exists?
+              raise NO_SUCH_PATCH % chapter.patch
+            end
+            chapter.apply_patch
+            unless chapter.patch.nil?
+              results = chapter.test
+              results["tests"].each do |test|
+                if test["passed"]
+                  puts TEST_PASSED % test["name"]
+                else
+                  raise TEST_FAILURE % JSON.pretty_generate(results)
+                end
               end
-              puts `patch < bloc/#{patch}`
-              puts `#{chapter.command}`
             end
           end
         rescue Exception => e

data/lib/bloc/models.rb

@@ -13,6 +13,23 @@ module Bloc
       include HashConstructed
       include ToHash
       attr_accessor :name, :command, :markdown, :default_file, :patch, :cursor_row, :cursor_column
+
+      def test
+        `#{@command}`
+        results = JSON.parse(File.read("results.json"))
+        File.delete("results.json")
+        results
+      end
+
+      def patch_exists?
+        File.exists?("bloc/#{@patch}")
+      end
+
+      def apply_patch
+        unless @patch.nil?
+          `patch < bloc/#{@patch}`
+        end
+      end
     end
   end
 end

data/lib/bloc/version.rb

@@ -1,3 +1,3 @@
 module Bloc
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bloc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226654954220 !ruby/object:Gem::Requirement
+  requirement: &70185906519900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226654954220
+  version_requirements: *70185906519900
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70226654953800 !ruby/object:Gem::Requirement
+  requirement: &70185906519480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226654953800
+  version_requirements: *70185906519480
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70226654953380 !ruby/object:Gem::Requirement
+  requirement: &70185906519060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226654953380
+  version_requirements: *70185906519060
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70226654952960 !ruby/object:Gem::Requirement
+  requirement: &70185906518640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70226654952960
+  version_requirements: *70185906518640
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70226654952540 !ruby/object:Gem::Requirement
+  requirement: &70185906518220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70226654952540
+  version_requirements: *70185906518220
 description: A command-line tool for Bloc
 email:
 - roshan.choxi@gmail.com