simonmenke-gm 0.0.5 → 0.0.6

data/README.textile

@@ -2,4 +2,10 @@ h1. GM (GemMake)
 
 GM is a gem and gemspec builder for use with github.
 
-For more info/docs go to "http://simonmenke.github.com/gm":http://simonmenke.github.com/gm
+For more info/docs go to "http://simonmenke.github.com/gm":http://simonmenke.github.com/gm
+
+h2. Todo
+
+* Document extendability
+* Document architecture
+* Implement CDN interfaces (rubyforge, github, your site, ...)

data/gm_commands/build_command.rb

@@ -9,6 +9,7 @@ module GM
       app.emulate = true
       app.build_gemspec
       
+      app.info "Building your gem..."
       builder = Gem::Builder.new app.gemspec
       app.gem_file_name = builder.build
       system("rm -f pkg/#{app.gem_file_name}")

data/gm_commands/help_command.rb

@@ -8,18 +8,45 @@ module GM
     def run
       puts "#{File.basename($0)} <command> <options>"
       puts options.to_s
+      puts ""
       puts "Commands:"
-      puts command_descriptions
+      command_descriptions
+      puts ""
+      puts "Passes:"
+      passes_in_running_order
+    end
+    
+    private
+    
+    def passes_in_running_order
+      format = "% 3d %- 20s %s"
+      
+      puts "- initialization"
+      ConfigurationPassQueue.new(:initialization).each_with_index do |pass, idx|
+        puts format % [idx, pass.name, pass.description]
+      end
+      puts "- configuration"
+      ConfigurationPassQueue.new(:configuration).each_with_index do |pass, idx|
+        puts format % [idx, pass.name, pass.description]
+      end
+      puts "- normal"
+      ConfigurationPassQueue.new(:normal).each_with_index do |pass, idx|
+        puts format % [idx, pass.name, pass.description]
+      end
+      puts "- finalization"
+      ConfigurationPassQueue.new(:finalization).each_with_index do |pass, idx|
+        puts format % [idx, pass.name, pass.description]
+      end
     end
     
     def command_descriptions
       descriptions = []
-      app.commands.collect do |name, cmd|
+      app.commands.each 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}"
+        puts "%- 17s %s" % [name, desc]
       end
     end
     

data/gm_commands/install_command.rb

@@ -7,6 +7,8 @@ module GM
     
     def run
       Command.run(:build)
+      
+      app.info "Installing your gem..."
       system("sudo gem install pkg/#{app.gem_file_name}")
     end
     

data/gm_commands/spec_command.rb

@@ -7,6 +7,7 @@ module GM
     
     def run
       app.build_gemspec
+      app.info "Writing your gemspec..."
       File.open("#{app.gemspec.name}.gemspec", 'w+') do |f|
         f.write app.gemspec.to_ruby
       end

data/gm_generators/gem/templates/Gmfile

@@ -0,0 +1,4 @@
+general:
+  name:     <%= app_name %>
+  version:  0.0.1
+  summary:  FIX my gem.

data/gm_generators/test/test_generator.rb

@@ -12,11 +12,10 @@ class TestGenerator < RubiGen::Base
   
   def manifest
     record do |m|
-      
       m.directory ''
       %w( test ).each { |path| m.directory path }
       
-      m.template "test/test_helper.rb", "test/test_helper.rb"
+      m.template "test/test_helper.rb", "test/test_helper.rb" unless File.exist? "test/test_helper.rb"
       m.template "test/test_case.rb", "test/#{@file_name}_test.rb" unless @file_name.nil?
     end
   end

data/gm_passes/clean_file_list.rb

@@ -0,0 +1,11 @@
+
+desc "Remove dir and duplicate paths"
+
+finalization_pass :clean_file_list do |spec|
+  
+  spec.files.reject! { |path| File.directory? path }
+  spec.files.uniq!
+  spec.files.compact!
+  spec.files.sort!
+  
+end

data/gm_passes/configatron.rb

@@ -37,12 +37,12 @@ end
 
 configuration_pass :configatron_global, :configatron_defaults do |s|
   c = configatron
-  c.configure_from_yaml(File.expand_path('~/.gmrc.yml'))
+  c.configure_from_yaml(File.expand_path('~/.gmrc'))
 end
 
 configuration_pass :configatron_local, :configatron_global do |s|
   c = configatron
