computering 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c68086d104fb3bed1f55ac98d5125ae49425a39
-  data.tar.gz: 7c5863b2754e9976309ff05a49dd3700766e0947
+  metadata.gz: d13edc9482c52c1b00141f73e6ace9b3110de791
+  data.tar.gz: cc408c711fdeafb68511ce4d81ae9d608439f5d7
 SHA512:
-  metadata.gz: ebbdd7570a201575f677b467a6dbb0b9279721d1158e4464857dd084a7ee1db6b5f306d14135dee99ba872476bb79ffa066cb967c8b289f50bfc4fae4ab552ff
-  data.tar.gz: 43d10ef29b3bc8f2a7ccc3d4b5f9b6bae2f3d82a550c39896440f6c74c3d8048e134306df0f87c91b28c1f973ab9d23661e392dd6a2ccd63ed50ac9dd2bd2eeb
+  metadata.gz: 4b56fde80f029c0ebf9947c9289076c62e8f0c90da539ab9e26c1b47ae7480ea42e547705cdb806dcb53902e2746c03cb43f8176b7bd92e6b3ee65f9bfc08ed2
+  data.tar.gz: 951a7b2a5d3db91b742babb63148a43f60cbb3c13c1f137a2149c919599c2628622413cb647ed17389249426f4272400f3d48ece8cd085370177a03798492011

data/.travis.yml

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

data/README.md

@@ -1,6 +1,6 @@
 # Computering
 
-![Computering](https://peepcode.com/blog/2013/charismatic-duo/img/dinosaur-hands.gif)
+![Computering](http://blog.pluralsight.com/wp-content/uploads/peepcode/2013/charismatic-duo/img/dinosaur-hands.gif)
 
 # Usage
 

data/computering.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rainbow", "> 1.0"
-  spec.add_dependency "sorcerer"
-  spec.add_dependency "minitest"
+  spec.add_dependency "rainbow", "~> 2.0"
+  spec.add_dependency "sorcerer", "~> 1.0"
+  spec.add_dependency "minitest", "~> 5.2"
+  spec.add_dependency "rouge", "~> 1.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.1"
 end

data/example/middleware.rb

@@ -0,0 +1,72 @@
+headline 'Rails Middlewares for Fun (and Profit?)'
+link 'Señor Developer Bacon', 'http://bit.ly/1maTrIt'
+
+paragraph 'what can we do with a middleware?'
+
+list [
+  "implement cross-cutting concerns (authorization, caching)",
+  "enrich request information (session-cookies)",
+  "modify the response (inject javascript)",
+]
+
+link 'rails is rack based', 'http://rack.github.io/'
+
+code(%Q[
+class HelloWorld
+  def call(env)
+    [200, {"Content-Type" => "text/plain"}, ["Hello world!"]]
+  end
+end
+
+# even simpler
+proc {|env| [200, {"Content-Type" => "text/plain"}, ["Hello world!"]] }
+])
+
+headline 'Website Example'
+
+command 'cd ~/o/ && git co 2c9846ce'
+link 'veggie.onruby', 'http://hamburg.onruby.dev:5000/'
+
+paragraph "let's write some code"
+
+code(%Q[
+# app/middlewares/bacon_infused.rb
+class BaconInfused
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    s, h, r = @app.call(env)
+    if r.content_type == 'text/html'
+      r.body = r.body.
+        gsub(/ruby|rails/i, 'BACON').
+        gsub(/src=('|")([^'|"]+).(png|jpg|jpeg|gif).*('|")/,
+          'src="http://bit.ly/1maTrIt"')
+    end
+    [s, h, r]
+  end
+end
+
+# config/application.rb
+config.middleware.use "BaconInfused"
+])
+
+command 'cd ~/o/ && git co ba41abd30'
+command 'cd ~/o/ && bundle exec rake middleware'
+link 'bacon.onruby', 'http://hamburg.onruby.dev:5000/'
+
+headline "Downsides"
+list [
+  "out of sight",
+  "fragile",
+  "no live code reloading",
+]
+
+link "WHY U NO CMD+R?", 'http://stackoverflow.com/questions/20874222/reloading-rails-middleware-without-restarting-the-server-in-development/21323432'
+
+link 'zazicki', 'http://bit.ly/Mqmwzz'
+
+link 'github.com/phoet/zazicki', 'http://github.com/phoet/zazicki'
+
+command 'cowsay KTHXBYE'

data/lib/computering.rb

@@ -9,6 +9,7 @@ require "computering/dsl/list"
 require "computering/dsl/link"
 require "computering/dsl/command"
 require "computering/dsl/spec"
+require "computering/dsl/code"
 require "computering/code_parser"
 require "computering/container"
 require "computering/cmd"

data/lib/computering/cmd.rb

@@ -23,16 +23,23 @@ module Computering
     def readchars(item)
       i = 0
       @stdin.noecho do |io|
+        @stdout.write item.padding if item.padding
         while char = io.getch
           raise Exit if char.ord == CONTROL_C
           if char.ord == ENTER
             @stdout.puts item[i..-1]
             item.execute
-            @stdout.puts item.buffer  if item.buffer
-            @stdout.puts item.padding if item.padding
+            @stdout.puts "#{item.padding}#{item.buffer}" if item.buffer
+            @stdout.puts
             break
           else
-            @stdout.write item[i] if item[i]
+            if item[i]
+              while item[i] =~ /\s/
+                @stdout.write item[i]
+                i += 1
+              end
+              @stdout.write item[i]
+            end
             i += 1
           end
         end

data/lib/computering/config.rb

@@ -7,27 +7,27 @@ module Computering
       },
       list: {
         text:   "-",
-        bullet: "-".color(:green),
+        bullet: Rainbow("-").color(:green),
       },
       headline: {
-        text:   "-".background(:red),
-        buffer: "-".background(:red),
+        text:   Rainbow("-").background(:red),
+        buffer: Rainbow("-").background(:red),
       },
       link: {
-        text:   "-".color(:black).background(:cyan),
-        cursor: "-".color(:green),
-        error:  "-".background(:red),
+        text:   Rainbow("-").color(:black).background(:cyan),
+        cursor: Rainbow("-").color(:green),
+        error:  Rainbow("-").background(:red),
       },
       command: {
-        text:   "-".color(:black).background(:cyan),
-        cursor: "-".color(:green),
-        buffer: "-".bright,
-        error:  "-".color(:red),
+        text:   Rainbow("-").color(:black).background(:cyan),
+        cursor: Rainbow("-").color(:green),
+        buffer: Rainbow("-").bright,
+        error:  Rainbow("-").color(:red),
       },
       spec: {
-        text:   "-".foreground(:green),
-        buffer: "-".bright,
-        error:  "-".color(:red),
+        text:   Rainbow("-").foreground(:green),
+        buffer: Rainbow("-").bright,
+        error:  Rainbow("-").color(:red),
       },
     }
     @style = @style_defaults.dup

data/lib/computering/dsl.rb

@@ -1,13 +1,13 @@
 module Computering
   module Dsl
-    def spec(name, &block)
-      self.items += Spec.from_block(name, block_source(name), &block)
-    end
-
     def configure(&block)
       Config.instance_eval(&block)
     end
 
+    def spec(name, &block)
+      self.items += Spec.from_block(name, block_source(name), &block)
+    end
+
     def list(*text)
       self.items += List.from_text(text)
     end
@@ -20,6 +20,10 @@ module Computering
       self.items += Text.from_text(text)
     end
 
+    def code(*text)
+      self.items += Code.from_text(text)
+    end
+
     def command(*text)
       self.items += Command.from_text(text)
     end

data/lib/computering/dsl/code.rb

@@ -0,0 +1,19 @@
+require 'rouge'
+
+module Computering::Dsl
+  class Code < Text
+    def self.from_text(*text)
+      text.flatten.map { |line| self.new(line) }
+    end
+
+    def padding
+      nil
+    end
+
+    protected
+
+    def text_with_style(text, index)
+      Rouge.highlight(text, 'ruby', 'terminal256')
+    end
+  end
+end

data/lib/computering/dsl/headline.rb

@@ -3,5 +3,9 @@ module Computering::Dsl
     def buffer
       add_style('=' * @text.size, :buffer)
     end
+
+    def margin
+      "       "
+    end
   end
 end

data/lib/computering/dsl/text.rb

@@ -20,12 +20,12 @@ module Computering::Dsl
     def execute
     end
 
-    def buffer
-      add_style(@buffer, :buffer) if @buffer
+    def padding
+      "   "
     end
 
-    def padding
-      "\n"
+    def buffer
+      add_style(@buffer, :buffer) if @buffer
     end
 
     def blank?

data/lib/computering/version.rb

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

data/test/config_test.rb

@@ -13,12 +13,12 @@ module Computering
 
       it "applies styles to text" do
         assert_equal "-", Config.style_defaults(:text, :text)
-        assert_equal "-".color(:green), Config.style_defaults(:command, :cursor)
+        assert_equal Rainbow("-").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)
+        Config.style = {command: {cursor: Rainbow("-").color(:blue)}}
+        assert_equal Rainbow("-").color(:blue), Config.style_defaults(:command, :cursor)
       end
     end
   end

data/test/dsl/text_test.rb

@@ -22,7 +22,7 @@ module Computering::Dsl
 
       it "has defaults" do
         assert_equal true, @item.blank?
-        assert_equal "\n", @item.padding
+        assert_equal "   ", @item.padding
         assert_equal nil,  @item.buffer
         assert_equal nil,  @item.execute
       end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: computering
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Schröder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sorcerer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !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
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: pretends you could type really fast
 email:
 - phoetmail@googlemail.com
@@ -88,13 +102,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - bin/computering
 - computering.gemspec
+- example/middleware.rb
 - example/preso.rb
 - example/socoded.rb
 - lib/computering.rb
@@ -103,6 +118,7 @@ files:
 - lib/computering/config.rb
 - lib/computering/container.rb
 - lib/computering/dsl.rb
+- lib/computering/dsl/code.rb
 - lib/computering/dsl/command.rb
 - lib/computering/dsl/headline.rb
 - lib/computering/dsl/link.rb
@@ -123,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: pretends you could type really fast