delano-drydock 0.6.2 → 0.6.3

data/CHANGES.txt

@@ -5,6 +5,20 @@ DRYDOCK, CHANGES
 * Support putting descriptions into resource file (or __END__)
 
 
+#### 0.6.3 (2009-05-10) #############################
+
+* ADDED: show-commands now displays a note about which command is the default
+* CHANGE: Moved mixins to lib/drydock/mixins (so other projects can require 'drydock/mixins')
+* FIXED: Support for inline command aliases when specifying a class: 
+command [:name, :alias1, :alias2] => SomeClass
+
+
+#### 0.6.2 (2009-05-07) #############################
+
+* ADDED: drydock/console.rb to start a new wing in the drydock
+* ADDED: mixins for String and Object (for Console)
+
+
 #### 0.6.1 (2009-05-03) #############################
 
 * FIXED: @@trawler raises an error in Ruby 1.8 if it's a Symbol

data/bin/example

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
 # Seafaring Drydock Examples
 # 
@@ -102,7 +102,7 @@ module Example
   end
 
   about "My way of saying hello!"
-  command :ahoy! => JohnWestSmokedOysters
+  command [:ahoy!, :hello!] => JohnWestSmokedOysters
   # If you don't provide a block, Drydock will call JohnWestSmokedOysters#ahoy!
 
 

data/drydock.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
   s.specification_version = 1 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
@@ -12,16 +12,17 @@
   # = MANIFEST =
   # git ls-files
   s.files = %w(
-    CHANGES.txt
-    LICENSE.txt
-    README.rdoc
-    Rakefile
-    bin/example
-    drydock.gemspec
-    lib/drydock.rb
-    lib/drydock/console.rb
-    lib/mixins/object.rb
-    lib/mixins/string.rb
+  CHANGES.txt
+  LICENSE.txt
+  README.rdoc
+  Rakefile
+  bin/example
+  drydock.gemspec
+  lib/drydock.rb
+  lib/drydock/console.rb
+  lib/drydock/mixins.rb
+  lib/drydock/mixins/object.rb
+  lib/drydock/mixins/string.rb
   )
 
   #  s.add_dependency ''

data/lib/{mixins → drydock/mixins}/string.rb

@@ -1,3 +1,4 @@
+
 class String
   @@print_with_attributes = true
   def String.disable_colour; @@print_with_attributes = false; end
@@ -63,4 +64,3 @@ class String
   alias :noansi :noatt
   
 end
-

data/lib/drydock/mixins.rb

@@ -0,0 +1,4 @@
+
+
+require 'drydock/mixins/object'
+require 'drydock/mixins/string'

data/lib/drydock.rb

@@ -3,8 +3,7 @@ require 'ostruct'
 require 'stringio'
 
 require 'drydock/console'
-require 'mixins/string'
-require 'mixins/object'
+require 'drydock/mixins'
 
 module Drydock
   class FancyArray < Array #:nodoc:
@@ -292,7 +291,8 @@ module Drydock
       if @global.verbose > 0
         puts # empty line
         cmd_names_sorted.each do |cmd|
-          puts "%s %s" % [@executable, cmds[cmd][:pretty]]
+          puts "$ %s" % [@executable] if Drydock.default?(cmd)
+          puts "$ %s %s" % [@executable, cmds[cmd][:pretty]]
           puts "%10s: %s" % ["About", cmds[cmd][:desc]] if cmds[cmd][:desc]
           if cmds[cmd][:aliases]
             cmds[cmd][:aliases].sort!{ |a,b| a.size <=> b.size }
@@ -306,7 +306,8 @@ module Drydock
           aliases = cmds[cmd][:aliases] || []
           aliases.sort!{ |a,b| a.size <=> b.size }
           aliases = aliases.empty? ? '' : "(aliases: #{aliases.join(', ')})"
-          puts "  %-16s %s" % [cmds[cmd][:pretty], aliases]
+          pattern = Drydock.default?(cmd) ? "* %-16s %s" : "  %-16s %s"
+          puts pattern % [cmds[cmd][:pretty], aliases]
         end
       end
     end
@@ -460,6 +461,12 @@ module Drydock
     @@default_command = (b) ? command(cmd || :default, &b).cmd : canonize(cmd)
   end
   
+  # Is +cmd+ the default command?
+  def default?(cmd)
+    return false if @@default_command.nil?
+    (@@default_command == canonize(cmd))
+  end
+  
   # Define a block for processing STDIN before the command is called. 
   # The command block receives the return value of this block as obj.stdin:
   #
@@ -588,11 +595,15 @@ module Drydock
     cmd = cmds.shift # Should we accept aliases here?
     
     if cmd.is_a? Hash
-      raise "#{cmd.values.first} is not a subclass of Drydock::Command" unless cmd.values.first.ancestors.member?(Drydock::Command)
-      c = cmd.values.first.new(cmd.keys.first, &b) # A custom class was specified
-    # TODO: handle command [:task, :alias] => Class
-    #elsif cmd.is_a? Array
-    #  p cmd
+      klass = cmd.values.first
+      names = cmd.keys.first
+      if names.is_a? Array
+        cmd, cmds = names.shift, [names].flatten.compact
+      else
+        cmd = names
+      end
+      raise "#{klass} is not a subclass of Drydock::Command" unless klass.ancestors.member?(Drydock::Command)
+      c = klass.new(cmd, &b)          # A custom class was specified
     else
       c = Drydock::Command.new(cmd, &b)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delano-drydock
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -32,8 +32,9 @@ files:
 - drydock.gemspec
 - lib/drydock.rb
 - lib/drydock/console.rb
-- lib/mixins/object.rb
-- lib/mixins/string.rb
+- lib/drydock/mixins.rb
+- lib/drydock/mixins/object.rb
+- lib/drydock/mixins/string.rb
 has_rdoc: true
 homepage: http://github.com/delano/drydock
 post_install_message: