gator 0.0.21.pre → 0.0.22.pre

data/Gemfile

@@ -12,5 +12,7 @@ group :development do
   gem "ci_reporter", "~> 1.6.5"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"
-  gem "rcov", ">= 0"
+  gem "simplecov", :require => false
+  gem "simplecov-rcov", :require => false
+  #gem "rcov", ">= 0"
 end

data/Rakefile

@@ -25,6 +25,9 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+require File.dirname(__FILE__)+"/rake/jeweler_prerelease_tasks"
+Jeweler::PrereleaseTasks.new
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'ci/reporter/rake/rspec'
@@ -35,12 +38,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task :spec => "ci:setup:rspec"
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :test => :spec
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-0.0.21.pre
+0.0.22.pre

data/bin/gator

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require "gator"
+require File.dirname(__FILE__) + "/../lib/gator"
 
-Gator::Runner.start
+Gator::Application.start

data/gator.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gator}
-  s.version = "0.0.21.pre"
+  s.name = "gator"
+  s.version = "0.0.22.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-19}
-  s.default_executable = %q{gator}
-  s.description = %q{gator - the friendly code-generator}
-  s.email = %q{dominic.graefen@gmail.com}
+  s.date = "2011-10-12"
+  s.description = "gator - the friendly code-generator"
+  s.email = "dominic.graefen@gmail.com"
   s.executables = ["gator"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,31 +28,51 @@ Gem::Specification.new do |s|
     "bin/gator",
     "gator.gemspec",
     "lib/gator.rb",
-    "lib/gator/command.rb",
-    "lib/gator/commands.rb",
-    "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",
-    "lib/gator/util.rb",
-    "spec/command_spec.rb",
-    "spec/config_spec.rb",
+    "lib/gator/core.rb",
+    "lib/gator/core/application/application.rb",
+    "lib/gator/core/application/application_configuration.rb",
+    "lib/gator/core/command/act_as_command.rb",
+    "lib/gator/core/command/act_as_command_collection.rb",
+    "lib/gator/core/command/command.rb",
+    "lib/gator/core/command/task.rb",
+    "lib/gator/core/configuration/act_as_configuration.rb",
+    "lib/gator/core/configuration/configuration.rb",
+    "lib/gator/core/io/paths.rb",
+    "lib/gator/core/io/project_file_locator.rb",
+    "lib/gator/core/io/ruby_file_loader.rb",
+    "lib/gator/core/io/sandbox.rb",
+    "lib/gator/core/project/layout.rb",
+    "lib/gator/core/project/project.rb",
+    "lib/gator/plugins/generators.rb",
+    "lib/gator/plugins/generators/act_as_template_generator.rb",
+    "lib/gator/plugins/generators/generate_command.rb",
+    "lib/gator/plugins/generators/generator.rb",
+    "lib/gator/plugins/scaffolding.rb",
+    "lib/gator/plugins/scaffolding/scaffold_command.rb",
+    "lib/gator/plugins/scaffolding/scaffolding_file_utils.rb",
+    "rake/jeweler.rb",
+    "rake/jeweler_prerelease_tasks.rb",
+    "rake/pre_release_gemspec.rb",
+    "rake/pre_release_to_git.rb",
+    "spec/core/application/application_configuration_spec.rb",
+    "spec/core/application/application_spec.rb",
+    "spec/core/command/command_spec.rb",
+    "spec/core/command/task_spec.rb",
+    "spec/core/configuration/configuration_spec.rb",
+    "spec/core/io/paths_spec.rb",
+    "spec/core/io/sandbox_spec.rb",
+    "spec/core/project/layout_spec.rb",
+    "spec/core/project/project_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"
+    "spec/fixtures/no_gator_file/.empty_directory",
+    "spec/plugins/scaffolding/scaffold_command_spec.rb",
+    "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/devboy/gator}
+  s.homepage = "http://github.com/devboy/gator"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{gator - the friendly code-generator}
+  s.rubygems_version = "1.8.10"
+  s.summary = "gator - the friendly code-generator"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -64,14 +83,16 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov-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"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
@@ -79,7 +100,8 @@ Gem::Specification.new do |s|
     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"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
   end
 end
 

data/lib/gator.rb

@@ -1,8 +1,6 @@
-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'
+require "thor"
+require "thor/group"
+
+require File.dirname(__FILE__) + '/gator/core'
+require File.dirname(__FILE__) + '/gator/plugins/generators'
+require File.dirname(__FILE__) + '/gator/plugins/scaffolding'

data/lib/gator/core.rb

@@ -0,0 +1,19 @@
+require File.expand_path( File.dirname(__FILE__) + '/core/command/act_as_command' )
+require File.expand_path( File.dirname(__FILE__) + '/core/command/act_as_command_collection' )
+require File.expand_path( File.dirname(__FILE__) + '/core/command/command' )
+require File.expand_path( File.dirname(__FILE__) + '/core/command/task' )
+
+require File.expand_path( File.dirname(__FILE__) + '/core/io/paths' )
+require File.expand_path( File.dirname(__FILE__) + '/core/io/ruby_file_loader' )
+require File.expand_path(File.dirname(__FILE__) + '/core/io/project_file_locator')
+require File.expand_path( File.dirname(__FILE__) + '/core/io/sandbox' )
+
+require File.expand_path( File.dirname(__FILE__) + '/core/configuration/act_as_configuration' )
+require File.expand_path( File.dirname(__FILE__) + '/core/configuration/configuration' )
+
+require File.expand_path( File.dirname(__FILE__) + '/core/project/layout' )
+require File.expand_path( File.dirname(__FILE__) + '/core/project/project' )
+
+require File.expand_path( File.dirname(__FILE__) + '/core/application/application' )
+require File.expand_path( File.dirname(__FILE__) + '/core/application/application_configuration' )
+

data/lib/gator/core/application/application.rb

@@ -0,0 +1,41 @@
+require 'singleton'
+
+class Gator
+  class Application < Command
+    #include Singleton
+    include Thor::Actions
+
+    desc "version", "Show Gator version"
+    def version
+      version_file = File.dirname(__FILE__) + '/../../../../VERSION'
+      say File.exist?(version_file) ? File.read(version_file) : ""
+    end
+
+    def initialize(*args)
+      bootstrap
+      super
+    end
+
+    no_tasks {
+
+      def bootstrap
+        Gator::Sandbox.add_getter :gator, Gator::ApplicationConfiguration.new
+        load_configuration
+        load_project
+      end
+
+      def load_configuration
+        file = Gator::Paths.env_file
+        say "No environment file (env.rb) could be found in gator home directory.(#{Gator::Paths.gator_home})", :yellow unless File.exist? file
+        RubyFileLoader.new(Gator::Sandbox).exec_file file if File.exist? file
+      end
+
+      def load_project
+        file = Gator::Paths.project_file
+        say "No project file (gator.rb) could be found in this directory.(#{Dir.pwd})", :yellow if file.nil?
+        RubyFileLoader.new(Gator::Sandbox).exec_file file unless file.nil?
+      end
+
+    }
+  end
+end

data/lib/gator/core/application/application_configuration.rb

@@ -0,0 +1,11 @@
+class Gator
+  class ApplicationConfiguration < Configuration
+
+    def initialize
+      add_configuration :project, Gator::Project.new
+      add_configuration :environment, Gator::Configuration.new
+      add_configuration :env, @environment
+    end
+
+  end
+end

data/lib/gator/core/command/act_as_command.rb

@@ -0,0 +1,40 @@
+class Gator
+  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 definition
+      self.class.definition
+    end
+
+    def get_subcommand(*args)
+      nil
+    end
+
+    def resolve_subcommand(command, fallback=nil)
+      return nil unless parent
+      parent.resolve_subcommand(command, fallback)
+    end
+
+  end
+end

data/lib/gator/core/command/act_as_command_collection.rb

@@ -0,0 +1,63 @@
+class Gator
+  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
+
+      alias :<< :register_subcommand
+
+
+      def get_subcommand(*args)
+        klass = self
+        args.each do |arg|
+          return nil unless klass.subcommand_classes.has_key? arg
+          klass = klass.subcommand_classes[arg]
+        end
+        klass
+      end
+
+      def resolve_subcommand(command, fallback=nil)
+
+        subcommand = get_subcommand *command
+        return subcommand unless subcommand.nil?
+
+        if command.respond_to?(:first) && command.first == definition[:command]
+          command_stripped = command.dup
+          command_stripped.shift
+          subcommand = command_stripped.empty? ? self : get_subcommand(*command_stripped)
+          return subcommand unless subcommand.nil?
+        end
+
+        subcommand = parent.resolve_subcommand command unless parent.nil?
+        return subcommand unless subcommand.nil?
+
+        resolve_subcommand fallback unless fallback.nil?
+      end
+
+    end
+
+    def get_subcommand(*args)
+      self.class.get_subcommand *args
+    end
+
+    def resolve_subcommand(command, fallback=nil)
+      self.class.resolve_subcommand command, fallback
+    end
+
+  end
+end

data/lib/gator/core/command/command.rb

@@ -0,0 +1,20 @@
+class Gator
+  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={})
+        if klass <= Thor::Group
+          desc usage, description, options
+          define_method(subcommand_name) { |*args| invoke klass }
+        else
+          desc usage, description, options
+          subcommand subcommand_name, klass
+        end
+      end
+    end
+
+  end
+end

