lunchy 0.2.0 → 0.3.0

data/History.md

@@ -1,6 +1,11 @@
 Changes
 ================
 
+0.3.0
+ - New 'install' command to install new plist files (spagalloco)
+ - Support persistent start/stop
+ - Fix Ruby 1.8 issues, thanks tmm1!
+
 0.2.0
  - Only show agents with plists by default (fhemberger)
  - Warn and stop if pattern matches multiple agents (andyjeffries)

data/bin/lunchy

@@ -4,8 +4,8 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib" if $0 == __FILE__
 require 'optparse'
 require 'lunchy'
 
-CONFIG = { :verbose => false }
-OPERATIONS = %w(start stop restart ls list status)
+CONFIG = { :verbose => false, :write => false }
+OPERATIONS = %w(start stop restart ls list status install)
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Lunchy #{Lunchy::VERSION}, the friendly launchctl wrapper\nUsage: #{__FILE__} [#{OPERATIONS.join('|')}] [options]"
@@ -13,23 +13,31 @@ option_parser = OptionParser.new do |opts|
   opts.on("-v", "--verbose", "Show command executions") do |verbose|
     CONFIG[:verbose] = true
   end
-  
+
+  opts.on("-w", "--write", "Persist command") do |verbose|
+    CONFIG[:write] = true
+  end
+
   opts.separator <<-EOS
 
 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]
- status [pattern]   Show the PID and label for all agents, with optional [pattern] filter
+ ls [pattern]           Show the list of installed agents, with optional [pattern] filter
+ list [pattern]         Alias for 'ls'
+ start [-w] [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)
+
+-w will persist the start/stop command so the agent will load on startup or never load, respectively.
 
 Example:
  lunchy ls
- lunchy start redis
+ lunchy start -w redis
  lunchy stop mongo
  lunchy status mysql
+ lunchy install /usr/local/Cellar/redis/2.2.2/io.redis.redis-server.plist
 EOS
 end
 option_parser.parse!

data/lib/lunchy.rb

@@ -1,35 +1,39 @@
+require 'fileutils'
+
 class Lunchy
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   def start(params)
-    raise ArgumentError, "start [name]" if params.empty?
+    raise ArgumentError, "start [-w] [name]" if params.empty?
     name = params[0]
     files = plists.select {|k,v| k =~ /#{name}/i }
-    if files.length > 1
+    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.length == 0
+    elsif files.size == 0
       return puts "No daemon found matching '#{name}'" if !name
     else
-      execute("launchctl load #{files.values.first.inspect}")
+      execute("launchctl load #{CONFIG[:write] ? '-w ' : ''}#{files.values.first.inspect}")
     end
   end
 
   def stop(params)
-    raise ArgumentError, "stop [name]" if params.empty?
+    raise ArgumentError, "stop [-w] [name]" if params.empty?
     name = params[0]
     files = plists.select {|k,v| k =~ /#{name}/i }
-    if files.length > 1
+    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.length == 0
+    elsif files.size == 0
       return puts "No daemon found matching '#{name}'" if !name
     else
-      execute("launchctl unload #{files.values.first.inspect}")
+      execute("launchctl unload #{CONFIG[:write] ? '-w ' : ''}#{files.values.first.inspect}")
     end
   end
 
   def restart(params)
-    stop(params)
-    start(params)
+    stop(params.dup)
+    start(params.dup)
   end
 
   def status(params)
@@ -42,14 +46,25 @@ class Lunchy
     cmd << " | grep -i \"#{pattern}\"" if pattern
     execute(cmd)
   end
-  
+
   def ls(params)
     agents = plists.keys
     agents = agents.grep(/#{params[0]}/) if !params.empty?
     puts agents.sort.join("\n")
   end
   alias_method :list, :ls
-  
+
+  def install(params)
+    raise ArgumentError, "install [file]" if params.empty?
+    filename = params[0]
+    %w(~/Library/LaunchAgents /Library/LaunchAgents).each do |dir|
+      if Dir.exist?(File.expand_path(dir))
+        FileUtils.cp filename, File.join(File.expand_path(dir), File.basename(filename))
+        return puts "#{filename} installed to #{dir}"
+      end
+    end
+  end
+
   private
 
   def execute(cmd)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lunchy
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -40,21 +39,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Friendly wrapper around launchctl