launch-agent 0.3.0 → 0.4.0

data/bin/launchagent

@@ -5,4 +5,43 @@ require 'git-style-binary/command'
 
 GitStyleBinary.primary do
   version "launch-agent #{LaunchAgent::VERSION}"
+
+  short_desc "load/unload a launchd agent"
+  banner <<-EOS
+Usage: #{command.full_name} #{all_options_string} {full command}
+
+Load/Unload a launchd agent
+
+EOS
+  opt :env, "additional environmental variables to be set before running the job. can specify multiple times. e.g. RAILS_ENV=development", :type => String, :multi => true
+  opt :daemon, "load as daemon. if it is set, --interval option is ignored", :default => false
+  opt :interval, "causes the job to be started every N seconds", :type => Integer
+
+  run do |command|
+    abort 'full command must be supplised' if command.argv.empty?
+
+    daemon  = command.opts[:daemon]
+    integer = command.opts[:interval]
+    env     = command.opts[:env]
+    agent   = nil
+
+    if daemon
+      agent = LaunchAgent::Daemon.new(*command.argv)
+    elsif command.opts.interval
+      agent = LaunchAgent::Daemon.new(interval, *command.argv)
+    else
+      abort 'at least one of --daemon and --interval must be set'
+    end
+
+    agent['EnvironmentVariables'] = env.inject({}) do |memo, e|
+      k, v = e.split('=')
+      memo[k] = v
+      memo
+    end
+
+    action = agent.loaded? ? :unload : :load
+    agent.send(action)
+
+    puts '%s "%s"' % [action, command.argv.join(' ')]
+  end
 end

data/lib/launch_agent/version.rb

@@ -1,4 +1,4 @@
 module LaunchAgent
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: launch-agent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70105443982460 !ruby/object:Gem::Requirement
+  requirement: &70147772789880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105443982460
+  version_requirements: *70147772789880
 - !ruby/object:Gem::Dependency
   name: git-style-binaries
-  requirement: &70105443982040 !ruby/object:Gem::Requirement
+  requirement: &70147772789460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105443982040
+  version_requirements: *70147772789460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70105443981520 !ruby/object:Gem::Requirement
+  requirement: &70147772788940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,14 +43,12 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70105443981520
+  version_requirements: *70147772788940
 description: A library to use launchd easily
 email:
 - youpy@buycheapviagraonlinenow.com
 executables:
 - launchagent
-- launchagent-daemon
-- launchagent-periodic
 extensions: []
 extra_rdoc_files: []
 files:
@@ -61,8 +59,6 @@ files:
 - README.rdoc
 - Rakefile
 - bin/launchagent
-- bin/launchagent-daemon
-- bin/launchagent-periodic
 - launch-agent.gemspec
 - lib/launch_agent.rb
 - lib/launch_agent/base.rb
@@ -86,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3385802500364367716
+      hash: 2567261959345071323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3385802500364367716
+      hash: 2567261959345071323
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/bin/launchagent-daemon

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'git-style-binary/command'
-
-GitStyleBinary.command do
-  short_desc "load/unload a daemon-like agent"
-  banner <<-EOS
-Usage: #{command.full_name} #{all_options_string} {full command}
-
-Load/Unload a daemon-like launchd agent
-
-
-EOS
-  opt :env, "additional environmental variables to be set before running the job. can specify multiple times", :type => String, :multi => true
-
-  run do |command|
-    abort 'full command must be supplised' if command.argv.empty?
-
-    agent = LaunchAgent::Daemon.new(*command.argv)
-
-    agent['EnvironmentVariables'] = command.opts[:env].inject({}) do |memo, env|
-      k, v = env.split('=')
-      memo[k] = v
-      memo
-    end
-
-    action = agent.loaded? ? :unload : :load
-    agent.send(action)
-
-    puts '%s "%s"' % [action, command.argv.join(' ')]
-  end
-end

data/bin/launchagent-periodic

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'git-style-binary/command'
-
-GitStyleBinary.command do
-  short_desc "load/unload a periodic agent"
-  banner <<-EOS
-Usage: #{command.full_name} #{all_options_string} {full command}
-
-Load/Unload a periodic launchd agent
-
-
-EOS
-  opt :interval, "causes the job to be started every N seconds", :required => true, :type => Integer
-  opt :env, "additional environmental variables to be set before running the job. can specify multiple times", :type => String, :multi => true
-
-  run do |command|
-    abort 'full command must be supplised' if command.argv.empty?
-
-    agent = LaunchAgent::Periodic.new(command.opts[:interval], *command.argv)
-
-    agent['EnvironmentVariables'] = command.opts[:env].inject({}) do |memo, env|
-      k, v = env.split('=')
-      memo[k] = v
-      memo
-    end
-
-    action = agent.loaded? ? :unload : :load
-    agent.send(action)
-
-    puts '%s "%s"' % [action, command.argv.join(' ')]
-  end
-end