cake 0.3.12 → 0.3.13

data/bin/cake

@@ -71,15 +71,15 @@ def add_opt!(key, *vals)
 end
 
 def parse_opts!
-  ARGV.unshift('run', '--global') if ARGV.first.index('/')
-  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
+  ARGV.unshift('run', '--global') if ARGV.any? and ARGV.first.index('/')
+  ARGV.unshift('default')         if ARGV.empty? or ARGV.first[0,1] == '-'
   $command = ARGV.shift.to_sym
   $opts = {}
   ARGV.each do |opt|
     case opt
-    when /^-(\w*)$/              then $1.split('').each {|c| add_opt!(c, '')}
-    when /^--?([-\w]*)=([\S]+)$/ then add_opt!($1, *$2.split(','))
-    when /^--?([-\w]*)$/         then add_opt!($1, "")
+    when /^-(\w+)$/              then $1.split('').each {|c| add_opt!(c, '')}
+    when /^--?([-\w]+)=([\S]+)$/ then add_opt!($1, *$2.split(','))
+    when /^--?([-\w]+)$/         then add_opt!($1, "")
     else                              add_opt!($command, opt)
     end
   end
@@ -87,6 +87,61 @@ def parse_opts!
 end
 parse_opts!
 
+def debug?
+  ENV['CAKE_DEBUG'] or $opts[:d] or $opts[:debug]
+end
+
+def verbose?
+  debug? or $opts[:v] or $opts[:verbose]
+end
+
+def restart?
+  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
+end
+
+def admin_command?
+  [:start, :stop, :reload, :restart].include?($command)
+end
+
+def log(command, *message)
+  message.each do |line|
+    printf("%11s %s\n", "[#{command}]", line)
+  end
+end
+
+class Configuration < Hash
+  def initialize(*paths)
+    paths.each do |path|
+      File.open(path, 'r') do |file|
+        file.each do |line|
+          next if ['#', '!'].include?(line[0,1])
+          key, value = line.split('=', 2)
+          next unless key and value
+          self[key.strip] = value.strip
+        end
+      end if File.exists?(path)
+    end
+  end
+
+  def [](*keys)
+    if keys.first.kind_of?(Symbol)
+      key = keys.join('.') + '.'
+      clone.delete_if {|k,v| not k.index(key) == 0}
+    else
+      super
+    end
+  end
+end
+
+def config
+  @config ||= Configuration.new("#{$home}/.cake/config", ".cake/config")
+end
+
+if debug?
+  puts "opts: #{$opts.inspect}"
+  puts "config: #{$config.inspect}"
+end
+
 GLOBAL_DEFAULT_PROJECT = <<END
 (defproject global "0.0.0"  
   :description "Don't rename this project, though you can change the version to your heart's content."
@@ -198,56 +253,6 @@ def newer?(file1, file2)
   not File.exists?(file2) or test(?>, file1, file2)
 end
 
-def debug?
-  ENV['CAKE_DEBUG'] or $opts[:d] or $opts[:debug]
-end
-
-def verbose?
-  debug? or $opts[:v] or $opts[:verbose]
-end
-
-def restart?
-  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
-end
-
-def admin_command?
-  [:start, :stop, :reload, :restart].include?($command)
-end
-
-def log(command, *message)
-  message.each do |line|
-    printf("%11s %s\n", "[#{command}]", line)
-  end
-end
-
-class Configuration < Hash
-  def initialize(*paths)
-    paths.each do |path|
-      File.open(path, 'r') do |file|
-        file.each do |line|
-          next if ['#', '!'].include?(line[0,1])
-          key, value = line.split('=', 2)
-          next unless key and value
-          self[key.strip] = value.strip
-        end
-      end if File.exists?(path)
-    end
-  end
-
-  def [](*keys)
-    if keys.first.kind_of?(Symbol)
-      key = keys.join('.') + '.'
-      clone.delete_if {|k,v| not k.index(key) == 0}
-    else
-      super
-    end
-  end
-end
-
-def config
-  @config ||= Configuration.new("#{$home}/.cake/config", ".cake/config")
-end
-
 def ps
   `jps -v`.split("\n").select {|l| l =~ /cake\.project/}
 end
@@ -418,7 +423,9 @@ class JVM
   end
 
   def eval(forms = $opts[:eval])
-    forms = forms.join(' ')
+    forms = forms.collect do |form|
+      form == '-' ? $stdin.gets(nil) : form
+    end.join(' ')
     with_socket do |socket|
       log(:eval, forms) if debug?
       socket.write(':eval [' + forms + ']')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Justin Balthrop