bloc 0.0.9 → 0.0.10

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.0.10
+
+* create, test, and patch commands added
+* create the bloc directory on create if not already present
+* add deployable key to manifest attr_accessors
+* consolidate logic around running tests and patching
+* applying patches is no longer a private method of the manifest
+
 ### 0.0.9
 
 * in_tmp_git mixin, and removed reliance on bundler/setup

data/bin/bloc

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-
 require "bloc"
 
 commands = {
   'validate' => proc { Bloc::Command::Validate.run },
-  'generate' => proc { Bloc::Command::Generate.run }
+  'create' => proc { Bloc::Command::Create.run },
+  'test' => proc { Bloc::Command::Test.run },
+  'patch' => proc { Bloc::Command::Patch.run }
 }
-if ARGV.length == 1 && commands.keys.include?(ARGV.first.downcase)
+if commands.keys.include?(ARGV.first.downcase)
   begin
     commands[ARGV.first.downcase].call
   rescue => e
@@ -20,8 +21,10 @@ else
       bloc <command> [options]
     
     Commands:
-      validate
-      generate ["Course name"]  
+      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)
 eos
   puts helpstring
 end

data/lib/bloc/command.rb

@@ -1,5 +1,7 @@
 require "bloc/command/validate.rb"
-require "bloc/command/generate.rb"
+require "bloc/command/create.rb"
+require "bloc/command/test.rb"
+require "bloc/command/patch.rb"
 require "bloc/models.rb"
 require "bloc/manifest.rb"
 

data/lib/bloc/command/create.rb

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,14 @@
+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/command/test.rb

@@ -0,0 +1,14 @@
+module Bloc
+  module Command
+    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
+      end
+    end
+  end
+end

data/lib/bloc/manifest.rb

@@ -8,10 +8,11 @@ module Bloc
     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
+    attr_accessor :course, :chapters, :deployable
 
     def initialize(options)
       @course = options["course"]
@@ -19,6 +20,7 @@ module Bloc
     end
 
     def write
+      Dir.mkdir(File.dirname(MANIFEST_PATH))
       File.open(MANIFEST_PATH, "w") do |file|
         file.write(JSON.pretty_generate(to_h))
       end
@@ -52,10 +54,21 @@ module Bloc
       Manifest.new({"course" => course, "chapters" => chapters})
     end
 
-    def run_tests
+    def run_tests(options = {})
+      defaults = {:chapter => nil, :apply_patch => false}
+      options = defaults.merge(options)
+
       in_tmp_git do
-        @chapters.each do |chapter|
-          chapter.run_tests
+        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
       end
     end

data/lib/bloc/models.rb

@@ -20,7 +20,6 @@ module Bloc
       TEST_PASSED = "Passed: %s".green
 
       def run_tests
-        apply_patch
         unless @patch.nil?
           results = test
           results["tests"].each do |test_result|
@@ -37,6 +36,12 @@ module Bloc
         File.exists?("bloc/#{@patch}")
       end
 
+      def apply_patch
+        unless @patch.nil?
+          `patch < bloc/#{@patch}`
+        end
+      end
+
       private
 
       def test
@@ -45,12 +50,6 @@ module Bloc
         File.delete("results.json")
         results
       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.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bloc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126183569760 !ruby/object:Gem::Requirement
+  requirement: &70339116316320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126183569760
+  version_requirements: *70339116316320
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70126183569340 !ruby/object:Gem::Requirement
+  requirement: &70339116315900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126183569340
+  version_requirements: *70339116315900
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70126183568920 !ruby/object:Gem::Requirement
+  requirement: &70339116315480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126183568920
+  version_requirements: *70339116315480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70126183568500 !ruby/object:Gem::Requirement
+  requirement: &70339116315060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126183568500
+  version_requirements: *70339116315060
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70126183568080 !ruby/object:Gem::Requirement
+  requirement: &70339116314640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126183568080
+  version_requirements: *70339116314640
 description: A command-line tool for Bloc
 email:
 - roshan.choxi@gmail.com
@@ -86,7 +86,9 @@ files:
 - bloc.gemspec
 - lib/bloc.rb
 - lib/bloc/command.rb
-- lib/bloc/command/generate.rb
+- lib/bloc/command/create.rb
+- lib/bloc/command/patch.rb
+- lib/bloc/command/test.rb
 - lib/bloc/command/validate.rb
 - lib/bloc/hash_constructed.rb
 - lib/bloc/manifest.rb

data/lib/bloc/command/generate.rb

@@ -1,12 +0,0 @@
-module Bloc
-  module Command
-    class Generate
-      def self.run(*args)
-        course = Bloc::Models::Course.new(:name => "My course", :description => "")
-        chapters = []
-        manifest = Bloc::Manifest.new({"course" => course, "chapters" => chapters})
-        manifest.write
-      end
-    end
-  end
-end