shaft 0.8 → 0.8.5

data/bin/shaft

@@ -12,6 +12,7 @@ class ShaftCLI < Thor
 
   map "-h" => :help
   map "-l" => :active
+  map :status => :active
 
   desc "active", "Lists active tunnels"
   method_options %w( short -s ) => :boolean
@@ -85,31 +86,17 @@ class ShaftCLI < Thor
     end
   end
 
-  desc "stop [NAME]", "Stops a tunnel"
-  method_options :name => :string
-  def stop(name)
-    active = get_active
-    if active.has_key?(name)
-      say "Stopping tunnel '#{name}' at pid #{active[name]}..."
-      begin
-        Process.kill "INT", active[name]
-      rescue Errno::ESRCH
-        say "Tunnel wasn't active (zombie shaft item)."
-      end
-
-      # verify killing
-      tunnel = get_tunnel(name)
-      if local_port_used?(tunnel['bind']['client-port'])
-        error "Could not stop tunnel process!"
-      else
-        say "Stopped."
-
-        # set as inactive
-        active.delete(name)
-        set_active(active)
+  desc "stop [NAME] [--all]", "Stops a tunnel"
+  method_option :name => :string, :required => false
+  option :all, :type => :boolean
+  def stop(name="")
+    if options[:all]
+      get_active.each_key do |tunnel|
+        _stop(tunnel)
       end
+      say "Done stopping all tunnels."
     else
-      error "Tunnel '#{name}' does not seem to be active!"
+      _stop(name)
     end
   end
 
@@ -120,6 +107,36 @@ class ShaftCLI < Thor
   end
 
   private
+  def _stop(name)
+    if name.length > 0
+      active = get_active
+      if name && active.has_key?(name)
+        say "Stopping tunnel '#{name}' at pid #{active[name]}..."
+        begin
+          Process.kill "INT", active[name]
+        rescue Errno::ESRCH
+          say "Tunnel wasn't active (zombie shaft item)."
+        end
+
+        # verify killing
+        tunnel = get_tunnel(name)
+        if local_port_used?(tunnel['bind']['client-port'])
+          error "Could not stop tunnel process!"
+        else
+          say "Stopped."
+
+          # set as inactive
+          active.delete(name)
+          set_active(active)
+        end
+      else
+        error "Tunnel '#{name}' does not seem to be active!"
+      end
+    else
+      error "Missing tunnel name!"
+    end
+  end
+
   def get_config
     @config ||= read_yaml(SHAFT_CONFIG)
   end

data/lib/shaft/version.rb

@@ -1,3 +1,3 @@
 module Shaft
-  VERSION = "0.8"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaft
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor