launch-agent 0.5.0 → 0.6.0

data/bin/launchagent

@@ -1,31 +1,30 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'launch_agent'
-require 'git-style-binary/command'
+require 'docopt'
 
-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
+program_name = File.basename($0)
+doc =<<-EOS
+Usage:
+  #{program_name} [--env=<env>] (--daemon | --interval <sec>) [--wdir=<dir>] [--] (<argument>...)
+  #{program_name} -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
 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 :wdir, "specify a directory to chdir(2) to before running the job", :type => String
-  opt :interval, "causes the job to be started every N seconds", :type => Integer
 
-  run do |command|
-    begin
-      agent = LaunchAgent::CLI::OptionParser.new(command.opts, command.argv).agent
-      action = agent.loaded? ? :unload : :load
-      agent.send(action)
-      puts '%s "%s"' % [action, command.argv.join(' ')]
-    rescue => e
-      abort e.message
-    end
-  end
+options = Docopt(doc, LaunchAgent::VERSION)
+
+begin
+  agent = LaunchAgent::CLI::OptionParser.new(options, ARGV).agent
+  action = agent.loaded? ? :unload : :load
+  agent.send(action)
+  puts '%s "%s"' % [action, ARGV.join(' ')]
+rescue => e
+  abort 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('git-style-binaries')
+  gem.add_dependency('docopt')
   gem.add_development_dependency('rspec', ['~> 2.8.0'])
   gem.add_development_dependency('rake')
 end

data/lib/launch_agent/cli.rb

@@ -11,14 +11,14 @@ module LaunchAgent
 
         daemon   = @opts[:daemon]
         interval = @opts[:interval]
-        env      = @opts[:env]
+        env      = @opts[:env].split(',')
         wdir     = @opts[:wdir]
         agent    = nil
 
         if daemon
           agent = LaunchAgent::Daemon.new(*@argv)
-        elsif @opts[:interval]
-          agent = LaunchAgent::Periodic.new(interval, *@argv)
+        elsif interval
+          agent = LaunchAgent::Periodic.new(interval.to_i, *@argv)
         else
           raise 'at least one of --daemon and --interval must be set'
         end

data/lib/launch_agent/version.rb

@@ -1,4 +1,4 @@
 module LaunchAgent
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end
 

data/spec/option_parser_spec.rb

@@ -6,21 +6,46 @@ describe CLI::OptionParser do
   before do
     @argv = %w/ruby foo.rb/
     @opts = {
-      :env => []
+      :env => ''
     }
-
-    @agent = CLI::OptionParser.new(opts, @argv).agent
-    @plist = agent2plist(@agent)
   end
 
   shared_examples_for 'valid agent' do
     it "should have necessary attributes" do
-      @plist['Label'].should eql('com.buycheapviagraonlinenow.ruby__foo_rb')
-      @plist['ProgramArguments'].should eql(@argv)
+      agent = CLI::OptionParser.new(opts, @argv).agent
+      plist = agent2plist(agent)
+
+      plist['Label'].should eql('com.buycheapviagraonlinenow.ruby__foo_rb')
+      plist['ProgramArguments'].should eql(@argv)
+    end
+  end
+
+  describe 'empty argv' do
+    let(:opts) do
+      @opts.merge(
+        :daemon => true)
+    end
+
+    it 'should raise if argv is empty' do
+      lambda {
+        CLI::OptionParser.new(opts, []).agent
+      }.should raise_error('full command must be supplied')
     end
   end
 
-  describe 'damon' do
+  describe 'empty options' do
+    let(:opts) do
+      @opts
+    end
+
+    it 'should raise if option is empty' do
+      lambda {
+        CLI::OptionParser.new(opts, @argv).agent
+      }.should raise_error('at least one of --daemon and --interval must be set')
+    end
+  end
+
+  describe 'daemon' do
     let(:opts) do
       @opts.merge(
         :daemon => true)
@@ -28,11 +53,14 @@ describe CLI::OptionParser do
 
     it_should_behave_like 'valid agent'
 
-    it 'should parse damon option' do
-      @plist['KeepAlive'].should eql({
+    it 'should parse daemon option' do
+      agent = CLI::OptionParser.new(opts, @argv).agent
+      plist = agent2plist(agent)
+
+      plist['KeepAlive'].should eql({
           'SuccessfulExit' => false
         })
-      @plist['RunAtLoad'].should be_true
+      plist['RunAtLoad'].should be_true
     end
   end
 
@@ -46,7 +74,10 @@ describe CLI::OptionParser do
     it_should_behave_like 'valid agent'
 
     it 'should parse wdir option' do
-      @plist['WorkingDirectory'].should eql('/foo/bar')
+      agent = CLI::OptionParser.new(opts, @argv).agent
+      plist = agent2plist(agent)
+
+      plist['WorkingDirectory'].should eql('/foo/bar')
     end
   end
 
@@ -54,26 +85,32 @@ describe CLI::OptionParser do
     let(:opts) do
       @opts.merge(
         :daemon => true,
-        :env => ['FOO=BAR','BAR=BAZ'])
+        :env => 'FOO=BAR,BAR=BAZ')
     end
 
     it_should_behave_like 'valid agent'
 
     it 'should parse env option' do
-      @plist['EnvironmentVariables'].should eql({ 'FOO' => 'BAR', 'BAR' => 'BAZ' })
+      agent = CLI::OptionParser.new(opts, @argv).agent
+      plist = agent2plist(agent)
+
+      plist['EnvironmentVariables'].should eql({ 'FOO' => 'BAR', 'BAR' => 'BAZ' })
     end
   end
 
   describe 'interval' do
     let(:opts) do
       @opts.merge(
-        :interval => 120)
+        :interval => "120")
     end
 
     it_should_behave_like 'valid agent'
 
     it 'should parse env option' do
-      @plist['StartInterval'].should eql(120)
+      agent = CLI::OptionParser.new(opts, @argv).agent
+      plist = agent2plist(agent)
+
+      plist['StartInterval'].should eql(120)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: launch-agent
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70200854706280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200854706280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: git-style-binaries
-  requirement: &70200854705860 !ruby/object:Gem::Requirement
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200854705860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70200854705340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70200854705340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70200854704920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70200854704920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library to use launchd easily
 email:
 - youpy@buycheapviagraonlinenow.com
@@ -96,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1175971151883054079
+      hash: -3804420004878315494
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,10 +125,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1175971151883054079
+      hash: -3804420004878315494
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A library to use launchd easily