bloc 0.0.10 → 0.1.0

data/bin/bloc

@@ -4,11 +4,12 @@ require "rubygems"
 require "bloc"
 
 commands = {
-  'validate' => proc { Bloc::Command::Validate.run },
-  'create' => proc { Bloc::Command::Create.run },
-  'test' => proc { Bloc::Command::Test.run },
-  'patch' => proc { Bloc::Command::Patch.run }
+  'validate'      => proc { Bloc::Command::Validate.run },
+  'test'          => proc { Bloc::Command::Test.run },
+  'authenticate'  => proc { Bloc::Command::Authenticate.run }, 
+  'tasks'         => proc { Bloc::Command::Tasks.run }
 }
+
 if commands.keys.include?(ARGV.first.downcase)
   begin
     commands[ARGV.first.downcase].call
@@ -25,6 +26,7 @@ else
       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
 eos
   puts helpstring
 end

data/bloc.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ruby-debug19"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "colorize"
+  s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "hashie"
 end

data/lib/bloc.rb

@@ -1,11 +1,14 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("./lib")
 
 require "colorize"
 require "json"
+require "hashie"
 
 require "bloc/version"
 require "bloc/command"
-require "bloc/models"
+require "bloc/client"
+require "bloc/manifest"
+require "bloc/runner"
 
 module Bloc
 end

data/lib/bloc/client.rb

@@ -0,0 +1,29 @@
+require "rest-client"
+
+require "bloc/client/authenticate"
+require "bloc/client/course"
+require "bloc/client/enrollment"
+
+module Bloc
+  class Client
+    include Authenticate
+
+    def self.client
+      @client ||= Bloc::Client.new
+    end
+
+    def self.credentials
+      @credentials ||= JSON.parse(File.read(Bloc::Command::Authenticate::CREDENTIALS_PATH))
+    end
+
+    def self.credentials=(credentials)
+      @credentials = credentials
+    end
+
+    private
+
+    def bloc_url(path)
+      "http://www.trybloc.com/api/v1#{path}"
+    end
+  end
+end

data/lib/bloc/client/authenticate.rb

@@ -0,0 +1,23 @@
+require "json"
+
+module Bloc
+  class Client
+    module Authenticate
+      def authenticate(options)
+        raise "Must Provide an Email"   unless options[:email]
+        raise "Must Provide a Password" unless options[:password]
+
+        response = RestClient.post(bloc_url("/api_keys"), {
+          :email => options[:email],
+          :password => options[:password]
+        })
+
+        credentials = JSON.parse(response.body)
+
+        Bloc::Client.credentials = credentials
+
+        credentials
+      end
+    end
+  end
+end

data/lib/bloc/client/course.rb

@@ -0,0 +1,24 @@
+module Bloc
+  class Client
+    class Course
+      def self.find(options={})
+        response = RestClient.get "http://www.trybloc.com/api/v1/courses/find", :params => options.merge(:api_key => Bloc::Client.credentials["api_key"])
+        self.new JSON.parse(response.body)
+      end
+
+      def initialize(attributes)
+        @attributes = attributes
+      end
+
+      def method_missing(method)
+        method = method.to_s
+
+        if @attributes[method]
+          return @attributes[method]
+        else
+          super(method)
+        end
+      end
+    end
+  end
+end

data/lib/bloc/client/enrollment.rb

@@ -0,0 +1,40 @@
+module Bloc
+  class Client
+    class Enrollment
+      def self.create(attributes)
+        raise "Must Provide a Course Id" unless attributes[:course_id]
+        course_id = attributes.delete(:course_id)
+
+        response = RestClient.post("http://www.trybloc.com/api/v1/courses/#{course_id}/enrollments", {
+          :enrollment => attributes,
+          :api_key => Bloc::Client.credentials["api_key"]
+        })
+
+        self.new JSON.parse(response.body)
+      end
+
+      def initialize(attributes)
+        @attributes = attributes
+      end
+
+      def update(attributes)
+        response = RestClient.put("http://www.trybloc.com/api/v1/courses/#{course_id}/enrollments/#{id}",  {
+          :enrollment => attributes,
+          :api_key => Bloc::Client.credentials["api_key"]
+        })
+
+        @attributes = JSON.parse(response.body)
+      end
+
+      def method_missing(method)
+        method = method.to_s
+
+        if @attributes[method]
+          return @attributes[method]
+        else
+          super(method)
+        end
+      end
+    end
+  end
+end