data/lib/gator/{task.rb → core/command/task.rb}

@@ -1,7 +1,4 @@
-require "thor/group"
-require "thor/actions"
-
-module Gator
+class Gator
   class Task < Thor::Group
     include ActAsCommand
     include Thor::Actions

data/lib/gator/core/configuration/act_as_configuration.rb

@@ -0,0 +1,30 @@
+class Gator
+  module ActAsConfiguration
+
+    def add_getter name, val
+      self.class.send :attr_reader, name
+      instance_variable_set "@#{name}", val
+    end
+
+    def add_configuration(name, val=nil)
+
+      create_method "#{name.to_s}=" do |val|
+        instance_variable_set("@#{name}", val)
+      end
+
+      create_method name do |&block|
+        block.call(instance_variable_get("@#{name}")) if block
+        instance_variable_get("@#{name}")
+      end
+
+      instance_variable_set("@#{name}", val) if val
+    end
+
+    private
+
+    def create_method(name, &block)
+      self.class.send(:define_method, name, &block)
+    end
+
+  end
+end

data/lib/gator/core/configuration/configuration.rb

@@ -0,0 +1,5 @@
+class Gator
+  class Configuration
+    include Gator::ActAsConfiguration
+  end
+end

data/lib/gator/core/io/paths.rb

@@ -0,0 +1,21 @@
+class Gator
+  class Paths
+
+    def self.gator_home
+      File.join(Thor::Util.user_home, ".gator").gsub(/\\/, '/')
+      end
+
+    def self.env_file
+      File.join gator_home, "environment.rb"
+    end
+
+    def self.project_home
+      Gator::ProjectFileLocator.new.find_project_dir
+    end
+
+    def self.project_file
+      Gator::ProjectFileLocator.new.find_project_file
+    end
+
+  end
+end