gator 0.0.14.pre → 0.0.16.pre

data/Gemfile

@@ -9,6 +9,7 @@ gem "thor", "~>0.14.6"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
+  gem "ci_reporter", "~> 1.6.5"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"
   gem "rcov", ">= 0"

data/README.rdoc

@@ -1,6 +1,6 @@
 = gator
 
-Description goes here.
+gator - the friendly code generator
 
 == Contributing to gator
  

data/Rakefile

@@ -27,10 +27,15 @@ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'ci/reporter/rake/rspec'
+
+ENV["CI_REPORTS"] ||= File.expand_path( File.join( File.dirname(__FILE__), "test", "report" ) )
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+task :spec => "ci:setup:rspec"
+
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
@@ -39,7 +44,7 @@ end
 task :test => :spec
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.14.pre
+0.0.16.pre

data/gator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gator}
-  s.version = "0.0.14.pre"
+  s.version = "0.0.16.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-07-06}
+  s.date = %q{2011-07-11}
   s.default_executable = %q{gator}
   s.description = %q{gator - the friendly code-generator}
   s.email = %q{dominic.graefen@gmail.com}
@@ -34,17 +34,18 @@ 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/as3/ClassTemplate.as.tt",
-    "lib/gator/generators/as3/class_generator.rb",
-    "lib/gator/generators/as3/collections.rb",
-    "lib/gator/generators/as3/test/ClassTemplate.as.tt",
-    "lib/gator/generators/as3/test/class_test_generator.rb",
     "lib/gator/project.rb",
     "lib/gator/runner.rb",
     "lib/gator/task.rb",
     "lib/gator/util.rb",
