Shorty 0.2.1 → 0.3.0

data/README.md

@@ -37,19 +37,19 @@ Usage: Ruby
 
 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 
+    add :start, lambda { `service ssh restart` }
+    
+    add :stop do 
       `service ssh stop`
     end
 
-    run :start
-    
-    # equivalent to...
-    run :start, :run
+    before :start, :call, lambda { puts 're-starting ssh' }
     
+    after  :stop, :call do
+      puts 'ssh stopped'
+    end
+
+    run :start, :call
     # --> "lambda { `service ssh restart` }.call" is called.
 
 Shorty is implemented [in just one file](https://github.com/da99/Shorty/blob/master/lib/Shorty.rb)

data/lib/Shorty.rb

@@ -60,19 +60,14 @@ class Shorty
       }
     end
 
-    def run name, action = nil
+    def run name, action
 
       r = shortys[name]
       raise ArgumentError, "#{name.inspect} not found" unless r
-      action ||= :run
 
       run_hooks befores, name, action, r 
       
-      result = if r.is_a?(Proc) && action == :run
-        r.call
-      else
-        r.send action
-      end
+      result = r.send(action)
       
       run_hooks afters,  name, action, r 
 

data/lib/Shorty/version.rb

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

data/spec/files/uptime.rb

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

data/spec/tests/DSL.rb

@@ -6,7 +6,7 @@ describe "Shorty DSL" do
   it "adds Shorty functionality" do
     a = nil
     add :ssh, lambda { a = :a}  
-    run :ssh
+    run :ssh, :call
     a.should == :a
   end
   

data/spec/tests/Shorty.rb

@@ -48,42 +48,49 @@ describe "Shorty :run" do
     @s.add :my_box, My_Box
   }
   
-  it "sets default action to :run" do
-    @s.run(:my_box)
-    .should == "My_Box run"
-  end
-
   it "runs target action" do
     @s.run(:my_box, :custom)
     .should == "My_Box custom"
   end
   
-end # === Shorty run
-
-
-describe "Shorty before" do
-  
-  it "runs before hooks before run" do
+  it "runs before hooks" do
     s = Shorty.new
     t = []
     s.add :test, lambda { t << :t }
-    s.before :test, :run do
+    s.before :test, :call do
       t << :b
     end
 
-    s.run :test
+    s.run :test, :call
     t.should == [:b, :t]
   end
   
+  it "runs after hooks" do
+    s = Shorty.new
+    t = []
+    s.add :test, lambda { t << :t }
+    s.after :test, :call do
+      t << :a
+    end
+
+    s.run :test, :call
+    t.should == [:t, :a]
+  end
+  
+end # === Shorty run
+
+
+describe "Shorty before" do
+  
   it "accepts a block" do
     s = Shorty.new
     t = []
     s.add :test, lambda { t << :t }
-    s.before :test, :run do
+    s.before :test, :call do
       t << :b
     end
 
-    s.run :test
+    s.run :test, :call
     t.should == [:b, :t]
   end
 
@@ -91,11 +98,11 @@ describe "Shorty before" do
     s = Shorty.new
     t = []
     s.add :test, lambda { t << :t }
-    s.before :test, :run, lambda {
+    s.before :test, :call, lambda {
       t << :b
     }
 
-    s.run :test
+    s.run :test, :call
     t.should == [:b, :t]
   end
   
@@ -104,7 +111,7 @@ describe "Shorty before" do
     s.add :test, lambda {}
     lambda {
       l = lambda {}
-      s.before(:test, :run, l) {}
+      s.before(:test, :call, l) {}
     }.should.raise(ArgumentError)
     .message.should.match %r!lambda and block both given!
   end
@@ -114,27 +121,15 @@ end # === Shorty before
 
 describe "Shorty after" do
   
-  it "runs after hooks after run" 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 block" do
     s = Shorty.new
     t = []
     s.add :test, lambda { t << :t }
-    s.after :test, :run do
+    s.after :test, :call do
       t << :a
     end
 
-    s.run :test
+    s.run :test, :call
     t.should == [:t, :a]
   end
 
@@ -142,11 +137,11 @@ describe "Shorty after" do
     s = Shorty.new
     t = []
     s.add :test, lambda { t << :t }
-    s.after :test, :run, lambda {
+    s.after :test, :call, lambda {
       t << :a
     }
 
-    s.run :test
+    s.run :test, :call
     t.should == [:t, :a]
   end
   
@@ -155,7 +150,7 @@ describe "Shorty after" do
     s.add :test, lambda {}
     lambda {
       l = lambda {}
-      s.after(:test, :run, l) {}
+      s.after(:test, :call, l) {}
     }.should.raise(ArgumentError)
     .message.should.match %r!lambda and block both given!
   end

metadata

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