simonmenke-gm 0.0.4 → 0.0.5

data/bin/gmm

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/gm'
+
+GM::App.instance.run

data/gm_commands/build_command.rb

@@ -3,10 +3,16 @@ module GM
   
   class BuildCommand < Command
     
+    desc "Build the gem (gem will be in ./pkg)"
+    
     def run
       app.emulate = true
       app.build_gemspec
-      app.build_gem
+      
+      builder = Gem::Builder.new app.gemspec
+      app.gem_file_name = builder.build
+      system("rm -f pkg/#{app.gem_file_name}")
+      system("mkdir -p pkg && mv #{app.gem_file_name} pkg/")
     end
     
   end

data/gm_commands/clean_command.rb

@@ -3,8 +3,10 @@ module GM
   
   class CleanCommand < Command
     
+    desc "Remove the build files."
+    
     def run
-      system("rm -rf pkg/* *.gemspec")
+      system("rm -rf pkg")
     end
     
   end

data/gm_commands/create_command.rb

@@ -3,11 +3,10 @@ module GM
   
   class CreateCommand < Command
     
+    desc "Generate the basic directory tree for a new gem"
+    
     def run
-      @gen_options = ARGV
-      
-      RubiGen::Base.use_component_sources!(:gm)
-      RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'gem')
+      Command.run(:gen, ['gem', *ARGV])
     end
     
   end

data/gm_commands/gen_command.rb

@@ -3,13 +3,15 @@ module GM
   
   class GenCommand < Command
     
+    desc "Use a generator"
+    
     def run
-      app.build_gemspec
-      @gen_name    = ARGV.shift
-      @gen_options = ARGV
+      app.build_gemspec if File.exist?('./gmfile.yml')
+      @gen_name    = self.argv.shift
+      @gen_options = self.argv
       
       RubiGen::Base.use_component_sources!(:gm)
-      RubiGen::Scripts::Generate.new.run(ARGV, :generator => @gen_name)
+      RubiGen::Scripts::Generate.new.run(@gen_options, :generator => @gen_name)
     end
     
   end

data/gm_commands/help_command.rb

@@ -3,10 +3,24 @@ module GM
   
   class HelpCommand < Command
     
+    desc "Display this help message"
+    
     def run
       puts "#{File.basename($0)} <command> <options>"
-      puts "Commands: #{App.instance.command_names.join(' ')}"
       puts options.to_s
+      puts "Commands:"
+      puts command_descriptions
+    end
+    
+    def command_descriptions
+      descriptions = []
+      app.commands.collect do |name, cmd|
+        descriptions << [name.to_s.underscore.sub('_command', ''), cmd.description]
+      end
+      descriptions.sort { |a,b| a.first <=> b.first }
+      descriptions.collect do |(name, desc)|
+        "#{name+(" "*(17-name.length))} #{desc}"
+      end
     end
     
   end

data/gm_commands/install_command.rb

@@ -3,10 +3,10 @@ module GM
   
   class InstallCommand < Command
     
+    desc "Install the gem localy"
+    
     def run
-      app.emulate = true
-      app.build_gemspec
-      app.build_gem
+      Command.run(:build)
       system("sudo gem install pkg/#{app.gem_file_name}")
     end
     

data/gm_commands/spec_command.rb

@@ -3,6 +3,8 @@ module GM
   
   class SpecCommand < Command
     
+    desc "Dump the gemspec file."
+    
     def run
       app.build_gemspec
       File.open("#{app.gemspec.name}.gemspec", 'w+') do |f|

data/gm_passes/configatron.rb

@@ -1,5 +1,5 @@
 