data/lib/bloc/command.rb

@@ -1,13 +1,10 @@
-require "bloc/command/validate.rb"
-require "bloc/command/create.rb"
-require "bloc/command/test.rb"
-require "bloc/command/patch.rb"
-require "bloc/models.rb"
-require "bloc/manifest.rb"
+require "bloc/command/validate"
+require "bloc/command/test"
+require "bloc/command/tasks"
+require "bloc/command/authenticate"
 
 module Bloc
   module Command
-  end
-
 
+  end
 end

data/lib/bloc/command/authenticate.rb

@@ -0,0 +1,43 @@
+require "colorize"
+
+module Bloc
+  module Command
+    class Authenticate
+      CREDENTIALS_PATH = File.join(ENV["HOME"], ".bloc", "credentials.json")
+      def self.run(*args)
+        login
+      end
+
+      def self.login
+        print "Email: "
+        email = $stdin.gets.chomp
+
+        print "Password: "
+        system "stty -echo"
+        password = $stdin.gets.chomp
+        system "stty echo"
+
+        print "\n"
+
+        client = Bloc::Client.new
+
+        begin
+          credentials = client.authenticate(:email => email, :password => password)
+          write_credentials(credentials)
+          puts "saved your credentials".green
+        rescue
+          puts "invalid email or password".red
+        end
+      end
+
+      private
+
+      def self.write_credentials(credentials)
+        FileUtils.mkdir_p(File.dirname(CREDENTIALS_PATH))
+        FileUtils.touch(CREDENTIALS_PATH)
+
+        File.open(CREDENTIALS_PATH, "w+") { |file| file << credentials.to_json }
+      end
+    end
+  end
+end

data/lib/bloc/command/tasks.rb

@@ -0,0 +1,37 @@
+require "bloc/command/tasks/formatter"
+
+module Bloc
+  module Command
+    class Tasks
+      def self.run
+        course = Client::Course.find(:scaffold_clone_url => git_remotes.first)
+        enrollment = Client::Enrollment.create(:course_id => course.id)
+
+        manifest = Manifest.parse
+
+        puts "Running Chapter #{enrollment.current_step} Tasks".green
+
+        results = Runner.run(manifest.chapters[enrollment.current_step - 1].command)
+
+        puts Formatter.format(results["tests"])
+
+        if results["tests"].all? {|result| result["passed"] }
+          puts "Chapter #{enrollment.current_step} Complete!"
+
+          if manifest.chapters.size == enrollment.current_step
+            enrollment.update(:completed => true)
+          else
+            enrollment.update(:current_step => enrollment.current_step + 1)
+          end
+        end
+      end
+
+      def self.git_remotes
+        `git remote -v`.split("\n").map do |remote|
+          name, url, method = remote.split(/\s/)
+          url
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Bloc
+  module Command
+    class Tasks
+      module Formatter
+        def self.format(results)
+          results.to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/bloc/command/test.rb

@@ -3,11 +3,7 @@ module Bloc
     class Test
       def self.run(*args)
         manifest = Manifest.parse
-        if ARGV[1].nil?
-          manifest.run_tests
-        else
-          manifest.run_tests(:chapter => ARGV[1].to_i)
-        end
+        results = Runner.run(manifest.chapters.first.command)
       end
     end
   end

data/lib/bloc/command/validate.rb

@@ -47,7 +47,9 @@ module Bloc
       def self.check_patches(manifest)
         # TODO: ensure all chapters have patches
         manifest.chapters.each do |chapter|
-          if chapter.patch_exists?
+          if chapter.patch.nil?
+
+          elsif File.exists? chapter.patch
             puts PATCH_EXISTS % chapter.patch
           else
             raise NO_SUCH_PATCH % chapter.patch

data/lib/bloc/manifest.rb

@@ -1,40 +1,12 @@
-require "bloc/hash_constructed.rb"
-require "bloc/temp_git.rb"
-require "bloc/models.rb"
-
 module Bloc
-  class Manifest
+  class Manifest < Hashie::Mash
     MANIFEST_NOT_FOUND = "Unable to find Bloc Manifest in bloc/bloc_manifest.json".red
     MANIFEST_PATH = File.join("bloc", "bloc_manifest.json")
     INVALID_MANIFEST = "Invalid JSON in Bloc Manifest: #{MANIFEST_PATH}".red
     VALID_MANIFEST = "Valid Bloc Manifest".green
     NO_SUCH_CHAPTER = "No such chapter.".red
-
-    include TempGit
-
-    attr_accessor :course, :chapters, :deployable
-
-    def initialize(options)
-      @course = options["course"]
-      @chapters = options["chapters"]
-    end
-
-    def write
-      Dir.mkdir(File.dirname(MANIFEST_PATH))
-      File.open(MANIFEST_PATH, "w") do |file|
-        file.write(JSON.pretty_generate(to_h))
-      end
-    end
-
-    def to_h
-      hash = {}
-      hash["course"] = @course.to_h
-      hash["chapters"] = []
-      @chapters.each do |chapter|
-        hash["chapters"] << chapter.to_h
-      end
-      hash
-    end
+    NO_COURSE = "Missing: course".red
+    NO_CHAPTERS = "Missing: chapters".red
 
     def self.parse
       raise MANIFEST_NOT_FOUND unless File.exists?(MANIFEST_PATH)
@@ -46,30 +18,16 @@ module Bloc
       rescue
         raise INVALID_MANIFEST
       end
-      course = Bloc::Models::Course.new(manifest["course"])
-      chapters = []
-      manifest["chapters"].each do |chapter|
-        chapters << Bloc::Models::Chapter.new(chapter)
-      end
-      Manifest.new({"course" => course, "chapters" => chapters})
+      Manifest.new(manifest)
     end
 
-    def run_tests(options = {})
-      defaults = {:chapter => nil, :apply_patch => false}
-      options = defaults.merge(options)
-
-      in_tmp_git do
-        if options[:chapter].nil?
-          @chapters.each do |chapter|
-            chapter.apply_patch if options[:apply_patch]
-            chapter.run_tests
-          end
-        else
-          index = options[:chapter] - 1
-          raise NO_SUCH_CHAPTER if @chapters[index].nil?
-          @chapters[index].apply_patch if options[:apply_patch]
-          @chapters[index].run_tests
-        end
+    def write
+      begin
+        Dir.mkdir(File.dirname(MANIFEST_PATH))
+      rescue
+      end
+      File.open(MANIFEST_PATH, "w") do |file|
+        file.write(JSON.pretty_generate(to_hash))
       end
     end
   end

data/lib/bloc/runner.rb

@@ -0,0 +1,10 @@
+module Bloc
+  class Runner
+    def self.run(command)
+      `#{command}`
+      results = JSON.parse(File.read("results.json"))
+      File.delete("results.json")
+      results
+    end
+  end
+end

data/lib/bloc/version.rb

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

data/script/test

@@ -0,0 +1 @@
+bundle exec rspec spec

data/spec/client/authenticate_spec.rb

@@ -0,0 +1,43 @@
+require "./spec/spec_helper"
+
+describe Bloc::Client do
+  describe "#authenticate" do
+    let(:client)        { Bloc::Client.new }
+    let(:email)         { "bob@loblaw.com" }
+    let(:password)      { "super_secret" }
+    let(:fake_response) { RestClient::Response.create(%Q({ "key" : "value" }), nil, nil) }
+
+    before do
+      RestClient.stub(:post).and_return(fake_response)
+    end
+
+    it "raises an error if no email is provided" do
+      lambda { client.authenticate(:password => password) }.should raise_error
+    end
+
+    it "raises an error if no password is provided" do
+      lambda { client.authenticate(:email => email) }.should raise_error
+    end
+
+    it "POSTs the email and password to the API keys endpoint" do
+      RestClient.should_receive(:post).with(anything, {
+        :email => email, 
+        :password => password
+      }).and_return(fake_response)
+
+      client.authenticate(:password => password, :email => email)
+    end
+
+    it "adds the api key as a param to all RestClient calls" do
+      Bloc::Client.should_receive(:credentials=).with(JSON.parse(fake_response.body))
+      client.authenticate(:password => password, :email => email)
+    end
+
+    it "returns a parsed JSON hash" do
+      RestClient.should_receive(:post).and_return(fake_response) 
+
+      result = client.authenticate(:password => password, :email => email)
+      result.should be_a(Hash)
+    end
+  end
+end

data/spec/client/course_spec.rb

@@ -0,0 +1,20 @@
+require "./spec/spec_helper"
+
+describe Bloc::Client::Course do
+  describe ".find" do
+    let(:query)         { { :scaffold_code_url => "some-url" } }
+    let(:fake_response) { RestClient::Response.create(%Q({ "key" : "value" }), nil, nil) }
+
+    before { RestClient.stub(:get).and_return(fake_response) }
+
+    it "queries the Bloc API by the conditions passed in" do
+      RestClient.should_receive(:get).with(anything, :params => hash_including(query)).and_return(fake_response)
+      Bloc::Client::Course.find(query)
+    end
+
+    it "returns a new instance of itself" do
+      course = Bloc::Client::Course.find(query)
+      course.should be_a(Bloc::Client::Course)
+    end
+  end
+end

data/spec/client/enrollment_spec.rb

@@ -0,0 +1,42 @@
+require "./spec/spec_helper"
+
+describe Bloc::Client::Enrollment do
+  let(:attributes) { { :id => 1, :current_step => 3, :completed => false , :course_id => 1} }
+  let(:fake_response) { RestClient::Response.create(attributes.to_json, nil, nil) }
+  before { RestClient.stub(:post).and_return(fake_response) }
+
+  describe ".create" do
+    it "raises an exception if no course_id is provided" do
+      lambda { Bloc::Client::Enrollment.create attributes.delete(:course_id) }.should raise_error
+    end
+
+    it "creates an Enrollment through the API" do
+      RestClient.should_receive(:post).with(anything, hash_including(:enrollment => attributes)).and_return(fake_response)
+      Bloc::Client::Enrollment.create(attributes)
+    end
+
+    it "returns an instance of itself" do
+      enrollment = Bloc::Client::Enrollment.create(attributes)
+      enrollment.should be_a(Bloc::Client::Enrollment)
+    end
+  end
+
+  describe "#update" do
+    let(:enrollment)            { Bloc::Client::Enrollment.create(attributes) }
+    let(:update_attributes)     { { "current_step" => "4" } }
+    let(:fake_update_response)  { RestClient::Response.create(attributes.merge(:current_step => 4).to_json, nil, nil) }
+
+    before { RestClient.stub(:put).and_return(fake_update_response) }
+
+    it "updates the enrollment through the API" do
+      RestClient.should_receive(:put).with(anything, hash_including(:enrollment => update_attributes)).and_return(fake_response)
+      enrollment.update(update_attributes)
+    end
+
+    it "updates the enrollments attributes" do
+      enrollment.current_step.should == 3
+      enrollment.update(update_attributes)
+      enrollment.current_step.should == 4
+    end
+  end
+end

data/spec/command/authenticate_spec.rb

@@ -0,0 +1,30 @@
+require "./spec/spec_helper"
+require "fakefs"
+
+describe Bloc::Command::Authenticate do
+  before do
+    $stdout = StringIO.new
+    $stdin.stub(:gets).and_return(email, password)
+    Bloc::Client.any_instance.should_receive(:authenticate).with({
+      :email => email, :password => password
+    }).and_return(credentials)
+  end
+
+  after  { $stdout = STDOUT }
+
+  let(:email)         { "bob@loblaw.com" }
+  let(:password)      { "super_secret" }
+  let(:credentials)   { {"credentials" => true} }
+
+  describe ".login" do
+    it "asks for user credentials" do
+      STDIN.should_receive(:gets).and_return(email, password)
+      Bloc::Command::Authenticate.login
+    end
+
+    it "writes the credentials to a dotfile" do
+      Bloc::Command::Authenticate.login
+      JSON.parse(File.read(Bloc::Command::Authenticate::CREDENTIALS_PATH)).should == credentials
+    end
+  end
+end

data/spec/command/tasks_spec.rb

@@ -0,0 +1,57 @@
+require "./spec/spec_helper"
+require "stringio"
+require "fakefs"
+
+module Bloc
+  describe Bloc::Command::Tasks do
+    describe ".run" do
+      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(:failed_results)    { { "tests" => [{"passed" => false }, { "passed" => true }] } }
+
+      before do
+        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"}]})
+        end
+        Command::Tasks.stub(:git_remotes).and_return([git_remote])
+        Client::Course.stub(:find).and_return(course)
+        Client::Enrollment.stub(:create).and_return(enrollment)
+        Runner.stub(:run).and_return(failed_results)
+
+        $stdout = StringIO.new
+      end
+
+      after { $stdout = STDOUT }
+
+      it "runs the tasks command for the current chapter" do
+        Runner.should_receive(:run).with("whatever")
+        Command::Tasks.run
+      end
+
+      context "if the tests pass" 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)
+        end
+
+        it "increments the current chapter of the enrollment" do
+          enrollment.should_receive(:update).with(:current_step => (enrollment.current_step + 1))
+          Command::Tasks.run
+        end
+
+        context "on the last chapter" do
+          let(:enrollment) { Client::Enrollment.new("id" => 1, "current_step" => 2, "completed" => false) }
+
+          it "sets the enrollment to 'completed' if there are no more chapters" do
+            enrollment.should_receive(:update).with(:completed => true)
+            Command::Tasks.run
+          end
+        end
+      end
+    end
+  end
+end

