dctl 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*1.0.2* (18th April, 2005)		Bruno Carnazzi		<mailto:bcarnazzi@gmail.com>
+	* better gem dependency support for cmdparse (>=1.0.1 required)
+	* added a check for incomplete command
+
 *1.0.1* (08th April, 2005)		Bruno Carnazzi		<mailto:bcarnazzi@gmail.com>
 	* updated Rakefile (and included gemspec)
 	* added a check on daemon for valid app_path (daemon_test.rb updated)

data/Rakefile

@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
   
   # s.test_suite_file = 'test/dctl_test.rb'
   
-  s.add_dependency('cmdparse', '= 1.0.0')
+  s.add_dependency('cmdparse', '> 1.0.0')
 
   s.require_path = 'lib'
   s.autorequire = 'dctl'

data/lib/dctl/cmdparser.rb

@@ -1,6 +1,6 @@
 begin
   require 'rubygems'
-  require 'cmdparse' # require_gem fails !
+  require_gem 'cmdparse' '> 1.0.0'
 rescue LoadError
   require 'cmdparse'
 end

data/lib/dctl/command.rb

@@ -1,10 +1,11 @@
 begin
   require 'rubygems'
-  require 'cmdparse' # require_gem fails !
+  require_gem 'cmdparse' '> 1.0.0'
 rescue LoadError
   require 'cmdparse'
 end
 
+# require 'optparse'
 require 'dctl/defaults'
 require 'dctl/daemon'
 
@@ -40,7 +41,7 @@ module Dctl
       
       def execute(cmd_parser, args)
         cmd_args = args.slice! 1, args.length
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         Dctl::Daemon.new(cmd, $DIR).start(cmd_args, @stdin, @stdout, @stderr)
       end
     end
@@ -59,7 +60,7 @@ module Dctl
       
       def execute(cmd_parser, args)
         cmd_args = args.slice! 1, args.length
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         Dctl::Daemon.new(cmd, $DIR).restart(cmd_args, @stdin, @stdout, @stderr)
       end
     end
@@ -75,7 +76,7 @@ module Dctl
       end
       
       def execute(cmd_parser, args)
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         Dctl::Daemon.new(cmd, $DIR).stop
       end
     end
@@ -91,7 +92,7 @@ module Dctl
       end
       
       def execute(cmd_parser, args)
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         Dctl::Daemon.new(cmd, $DIR).zap
       end
     end
@@ -108,7 +109,7 @@ module Dctl
       
       def execute(cmd_parser, args)
         cmd_args = args.slice! 1, args.length
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         Dctl::Daemon.new(cmd, $DIR).run(cmd_args)
       end
     end
@@ -124,11 +125,10 @@ module Dctl
       end
       
       def execute(cmd_parser, args)
-        cmd = args[0]
+        cmd = args[0] || raise(OptionParser::MissingArgument)
         puts "#{File.basename cmd}: #{Dctl::Daemon.new(cmd, $DIR).status}"
       end
     end
-
     
   end
 

data/lib/dctl/daemon.rb

@@ -8,8 +8,7 @@ module Dctl
     include Daemonize
     
     def initialize(cmd, pidpath)
-      @app_path = Daemon::which cmd
-      @app_path = File.expand_path cmd if not @app_path
+      @app_path = Daemon::which(cmd) || File.expand_path(cmd)
       raise Errno::EISDIR, @app_path if File.directory? @app_path
       raise Errno::ENOENT, @app_path until File.file? @app_path
       raise Errno::EACCES, @app_path until File.executable? @app_path

data/lib/dctl/metainf.rb

@@ -1,6 +1,6 @@
 # This file contains informations about Dctl current release.
 
 module Dctl
-  VERSION = [1, 0, 1]
+  VERSION = [1, 0, 2]
   RELEASE = 'Leonard release'
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: dctl
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2005-04-08
+  version: 1.0.2
+date: 2005-04-18
 summary: "dctl - a daemon controller written in Ruby"
 require_paths: 
   - lib
@@ -68,7 +68,7 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - "="
+          - ">"
           - !ruby/object:Gem::Version 
             version: 1.0.0
       version: