bloc 0.1.1 → 0.1.2

data/bin/bloc

@@ -5,7 +5,7 @@ require "bloc"
 
 commands = {
   # user commands
-  'authenticate'  => proc { Bloc::Command::Authenticate.run }, 
+  'authenticate'  => proc { Bloc::Command::Authenticate.run },
   'tasks'         => proc { Bloc::Command::Tasks.run },
 
   # author commands

data/lib/bloc/command/add_chapter.rb

@@ -3,24 +3,22 @@ module Bloc::Command
     USAGE = <<eos
 Usage:
 
-bloc add-chapter <"name"> <"markdown"> <"command">
+bloc add-chapter ["name"]
 
 Example:
 
-bloc add-chapter "Stacks and Queues" "markdown/chapter4.md" "rspec spec -t ch4 -f j"
+bloc add-chapter "Stacks and Queues"
 eos
     def self.run(*args)
       raise Bloc::Manifest::MANIFEST_NOT_FOUND unless File.exists?(Bloc::Manifest::MANIFEST_PATH)
-      raise USAGE unless ARGV.size == 3
-      name = ARGV[1] || "New Chapter"
-      markdown = ARGV[2] || ""
-      command = ARGV[3] || ""
-
+      raise USAGE unless ARGV.size == 2
+      name = ARGV[1]
       manifest = Bloc::Manifest.parse
+      number = manifest.chapters.size + 1
       manifest.add_chapter(
         :name => name,
-        :markdown => markdown,
-        :command => command
+        :markdown => "chapters/chapter#{number}.md",
+        :command => ""
       )
     end
   end

data/lib/bloc/command/tasks/formatter.rb

@@ -1,9 +1,46 @@
+require "colorize"
+
 module Bloc
   module Command
     class Tasks
       module Formatter
-        def self.format(results)
-          results.to_yaml
+        def self.format(tests)
+          output = ""
+          tests.each_with_index do |test, index|
+            if test["passed"]
+              output << format_passed(test, index)
+            else
+              output << format_failed(test, index)
+            end
+          end
+
+          output
+        end
+
+        def self.format_passed(test, index)
+          %Q(
+#{index+1}. #{indent(test["name"].green)}
+#{indent(test["description"])}
+          )
+        end
+
+        def self.format_failed(test, index)
+          %Q(
+#{index+1}. #{indent(test["name"].red)}
+#{indent(test["description"])}
+#{indent(test["failed_line"])}
+#{indent(test["backtrace"].join("\n"))}
+
+#{indent(test["code"].light_cyan)}
+#{indent(test["stdout"])}
+          )
+        end
+
+        def self.indent(text, options={})
+          tab_level = options[:level] || 1
+          tabs = "\t"*tab_level
+          lines = text.split("\n")
+          lines.map {|line| tabs + line }.join("\n")
         end
       end
     end

data/lib/bloc/command/validate.rb

@@ -1,22 +1,40 @@
 module Bloc
   module Command
     class Validate
-      NO_DEFAULT_COURSE_FILE = "No default file for course specified (OK)".green
-      VALID_DEFAULT_COURSE_FILE = "Default file for course exists (OK)".green
+      LESSON_NOT_SPECIFIED = "No markdown was specified for: '%s'".red
+      LESSON_NOT_FOUND = "Missing markdown file: %s".red
+      LESSON_EXISTS = "(OK) Markdown exists: %s".green
+      NO_DEFAULT_COURSE_FILE = "(OK) No default file for course specified".green
+      VALID_DEFAULT_COURSE_FILE = "(OK) Default file for course exists".green
       INVALID_DEFAULT_COURSE_FILE = "Default file for course does not exist (expected %s)".red
-      NO_DEFAULT_CHAPTER_FILE = "No default file for chapter specified (OK): %s".green
-      VALID_DEFAULT_CHAPTER_FILE = "Default file for chapter exists (OK): %s".green
+      NO_DEFAULT_CHAPTER_FILE = "(OK) No default file for chapter specified: %s".green
+      VALID_DEFAULT_CHAPTER_FILE = "(OK) Default file for chapter exists: %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
-      PATCH_EXISTS = "Patch exists: %s".green
+      PATCH_EXISTS = "(OK) Patch exists: %s".green
 
       def self.run(*args)
-        manifest = Manifest.parse
+        manifest = Bloc::Manifest.parse
+        check_markdown_files manifest
         check_course_default_file manifest
         check_chapter_default_files manifest
         check_patches manifest
       end
 
+      def self.check_markdown_files(manifest)
+        manifest.chapters.each do |chapter|
+          begin
+            if File.exists?("bloc/#{chapter.markdown}")
+              puts LESSON_EXISTS % chapter.markdown
+            else
+              raise LESSON_NOT_FOUND % chapter.markdown
+            end
+          rescue NoMethodError => e
+            raise LESSON_NOT_SPECIFIED % chapter.name
+          end
+        end
+      end
+
       def self.check_course_default_file(manifest)
         course_default_file = manifest.course.default_file
         if course_default_file.nil?

data/lib/bloc/version.rb

@@ -1,3 +1,3 @@
 module Bloc
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/command/add_chapter_spec.rb

@@ -11,24 +11,38 @@ module Bloc::Command
         },
         :chapters => []
       }