-pre_pass :configatron_defaults do |spec|
+configuration_pass :configatron_defaults do |spec|
   
   configatron.configure_from_hash({
     :general => {
@@ -35,17 +35,17 @@ pre_pass :configatron_defaults do |spec|
   
 end
 
-pre_pass :configatron_global, :configatron_defaults do |s|
+configuration_pass :configatron_global, :configatron_defaults do |s|
   c = configatron
   c.configure_from_yaml(File.expand_path('~/.gmrc.yml'))
 end
 
-pre_pass :configatron_local, :configatron_global do |s|
+configuration_pass :configatron_local, :configatron_global do |s|
   c = configatron
   c.configure_from_yaml(File.expand_path('gmfile.yml'))
 end
 
-pre_pass :configatron_normalize, :configatron_local do |s|
+configuration_pass :configatron_normalize, :configatron_local do |s|
   c = configatron
   
   if c.rubyforge.project.nil?
@@ -57,7 +57,7 @@ pre_pass :configatron_normalize, :configatron_local do |s|
   end
 end
 
-pre_pass :configatron_exclude_passes, :configatron_local do |s|
+configuration_pass :configatron_exclude_passes, :configatron_local do |s|
   c = configatron
   c.excluded_passes.each do |pass|
     exclude_pass(pass)

data/gm_passes/defaults.rb

@@ -1,5 +1,5 @@
 
-init_pass :defaults do |spec|
+initialization_pass :defaults do |spec|
   
   spec.platform = Gem::Platform::RUBY
   spec.files = []

data/gm_passes/github.rb

@@ -1,5 +1,5 @@
 
-post_pass :emulate_github do |spec|
+finalization_pass :emulate_github do |spec|
   
   if GM::App.emulate?
     spec.name = "#{configatron.github.username}-#{configatron.github.project}"

data/lib/gm/app.rb

@@ -30,14 +30,7 @@ module GM
     def run
       load_passes
       load_commands
-      Command.build(self).run
-    end
-    
-    # ge a list of all the command names
-    def command_names
-      commands.keys.collect do |name|
-        name.to_s.gsub(/[A-Z]/){|m|'_'+m.downcase}.sub(/^_/, '').sub('_command', '')
-      end.sort
+      Command.run
     end
     
     # should we emulate github?
@@ -47,21 +40,14 @@ module GM
     
     def build_gemspec
       @gemspec = Gem::Specification.new do |s|
-        ConfigurationPassQueue.new(:init).run(s)
-        ConfigurationPassQueue.new(:pre).run(s)
+        ConfigurationPassQueue.new(:initialization).run(s)
+        ConfigurationPassQueue.new(:configuration).run(s)
         ConfigurationPassQueue.new(:normal).run(s)
-        ConfigurationPassQueue.new(:post).run(s)
+        ConfigurationPassQueue.new(:finalization).run(s)
       end
       @gemspec.validate
     end
     
-    def build_gem
-      builder = Gem::Builder.new @gemspec
-      @gem_file_name = builder.build
-      system("rm -f pkg/#{@gem_file_name}")
-      system("mkdir -p pkg && mv #{@gem_file_name} pkg/")
-    end
-    
     private
     
     # load all passes

data/lib/gm/command.rb

@@ -4,8 +4,19 @@ module GM
   class Command
     
     attr_accessor :app
+    attr_accessor :argv
     attr_accessor :options
     
+    def self.desc(text)
+      module_eval %{
+        def self.description
+          #{text.inspect}
+        end
+      }
+    end
+    
+    desc ""
+    
     # load a command from a file
     def self.load_command(path)
       cmd_name = File.basename(path, '.rb')
@@ -22,21 +33,32 @@ module GM
     end
     
     # build a command
-    def self.build(app)
-      cmd_name  = (ARGV.detect {|i| not i =~ /^--?/ } || 'help')
-      ARGV.delete(cmd_name)
-      cmd_name  = cmd_name + '_command'
-      cmd_name  = cmd_name.gsub(/(^|_)([a-z])/i) { |m| $2.upcase }
-      cmd_class = GM::App.instance.commands[cmd_name.to_sym] || GM::App.instance.commands[:HelpCommand] 
-      cmd = cmd_class.new
+    def self.run(cmd_name=nil, argv=ARGV)
+      app = GM::App.instance
+      cmd = self.build(cmd_name, argv)
       cmd.app = app
-      cmd.options = app.options = Clip do |p|
+      cmd.options = app.options = Clip(argv) do |p|
         app.extra_options(p)
         cmd.extra_options(p)
       end
-      ARGV.clear
-      ARGV.concat(cmd.options.remainder)
-      cmd
+      argv.clear
+      argv.concat(cmd.options.remainder)
+      cmd.argv = argv
+      cmd.run
+      argv
+    end
+    
+    # build a command
+    def self.build(cmd_name=nil, argv=ARGV)
+      if cmd_name.nil?
+        cmd_name  = (argv.detect {|i| not i =~ /^--?/ } || 'help')
+        argv.delete(cmd_name)
+      end
+      app         = GM::App.instance
+      cmd_name    = "#{cmd_name}_command".camelize
+      cmd_class   = app.commands[cmd_name.to_sym]
+      cmd_class ||= app.commands[:HelpCommand]
+      cmd_class.new
     end
     
     # A command can overwrite this method in order to add extra command line options.

data/lib/gm/dsl.rb

@@ -11,18 +11,19 @@ module GM
     end
     module_function :load_pass
     
-    def init_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:init)
+    def initialization_pass(name, dependencies=[], &proc)
+      ConfigurationPass.new(name, dependencies, &proc).register(:initialization)
     end
-    def pre_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:pre)
+    def configuration_pass(name, dependencies=[], &proc)
+      ConfigurationPass.new(name, dependencies, &proc).register(:configuration)
     end
     def pass(name, dependencies=[], &proc)
       ConfigurationPass.new(name, dependencies, &proc).register(:normal)
     end
-    def post_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:post)
+    def finalization_pass(name, dependencies=[], &proc)
+      ConfigurationPass.new(name, dependencies, &proc).register(:finalization)
     end
