Shorty 0.2.0 → 0.2.1

data/README.md

@@ -9,14 +9,19 @@ Installation
 
     gem install Shorty
 
-Usage
+Usage: Ruby
 ------
 
     require "Shorty"
     
     include Shorty::DSL
 
-    add :ssh, My_SSH_Commands.new
+    class My_SSH
+      def self.restart
+      end
+    end
+    
+    add :ssh, My_SSH
     
     before :ssh, :restart do
       puts "restarting SSH"
@@ -26,8 +31,50 @@ Usage
       puts "SSH has been restarted"
     end
 
-    run :ssh, :restart
+    run :ssh, :restart 
+    
+    # --> My_SSH.restart is run with before/after hooks.
+
+You can also use lambdas or a code block:
+   
+    add    :start, lambda { `service ssh restart` }
+    before :start, :run, lambda { puts 're-starting ssh' }
+    after  :start, :run, lambda { puts 'finished re-starting ssh' }
+
+    add    :stop do 
+      `service ssh stop`
+    end
 
+    run :start
+    
+    # equivalent to...
+    run :start, :run
+    
+    # --> "lambda { `service ssh restart` }.call" is called.
+
+Shorty is implemented [in just one file](https://github.com/da99/Shorty/blob/master/lib/Shorty.rb)
+in case you have any more questions.
+
+Usage: Shorty (executable)
+------
+
+Write a Ruby file, `~/uptime.rb`, that uses the Shorty DSL:
+
+    add :uptime, lambda { puts 'uptime' }
+
+    before :uptime, :run do
+      puts "starting uptime"
+    end
+
+    after :uptime, :run do
+      puts "finished uptime"
+    end
+
+    run :uptime
+
+In your shell:
+
+    Shorty ~/uptime.rb
 
 Run Tests
 ---------
@@ -37,9 +84,4 @@ Run Tests
     bundle update
     bundle exec bacon spec/main.rb
 
-"I hate writing."
------------------------------
-
-If you know of existing software that makes the above redundant,
-please tell me. The last thing I want to do is maintain code.
 

data/lib/Shorty.rb

@@ -16,14 +16,21 @@ class Shorty
       @afters ||= Hash[]
     end
 
-    def add name, val = :_NONE_
-      if name.is_a?(String) && val == :_NONE_
+    def add name, val = :_NONE_, &blok
+      if name.is_a?(String) && val == :_NONE_ && !blok
         file = File.expand_path(name)
         (file = "#{file}.rb") unless File.exists?(file)
         eval File.read(file), nil, file, 1
         return true
       end
+      
       raise ArgumentError, "#{name.inspect} already set" if shortys[name]
+      raise ArgumentError, "lambda and block both given" if val.is_a?(Proc) && block_given?
+      
+      if val == :_NONE_ && blok
+        val = blok
+      end
+
       shortys[name] = val
     end
 

data/lib/Shorty/version.rb

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

data/spec/tests/Shorty.rb

@@ -13,7 +13,35 @@ module My_Box
   end # === class
 end # === My_Box
 
-describe "Shorty run" do
+describe "Shorty :add" do
+  
+  it "raises ArgumentError if both lambda and block are given" do
+    lambda {
+      s = Shorty.new
+      l = lambda {}
+      s.add :my_box, l do
+      end
+    }.should.raise(ArgumentError)
+    .message.should.match %r!lambda and block both given!
+  end
+
+  it "accepts a block as a value" do
+    p = Proc.new {}
+    s = Shorty.new
+    s.add :my_box, &p
+    s.shortys[:my_box].should == p
+  end
+
+  it "accepts a lambda as a value" do
+    l = lambda {}
+    s = Shorty.new
+    s.add :my_box, l
+    s.shortys[:my_box].should == l
+  end
+
+end # === Shorty :add
+
+describe "Shorty :run" do
   
   before { 
     @s = Shorty.new
@@ -46,6 +74,18 @@ describe "Shorty before" do
     s.run :test
     t.should == [:b, :t]
   end
+  
+  it "accepts a block" do
+    s = Shorty.new
+    t = []
+    s.add :test, lambda { t << :t }
+    s.before :test, :run do
+      t << :b
+    end
+
+    s.run :test
+    t.should == [:b, :t]
+  end
 
   it "accepts a lambda instead of a block" do
     s = Shorty.new
@@ -85,6 +125,18 @@ describe "Shorty after" do
     s.run :test
     t.should == [:t, :a]
   end
+  
+  it "accepts a block" do
+    s = Shorty.new
+    t = []
+    s.add :test, lambda { t << :t }
+    s.after :test, :run do
+      t << :a
+    end
+
+    s.run :test
+    t.should == [:t, :a]
+  end
 
   it "accepts a lambda instead of a block" do
     s = Shorty.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Shorty
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: