launch-agent 0.6.1 → 0.7.0

data/README.rdoc

@@ -17,6 +17,16 @@ A library to use launchd easily
 == CLI
 
  $ launchagent -h
+ Usage:
+   launchagent [--env=<env>] (--daemon | --interval <sec>) [--wdir=<dir>] [--] (<argument>...)
+   launchagent -h | --help
+
+ Options:
+   -h --help              Show this screen.
+   -e --env=<env>         Additional environmental variables to be set before running the job. Can specify multiple value with comma. e.g. FOO=bar,BAR=baz
+   -w --wdir=<dir>        Specify a directory to chdir(2) to before running the job
+   -d --daemon            Load as daemon. If it is set, --interval option is ignored.
+   -i --interval=<sec>    Causes the job to be started every N seconds
 
 == Note on Patches/Pull Requests
  

data/bin/launchagent

@@ -7,24 +7,25 @@ require 'docopt'
 program_name = File.basename($0)
 doc =<<-EOS
 Usage:
-  #{program_name} [--env=<env>] (--daemon | --interval <sec>) [--wdir=<dir>] [--] (<argument>...)
+  #{program_name} [--env=<env>] (--daemon | --interval <sec>) [--wdir=<dir>] (<argument>...)
   #{program_name} -h | --help
 
 Options:
   -h --help              Show this screen.
+  -v --version           Show version information.
   -e --env=<env>         Additional environmental variables to be set before running the job. Can specify multiple value with comma. e.g. FOO=bar,BAR=baz
   -w --wdir=<dir>        Specify a directory to chdir(2) to before running the job
   -d --daemon            Load as daemon. If it is set, --interval option is ignored.
   -i --interval=<sec>    Causes the job to be started every N seconds
 EOS
 
-options = Docopt(doc, LaunchAgent::VERSION)
-
 begin
-  agent = LaunchAgent::CLI::OptionParser.new(options, ARGV).agent
+  options = Docopt::docopt(doc, :version => LaunchAgent::VERSION)
+
+  agent = LaunchAgent::CLI::OptionParser.new(options, options['<argument>']).agent
   action = agent.loaded? ? :unload : :load
   agent.send(action)
-  puts '%s "%s"' % [action, ARGV.join(' ')]
-rescue => e
-  abort e.message
+  puts '%s "%s"' % [action, agent.args.join(' ')]
+rescue Docopt::Exit => e
+  puts e.message
 end

data/launch-agent.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = LaunchAgent::VERSION
 
   gem.add_dependency('plist')
-  gem.add_dependency('docopt')
+  gem.add_dependency('docopt', '0.5.0')
   gem.add_development_dependency('rspec', ['~> 2.8.0'])
   gem.add_development_dependency('rake')
 end

data/lib/launch_agent/base.rb

@@ -1,5 +1,7 @@
 module LaunchAgent
   class Base
+    attr_reader :args
+
     DOMAIN = 'com.buycheapviagraonlinenow'
     KEYS = [
       'Label',

data/lib/launch_agent/cli.rb

@@ -4,15 +4,19 @@ module LaunchAgent
       def initialize(opts, argv)
         @opts = opts
         @argv = argv
+
+        if @argv[0] == '--'
+          @argv.shift
+        end
       end
 
       def agent
         raise 'full command must be supplied' if @argv.empty?
 
-        daemon   = @opts[:daemon]
-        interval = @opts[:interval]
-        env      = (@opts[:env] || '').split(',')
-        wdir     = @opts[:wdir]
+        daemon   = @opts['--daemon']
+        interval = @opts['--interval']
+        env      = (@opts['--env'] || '').split(',')
+        wdir     = @opts['--wdir']
         agent    = nil
 
         if daemon

data/lib/launch_agent/version.rb

@@ -1,4 +1,4 @@
 module LaunchAgent
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end
 

data/spec/cli_spec.rb

@@ -11,7 +11,7 @@ describe 'CLI' do
   end
 
   it 'should load/unload daemon-like agent' do
-    command = File.expand_path(File.dirname(__FILE__) + '/../bin/launchagent --daemon --env FOO=BAR ruby foo.rb')
+    command = File.expand_path(File.dirname(__FILE__) + '/../bin/launchagent --daemon --env FOO=BAR -- ruby foo.rb')
 
     system(command)
 

data/spec/option_parser_spec.rb

@@ -23,7 +23,7 @@ describe CLI::OptionParser do
   describe 'empty argv' do
     let(:opts) do
       @opts.merge(
-        :daemon => true)
+        '--daemon' => true)
     end
 
     it 'should raise if argv is empty' do
@@ -36,8 +36,8 @@ describe CLI::OptionParser do
   describe 'empty env' do
     let(:opts) do
       @opts.merge(
-        :env => nil,
-        :daemon => true)
+        '--env' => nil,
+        '--daemon' => true)
     end
 
     it_should_behave_like 'valid agent'
@@ -58,7 +58,7 @@ describe CLI::OptionParser do
   describe 'daemon' do
     let(:opts) do
       @opts.merge(
-        :daemon => true)
+        '--daemon' => true)
     end
 
     it_should_behave_like 'valid agent'
@@ -77,8 +77,8 @@ describe CLI::OptionParser do
   describe 'wdir' do
     let(:opts) do
       @opts.merge(
-        :daemon => true,
-        :wdir => '/foo/bar')
+        '--daemon' => true,
+        '--wdir' => '/foo/bar')
     end
 
     it_should_behave_like 'valid agent'
@@ -94,8 +94,8 @@ describe CLI::OptionParser do
   describe 'env' do
     let(:opts) do
       @opts.merge(
-        :daemon => true,
-        :env => 'FOO=BAR,BAR=BAZ')
+        '--daemon' => true,
+        '--env' => 'FOO=BAR,BAR=BAZ')
     end
 
     it_should_behave_like 'valid agent'
@@ -111,7 +111,7 @@ describe CLI::OptionParser do
   describe 'interval' do
     let(:opts) do
       @opts.merge(
-        :interval => "120")
+        '--interval' => "120")
     end
 
     it_should_behave_like 'valid agent'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: launch-agent
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863205438131634813
+      hash: 3228195630547528638
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863205438131634813
+      hash: 3228195630547528638
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24