+    
     def exclude_pass(name, fase=:normal)
       GM::App.instance.exclude_pass(name, fase)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-gm
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Simon Menke
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 
 date: 2009-01-14 00:00:00 -08:00
-default_executable: gm
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: configatron
@@ -52,12 +52,14 @@ description:
 email: simon.menke@gmail.com
 executables: 
 - gm
+- gmm
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/gm
+- bin/gmm
 - lib/extentions/gem.rb
 - lib/gm/app.rb
 - lib/gm/command.rb
@@ -67,19 +69,6 @@ files:
 - lib/gm.rb
 - LICENSE.txt
 - README.textile
-- gm_generators/bin/bin_generator.rb
-- gm_generators/bin/templates/bin/bin.rb
-- gm_generators/gem/gem_generator.rb
-- gm_generators/gem/templates/gmfile.yml
-- gm_generators/gem/templates/lib/module.rb
-- gm_generators/gem/templates/README.textile
-- gm_generators/mit_license/mit_license_generator.rb
-- gm_generators/mit_license/templates/LICENSE.txt
-- gm_generators/rails/rails_generator.rb
-- gm_generators/rails/templates/rails/init.rb
-- gm_generators/test/templates/test/test_case.rb
-- gm_generators/test/templates/test/test_helper.rb
-- gm_generators/test/test_generator.rb
 - gm_commands/build_command.rb
 - gm_commands/clean_command.rb
 - gm_commands/create_command.rb
@@ -97,6 +86,19 @@ files:
 - gm_passes/rubigen.rb
 - gm_passes/specs.rb
 - gm_passes/test.rb
+- gm_generators/bin/bin_generator.rb
+- gm_generators/bin/templates/bin/bin.rb
+- gm_generators/gem/gem_generator.rb
+- gm_generators/gem/templates/README.textile
+- gm_generators/gem/templates/gmfile.yml
+- gm_generators/gem/templates/lib/module.rb
+- gm_generators/mit_license/mit_license_generator.rb
+- gm_generators/mit_license/templates/LICENSE.txt
+- gm_generators/rails/rails_generator.rb
+- gm_generators/rails/templates/rails/init.rb
+- gm_generators/test/templates/test/test_case.rb
+- gm_generators/test/templates/test/test_helper.rb
+- gm_generators/test/test_generator.rb
 has_rdoc: true
 homepage: http://github.com/simonmenke/gm
 post_install_message: