bloc 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.1.1
+
+* bloc add-chapter
+* specs update
+
+### 0.1.0
+
+* bloc tasks
+* bloc authenticate
+* bloc create
+
 ### 0.0.10
 
 * create, test, and patch commands added

data/Makefile

@@ -0,0 +1,2 @@
+test:
+	bundle exec rspec spec

data/bin/bloc

@@ -4,10 +4,15 @@ require "rubygems"
 require "bloc"
 
 commands = {
+  # user commands
+  'authenticate'  => proc { Bloc::Command::Authenticate.run }, 
+  'tasks'         => proc { Bloc::Command::Tasks.run },
+
+  # author commands
   'validate'      => proc { Bloc::Command::Validate.run },
   'test'          => proc { Bloc::Command::Test.run },
-  'authenticate'  => proc { Bloc::Command::Authenticate.run }, 
-  'tasks'         => proc { Bloc::Command::Tasks.run }
+  'create'        => proc { Bloc::Command::Create.run },
+  'add-chapter'   => proc { Bloc::Command::AddChapter.run },
 }
 
 if commands.keys.include?(ARGV.first.downcase)
@@ -21,12 +26,17 @@ else
     Usage: 
       bloc <command> [options]
     
-    Commands:
+    User Commands:
+      authenticate                      Authenticate by entering your Bloc email and password
+      tasks                             Run the tasks for your current chapter
+
+    Author Commands:
       validate                          Attempt to parse the manifest and check for the existence of default files
-      create["Course name"]             Create a course manifest with the specified name prefilled
       test [chapter-number]             If chapter number is specified, run tests for that chapter. If not, run all tests in order.
-      patch [chapter-number]            Same as "test", except apply patches first (if present)
-      authenticate                      Authenticate by entering your Bloc email and password
+      create ["Course name"]            Create a course manifest with the specified name
+      add-chapter <"name"> <"markdown"> <"command">
+                                        Add a chapter with the specified attributes
+
 eos
   puts helpstring
 end

data/lib/bloc/command.rb

@@ -2,6 +2,8 @@ require "bloc/command/validate"
 require "bloc/command/test"
 require "bloc/command/tasks"
 require "bloc/command/authenticate"
+require "bloc/command/create"
+require "bloc/command/add_chapter"
 
 module Bloc
   module Command

data/lib/bloc/command/add_chapter.rb

@@ -0,0 +1,27 @@
+module Bloc::Command
+  class AddChapter
+    USAGE = <<eos
+Usage:
+
+bloc add-chapter <"name"> <"markdown"> <"command">
+
+Example:
+
+bloc add-chapter "Stacks and Queues" "markdown/chapter4.md" "rspec spec -t ch4 -f j"
+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] || ""
+
+      manifest = Bloc::Manifest.parse
+      manifest.add_chapter(
+        :name => name,
+        :markdown => markdown,
+        :command => command
+      )
+    end
+  end
+end

data/lib/bloc/command/create.rb

@@ -0,0 +1,21 @@
+module Bloc
+  module Command
+    class Create
+      MANIFEST_ALREADY_EXISTS = "Found existing bloc manifest, remove and re-run command.".red
+
+      def self.run(*args)
+        raise MANIFEST_ALREADY_EXISTS if File.exists?(Bloc::Manifest::MANIFEST_PATH)
+        name = ARGV[1] || "My Bloc Course"
+        manifest = {
+          :course => {
+            :name => name,
+            :description => ""
+          },
+          :chapters => []
+        }
+
+        Bloc::Manifest.new(manifest).write
+      end
+    end
+  end
+end

data/lib/bloc/manifest.rb

@@ -21,6 +21,11 @@ module Bloc
       Manifest.new(manifest)
     end
 
+    def add_chapter(options)
+      chapters << Manifest.new(options)
+      write
+    end
+
     def write
       begin
         Dir.mkdir(File.dirname(MANIFEST_PATH))

data/lib/bloc/version.rb

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

data/spec/command/add_chapter_spec.rb

@@ -0,0 +1,37 @@
+require './spec/spec_helper'
+require 'fakefs/safe'
+
+module Bloc::Command
+  describe AddChapter do
+    before do
+      @options = {
+        :course => {
+          :name => "foobar",
+          :description => "foobar"
+        },
+        :chapters => []
+      }
+    end
+
+    it "raises an exception if a manifest doesn't exist" do
+      lambda { AddChapter.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
+    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)
+    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
+    end
+  end
+end

data/spec/command/create_spec.rb

@@ -0,0 +1,29 @@
+require './spec/spec_helper'
+require 'fakefs/safe'
+
+module Bloc::Command
+  describe Create do
+    it "writes a valid bloc manifest" do
+      FakeFS do
+        Create.run()
+        lambda { Bloc::Manifest.parse }.should_not raise_error
+      end
+    end
+
+    it "raises an exception if a manifest already exists", :wip => true do
+      FakeFS do
+        manifest = {
+          :course => {
+            :name => "Fobar",
+            :description => "foobar"
+          },
+          :chapters => []
+        }
+
+        Bloc::Manifest.new(manifest).write
+        File.exists?(Bloc::Manifest::MANIFEST_PATH).should be(true)
+        lambda { Create.run() }.should raise_error(Create::MANIFEST_ALREADY_EXISTS)
+      end
+    end
+  end
+end

data/spec/command/tasks_spec.rb

@@ -1,6 +1,6 @@
 require "./spec/spec_helper"
 require "stringio"
-require "fakefs"
+require "fakefs/safe"
 
 module Bloc
   describe Bloc::Command::Tasks do
@@ -12,6 +12,7 @@ module Bloc
       let(:failed_results)    { { "tests" => [{"passed" => false }, { "passed" => true }] } }
 
       before do
+        FakeFS.activate!
         FileUtils.mkdir_p(File.dirname(Manifest::MANIFEST_PATH))
         File.open(Manifest::MANIFEST_PATH, "w+") do |f|
           f << %Q({"course": {"name" : "CatNap"}, "chapters": [{ "command": "whatever" }, {"command": "stuff"}]})
@@ -24,7 +25,10 @@ module Bloc
         $stdout = StringIO.new
       end
 
-      after { $stdout = STDOUT }
+      after do
+        $stdout = STDOUT
+        FakeFS.deactivate!
+      end
 
       it "runs the tasks command for the current chapter" do
         Runner.should_receive(:run).with("whatever")

data/spec/command/validate_spec.rb

@@ -1,23 +1,28 @@
 require "./spec/spec_helper"
-require "fakefs"
+require "fakefs/safe"
 require "stringio"
 
 module Bloc::Command
   describe Validate do
     it "raises an exception if the Bloc manifest can not be found" do
-      lambda { Validate.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
+      FakeFS do
+        lambda { Validate.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
+      end
     end
 
     it "raises an exception if the Bloc manifest has invalid JSON" do
-      FileUtils.mkdir_p("bloc")
-      File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write "<<invalid json>>" }
+      FakeFS do
+        FileUtils.mkdir_p("bloc")
+        File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write "<<invalid json>>" }
 
-      lambda { Validate.run() }.should raise_error(Bloc::Manifest::INVALID_MANIFEST)
+        lambda { Validate.run() }.should raise_error(Bloc::Manifest::INVALID_MANIFEST)
+      end
     end
 
     it "prints a success message if the manifest is valid" do
