volley 0.1.7 → 0.1.8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.7:
+* handle docopt exit for --version
+* update to use newest docopt version
+
 ## v0.1.6:
 * add better support for plan#stop
 * fix bugs in volley plans

data/bin/volley

@@ -4,9 +4,13 @@ require 'rubygems'
 require 'docopt'
 require 'volley'
 require 'daemons'
+require 'awesome_print'
 
 DOC = <<-DOC
-Usage: volley [options] <plan> <descriptor> [argument]...
+Usage:
+  volley [options] PLAN
+  volley [options] PLAN DESCRIPTOR
+  volley [options] PLAN DESCRIPTOR [ARGUMENT ...]
 
 <plan>
   The plan to run. This can be just the plan name or the project:plan.
@@ -49,14 +53,15 @@ module Volley
     def run(argv)
       STDOUT.sync = true
       options     = Docopt::docopt(DOC, :version => Volley::Version::STRING)
-      debug       = options[:debug]
-      quiet       = options[:quiet]
-      config      = options[:config]
-      primary     = options[:primary]
-      fork        = options[:fork]
-      log         = options[:log]
-      level       = options[:level]
-      force       = options[:force]
+      ap options
+      debug       = options["--debug"]
+      quiet       = options["--quiet"]
+      config      = options["--config"]
+      primary     = options["--primary"]
+      fork        = options["--fork"]
+      log         = options["--log"]
+      level       = options["--level"]
+      force       = options["--force"]
       args        = { }
 
 
@@ -74,6 +79,8 @@ module Volley
         Volley::Log.console_quiet
       end
 
+      ap argv
+
       kvs = argv.select { |e| e.match(/(\w+)\=(\w+)/) }
       pos = argv.reject { |e| e.match(/(\w+)\=(\w+)/) }
 
@@ -126,7 +133,7 @@ module Volley
     rescue SystemExit
       Volley::Log.debug "exited"
     rescue Docopt::Exit => e
-      Volley::Log.info "volley version: #{e.message}"
+      Volley::Log.info e.message
     rescue => e
       Volley::Log.error "error: #{e} #{e.message} at #{e.backtrace.first}"
       Volley::Log.debug e
@@ -134,4 +141,4 @@ module Volley
   end
 end
 
-Volley::Command.new.run(ARGV)
+Volley::Command.new.run(ARGV)

data/lib/volley/dsl/file.rb

@@ -59,6 +59,7 @@ module Volley
         end
 
         def find_file(filename)
+          return unless filename
           [filename, File.expand_path(filename), File.expand_path(filename, __FILE__)].each do |f|
             return f if File.file?(f)
           end
@@ -69,4 +70,4 @@ module Volley
       end
     end
   end
-end
+end

data/lib/volley/version.rb

@@ -3,7 +3,7 @@ unless defined?(Volley::Version)
     module Version
       MAJOR  = 0
       MINOR  = 1
-      TINY   = 7
+      TINY   = 8
       TAG    = nil
       STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
     end

data/volley.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport"
   gem.add_dependency "mixlib-shellout"
   gem.add_dependency "yell"
-  gem.add_dependency "docopt"
+  gem.add_dependency "docopt", '0.5.0'
   gem.add_dependency "daemons"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -96,17 +96,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: daemons
   requirement: !ruby/object:Gem::Requirement