-  c.configure_from_yaml(File.expand_path('gmfile.yml'))
+  c.configure_from_yaml(File.expand_path('Gmfile'))
 end
 
 configuration_pass :configatron_normalize, :configatron_local do |s|
@@ -64,7 +64,7 @@ configuration_pass :configatron_exclude_passes, :configatron_local do |s|
   end
 end
 
-pass :configatron do |s|
+configuration_pass :configatron, :configatron_exclude_passes do |s|
   c = configatron
   s.name     = c.general.name
   s.version  = c.general.version

data/gm_passes/defaults.rb

@@ -1,8 +1,10 @@
 
+desc "Initiate default values for the gemspec"
 initialization_pass :defaults do |spec|
   
   spec.platform = Gem::Platform::RUBY
   spec.files = []
   spec.test_files = []
+  spec.require_paths = ['lib']
   
 end

data/gm_passes/executables.rb

@@ -1,4 +1,5 @@
 
+desc "Discover exceutables in bin/"
 pass :executables do |spec|
   
   paths = Dir.glob('bin/*')

data/gm_passes/files.rb

@@ -1,14 +1,15 @@
 
-pass :files do |spec|
-  
-  files  = []
-  files += Dir.glob('bin/*')
-  files += Dir.glob('lib/**/*.rb')
-  files += Dir.glob('*.{txt,rdoc,textile}')
-  spec.files += files
-  
+desc "Collect lib files"
+pass :lib_files do |spec|
+  spec.files += Dir.glob('lib/**/*.rb')
 end
 
-pass :require_paths do |spec|
-  spec.require_paths = ['lib']
+desc "Collect bin files"
+pass :bin_files, :before => :executables do |spec|
+  spec.files += Dir.glob('bin/*')
+end
+
+desc "Collect text files"
+pass :text_files do |spec|
+  spec.files += Dir.glob('*.{txt,rdoc,textile}')
 end

data/gm_passes/github.rb

@@ -1,4 +1,5 @@
 
+desc "Rename the gem in emulation mode (build, install) so it resembles a GitHub gem."
 finalization_pass :emulate_github do |spec|
   
   if GM::App.emulate?

data/gm_passes/gm.rb

@@ -1,7 +1,9 @@
 
-pass :gm_passes do |spec|
+desc "Collect all GM related files (generators, commands, passes)"
+pass :gm_files do |spec|
   
   spec.files += Dir.glob('gm_commands/*_command.rb')
   spec.files += Dir.glob('gm_passes/*.rb')
+  spec.files += Dir.glob('gm_generators/**/*')
   
 end

data/gm_passes/rails.rb

@@ -1,4 +1,5 @@
 
+desc "Collect all Rails related files (rails/init.rb, tasks/*.rake)"
 pass :rails do |spec|
   
   spec.files += Dir.glob('rails/init.rb')

data/gm_passes/rubigen.rb

@@ -1,4 +1,5 @@
 
+desc "Collect rubigen files"
 pass :rubigen do |spec|
   
   paths = Dir.glob('*generators/**/*')

data/gm_passes/specs.rb

@@ -1,4 +1,5 @@
 
+desc "Collect rspec files"
 pass :specs do |spec|
   
   spec.test_files += Dir.glob('spec/**/*.rb')

data/gm_passes/test.rb

@@ -1,4 +1,5 @@
 
+desc "Collect Test::Unit files"
 pass :tests do |spec|
   
   spec.test_files += Dir.glob('test/**/*.rb')

data/lib/extentions/gem.rb

@@ -1,6 +1,28 @@
 
 module Gem # :nodoc:
   
+  def self.find_recent_files(path)
+    specs = searcher.find_all path
+    specs = specs.inject({}) do |s, spec|
+      if s[spec.name].nil?
+        s[spec.name] = spec
+      elsif (s[spec.name] <=> spec) == -1
+        s[spec.name] = spec
+      end
+      s
+    end.values
+    
+    specs.map do |spec|
+      searcher.matching_files spec, path
+    end.flatten
+  end
+  
+  def self.find_recent_resources(path)
+    find_recent_files(File.join('..',path)).map do |gem_path|
+      File.expand_path(gem_path)
+    end
+  end
+  
   class Specification # :nodoc:
     
     alias_method :ruby_code_old, :ruby_code