data/spec/command/validate_spec.rb

@@ -5,25 +5,33 @@ 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(Validate::MANIFEST_NOT_FOUND)
+      lambda { Validate.run() }.should raise_error(Bloc::Manifest::MANIFEST_NOT_FOUND)
     end
 
     it "raises an exception if the Bloc manifest has invalid JSON" do
       FileUtils.mkdir_p("bloc")
-      File.open(Validate::MANIFEST_PATH, 'w+') {|f| f.write "<<invalid json>>" }
+      File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write "<<invalid json>>" }
 
-      lambda { Validate.run() }.should raise_error(Validate::INVALID_MANIFEST)
+      lambda { Validate.run() }.should raise_error(Bloc::Manifest::INVALID_MANIFEST)
     end
 
     it "prints a success message if the manifest is valid" do
       FileUtils.mkdir_p("bloc")
-      File.open(Validate::MANIFEST_PATH, 'w+') {|f| f.write %Q({"json": "true" }) }
+      File.open(Bloc::Manifest::MANIFEST_PATH, 'w+') {|f| f.write <<-eos
+{
+  "course": {
+    "name": "Foobar",
+    "description": ""
+  },
+  "chapters": []
+}
+eos
+}
 
       out = StringIO.new
       $stdout = out
       Validate.run()
       $stdout = STDOUT
-      out.string.chomp.should == Validate::VALID_MANIFEST
     end
   end
 end

data/spec/manifest_spec.rb

@@ -0,0 +1,39 @@
+require './spec/spec_helper.rb'
+require 'fakefs/safe'
+
+module Bloc
+  describe Manifest do
+    it "writes valid JSON" do
+      FakeFS do
+        Bloc::Manifest.new(@options).write
+        lambda { JSON.parse File.read(Bloc::Manifest::MANIFEST_PATH) }.should_not raise_error
+      end
+    end
+
+    it "can parse its own output" do
+      FakeFS do
+        Bloc::Manifest.new(@options).write
+        lambda { Bloc::Manifest.parse }.should_not raise_error
+      end
+    end
+
+    it "parses a valid manifest" do
+      valid_manifests = Dir['spec/valid_manifests/*'].map {|path| File.read(path)}
+      valid_manifests.each do |manifest|
+        FakeFS do
+          FileUtils.mkdir_p 'bloc'
+          File.open(Bloc::Manifest::MANIFEST_PATH, "w") do |file|
+            file.write manifest
+          end
+          STDOUT.should_receive(:puts).and_return(Bloc::Manifest::VALID_MANIFEST)
+          lambda { Bloc::Manifest.parse }.should_not raise_error
+        end
+      end
+    end
+
+    it "to_hash produces a valid ruby hash" do
+      manifest = Bloc::Manifest.new(@options)
+      manifest.to_hash.class.should be(Hash)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,21 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 require "bloc"
+
+module Helpers
+  # Replace standard input with faked one StringIO. 
+  def fake_stdin(text)
+    begin
+      $stdin = StringIO.new
+      $stdin.puts(text)
+      $stdin.rewind
+      yield
+    ensure
+      $stdin = STDIN
+    end
+  end
+end
+
+RSpec.configure do |conf|
+  conf.include(Helpers)
+end

data/spec/valid_manifests/1.json

@@ -0,0 +1,7 @@
+{
+   "course": {
+      "name": "Foobar",
+      "description": ""
+   },
+   "chapters": []
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bloc
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-03-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339116316320 !ruby/object:Gem::Requirement
+  requirement: &70122279915300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339116316320
+  version_requirements: *70122279915300
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70339116315900 !ruby/object:Gem::Requirement
+  requirement: &70122279914880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339116315900
+  version_requirements: *70122279914880
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70339116315480 !ruby/object:Gem::Requirement
+  requirement: &70122279914460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339116315480
+  version_requirements: *70122279914460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70339116315060 !ruby/object:Gem::Requirement
+  requirement: &70122279914040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339116315060
+  version_requirements: *70122279914040
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70339116314640 !ruby/object:Gem::Requirement
+  requirement: &70122279913620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339116314640
+  version_requirements: *70122279913620
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70122279913200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70122279913200
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70122279912780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70122279912780
 description: A command-line tool for Bloc
 email:
 - roshan.choxi@gmail.com
@@ -85,19 +107,31 @@ files:
 - bin/bloc
 - bloc.gemspec
 - lib/bloc.rb
+- lib/bloc/client.rb
+- lib/bloc/client/authenticate.rb
+- lib/bloc/client/course.rb
+- lib/bloc/client/enrollment.rb
 - lib/bloc/command.rb
-- lib/bloc/command/create.rb
-- lib/bloc/command/patch.rb
+- lib/bloc/command/authenticate.rb
+- lib/bloc/command/tasks.rb
+- lib/bloc/command/tasks/formatter.rb
 - lib/bloc/command/test.rb
 - lib/bloc/command/validate.rb
-- lib/bloc/hash_constructed.rb
 - lib/bloc/manifest.rb
-- lib/bloc/models.rb
+- lib/bloc/runner.rb
 - lib/bloc/temp_git.rb
 - lib/bloc/to_hash.rb
 - lib/bloc/version.rb
+- script/test
+- spec/client/authenticate_spec.rb
+- spec/client/course_spec.rb
+- spec/client/enrollment_spec.rb
+- spec/command/authenticate_spec.rb
+- spec/command/tasks_spec.rb
 - spec/command/validate_spec.rb
+- spec/manifest_spec.rb
 - spec/spec_helper.rb
+- spec/valid_manifests/1.json
 homepage: 
 licenses: []
 post_install_message: 
@@ -123,5 +157,12 @@ signing_key:
 specification_version: 3
 summary: A CLI For Bloc
 test_files:
+- spec/client/authenticate_spec.rb
+- spec/client/course_spec.rb
+- spec/client/enrollment_spec.rb
+- spec/command/authenticate_spec.rb
+- spec/command/tasks_spec.rb
 - spec/command/validate_spec.rb
+- spec/manifest_spec.rb
 - spec/spec_helper.rb
+- spec/valid_manifests/1.json

data/lib/bloc/command/create.rb

@@ -1,21 +0,0 @@
-module Bloc
-  module Command
-    class Create
-      def self.run(*args)
-        name = ARGV[1]
-        if name.nil?
-          raise "Please specify a name.".red
-        end
-        course = Bloc::Models::Course.new(:name => name, :description => "")
-        chapters = []
-        manifest = Bloc::Manifest.new({"course" => course, "chapters" => chapters})
-        begin
-          manifest.write
-          puts "Wrote manifest.".green
-        rescue Exception => e
-          raise e.to_s.red
-        end
-      end
-    end
-  end
-end

data/lib/bloc/command/patch.rb

@@ -1,14 +0,0 @@
-module Bloc
-  module Command
-    class Patch
-      def self.run(*args)
-        manifest = Manifest.parse
-        if ARGV[1].nil?
-          manifest.run_tests(:apply_patch => true)
-        else
-          manifest.run_tests(:chapter => ARGV[1].to_i, :apply_patch => true)
-        end
-      end
-    end
-  end
-end

data/lib/bloc/hash_constructed.rb

@@ -1,5 +0,0 @@
-module HashConstructed
- def initialize(h)
-   h.each {|k,v| send("#{k}=",v)}
- end
-end

data/lib/bloc/models.rb

@@ -1,55 +0,0 @@
-require 'bloc/hash_constructed.rb'
-require 'bloc/to_hash.rb'
-
-module Bloc
-  module Models
-    class Course
-      include HashConstructed
-      include ToHash
-      attr_accessor :name, :description, :default_file
-
-
-    end
-
-    class Chapter
-      include HashConstructed
-      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
-        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
-
-      def apply_patch
-        unless @patch.nil?
-          `patch < bloc/#{@patch}`
-        end
-      end
-
-      private
-
-      def test
-        `#{@command}`
-        results = JSON.parse(File.read("results.json"))
-        File.delete("results.json")
-        results
-      end
-    end
-  end
-end