-    "spec/spec_helper.rb"
+    "spec/command_spec.rb",
+    "spec/config_spec.rb",
+    "spec/fixtures/empty_gator_project/gator.rb",
+    "spec/project_spec.rb",
+    "spec/runner_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/task_spec.rb",
+    "spec/util_spec.rb"
   ]
   s.homepage = %q{http://github.com/devboy/gator}
   s.licenses = ["MIT"]
@@ -58,12 +59,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<ci_reporter>, ["~> 1.6.5"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -71,6 +74,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/gator.rb

@@ -4,5 +4,4 @@ require 'gator/util'
 require 'gator/command'
 require 'gator/task'
 require 'gator/runner'
-require 'gator/commands'
-require 'gator/generators'
+require 'gator/commands'

data/lib/gator/command.rb

@@ -1,12 +1,73 @@
 module Gator
-  class Command < Thor
 
-    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?
+  module ActAsCommand
+
+    def self.included(base)
+      base.extend(ClassMethods)
     end
 
+    module ClassMethods
+
+      attr_reader :definition, :parent
+
+      def define(definition)
+        @definition = definition
+      end
+
+      def parent_command=(klass)
+        @parent = klass
+      end
+
+    end
+
+    def parent
+      self.class.parent
+    end
+
+    def get_subcommand(*args)
+      nil
+    end
+
+  end
+
+  module ActAsCommandCollection
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def subcommand_classes
+        @subcommand_classes ||= {}
+      end
+
+      def register_subcommand(klass)
+        d = klass.definition
+        register klass, d[:command], d[:usage], d[:description], d[:options] || {}
+        map [d[:short]] => d[:command] unless d[:short].nil?
+        subcommand_classes[d[:command]] = klass
+        klass.parent_command = self
+      end
+
+      def get_subcommand(*args)
+        arg = args.shift
+        klass = subcommand_classes[arg.to_s]
+        until args.empty? do
+          arg = args.shift
+          klass = klass.subcommand_classes[arg]
+        end
+        klass
+      end
+
+    end
+
+  end
+
+  class Command < Thor
+    include ActAsCommand
+    include ActAsCommandCollection
+
     #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={})

data/lib/gator/commands.rb

@@ -1 +1,5 @@
-Dir.glob( File.join( File.dirname(__FILE__), "commands", "*.rb" ) ).each { |rb| require rb }
+require File.dirname(__FILE__) + '/commands/project'
+require File.dirname(__FILE__) + '/commands/generate'
+
+Gator::Runner.register_subcommand Gator::ProjectCommand
+Gator::Runner.register_subcommand Gator::GenerateCommand

data/lib/gator/commands/generate.rb

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

data/lib/gator/commands/project.rb

@@ -1,15 +1,13 @@
 require "thor"
 require "thor/actions"
 require "fileutils"
-require "gator/command"
-require "gator/config"
 
 module Gator
   class ProjectCommand < Command
     include Thor::Actions
     include Gator::Configuration
 
-    define :on => Gator::Runner, :as => "project", :short => "p",
+    define :command => "project", :short => "p",
            :usage => "project TASK", :description => "Set of tasks to manage project templates."
 
     def self.source_root

data/lib/gator/task.rb

@@ -3,13 +3,7 @@ require "thor/actions"
 
 module Gator
   class Task < Thor::Group
+    include ActAsCommand
     include Thor::Actions
-
-    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

data/spec/command_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe Gator::ActAsCommand do
+
+  it "should have some tests"
+
+end
+
+describe Gator::ActAsCommandCollection do
+
+  it "should have some tests"
+
+end
+
+describe Gator::Command do
+
+  it "should have some tests"
+
+end

data/spec/config_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe Gator::Configuration do
+
+  it "should have some tests"
+
+end
+
+describe Gator::GatorConfiguration do
+
+  it "should have some tests"
+
+end

data/spec/project_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe Gator::Project do
+
+  it "should have some tests"
+
+end
+
+describe Gator::Project::Layout do
+
+  it "should have some tests"
+  it "could be the tests from the buildr project"
+
+end

data/spec/runner_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe Gator::Runner do
+
+  it "should have some tests"
+
+end

data/spec/task_spec.rb

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

data/spec/util_spec.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe Gator::Util do
+
+  it "should contain the correct filenames" do
+    Gator::Util.gator_files.include?("gator").should == true
+    Gator::Util.gator_files.include?("gator.rb").should == true
+  end
+
+  it "should contain the correct filenames for directory" do
+    Gator::Util.gator_files_for("testdir").include?("testdir/gator").should == true
+    Gator::Util.gator_files_for("testdir").include?("testdir/gator.rb").should == true
+  end
+
+  it "should provide the correct gator root directory" do
+    Gator::Util.gator_root.should == File.join(File.expand_path("~"), ".gator")
+  end
+
+  it "should provide the correct project template directory" do
+    Gator::Util.project_template_root.should == File.join(Gator::Util.gator_root, "templates", "projects")
+  end
+
+  it "should load a rubyfile correctly"
+
+  it "should find the gator project directory from project base directory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project')
+    Gator::Util.find_gator_project(project_dir).should == project_dir
+  end
+
+  it "should find the gator project directory from a project subdirectory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project')
+    sub_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project/sub_dir')
+    Gator::Util.find_gator_project(sub_dir).should == project_dir
+  end
+
+  it "should find the gator.rb file from project base directory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project')
+    file = File.join(project_dir, "gator.rb")
+    Gator::Util.find_gator_project_file(project_dir).should == file
+  end
+
+  it "should find the gator.rb file from a project subdirectory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project')
+    sub_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/empty_gator_project/sub_dir')
+    file = File.join(project_dir, "gator.rb")
+    Gator::Util.find_gator_project_file(sub_dir).should == file
+  end
+
+  it "should not find a gator project in a project without gator.rb from the its base directory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/no_gator_file')
+    Gator::Util.find_gator_project(project_dir).should == nil
+  end
+
+  it "should not find a gator project in a project without gator.rb from the a subdirectory" do
+    project_dir = File.expand_path(File.dirname(__FILE__) + '/fixtures/no_gator_file/subdir')
+    Gator::Util.find_gator_project(project_dir).should == nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gator
 version: !ruby/object:Gem::Version
-  version: 0.0.14.pre
+  version: 0.0.16.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000 +02:00
+date: 2011-07-11 00:00:00.000000000 +02:00
 default_executable: gator
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2157356460 !ruby/object:Gem::Requirement
+  requirement: &2155529440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157356460
+  version_requirements: *2155529440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157355940 !ruby/object:Gem::Requirement
+  requirement: &2155528920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,21 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157355940
+  version_requirements: *2155528920
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &2155528440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :development
+  prerelease: false
+  version_requirements: *2155528440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157355400 !ruby/object:Gem::Requirement
+  requirement: &2155527940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157355400
+  version_requirements: *2155527940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157354800 !ruby/object:Gem::Requirement
+  requirement: &2155527460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2157354800
+  version_requirements: *2155527460
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2157346500 !ruby/object:Gem::Requirement
+  requirement: &2155526940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157346500
+  version_requirements: *2155526940
 description: gator - the friendly code-generator
 email: dominic.graefen@gmail.com
 executables:
@@ -91,17 +102,18 @@ files:
 - 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
-- lib/gator/generators/as3/class_generator.rb
-- lib/gator/generators/as3/collections.rb
-- lib/gator/generators/as3/test/ClassTemplate.as.tt
-- lib/gator/generators/as3/test/class_test_generator.rb
 - lib/gator/project.rb
 - lib/gator/runner.rb
 - lib/gator/task.rb
 - lib/gator/util.rb
+- spec/command_spec.rb
+- spec/config_spec.rb
+- spec/fixtures/empty_gator_project/gator.rb
+- spec/project_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
+- spec/task_spec.rb
+- spec/util_spec.rb
 has_rdoc: true
 homepage: http://github.com/devboy/gator
 licenses:
@@ -118,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -355308578619065228
+      hash: -2787342404688120478
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/gator/generators.rb

@@ -1,2 +0,0 @@
-require File.dirname(__FILE__) + '/generators/as3/collections'
-Dir.glob( File.join( File.dirname(__FILE__), "generators", "**", "*.rb" ) ).each { |rb| require rb }

data/lib/gator/generators/as3/ClassTemplate.as.tt

@@ -1,9 +0,0 @@
-package <%= package_name %>
-{
-    public class <%= class_name %>
-    {
-        public function <%= class_name %>()
-        {
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-module Gator
-  module AS3
-    class ClassGenerator < Task
-      include Gator::Project
-
-      define :on => Gator::AS3::GeneratorCollection, :as => "klass",
-             :usage => "generate as3 klass CLASS_NAME", :description => "Creates AS3 class."
-
-      argument :classname
-
-      def self.source_root
-        File.dirname __FILE__
-      end
-
-      def generate
-        src = project.path(:src, :main, :as3)
-        @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")
-
-        invoke Gator::AS3::TestGeneratorCollection, "klass"
-      end
-
-      no_tasks {
-
-        def package_name
-          @package_name
-        end
-
-        def class_name
-          @class_name
-        end
-
-      }
-
-      protected
-
-      def split_class_name(class_name)
-        pieces = class_name.split "."
-        class_name = pieces.pop
-        package_name = pieces.join "."
-        return package_name, class_name
-      end
-
-    end
-  end
-end

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

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

data/lib/gator/generators/as3/test/ClassTemplate.as.tt

@@ -1,9 +0,0 @@
-package <%= package_name %>
-{
-    public class <%= class_name %>
-    {
-        public function <%= class_name %>()
-        {
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-module Gator
-  module AS3
-    class ClassTestGenerator < Task
-      include Gator::Project
-
-      define :on => Gator::AS3::TestGeneratorCollection, :as => "klass",
-             :usage => "generate as3 test klass CLASS_NAME", :description => "Creates AS3 class test."
-
-      argument :classname
-
-      def self.source_root
-        File.dirname __FILE__
-      end
-
-      def generate
-        src = project.path(:src, :test, :as3)
-        @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")
-
-        invoke Gator::AS3::GeneratorCollection, "klass"
-      end
-
-      no_tasks {
-
-        def package_name
-          @package_name
-        end
-
-        def class_name
-          @class_name
-        end
-
-      }
-
-      protected
-
-      def split_class_name(class_name)
-        pieces = class_name.split "."
-        class_name = pieces.pop
-        package_name = pieces.join "."
-        return package_name, class_name
-      end
-
-    end
-  end
-end