data/lib/gm.rb

@@ -10,8 +10,14 @@ rescue LoadError
 end
 
 module GM
+  
+  def self.app
+    GM::App.instance
+  end
+  
 end
 
+require File.dirname(__FILE__)+'/extentions/gem'
 require File.dirname(__FILE__)+'/gm/app'
 require File.dirname(__FILE__)+'/gm/command'
 require File.dirname(__FILE__)+'/gm/configuration_pass'

data/lib/gm/app.rb

@@ -24,6 +24,7 @@ module GM
     # extra options provided by the app.
     def extra_options(options)
       options.flag 'v', 'verbose', :desc => 'Print more information.'
+      options.flag 'd', 'debug', :desc => 'Print debugging information.'
     end
     
     # run the app
@@ -39,6 +40,7 @@ module GM
     end
     
     def build_gemspec
+      self.info "Generating your gemspec..."
       @gemspec = Gem::Specification.new do |s|
         ConfigurationPassQueue.new(:initialization).run(s)
         ConfigurationPassQueue.new(:configuration).run(s)
@@ -48,20 +50,31 @@ module GM
       @gemspec.validate
     end
     
+    def info(msg)
+      puts msg if ARGV.include? '-v' or @options.verbose?
+    end
+    
+    def debug(msg)
+      puts msg if ARGV.include? '-d' or @options.debug?
+    end
+    
     private
     
     # load all passes
     def load_passes
-      require 'reverse_require'
-      Gem.find_resources('gm_passes/*.rb').uniq.each do |path|
+      Gem.find_recent_resources('gm_passes/*.rb').uniq.each do |path|
         GM::DSL.load_pass path
       end
+      @configuration_passes.each do |fase, passes|
+        passes.each do |name, pass|
+          pass.dependencies
+        end
+      end
     end
     
     # load all commands
     def load_commands
-      require 'reverse_require'
-      Gem.find_resources('gm_commands/*_command.rb').uniq.each do |path|
+      Gem.find_recent_resources('gm_commands/*_command.rb').uniq.each do |path|
         GM::Command.load_command path
       end
     end

data/lib/gm/configuration_pass.rb

@@ -5,22 +5,54 @@ module GM
     
     attr_accessor :proc
     attr_accessor :name
+    attr_accessor :fase
+    attr_accessor :description
     attr_accessor :dependencies
+    attr_accessor :run_before
+    attr_accessor :run_after
     
-    def initialize(name, dependencies=[], &proc)
+    def initialize(name, description, options={}, &proc)
       @name = name.to_sym
-      @dependencies = [dependencies].flatten.collect { |dep| dep.to_sym }
+      @description = description || ""
       @proc = proc || Proc.new { |spec| }
+      @dependencies = nil
+      
+      case options
+      when Hash
+        @run_after = options.delete(:after)
+        @run_before = options.delete(:before)
+      else @run_after = [options]
+      end
+      @run_after  = [@run_after].flatten.compact.collect  { |dep| dep.to_sym }
+      @run_before = [@run_before].flatten.compact.collect { |dep| dep.to_sym }
     end
     
     def register(fase)
-      GM::App.instance.configuration_passes[fase.to_sym][@name] = self
+      @fase = fase.to_sym
+      GM.app.configuration_passes[@fase][@name] = self
     end
     
     def run(spec)
+      GM.app.debug "Running #{@name} pass."
       @proc.call spec
     end
     
+    def dependencies
+      return @dependencies unless @dependencies.nil?
+      @dependencies = @run_after.dup
+      @run_before.each do |dep|
+        pass = GM.app.configuration_passes[@fase][dep]
+        pass.add_dependency(@name) unless pass.nil?
+      end
+      @dependencies
+    end
+    
+    def add_dependency(dep)
+      return if dep.nil?
+      @run_after << dep
+      @dependencies << dep unless @dependencies.nil?
+    end
+    
   end
   
 end

data/lib/gm/configuration_pass_queue.rb

@@ -2,32 +2,67 @@
 module GM
   
   class ConfigurationPassQueue
+    include Enumerable
+    
+    attr_accessor :fase
     attr_accessor :queue
     attr_accessor :passes
-    attr_accessor :processed_passes
     
     def initialize(fase)
-      @passes = GM::App.instance.configuration_passes[fase.to_sym].dup
-      @processed_passes = []
-      @queue  = @passes.values
+      @fase = fase
+      reset!
     end
     
