lunchy 0.1.0 → 0.2.0

data/History.md

@@ -0,0 +1,10 @@
+Changes
+================
+
+0.2.0
+ - Only show agents with plists by default (fhemberger)
+ - Warn and stop if pattern matches multiple agents (andyjeffries)
+ - Add 'list', an alias for 'ls' (jnewland)
+ 
+0.1.0
+  Initial release

data/README.md

@@ -3,7 +3,7 @@ lunchy
 
 A friendly wrapper for launchctl.  Start your agents and go to lunch!
 
-Don't you hate OSX's launchctl?  You have to give it exact filenames.  The syntax is annoying different from Linux's simple init system and overly verbose.  It's just not a very developer-friendly tool.
+Don't you hate OSX's launchctl?  You have to give it exact filenames.  The syntax is annoying different from Linux's nice, simple init system and overly verbose.  It's just not a very developer-friendly tool.
 
 Lunchy aims to be that friendly tool by wrapping launchctl and providing a few simple operations that you perform all the time:
 
@@ -13,7 +13,7 @@ Lunchy aims to be that friendly tool by wrapping launchctl and providing a few s
  - restart [pattern]
  - status [pattern]
  
-where pattern is just a substring that matches the agent's plist filename.  Make sure you use a unique pattern or Lunchy will operate on the first matching agent.
+where pattern is just a substring that matches the agent's plist filename.  If you don't use a unique pattern, Lunchy will warn you of this and give you a list of the matching items instead.
 
 So instead of:
 
@@ -32,7 +32,7 @@ and:
     io.redis.redis-server
     org.mongodb.mongod
 
-Lunchy isn't a great name but gem names are like domains, most of the good ones are taken.  :-(
+The original name was supposed to be launchy.  Lunchy isn't a great name but gem names are like domains, most of the good ones are taken.  :-(
 
 
 Installation

data/bin/lunchy

@@ -5,7 +5,7 @@ require 'optparse'
 require 'lunchy'
 
 CONFIG = { :verbose => false }
-OPERATIONS = %w(start stop restart ls status)
+OPERATIONS = %w(start stop restart ls list status)
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Lunchy #{Lunchy::VERSION}, the friendly launchctl wrapper\nUsage: #{__FILE__} [#{OPERATIONS.join('|')}] [options]"
@@ -19,6 +19,7 @@ option_parser = OptionParser.new do |opts|
 Supported commands:
 
  ls [pattern]       Show the list of installed agents, with optional [pattern] filter
+ list [pattern]     Alias for 'ls'
  start [pattern]    Start the first agent matching [pattern]
  stop [pattern]     Stop the first agent matching [pattern]
  restart [pattern]  Stop and start the first agent matching [pattern]

data/lib/lunchy.rb

@@ -1,20 +1,30 @@
 class Lunchy
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 
   def start(params)
     raise ArgumentError, "start [name]" if params.empty?
     name = params[0]
-    (_, file) = plists.detect { |k,v| k =~ /#{name}/i }
-    return puts "No daemon found matching '#{name}'" if !name
-    execute("launchctl load #{file}")
+    files = plists.select {|k,v| k =~ /#{name}/i }
+    if files.length > 1
+      return puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n" + files.keys.join("\n")
+    elsif files.length == 0
+      return puts "No daemon found matching '#{name}'" if !name
+    else
+      execute("launchctl load #{files.values.first.inspect}")
+    end
   end
 
   def stop(params)
     raise ArgumentError, "stop [name]" if params.empty?
     name = params[0]
-    (_, file) = plists.detect { |k,v| k =~ /#{name}/i }
-    return puts "No daemon found matching '#{name}'" if !name
-    execute("launchctl unload #{file}")
+    files = plists.select {|k,v| k =~ /#{name}/i }
+    if files.length > 1
+      return puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n" + files.keys.join("\n")
+    elsif files.length == 0
+      return puts "No daemon found matching '#{name}'" if !name
+    else
+      execute("launchctl unload #{files.values.first.inspect}")
+    end
   end
 
   def restart(params)
@@ -25,6 +35,10 @@ class Lunchy
   def status(params)
     pattern = params[0]
     cmd = "launchctl list"
+    if !verbose?
+      agents = "(" + plists.keys.join("|") + ")"
+      cmd << " | grep -i -E \"#{agents}\""
+    end
     cmd << " | grep -i \"#{pattern}\"" if pattern
     execute(cmd)
   end
@@ -34,6 +48,7 @@ class Lunchy
     agents = agents.grep(/#{params[0]}/) if !params.empty?
     puts agents.sort.join("\n")
   end
+  alias_method :list, :ls
   
   private
 
@@ -46,8 +61,8 @@ class Lunchy
     @plists ||= begin
       plists = {}
       %w(/Library/LaunchAgents ~/Library/LaunchAgents).each do |dir|
-        Dir["#{File.expand_path(dir)}/*.plist"].each do |filename|
-          plists[File.basename(filename, ".plist")] = filename
+        Dir["#{File.expand_path(dir)}/*.plist"].inject(plists) do |memo, filename|
+          memo[File.basename(filename, ".plist")] = filename; memo
         end
       end
       plists

data/lunchy.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "lunchy"
+require "./lib/lunchy"
 
 Gem::Specification.new do |s|
   s.name        = "lunchy"
@@ -8,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mike Perham"]
   s.email       = ["mperham@gmail.com"]
-  s.homepage    = "http://github.com/mperham/lunch"
+  s.homepage    = "http://github.com/mperham/lunchy"
   s.summary     = s.description = %q{Friendly wrapper around launchctl}
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -2,7 +2,7 @@
 name: lunchy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,13 +24,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- History.md
 - LICENSE
 - README.md
 - bin/lunchy
 - lib/lunchy.rb
 - lunchy.gemspec
 has_rdoc: true
-homepage: http://github.com/mperham/lunch
+homepage: http://github.com/mperham/lunchy
 licenses: []
 
 post_install_message: