Shorty 0.1.0 → 0.2.0

data/README.md

@@ -2,7 +2,7 @@
 Shorty
 ================
 
-A Ruby gem.
+A Ruby gem that provides DSL to add before/after hooks to method calls.
 
 Installation
 ------------

data/bin/Shorty

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+# 
+
+
+require "Shorty"
+
+include Shorty::DSL
+
+files = ARGV.map { |str| File.expand_path(str) }.uniq
+
+files.each { |file|
+  require file
+}

data/lib/Shorty.rb

@@ -27,14 +27,19 @@ class Shorty
       shortys[name] = val
     end
 
-    def before name, action, &blok
-      befores[[name, action]] ||= []
-      befores[[name, action]] << blok
+    def before *args, &blok
+      add_hook :before, *args, &blok
     end
 
-    def after name, action, &blok
-      afters[[name, action]] ||= []
-      afters[[name, action]] << blok
+    def after *args, &blok
+      add_hook :after, *args, &blok
+    end
+
+    def add_hook type, name, action, l = nil, &blok
+      raise ArgumentError, "lambda and block both given" if l && blok
+      list = (type == :before ? befores : afters )
+      list[[name, action]] ||= []
+      list[[name, action]] << (l || blok)
     end
 
     def run_hooks group, name, action, package
@@ -67,10 +72,6 @@ class Shorty
       result
     end # === def package
 
-    def executable? name
-      `which #{name}`.strip.empty?
-    end
-
   end # === DSL
 
   include DSL

data/lib/Shorty/version.rb

@@ -1,3 +1,3 @@
 class Shorty
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/files/uptime.rb

@@ -0,0 +1,12 @@
+
+add :uptime, lambda { puts 'uptime' }
+
+before :uptime, :run do
+  puts "starting uptime"
+end
+
+after :uptime, :run do
+  puts "finished uptime"
+end
+
+run :uptime

data/spec/main.rb

@@ -3,6 +3,7 @@ require File.expand_path('spec/helper')
 require 'Shorty'
 require 'Bacon_Colored'
 require 'pry'
+require 'Exit_Zero'
 
 
 # ======== Include the tests.

data/spec/tests/Shorty.rb

@@ -47,6 +47,28 @@ describe "Shorty before" do
     t.should == [:b, :t]
   end
 
+  it "accepts a lambda instead of a block" do
+    s = Shorty.new
+    t = []
+    s.add :test, lambda { t << :t }
+    s.before :test, :run, lambda {
+      t << :b
+    }
+
+    s.run :test
+    t.should == [:b, :t]
+  end
+  
+  it "raises ArgumentError if both a lambda and a block are given" do
+    s = Shorty.new
+    s.add :test, lambda {}
+    lambda {
+      l = lambda {}
+      s.before(:test, :run, l) {}
+    }.should.raise(ArgumentError)
+    .message.should.match %r!lambda and block both given!
+  end
+
 end # === Shorty before
 
 
@@ -64,4 +86,26 @@ describe "Shorty after" do
     t.should == [:t, :a]
   end
 
+  it "accepts a lambda instead of a block" do
+    s = Shorty.new
+    t = []
+    s.add :test, lambda { t << :t }
+    s.after :test, :run, lambda {
+      t << :a
+    }
+
+    s.run :test
+    t.should == [:t, :a]
+  end
+  
+  it "raises ArgumentError if both a lambda and a block are given" do
+    s = Shorty.new
+    s.add :test, lambda {}
+    lambda {
+      l = lambda {}
+      s.after(:test, :run, l) {}
+    }.should.raise(ArgumentError)
+    .message.should.match %r!lambda and block both given!
+  end
+
 end # === Shorty after

data/spec/tests/bin.rb

@@ -1,13 +1,36 @@
 
-bins = Dir.glob("bin/*")
-
-unless bins.empty?
-  describe "permissions of bin/" do
-    bins.each { |file|
-      it "should chmod 755 for: #{file}" do
-        `stat -c %a #{file}`.strip
-        .should.be == "755"
-      end
-    }
-  end # === permissions of bin/
-end # === unless bins.empty?
+
+describe "permissions of bin/" do
+  
+  bins = Dir.glob("bin/*")
+  
+  bins.each { |file|
+    it "should chmod 755 for: #{file}" do
+      `stat -c %a #{file}`.strip
+      .should.be == "755"
+    end
+  }
+  
+end # === permissions of bin/
+
+describe "Shorty bin" do
+  
+  it "runs file that includes Shorty DSL" do
+    Exit_0("Shorty spec/files/uptime.rb").out.split
+    .should == %@ 
+      starting uptime
+      uptime
+      finished uptime
+    @.split
+  end
+
+  it "runs file only once despite same file, different relative paths" do
+    Exit_0("Shorty spec/files/uptime.rb ./spec/files/uptime.rb").out.split
+    .should == %@ 
+      starting uptime
+      uptime
+      finished uptime
+    @.split
+  end
+
+end # === Shorty bin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Shorty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -95,7 +95,8 @@ description: ! "\n    Add before/after hooks to your method calls.  More info. a
   \   the homepage.\n  "
 email:
 - i-hate-spam-45671204@mailinator.com
-executables: []
+executables:
+- Shorty
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,8 +105,10 @@ files:
 - README.md
 - Rakefile
 - Shorty.gemspec
+- bin/Shorty
 - lib/Shorty.rb
 - lib/Shorty/version.rb
+- spec/files/uptime.rb
 - spec/helper.rb
 - spec/main.rb
 - spec/tests/DSL.rb