workon 0.0.7 → 0.0.8

data/lib/workon.rb

@@ -48,6 +48,6 @@ module Workon
   
   def self.config(args = [])
     load_configuration args unless args.empty?
-    Workon::Configuration.instance.options  
+    Workon::Configuration.instance
   end
 end

data/lib/workon/actor.rb

@@ -7,22 +7,30 @@ module Workon
     end
     
     def self.before(actor = nil, other = nil)
-      @before ||= {}
+      @before ||= Hash.new { [] }
       
       return @before if actor.nil?
       raise ArgumentError if other.nil?
       
-      @before[other] = actor
+      @before[other] += [actor]
     end
     
     def self.ordered
       order ||= Workon::Actor::Base.subclasses.inject([]) do |memo, klass|
-        finder      = klass.name.split('::').last
-        other       = before[finder.to_sym]
-        should_add  = !Workon.config[:without].include?(finder) && !memo.include?(klass)
+        other       = encompass klass
+        should_add  = !Workon.config[:without].include?(klass.actor_name) && !memo.include?(klass)
         
-        should_add ? memo + (other ? [other, klass] : [klass]) : memo
+        should_add ? memo + other : memo
       end
+      
+      order
+    end
+    
+    def self.encompass(klass)
+      finder  = klass.actor_name.to_sym
+      _before = before[finder].map {|k| encompass k }
+      
+      (_before + [klass]).flatten
     end
   end
 end

data/lib/workon/actor/base.rb

@@ -27,6 +27,10 @@ module Workon
         Workon::Actor.before self, other
       end
       
+      def self.actor_name
+        name.split('::').last
+      end
+      
       def initialize(path)
         @path = path
       end
@@ -36,13 +40,11 @@ module Workon
       end
       
       def has_option?(key)
-        key = key.to_sym
-        
-        !options[key].nil? && (options[key] || !options[key].empty?)
+        options.exists? key
       end
       
       def fetch_option(key, default = nil)
-        has_option?(key) ? options[key] : default
+        options.fetch key, default
       end
       
       def project

data/lib/workon/actor/middleman.rb

@@ -1,12 +1,13 @@
 module Workon
   module Actor
     class Middleman < Base
+      before :WebBrowser
       option('--middleman', 'Start mm-server') { |v| options[:middleman] = true }
       
       def commit
         if fetch_option :middleman, false
-          screen "mm-server"
-          run "sleep 3 && open http://localhost:4567/"
+          port = fetch_option :port, 4567
+          screen "mm-server --port #{port}"
         end
       end
     end

data/lib/workon/actor/passenger.rb

@@ -1,6 +1,8 @@
 module Workon
   module Actor
     class Passenger < Base
+      before :WebBrowser
+      
       def is_rack_app?
         !Dir['config.ru'].empty?
       end
@@ -10,7 +12,10 @@ module Workon
       end
       
       def commit
-        screen "passenger start" if is_rack_app? && passenger_standalone_available?
+        if is_rack_app? && passenger_standalone_available?
+          port = fetch_option :port, 3000
+          screen "passenger start --port #{port}"
+        end
       end
     end
   end

data/lib/workon/actor/web_browser.rb

@@ -2,10 +2,25 @@ module Workon
   module Actor
     class WebBrowser < Base
       option('--host HOST', 'Ping this host') { |v| options[:host] = v}
+      option('--port PORT', Integer, 'Use this port for Middleman/Passenger') { |v| options[:port] = v}
       
       def command
-        host_name = fetch_option :host, %{#{project}.local}
-        %{ping -q -c 1 -t 1 #{host_name} && open http://#{host_name}}
+        host_name   = fetch_option :host, %{#{project}.local}
+        port_number = fetch_option :port, nil
+        
+        command, qualified = port_number.nil? ? ping_test(host_name) : netstat_test(port_number)
+        %{#{command} && open http://#{qualified}}
+      end
+      
+      private
+      def ping_test(host_name)
+        command = %{ping -q -c 1 -t 1 #{host_name}}
+        [ command, host_name ]
+      end
+      
+      def netstat_test(port)
+        command = %{sleep 3 && netstat -na | egrep 'tcp4*6* +([0-9]+ +){2}(\\*|([0-9]+\\.)+[0-9]+)(:|\\.)#{port}'}
+        [ command, "localhost:#{port}" ]
       end
     end
   end

data/lib/workon/configuration.rb

@@ -20,6 +20,34 @@ module Workon
       options[:project] = args.first unless args.empty?
     end
     
+    def exists?(key)
+      key = key.to_sym
+      !blank? options[key]
+    end
+    
+    def set(key, value)
+      key = key.to_sym
+      options[key] = value
+    end
+    
+    def fetch(key, default = nil)
+      key = key.to_sym
+      
+      if !exists?(key) && !blank?(default)
+        set key, default
+      end
+      
+      options[key]
+    end
+    
+    def [](key)
+      fetch key
+    end
+    
+    def []=(key, value)
+      set key, value
+    end
+    
     def parser
       @parser ||= OptionParser.new do |o|
         o.banner = "Usage: #{File.basename($0)} [options] project"
@@ -84,5 +112,10 @@ module Workon
         STDERR.puts %(Could not save workon configuration to #{project_rc_path})
       end
     end
+    
+    private
+    def blank?(object)
+      object.respond_to?(:empty?) ? object.empty? : !object
+    end
   end
 end

data/lib/workon/version.rb

@@ -1,3 +1,3 @@
 module Workon
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: workon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mike Wyatt