bloc 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.0.8
+
+* run_tests moved to Manifest.run_tests (since we want to run bloc.validate on resync)
+
 ### 0.0.7
 
 * test results are included in validation now, but only if a patch exists

data/lib/bloc/command/validate.rb

@@ -8,8 +8,7 @@ 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
+      PATCH_EXISTS = "Patch exists: %s".green
 
       def self.run(*args)
         manifest = Manifest.parse
@@ -18,7 +17,6 @@ module Bloc
         check_patches manifest
       end
 
-
       def self.check_course_default_file(manifest)
         course_default_file = manifest.course.default_file
         if course_default_file.nil?
@@ -48,36 +46,14 @@ module Bloc
 
       def self.check_patches(manifest)
         # TODO: ensure all chapters have patches
-        begin
-          `mv .git .git.backup`
-          `git init`
-          `git add .`
-          `git commit -m "initial"`
-          manifest.chapters.each do |chapter|
-            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
-            end
+        manifest.chapters.each do |chapter|
+          if chapter.patch_exists?
+            puts PATCH_EXISTS % chapter.patch
+          else
+            raise NO_SUCH_PATCH % chapter.patch
           end
-        rescue Exception => e
-          raise e
-        ensure
-          `git checkout .`
-          `rm -rf .git`
-          `mv .git.backup .git`
         end
       end
-
     end
   end
 end

data/lib/bloc/manifest.rb

@@ -48,5 +48,24 @@ module Bloc
       end
       Manifest.new({"course" => course, "chapters" => chapters})
     end
+
+    def run_tests
+      begin
+        `mv .git .git.backup`
+        `git init`
+        `git add .`
+        `git commit -m "initial"`
+
+        @chapters.each do |chapter|
+          chapter.run_tests
+        end
+      rescue
+        raise e
+      ensure
+        `git checkout .`
+        `rm -rf .git`
+        `mv .git.backup .git`
+      end
+    end
   end
 end

data/lib/bloc/models.rb

@@ -7,6 +7,8 @@ module Bloc
       include HashConstructed
       include ToHash
       attr_accessor :name, :description, :default_file
+
+
     end
 
     class Chapter
@@ -14,6 +16,29 @@ module Bloc
       include ToHash
       attr_accessor :name, :command, :markdown, :default_file, :patch, :cursor_row, :cursor_column
 
+      TEST_FAILURE = "Failed test:\n%s".red
+      TEST_PASSED = "Passed: %s".green
+
+      def run_tests
+        apply_patch
+        unless @patch.nil?
+          results = test
+          results["tests"].each do |test_result|
+            if test_result["passed"]
+              puts TEST_PASSED % test_result["name"]
+            else
+              raise TEST_FAILURE % test_result["name"]
+            end
+          end
+        end
+      end
+
+      def patch_exists?
+        File.exists?("bloc/#{@patch}")
+      end
+
+      private
+
       def test
         `#{@command}`
         results = JSON.parse(File.read("results.json"))
@@ -21,10 +46,6 @@ module Bloc
         results
       end
 
-      def patch_exists?
-        File.exists?("bloc/#{@patch}")
-      end
-
       def apply_patch
         unless @patch.nil?
           `patch < bloc/#{@patch}`

data/lib/bloc/version.rb

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

metadata

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