+      $verbose = $VERBOSE
+      $VERBOSE = nil
+      $argv = ARGV
+      ARGV = ['add-chapter', 'stacks and queues']
+    end
+
+    after do
+      ARGV = $argv
+      $VERBOSE = $verbose
     end
 
     it "raises an exception if a manifest doesn't exist" do
-      lambda { AddChapter.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
+      FakeFS do
+        lambda { AddChapter.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
+      end
     end
 
     it "raises and exception if not all arguments are passed" do
-      Bloc::Manifest.new(@options).write
-      lambda { AddChapter.run() }.should raise_error(AddChapter::USAGE)
+      FakeFS do
+        $tmp = ARGV
+        ARGV = ['add-chapter']
+        Bloc::Manifest.new(@options).write
+        lambda { AddChapter.run() }.should raise_error(AddChapter::USAGE)
+        ARGV = $tmp
+      end
     end
 
     it "adds a chapter to an existing manifest" do
       FakeFS do
-
         manifest = Bloc::Manifest.new(@options)
         manifest.write
         chapter_count = manifest.chapters.size
-        ARGV = ['stacks and queues', 'markdown/chapter4.md', 'rspec spec -t ch4 -f j']
         AddChapter.run
         Bloc::Manifest.parse.chapters.size.should be(chapter_count + 1)
       end

data/spec/command/tasks_spec.rb

@@ -8,7 +8,7 @@ module Bloc
       let(:enrollment) { Client::Enrollment.new("id" => 1, "current_step" => 1, "completed" => false) }
       let(:course)     { Client::Course.new({"id" => "1", "slug" => "url-shortener" }) }
       let(:git_remote) { "git://github.com/Bloc/URL-Shortener.git" }
-      let(:passed_results)    { { "tests" => [{"passed" => true }, { "passed" => true }] } } 
+      let(:passed_results)    { { "tests" => [{"passed" => true }, { "passed" => true }] } }
       let(:failed_results)    { { "tests" => [{"passed" => false }, { "passed" => true }] } }
 
       before do
@@ -23,6 +23,7 @@ module Bloc
         Runner.stub(:run).and_return(failed_results)
 
         $stdout = StringIO.new
+        Command::Tasks::Formatter.stub(:format)
       end
 
       after do
@@ -36,7 +37,7 @@ module Bloc
       end
 
       context "if the tests pass" do
-        before do 
+        before do
           Runner.stub(:run).and_return(passed_results)
           Client::Course.stub(:find).with(:scaffold_clone_url => git_remote).and_return(course)
           Client::Enrollment.stub(:create).with(:course_id => course.id).and_return(enrollment)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bloc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70272016576460 !ruby/object:Gem::Requirement
+  requirement: &70329855606340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272016576460
+  version_requirements: *70329855606340
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70272016576040 !ruby/object:Gem::Requirement
+  requirement: &70329855605920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272016576040
+  version_requirements: *70329855605920
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70272016575620 !ruby/object:Gem::Requirement
+  requirement: &70329855605500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272016575620
+  version_requirements: *70329855605500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70272016575200 !ruby/object:Gem::Requirement
+  requirement: &70329855605080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272016575200
+  version_requirements: *70329855605080
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70272016574780 !ruby/object:Gem::Requirement
+  requirement: &70329855604660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272016574780
+  version_requirements: *70329855604660
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70272016574360 !ruby/object:Gem::Requirement
+  requirement: &70329855604240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272016574360
+  version_requirements: *70329855604240
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70272016573940 !ruby/object:Gem::Requirement
+  requirement: &70329855603820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272016573940
+  version_requirements: *70329855603820
 description: A command-line tool for Bloc
 email:
 - roshan.choxi@gmail.com