lunchy 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fe9904b30b68e92d860ede29932192a4f8131c15
+  data.tar.gz: 173bd3acfad8b595e078dfa7fd5163e71595bc68
+SHA512:
+  metadata.gz: 65ce72ab1bbe94e21883ba1bf5ba2e5924a596c10d083aa103e0840cc6a0bbedac9a0815d8c481605d329abc7d22a671db687f23e0952346c17960b653e367d2
+  data.tar.gz: a3c84055cce932ddb7a1530182cd639bfb0754c57c3385871798ffd97ac3da93535b268b9903c5c4bfeeca555a2e501b8cfdf93e77bc2fff25a604fddb176480

data/History.md

@@ -1,6 +1,12 @@
 Changes
 ================
 
+0.7.0
+----
+
+- Add 'show' command to display contents of matching plist file (jonpierce)
+- Add '-l' option on 'ls' command to display absolute paths to plist files (jonpierce)
+
 0.6.0
 ----
 

data/README.md

@@ -13,6 +13,7 @@ Lunchy aims to be that friendly tool by wrapping launchctl and providing a few s
  - restart [pattern]
  - status [pattern]
  - install [file]
+ - show [pattern]
  - edit [pattern]
 
 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.
@@ -50,7 +51,7 @@ Thanks
 
 Thanks to all the individual contributors who've improved Lunchy, see credits in History.md.
 
-Lunchy was written as part of my project time at [Carbon Five](http://carbonfive.com).  [We're hiring](http://carbonfive.com/view/page.basic/jobs) if you love working on Ruby and open source.
+Lunchy was written as part of my project time at [Carbon Five](http://carbonfive.com).  [They're hiring](http://carbonfive.com/view/page.basic/jobs) if you love working on Ruby and open source.
 
 
 About

data/bin/lunchy

@@ -4,11 +4,12 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib" if $0 == __FILE__
 require 'optparse'
 require 'lunchy'
 
-CONFIG = { :verbose => false, :write => false }
-OPERATIONS = %w(start stop restart ls list status install edit)
+CONFIG = {}
+OPERATIONS = %w(start stop restart ls list status install show edit)
 
 option_parser = OptionParser.new do |opts|
-  opts.banner = "Lunchy #{Lunchy::VERSION}, the friendly launchctl wrapper\nUsage: #{__FILE__} [#{OPERATIONS.join('|')}] [options]"
+  opts.banner = "Lunchy #{Lunchy::VERSION}, the friendly launchctl wrapper\n" \
+    "Usage: #{File.basename(__FILE__)} [#{OPERATIONS.join('|')}] [options]"
 
   opts.on("-F", "--force", "Force start (disabled) agents") do |verbose|
     CONFIG[:force] = true
@@ -22,27 +23,35 @@ option_parser = OptionParser.new do |opts|
     CONFIG[:write] = true
   end
 
+  opts.on("-l", "--long", "Display absolute paths when listing agents") do
+    CONFIG[:long] = true
+  end
+
   opts.separator <<-EOS
 
 Supported commands:
 
- ls [pattern]            Show the list of installed agents, with optional [pattern] filter
- list [pattern]          Alias for 'ls'
+ ls [-l] [pattern]       Show the list of installed agents, with optional [pattern] filter
+ list [-l] [pattern]     Alias for 'ls'
  start [-wF] [pattern]   Start the first agent matching [pattern]
  stop [-w] [pattern]     Stop the first agent matching [pattern]
  restart [pattern]       Stop and start the first agent matching [pattern]
  status [pattern]        Show the PID and label for all agents, with optional [pattern] filter
- install [file]          Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents (whichever it finds first)
- edit [pattern]          Opens the launchctl daemon file in the default editor (EDITOR environment variable)
+ install [file]          Install [file] to ~/Library/LaunchAgents or /Library/LaunchAgents (whichever it finds first)
+ show [pattern]          Show the contents of the launchctl daemon file
+ edit [pattern]          Open the launchctl daemon file in the default editor (EDITOR environment variable)
 
 -w will persist the start/stop command so the agent will load on startup or never load, respectively.
+-l will display absolute paths of the launchctl daemon files when showing list of installed agents.
 
 Example:
  lunchy ls
+ lunchy ls -l nginx
  lunchy start -w redis
  lunchy stop mongo
  lunchy status mysql
  lunchy install /usr/local/Cellar/redis/2.2.2/io.redis.redis-server.plist
+ lunchy show redis
  lunchy edit mongo
 
 Note: if you run lunchy as root, you can manage daemons in /Library/LaunchDaemons also.
@@ -64,4 +73,4 @@ if OPERATIONS.include?(op)
   end
 else
   puts option_parser.help
-end
+end

data/lib/lunchy.rb

@@ -1,35 +1,23 @@
 require 'fileutils'
 
 class Lunchy
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 
   def start(params)
     raise ArgumentError, "start [-wF] [name]" if params.empty?
-    name = params[0]
-    files = plists.select {|k,v| k =~ /#{name}/i }
-    files = Hash[files] if files.is_a?(Array) # ruby 1.8
-    if files.size > 1
-      return puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n" + files.keys.join("\n")
-    elsif files.size == 0
-      return puts "No daemon found matching '#{name}'" if !name
-    else
-      execute("launchctl load #{CONFIG[:force] ? '-F ' : ''}#{CONFIG[:write] ? '-w ' : ''}#{files.values.first.inspect}")
-      puts "started #{files.keys.first}"
+
+    with_match params[0] do |name, path|
+      execute("launchctl load #{force}#{write}#{path.inspect}")
+      puts "started #{name}"
     end
   end
 
   def stop(params)
     raise ArgumentError, "stop [-w] [name]" if params.empty?
-    name = params[0]
-    files = plists.select {|k,v| k =~ /#{name}/i }
-    files = Hash[files] if files.is_a?(Array) # ruby 1.8
-    if files.size > 1
-      return puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n" + files.keys.join("\n")
-    elsif files.size == 0
-      return puts "No daemon found matching '#{name}'" if !name
-    else
-      execute("launchctl unload #{CONFIG[:write] ? '-w ' : ''}#{files.values.first.inspect}")
-      puts "stopped #{files.keys.first}"
+
+    with_match params[0] do |name, path|
+      execute("launchctl unload #{write}#{path.inspect}")
+      puts "stopped #{name}"
     end
   end
 
@@ -41,10 +29,12 @@ class Lunchy
   def status(params)
     pattern = params[0]
     cmd = "launchctl list"
-    if !verbose?
+
+    unless verbose?
       agents = plists.keys.map { |k| "-e \"#{k}\"" }.join(" ")
       cmd << " | grep -i #{agents}"
     end
+
     cmd.gsub!('.','\.')
     cmd << " | grep -i \"#{pattern}\"" if pattern
     execute(cmd)
@@ -53,7 +43,11 @@ class Lunchy
   def ls(params)
     agents = plists.keys
     agents = agents.grep(/#{params[0]}/) if !params.empty?
-    puts agents.sort.join("\n")
+    if long
+      puts agents.map { |agent| plists[agent] }.sort.join("\n")
+    else
+      puts agents.sort.join("\n")
+    end
   end
   alias_method :list, :ls
 
@@ -68,27 +62,54 @@ class Lunchy
     end
   end
 
+  def show(params)
+    raise ArgumentError, "show [name]" if params.empty?
+
+    with_match params[0] do |_, path|
+      puts IO.read(path)
+    end
+  end
+
   def edit(params)
     raise ArgumentError, "edit [name]" if params.empty?
-    name = params[0]
-    files = plists.select {|k,v| k =~ /#{name}/i }
-    files = Hash[files] if files.is_a?(Array) # ruby 1.8
-    if files.size > 1
-      return puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n" + files.keys.join("\n")
-    elsif files.size == 0
-      return puts "No daemon found matching '#{name}'" if !name
-    else
+
+    with_match params[0] do |_, path|
       editor = ENV['EDITOR']
       if editor.nil?
         raise 'EDITOR environment variable is not set'
       else
-        execute("#{editor} #{files.values.first.inspect} > `tty`")
+        execute("#{editor} #{path.inspect} > `tty`")
       end
     end
   end
 
   private
 
+  def force
+    CONFIG[:force] and '-F '
+  end
+
+  def write
+    CONFIG[:write] and '-w '
+  end
+
+  def long
+    CONFIG[:long]
+  end
+
+  def with_match name
+    files = plists.select {|k,_| k =~ /#{name}/i }
+    files = Hash[files] if files.is_a?(Array) # ruby 1.8
+
+    if files.size > 1
+      puts "Multiple daemons found matching '#{name}'. You need to be more specific. Matches found are:\n#{files.keys.join("\n")}"
+    elsif files.empty?
+      puts "No daemon found matching '#{name}'" unless name
+    else
+      yield(*files.to_a.first)
+    end
+  end
+
   def execute(cmd)
     puts "Executing: #{cmd}" if verbose?
     emitted = `#{cmd}`
@@ -117,20 +138,6 @@ class Lunchy
     Process.euid == 0
   end
 
-  # def daemons
-  #   @daemons ||= begin
-  #     content = `launchctl list | grep -v -i "^-\\|anonymous"`
-  #     daemons = []
-  #     content.each_line do |x|
-  #       data = x.split(' ')
-  #       daemons << {
-  #         :pid => data[0].to_i,
-  #         :name => data[2]
-  #       }
-  #     end
-  #   end
-  # end
-
   def verbose?
     CONFIG[:verbose]
   end

metadata

@@ -1,68 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lunchy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -08:00
-default_executable: 
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies: []
-
 description: Friendly wrapper around launchctl
-email: 
+email:
 - mperham@gmail.com
-executables: 
+executables:
 - lunchy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - History.md
 - LICENSE
 - README.md
 - bin/lunchy
 - lib/lunchy.rb
 - lunchy.gemspec
-has_rdoc: true
 homepage: http://github.com/mperham/lunchy
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Friendly wrapper around launchctl
 test_files: []
-