gator 0.0.20.pre → 0.0.21.pre

data/VERSION

@@ -1 +1 @@
-0.0.20.pre
+0.0.21.pre

data/gator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gator}
-  s.version = "0.0.20.pre"
+  s.version = "0.0.21.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-08-15}
+  s.date = %q{2011-08-19}
   s.default_executable = %q{gator}
   s.description = %q{gator - the friendly code-generator}
   s.email = %q{dominic.graefen@gmail.com}
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/gator/commands/generate.rb",
     "lib/gator/commands/project.rb",
     "lib/gator/config.rb",
+    "lib/gator/generators.rb",
+    "lib/gator/generators/generator.rb",
     "lib/gator/project.rb",
     "lib/gator/runner.rb",
     "lib/gator/task.rb",

data/lib/gator.rb

@@ -1,7 +1,8 @@
-require 'gator/config'
-require 'gator/project'
-require 'gator/util'
-require 'gator/command'
-require 'gator/task'
-require 'gator/runner'
-require 'gator/commands'
+require File.dirname(__FILE__) + '/gator/config'
+require File.dirname(__FILE__) + '/gator/project'
+require File.dirname(__FILE__) + '/gator/util'
+require File.dirname(__FILE__) + '/gator/command'
+require File.dirname(__FILE__) + '/gator/task'
+require File.dirname(__FILE__) + '/gator/generators'
+require File.dirname(__FILE__) + '/gator/runner'
+require File.dirname(__FILE__) + '/gator/commands'

data/lib/gator/command.rb

@@ -24,6 +24,10 @@ module Gator
       self.class.parent
     end
 
+    def definition
+      self.class.definition
+    end
+
     def get_subcommand(*args)
       nil
     end

data/lib/gator/generators.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/generators/generator'

data/lib/gator/generators/generator.rb

@@ -0,0 +1,31 @@
+module Gator
+  class Generator < Task
+    def init
+    end
+  end
+  module ActAsTemplateGenerator
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def template_root
+        nil
+      end
+
+      def source_paths
+        unless @template_roots
+          @template_roots = []
+          @template_roots += Gator::Project.project.template_roots if Gator::Project.project
+          @template_roots << Gator::Util.generator_template_root
+          @template_roots << template_root if template_root
+        end
+        @template_roots
+      end
+
+    end
+
+  end
+end

data/lib/gator/project.rb

@@ -32,6 +32,10 @@ module Gator
         @options ||= {}
       end
 
+      def template_roots
+        @template_roots ||= []
+      end
+
     end
 
     # THIS CLASS IS STOLEN FROM BUILDR

data/lib/gator/util.rb

@@ -29,6 +29,10 @@ module Gator
       File.join(gator_root, "templates", "projects")
     end
 
+    def self.generator_template_root
+      File.join(gator_root, "templates", "generators" )
+    end
+
     def self.load_rubyfile(path, content=nil, debug=false)
       content ||= File.binread(path)
 

data/spec/command_spec.rb

@@ -1,20 +1,84 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+class CommandA < Gator::Command
+  define :command => "a", :short => "a",
+  :usage => "a", :description => "a"
+end
+
+class CommandB < Gator::Command
+  define :command => "b", :short => "b",
+  :usage => "b", :description => "b"
+end
+
+class CommandC < Gator::Command
+  define :command => "c", :short => "c",
+  :usage => "c", :description => "c"
+end
+
+class SpecCollection < Gator::Command
+  define :command => "collection", :short => "c",
+         :usage => "collection", :description => "collection"
+
+  register_subcommand CommandA
+  CommandA.register_subcommand CommandB
+  register_subcommand CommandC
+end
 
 describe Gator::ActAsCommand do
 
-  it "should have some tests"
+  it "should contain the correct definition" do
+    CommandA.definition[:command].should == "a"
+    CommandA.definition[:short].should == "a"
+    CommandA.definition[:usage].should == "a"
+    CommandA.definition[:description].should == "a"
+  end
+
+  it "should have the correct parent" do
+    CommandB.parent.should == CommandA
+    CommandA.parent.should == SpecCollection
+    CommandC.parent.should == SpecCollection
+    SpecCollection.parent.should == nil
+  end
 
 end
 
 describe Gator::ActAsCommandCollection do
 
-  it "should have some tests"
+  it "should provide the correct subcommands" do
+    SpecCollection.get_subcommand("a").should == CommandA
+    SpecCollection.get_subcommand("c").should == CommandC
+  end
+
+  it "should provide the correct nested subcommands" do
+    SpecCollection.get_subcommand("a","b").should == CommandB
+  end
+
+  it "should return nil if a command cannot be found" do
+    SpecCollection.get_subcommand("d").should == nil
+  end
+
+  it "should resolve the correct subcommand on a parent" do
+    CommandB.resolve_subcommand(["a"]).should == CommandA
+    CommandB.resolve_subcommand(["c"]).should == CommandC
+  end
+
+  it "should resolve the correct nested subcommand on a parent" do
+    CommandC.resolve_subcommand(["a","b"]).should == CommandB
+  end
+
+  it "should fall back to CommandB" do
+    CommandC.resolve_subcommand(["a","d"],["a","b"]).should == CommandB
+  end
+
+  it "should return nil if a command cannot be resolved" do
+    CommandC.resolve_subcommand("d").should == nil
+  end
 
 end
 
 describe Gator::Command do
 
-  it "should have some tests"
+  it "should be covered by Gator::ActAsCommandCollection & Gator::ActAsCommand" do
+  end
 
 end

data/spec/task_spec.rb

@@ -3,6 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Gator::Task do
 
-  it "should have some tests"
+  it "should really have some tests"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gator
 version: !ruby/object:Gem::Version
-  version: 0.0.20.pre
+  version: 0.0.21.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 +02:00
+date: 2011-08-19 00:00:00.000000000 +02:00
 default_executable: gator
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2158120480 !ruby/object:Gem::Requirement
+  requirement: &2158656960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2158120480
+  version_requirements: *2158656960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158119980 !ruby/object:Gem::Requirement
+  requirement: &2158656340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2158119980
+  version_requirements: *2158656340
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2158119440 !ruby/object:Gem::Requirement
+  requirement: &2158655620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2158119440
+  version_requirements: *2158655620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158115740 !ruby/object:Gem::Requirement
+  requirement: &2158654900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158115740
+  version_requirements: *2158654900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158115200 !ruby/object:Gem::Requirement
+  requirement: &2158653320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2158115200
+  version_requirements: *2158653320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2158114640 !ruby/object:Gem::Requirement
+  requirement: &2158652720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158114640
+  version_requirements: *2158652720
 description: gator - the friendly code-generator
 email: dominic.graefen@gmail.com
 executables:
@@ -102,6 +102,8 @@ files:
 - lib/gator/commands/generate.rb
 - lib/gator/commands/project.rb
 - lib/gator/config.rb
+- lib/gator/generators.rb
+- lib/gator/generators/generator.rb
 - lib/gator/project.rb
 - lib/gator/runner.rb
 - lib/gator/task.rb
@@ -130,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 382817011434397857
+      hash: -2425800773055495603
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: