gator 0.0.13.pre → 0.0.14.pre

data/VERSION

@@ -1 +1 @@
-0.0.13.pre
+0.0.14.pre

data/gator.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gator}
-  s.version = "0.0.13.pre"
+  s.version = "0.0.14.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
     "lib/gator.rb",
     "lib/gator/command.rb",
     "lib/gator/commands.rb",
-    "lib/gator/commands/generate_command.rb",
-    "lib/gator/commands/project_command.rb",
+    "lib/gator/commands/generate.rb",
+    "lib/gator/commands/project.rb",
     "lib/gator/config.rb",
     "lib/gator/generators.rb",
     "lib/gator/generators/as3/ClassTemplate.as.tt",

data/lib/gator.rb

@@ -1,8 +1,8 @@
 require 'gator/config'
 require 'gator/project'
 require 'gator/util'
-require 'gator/task'
 require 'gator/command'
+require 'gator/task'
 require 'gator/runner'
 require 'gator/commands'
 require 'gator/generators'

data/lib/gator/command.rb

@@ -1,11 +1,13 @@
 module Gator
   class Command < Thor
-    def self.register_command(target, name, usage, description, mappings=[], options={})
-      target.register self, name, usage, description, options
-      target.map mappings => name
+
+    def self.define( definition )
+      @definition = d = definition
+      d[:on].register self, d[:as], d[:usage], d[:description], d[:options] || {}
+      d[:on].map [ d[:short] ] => d[:as] unless d[:short].nil?
     end
 
-    #The following lines fixes a bug in thor see: https://github.com/wycats/thor/pull/150
+    #The following lines fix a bug in thor see: https://github.com/wycats/thor/pull/150
     class << self
       def register(klass, subcommand_name, usage, description, options={})
         if klass <= Thor::Group

data/lib/gator/commands/generate.rb

@@ -0,0 +1,8 @@
+require 'thor/actions'
+
+module Gator
+  class GenerateCommand < Command
+    define :on => Gator::Runner, :as => "generate", :short => "g",
+           :usage => "generate TASK", :description => "Generators."
+  end
+end

data/lib/gator/commands/{project_command.rb → project.rb}

@@ -9,7 +9,8 @@ module Gator
     include Thor::Actions
     include Gator::Configuration
 
-    register_command Gator::Runner, "project", "project TASK", "Set of tasks to manage project templates.", ["p"]
+    define :on => Gator::Runner, :as => "project", :short => "p",
+           :usage => "project TASK", :description => "Set of tasks to manage project templates."
 
     def self.source_root
       Gator::Util.project_template_root

data/lib/gator/generators/as3/class_generator.rb

@@ -3,9 +3,10 @@ module Gator
     class ClassGenerator < Task
       include Gator::Project
 
-      register_task Gator::AS3::GeneratorCollection, "klass", "generate as3 klass CLASS_NAME", "Creates AS3 class."
+      define :on => Gator::AS3::GeneratorCollection, :as => "klass",
+             :usage => "generate as3 klass CLASS_NAME", :description => "Creates AS3 class."
 
-      argument :name
+      argument :classname
 
       def self.source_root
         File.dirname __FILE__
@@ -13,7 +14,7 @@ module Gator
 
       def generate
         src = project.path(:src, :main, :as3)
-        @package_name, @class_name = split_class_name(name)
+        @package_name, @class_name = split_class_name(classname)
         src = File.join(src, @package_name.split(".").join(File::SEPARATOR)) unless @package_name == ""
         template "ClassTemplate.as.tt", File.join(src, "#{@class_name}.as")
 

data/lib/gator/generators/as3/collections.rb

@@ -1,10 +1,15 @@
 module Gator
   module AS3
+
     class GeneratorCollection < Gator::Command
-      register_command Gator::GenerateCommand, "as3", "generate as3 GENERATOR", "Generators for AS3"
+      define :on => Gator::GenerateCommand, :as => "as3",
+             :usage => "generate as3 GENERATOR", :description => "Generators for AS3."
     end
+
     class TestGeneratorCollection < Gator::Command
-      register_command GeneratorCollection, "test", "generate as3 test GENERATOR", "TestGenerators for AS3"
+      define :on => GeneratorCollection, :as => "test",
+             :usage => "generate as3 test GENERATOR", :description => "TestGenerators for AS3."
     end
+
   end
 end

data/lib/gator/generators/as3/test/class_test_generator.rb

@@ -3,9 +3,10 @@ module Gator
     class ClassTestGenerator < Task
       include Gator::Project
 
-      register_task Gator::AS3::TestGeneratorCollection, "klass", "generate as3 test klass CLASS_NAME", "Creates AS3 class test."
+      define :on => Gator::AS3::TestGeneratorCollection, :as => "klass",
+             :usage => "generate as3 test klass CLASS_NAME", :description => "Creates AS3 class test."
 
-      argument :name
+      argument :classname
 
       def self.source_root
         File.dirname __FILE__
@@ -13,7 +14,7 @@ module Gator
 
       def generate
         src = project.path(:src, :test, :as3)
-        @package_name, @class_name = split_class_name(name)
+        @package_name, @class_name = split_class_name(classname)
         @class_name += "Test"
         src = File.join(src, @package_name.split(".").join(File::SEPARATOR)) unless @package_name == ""
         template "ClassTemplate.as.tt", File.join(src, "#{@class_name}.as")

data/lib/gator/task.rb

@@ -4,9 +4,12 @@ require "thor/actions"
 module Gator
   class Task < Thor::Group
     include Thor::Actions
-    def self.register_task( target, name, usage, description, mappings=[], options={} )
-      target.register self, name, usage,description,options
-      target.map mappings => name
+
+    def self.define( definition )
+      @definition = d = definition
+      d[:on].register self, d[:as], d[:usage], d[:description], d[:options] || {}
+      d[:on].map [ d[:short] ] => d[:as] unless d[:short].nil?
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gator
 version: !ruby/object:Gem::Version
-  version: 0.0.13.pre
+  version: 0.0.14.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: gator
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2161742020 !ruby/object:Gem::Requirement
+  requirement: &2157356460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2161742020
+  version_requirements: *2157356460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161741520 !ruby/object:Gem::Requirement
+  requirement: &2157355940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2161741520
+  version_requirements: *2157355940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161741000 !ruby/object:Gem::Requirement
+  requirement: &2157355400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161741000
+  version_requirements: *2157355400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161740460 !ruby/object:Gem::Requirement
+  requirement: &2157354800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2161740460
+  version_requirements: *2157354800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2161739860 !ruby/object:Gem::Requirement
+  requirement: &2157346500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161739860
+  version_requirements: *2157346500
 description: gator - the friendly code-generator
 email: dominic.graefen@gmail.com
 executables:
@@ -88,8 +88,8 @@ files:
 - lib/gator.rb
 - lib/gator/command.rb
 - lib/gator/commands.rb
-- lib/gator/commands/generate_command.rb
-- lib/gator/commands/project_command.rb
+- lib/gator/commands/generate.rb
+- lib/gator/commands/project.rb
 - lib/gator/config.rb
 - lib/gator/generators.rb
 - lib/gator/generators/as3/ClassTemplate.as.tt
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2732303947582231571
+      hash: -355308578619065228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/gator/commands/generate_command.rb

@@ -1,7 +0,0 @@
-require 'thor/actions'
-
-module Gator
-  class GenerateCommand < Command
-    register_command Gator::Runner, "generate", "generate TASK", "Generators.", ["g"]
-  end
-end