computering 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efa6d55cd4edf4da0ff1bf5c1ab415973b9cdc0
-  data.tar.gz: 3f125e492b6ca53f7e011a044488ff4a0d2d00da
+  metadata.gz: 7c68086d104fb3bed1f55ac98d5125ae49425a39
+  data.tar.gz: 7c5863b2754e9976309ff05a49dd3700766e0947
 SHA512:
-  metadata.gz: 296528c1d1c84523f13a57366e38143a856db47ef4334bb2a900f3d3c7c7649ad268adc0897de24a7e36e285bd97fe2da8034e6196b0bf8bd1d5fc319d68c536
-  data.tar.gz: cb578a23be60309645c8dcf33e7b9438b90d4c07a978cc17af8bbcbabd00215e113b97d1dc1ba8c4140b8654a2c695519dd3d6cdbc1aa8b709e70966054556fa
+  metadata.gz: ebbdd7570a201575f677b467a6dbb0b9279721d1158e4464857dd084a7ee1db6b5f306d14135dee99ba872476bb79ffa066cb967c8b289f50bfc4fae4ab552ff
+  data.tar.gz: 43d10ef29b3bc8f2a7ccc3d4b5f9b6bae2f3d82a550c39896440f6c74c3d8048e134306df0f87c91b28c1f973ab9d23661e392dd6a2ccd63ed50ac9dd2bd2eeb

data/.travis.yml

@@ -0,0 +1,3 @@
+script: "bundle exec rake"
+rvm:
+  - 2.0.0-p247

data/README.md

@@ -24,7 +24,7 @@ echo "
 headline 'computering'
 paragraph 'is super easy'
 command 'echo to use'
-link 'see yourself', 'https://github.com/phoet/computering'
+link 'see yourself', 'https://github.com/phoet/computering#usage'
 " > preso.rb
 ```
 
@@ -39,7 +39,6 @@ computering preso.rb
 * syntax-check
 * dry-mode
 * config speed
-* add styling
 
 # License
 

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task default: :test

data/bin/computering

@@ -2,7 +2,7 @@
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-require "Computering"
+require "computering"
 
 abort "USAGE: computering file [file ...]" if ARGV.empty?
 

data/computering.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rainbow", "> 1.0"
+  spec.add_dependency "sorcerer"
+  spec.add_dependency "minitest"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
 end

data/example/preso.rb

@@ -1,7 +1,23 @@
+configure do
+  # changes styles described here: https://github.com/sickill/rainbow#features
+  self.style = {
+    headline: {
+      text:   "-".background(:green),
+      buffer: "-".background(:blue),
+    }
+  }
+end
+
 headline 'computering'
 
 paragraph 'is super easy'
 
 command 'echo to use'
 
-link 'see yourself', 'https://github.com/phoet/computering'
+spec "runs spec" do
+  it "even runs your spec with minitest" do
+    true.must_equal true
+  end
+end
+
+link 'see yourself', 'https://github.com/phoet/computering#usage'

data/example/socoded.rb

@@ -0,0 +1,23 @@
+paragraph 'hi, i am peter, member of señor developer crew'
+paragraph '@phoet on twitter and on github'
+paragraph 'i pretend to type incredible fast'
+
+headline 'SO CODED'
+
+paragraph 'A Web Conference in Hamburg'
+
+headline 'SAVE the DATE'
+
+paragraph '19. & 20. Sept. 2013'
+
+headline 'VENUE'
+
+paragraph 'LOLA Hamburg Bergedorf'
+
+headline 'LINEUP'
+
+list "Jessica Allen (Engine Yard)", "Jason Costello (GitHub)", "Chad Fowler (6Wunderkinder)"
+
+headline 'interwebs'
+
+link '@socodedconf', 'http://socoded.com/'

data/lib/computering.rb

@@ -1,9 +1,14 @@
 require "rainbow"
 
 require "computering/version"
+require "computering/config"
 require "computering/dsl"
 require "computering/dsl/text"
-require "computering/dsl/command"
 require "computering/dsl/headline"
+require "computering/dsl/list"
 require "computering/dsl/link"
+require "computering/dsl/command"
+require "computering/dsl/spec"
+require "computering/code_parser"
+require "computering/container"
 require "computering/cmd"

data/lib/computering/cmd.rb

@@ -4,27 +4,19 @@ module Computering
   class Cmd
     class Exit < StandardError; end
 
-    include Computering::Dsl
-
     CONTROL_C = 3
     ENTER     = 13
 
     def initialize(file, stdin = STDIN, stdout = STDOUT)
-      @file   = file
-      @stdin  = stdin
-      @stdout = stdout
-      @code   = File.readlines(file).join "\n"
-
-      instance_eval @code
+      @file       = file
+      @stdin      = stdin
+      @stdout     = stdout
+      @container  = Container.new File.read(file)
     end
 
     def execute
-      items.each do |item|
-        if item.blank?
-          @stdout.puts
-        else
-          readchars item
-        end
+      @container.items.each do |item|
+        readchars item unless item.blank?
       end
     end
 
@@ -36,10 +28,11 @@ module Computering
           if char.ord == ENTER
             @stdout.puts item[i..-1]
             item.execute
-            @stdout.puts item.buffer
+            @stdout.puts item.buffer  if item.buffer
+            @stdout.puts item.padding if item.padding
             break
           else
-            @stdout.putc item[i] if item[i]
+            @stdout.write item[i] if item[i]
             i += 1
           end
         end

data/lib/computering/code_parser.rb

@@ -0,0 +1,31 @@
+require "ripper"
+require "sorcerer"
+
+module Computering
+  class CodeParser
+    attr_reader :blocks
+
+    def initialize(code)
+      @sexp   = Ripper::SexpBuilder.new(code).parse
+      @blocks = {}
+      walk(@sexp)
+    end
+
+    def walk(sexp, last=nil)
+      sexp.each do |item|
+        if item.is_a? Array
+          walk(item, sexp)
+        elsif item == :command
+          next_item = sexp[1]
+          token, name, _ = next_item
+          if token == :@ident && name == "spec"
+            block_sexp = last.last.last
+            code = Sorcerer.source(block_sexp, multiline: true, indent: true)
+            name = sexp.last[1].last.last.last[1]
+            @blocks[name] = code
+          end
+        end
+      end
+    end
+  end
+end

data/lib/computering/config.rb

@@ -0,0 +1,48 @@
+module Computering
+  class Config
+    @style_defaults = {
+      text: {
+        text:   "-",
+        buffer: "-",
+      },
+      list: {
+        text:   "-",
+        bullet: "-".color(:green),
+      },
+      headline: {
+        text:   "-".background(:red),
+        buffer: "-".background(:red),
+      },
+      link: {
+        text:   "-".color(:black).background(:cyan),
+        cursor: "-".color(:green),
+        error:  "-".background(:red),
+      },
+      command: {
+        text:   "-".color(:black).background(:cyan),
+        cursor: "-".color(:green),
+        buffer: "-".bright,
+        error:  "-".color(:red),
+      },
+      spec: {
+        text:   "-".foreground(:green),
+        buffer: "-".bright,
+        error:  "-".color(:red),
+      },
+    }
+    @style = @style_defaults.dup
+
+    class << self
+      attr_accessor :style
+
+      def styling(text, id, type)
+        style_defaults(id, type).gsub("-", text)
+      end
+
+      def style_defaults(id, type)
+        default = @style_defaults[id][type] || "-"
+        (style[id] && style[id][type]) ? style[id][type] : default
+      end
+    end
+  end
+end

data/lib/computering/container.rb

@@ -0,0 +1,17 @@
+module Computering
+  class Container
+    include Computering::Dsl
+
+    def initialize(code)
+      @source = CodeParser.new(code)
+
+      instance_eval code
+    end
+
+    protected
+
+    def block_source(name)
+      @source.blocks[name].strip
+    end
+  end
+end

data/lib/computering/dsl.rb

@@ -1,14 +1,26 @@
 module Computering
   module Dsl
-    def headline(text)
+    def spec(name, &block)
+      self.items += Spec.from_block(name, block_source(name), &block)
+    end
+
+    def configure(&block)
+      Config.instance_eval(&block)
+    end
+
+    def list(*text)
+      self.items += List.from_text(text)
+    end
+
+    def headline(*text)
       self.items += Headline.from_text(text)
     end
 
-    def paragraph(text)
+    def paragraph(*text)
       self.items += Text.from_text(text)
     end
 
-    def command(text)
+    def command(*text)
       self.items += Command.from_text(text)
     end
 
@@ -16,8 +28,6 @@ module Computering
       self.items += Link.from_text(text, link)
     end
 
-    protected
-
     def items
       @items ||= []
     end

data/lib/computering/dsl/command.rb

@@ -2,24 +2,23 @@ require "bundler"
 
 module Computering::Dsl
   class Command < Text
-    def initialize(cmd)
-      @text   = " #{'⌘'.color(:green)}  #{cmd.color(:black).background(:cyan)}"
-      @buffer = ""
-      @cmd    = cmd
-    end
-
     def execute
-      output = ""
+      @buffer = "\n"
       Bundler.with_clean_env do
-        output = `#{@cmd}`
+        @buffer << `#{@text}`.chomp
       end