-      FileUtils.mkdir_p("bloc")
-      File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write <<-eos
+      FakeFS do
+        FileUtils.mkdir_p("bloc")
+        File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write <<-eos
 {
   "course": {
     "name": "Foobar",
@@ -28,10 +33,11 @@ module Bloc::Command
 eos
 }
 
-      out = StringIO.new
-      $stdout = out
-      Validate.run()
-      $stdout = STDOUT
+        out = StringIO.new
+        $stdout = out
+        Validate.run()
+        $stdout = STDOUT
+      end
     end
   end
 end

data/spec/manifest_spec.rb

@@ -3,6 +3,15 @@ require 'fakefs/safe'
 
 module Bloc
   describe Manifest do
+    before do
+      @options = {
+        :course => {
+          :name => "foobar",
+          :description => "foobar"
+        },
+        :chapters => []
+      }
+    end
     it "writes valid JSON" do
       FakeFS do
         Bloc::Manifest.new(@options).write
@@ -35,5 +44,17 @@ module Bloc
       manifest = Bloc::Manifest.new(@options)
       manifest.to_hash.class.should be(Hash)
     end
+
+    it "adds chapters correctly" do
+      FakeFS do
+        manifest = Bloc::Manifest.new(@options)
+        manifest.write
+        original_size = manifest.chapters.size
+
+        manifest.add_chapter(:name => "", :markdown => "", :command => "")
+        manifest.write
+        Bloc::Manifest.parse.chapters.size.should be(original_size + 1)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 require "bloc"
+require "fakefs/safe"
 
 module Helpers
   # Replace standard input with faked one StringIO. 
@@ -18,4 +19,7 @@ end
 
 RSpec.configure do |conf|
   conf.include(Helpers)
+  conf.after do
+    FakeFS::FileSystem.clear
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bloc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70122279915300 !ruby/object:Gem::Requirement
+  requirement: &70272016576460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122279915300
+  version_requirements: *70272016576460
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70122279914880 !ruby/object:Gem::Requirement
+  requirement: &70272016576040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122279914880
+  version_requirements: *70272016576040
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70122279914460 !ruby/object:Gem::Requirement
+  requirement: &70272016575620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122279914460
+  version_requirements: *70272016575620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70122279914040 !ruby/object:Gem::Requirement
+  requirement: &70272016575200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122279914040
+  version_requirements: *70272016575200
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70122279913620 !ruby/object:Gem::Requirement
+  requirement: &70272016574780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122279913620
+  version_requirements: *70272016574780
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70122279913200 !ruby/object:Gem::Requirement
+  requirement: &70272016574360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122279913200
+  version_requirements: *70272016574360
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70122279912780 !ruby/object:Gem::Requirement
+  requirement: &70272016573940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122279912780
+  version_requirements: *70272016573940
 description: A command-line tool for Bloc
 email:
 - roshan.choxi@gmail.com
@@ -102,6 +102,7 @@ files:
 - .rvmrc
 - CHANGELOG.md
 - Gemfile
+- Makefile
 - README.md
 - Rakefile
 - bin/bloc
@@ -112,7 +113,9 @@ files:
 - lib/bloc/client/course.rb
 - lib/bloc/client/enrollment.rb
 - lib/bloc/command.rb
+- lib/bloc/command/add_chapter.rb
 - lib/bloc/command/authenticate.rb
+- lib/bloc/command/create.rb
 - lib/bloc/command/tasks.rb
 - lib/bloc/command/tasks/formatter.rb
 - lib/bloc/command/test.rb
@@ -126,7 +129,9 @@ files:
 - spec/client/authenticate_spec.rb
 - spec/client/course_spec.rb
 - spec/client/enrollment_spec.rb
+- spec/command/add_chapter_spec.rb
 - spec/command/authenticate_spec.rb
+- spec/command/create_spec.rb
 - spec/command/tasks_spec.rb
 - spec/command/validate_spec.rb
 - spec/manifest_spec.rb
@@ -160,7 +165,9 @@ test_files:
 - spec/client/authenticate_spec.rb
 - spec/client/course_spec.rb
 - spec/client/enrollment_spec.rb
+- spec/command/add_chapter_spec.rb
 - spec/command/authenticate_spec.rb
+- spec/command/create_spec.rb
 - spec/command/tasks_spec.rb
 - spec/command/validate_spec.rb
 - spec/manifest_spec.rb