-    def run(spec)
-      until @queue.empty?
-        @queue.each do |pass|
-          if run_pass(pass, spec)
-            @queue.delete(pass)
+    def order
+      return false unless @queue.nil?
+      
+      unordered_passes = @passes.values.dup
+      ordered_passes   = []
+      
+      dependencies = Hash.new { |h,k| h[k.to_sym] = [] }
+      unordered_passes.each do |pass|
+        dependencies[pass.name].concat pass.dependencies.dup
+      end
+      
+      dependencies.each do |k,v|
+        v.delete(k) if v.include? k
+        v.dup.each do |n|
+          v.delete(n) if dependencies[n].nil?
+        end
+      end
+      
+      until unordered_passes.empty?
+        unordered_passes.each do |pass|
+          if dependencies[pass.name].empty?
+            unordered_passes.delete(pass)
+            ordered_passes << pass
+            dependencies.each do |k,v|
+              v.delete pass.name
+            end
           end
         end
       end
+      
+      @queue = ordered_passes
+      return true
     end
     
-    def run_pass(pass, spec)
-      return false unless (pass.dependencies - @processed_passes).empty?
-      pass.run spec
-      @processed_passes << pass.name
-      return true
+    def run(spec)
+      each do |pass|
+        pass.run spec
+      end
+    end
+    
+    def reset!
+      @passes = GM::App.instance.configuration_passes[@fase.to_sym].dup
+      @queue  = nil
     end
+    
+    def each(&block)
+      order
+      @queue.each(&block)
+    end
+    
   end
   
 end

data/lib/gm/dsl.rb

@@ -11,17 +11,28 @@ module GM
     end
     module_function :load_pass
     
-    def initialization_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:initialization)
+    def desc(msg)
+      @description = msg
     end
-    def configuration_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:configuration)
+    
+    def initialization_pass(name, options={}, &proc)
+      ConfigurationPass.new(name, @description, options, &proc).register(:initialization)
+      @description = nil
     end
-    def pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:normal)
+    
+    def configuration_pass(name, options={}, &proc)
+      ConfigurationPass.new(name, @description, options, &proc).register(:configuration)
+      @description = nil
     end
-    def finalization_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:finalization)
+    
+    def pass(name, options={}, &proc)
+      ConfigurationPass.new(name, @description, options, &proc).register(:normal)
+      @description = nil
+    end
+    
+    def finalization_pass(name, options={}, &proc)
+      ConfigurationPass.new(name, @description, options, &proc).register(:finalization)
+      @description = nil
     end
     
     def exclude_pass(name, fase=:normal)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-gm
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,15 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: reverse-require
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-    version: 
 description: 
 email: simon.menke@gmail.com
 executables: 
@@ -58,8 +49,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/gm
-- bin/gmm
 - lib/extentions/gem.rb
 - lib/gm/app.rb
 - lib/gm/command.rb
@@ -67,8 +56,19 @@ files:
 - lib/gm/configuration_pass_queue.rb
 - lib/gm/dsl.rb
 - 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
+- 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
@@ -76,6 +76,7 @@ files:
 - gm_commands/help_command.rb
 - gm_commands/install_command.rb
 - gm_commands/spec_command.rb
+- gm_passes/clean_file_list.rb
 - gm_passes/configatron.rb
 - gm_passes/defaults.rb
 - gm_passes/executables.rb
@@ -86,19 +87,24 @@ 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
+- gm_generators/bin
+- gm_generators/bin/templates
+- gm_generators/bin/templates/bin
+- gm_generators/gem
+- gm_generators/gem/templates
+- gm_generators/gem/templates/lib
+- gm_generators/mit_license
+- gm_generators/mit_license/templates
+- gm_generators/rails
+- gm_generators/rails/templates
+- gm_generators/rails/templates/rails
+- gm_generators/test
+- gm_generators/test/templates
+- gm_generators/test/templates/test
+- bin/gm
+- bin/gmm
+- LICENSE.txt
+- README.textile
 has_rdoc: true
 homepage: http://github.com/simonmenke/gm
 post_install_message: 

data/gm_generators/gem/templates/gmfile.yml

@@ -1,3 +0,0 @@
-general:
-  name:     <%= app_name %>
-  version:  0.0.1