-      @buffer = "\n#{output}\n"
     rescue
-      puts $!
+      @buffer << add_style($!.message, :error)
     end
 
-    def self.from_text(cmd)
-      Array(self.new cmd)
+    protected
+
+    def text_with_style(text, index)
+      text = add_style(text, :text)
+      if index == 0 || index == (0..-1)
+        text = " #{add_style('⌘', :cursor)}  #{text}"
+      end
+      text
     end
   end
 end

data/lib/computering/dsl/headline.rb

@@ -1,8 +1,7 @@
 module Computering::Dsl
   class Headline < Text
-    def initialize(text)
-      @text   = text.background(:red)
-      @buffer = "#{'=' * text.size}\n\n".foreground(:red)
+    def buffer
+      add_style('=' * @text.size, :buffer)
     end
   end
 end

data/lib/computering/dsl/link.rb

@@ -1,19 +1,39 @@
+# -*- coding: utf-8 -*-
 module Computering::Dsl
   class Link < Text
+    def self.from_text(text, link)
+      Array(self.new text, link)
+    end
+
     def initialize(text, link)
-      @text   = " #{'☞'.color(:green)}  #{text}"
-      @link   = link
-      @buffer = ''
+      super text
+      @link = link
     end
 
     def execute
-      `open '#{@link}'`
+      `#{command_by_os} '#{@link}'`
     rescue
-      puts $!
+      @buffer = add_style($!.message, :error)
     end
 
-    def self.from_text(text, link)
-      Array(self.new text, link)
+    protected
+
+    def text_with_style(text, index)
+      text = add_style(text, :text)
+      if index == 0 || index == (0..-1)
+        text = " #{add_style('☞', :cursor)}  #{text}"
+      end
+      text
+    end
+
+    private
+
+    def command_by_os
+      if (/linux/ =~ RUBY_PLATFORM)
+        "xdg-open"
+      else
+        "open"
+      end
     end
   end
 end

data/lib/computering/dsl/list.rb

@@ -0,0 +1,13 @@
+module Computering::Dsl
+  class List < Text
+    protected
+
+    def text_with_style(text, index)
+      text = add_style(text, :text)
+      if index == 0 || index == (0..-1)
+        text = " #{add_style('*', :bullet)}  #{text}"
+      end
+      text
+    end
+  end
+end

data/lib/computering/dsl/spec.rb

@@ -0,0 +1,49 @@
+require "minitest"
+require "minitest/spec"
+require "stringio"
+
+module Minitest
+  class SummaryReporter < StatisticsReporter
+    def start
+      # REM (ps) monkeypatch it so that there is not so much verbose output
+      super
+      self.sync = io.respond_to? :"sync="
+      self.old_sync, io.sync = io.sync, true if self.sync
+    end
+  end
+end
+
+module Computering::Dsl
+  class Spec < Text
+    def self.from_block(name, text, &block)
+      Array(self.new name, text, &block)
+    end
+
+    def initialize(name, text, &block)
+      super text
+      @name   = name
+      @block  = block
+      @buffer = "\n"
+    end
+
+    def execute
+      describe @name, &@block
+
+      output    = StringIO.new("")
+      reporter  = Minitest::SummaryReporter.new(output)
+
+      reporter.start
+
+      Minitest::Runnable.runnables.each do |runnable|
+        runnable.run reporter
+      end
+
+      reporter.report
+
+      @buffer << output.string.strip
+      Minitest::Test.reset
+    rescue
+      @buffer << add_style($!.message, :error)
+    end
+  end
+end

data/lib/computering/dsl/text.rb

@@ -1,27 +1,46 @@
 module Computering::Dsl
   class Text
-    def initialize(text)
+    def self.from_text(*text)
+      text.flatten.map do |t|
+        t.strip.split("\n").map { |line| self.new(line) }
+      end.flatten
+    end
+
+    attr_reader :text
+
+    def initialize(text, buffer = nil)
       @text   = text
-      @buffer = ""
+      @buffer = buffer
     end
 
     def [](index)
-      @text[index]
+      text_with_style(@text[index], index) if @text[index]
     end
 
     def execute
     end
 
     def buffer
-      @buffer
+      add_style(@buffer, :buffer) if @buffer
+    end
+
+    def padding
+      "\n"
     end
 
     def blank?
       @text.nil? || @text.strip == ""
     end
 
-    def self.from_text(text)
-      text.strip.split("\n").map { |line| self.new(line) }
+    protected
+
+    def text_with_style(text, index)
+      add_style(text, :text)
+    end
+
+    def add_style(text, type)
+      id = self.class.name.split("::").last.downcase.to_sym
+      Computering::Config.styling(text, id, type)
     end
   end
 end

data/lib/computering/version.rb

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

data/test/config_test.rb

@@ -0,0 +1,25 @@
+require_relative "test_helper"
+
+module Computering
+  describe Config do
+    describe "style" do
+      before do
+        Config.style = {}
+      end
+
+      it "has defaults" do
+        assert_equal Hash, Config.style.class
+      end
+
+      it "applies styles to text" do
+        assert_equal "-", Config.style_defaults(:text, :text)
+        assert_equal "-".color(:green), Config.style_defaults(:command, :cursor)
+      end
+
+      it "can override styles" do
+        Config.style = {command: {cursor: "-".color(:blue)}}
+        assert_equal "-".color(:blue), Config.style_defaults(:command, :cursor)
+      end
+    end
+  end
+end

data/test/dsl/text_test.rb

@@ -0,0 +1,38 @@
+require_relative "../test_helper"
+
+module Computering::Dsl
+  describe Text do
+    describe "char access" do
+      before do
+        @item = Text.new "txt"
+      end
+
+      it "gets each character" do
+        assert_equal "t", @item[0]
+        assert_equal "x", @item[1]
+        assert_equal "t", @item[2]
+        assert_equal "txt", @item[0..-1]
+      end
+    end
+
+    describe "initalization" do
+      before do
+        @item = Text.new ""
+      end
+
+      it "has defaults" do
+        assert_equal true, @item.blank?
+        assert_equal "\n", @item.padding
+        assert_equal nil,  @item.buffer
+        assert_equal nil,  @item.execute
+      end
+
+      it "inits from string" do
+        items = Text.from_text("bla\nblupp")
+        assert_equal 2, items.size
+        assert_equal "bla", items[0].text
+        assert_equal "blupp", items[1].text
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'minitest/autorun'
+require 'computering'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: computering
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Schröder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -25,33 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sorcerer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,23 +89,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/computering
 - computering.gemspec
 - example/preso.rb
+- example/socoded.rb
 - lib/computering.rb
 - lib/computering/cmd.rb
+- lib/computering/code_parser.rb
+- lib/computering/config.rb
+- lib/computering/container.rb
 - lib/computering/dsl.rb
 - lib/computering/dsl/command.rb
 - lib/computering/dsl/headline.rb
 - lib/computering/dsl/link.rb
+- lib/computering/dsl/list.rb
+- lib/computering/dsl/spec.rb
 - lib/computering/dsl/text.rb
 - lib/computering/version.rb
-- spec/computering/dsl/text_spec.rb
-- spec/spec_helper.rb
+- test/config_test.rb
+- test/dsl/text_test.rb
+- test/test_helper.rb
 homepage: https://github.com/phoet/computering
 licenses:
 - THE (extended) BEER-WARE LICENSE
@@ -117,6 +138,7 @@ signing_key:
 specification_version: 4
 summary: pretends you could type really fast
 test_files:
-- spec/computering/dsl/text_spec.rb
-- spec/spec_helper.rb
+- test/config_test.rb
+- test/dsl/text_test.rb
+- test/test_helper.rb
 has_rdoc: 

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/spec/computering/dsl/text_spec.rb

@@ -1,12 +0,0 @@
-require "spec_helper"
-
-module Computering::Dsl
-  describe Text do
-    context "initialization" do
-      it "inits from a paragraph" do
-        items = Text.from_text(TEXT)
-        items.should have(3).items
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,13 +0,0 @@
-require "computering"
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-end
-
-TEXT = <<-PARAGRAPH
-Hallo leute,
-
-wie geht es euch?
-PARAGRAPH