simonmenke-gm 0.0.1 → 0.0.2

data/lib/gm.rb

@@ -10,3 +10,5 @@ end
 
 require File.dirname(__FILE__)+'/gm/app'
 require File.dirname(__FILE__)+'/gm/configuration_pass'
+require File.dirname(__FILE__)+'/gm/configuration_pass_queue'
+require File.dirname(__FILE__)+'/gm/dsl'

data/lib/gm/app.rb

@@ -5,8 +5,18 @@ module GM
   class App
     include Singleton
     
+    attr_accessor :configuration_passes
+    
     COMMANDS = %w( help build spec install clean )
     
+    def initialize
+      @configuration_passes = Hash.new { |h, k| h[k] = {} }
+    end
+    
+    def exclude_pass(name, fase=:normal)
+      @configuration_passes[fase.to_sym].delete(name.to_sym)
+    end
+    
     def parse_options
       @command = ARGV.shift unless ARGV.empty?
       @command = nil unless COMMANDS.include? @command
@@ -57,7 +67,7 @@ module GM
     
     def load_passes
       Dir.glob(File.dirname(__FILE__)+'/../passes/*.rb') do |path|
-        require path
+        GM::DSL.load_pass path
       end
     end
     

data/lib/gm/configuration_pass.rb

@@ -1,59 +1,6 @@
 
 module GM
   
-  class << self
-    attr_accessor :configuration_passes
-  end
-  self.configuration_passes = Hash.new { |h, k| h[k] = {} }
-  
-  def self.exclude_pass(name, fase=:normal)
-    self.configuration_passes[fase.to_sym].delete(name.to_sym)
-  end
-  
-  module DSL
-    def init_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:init)
-    end
-    def pre_pass(name, dependencies=[], &proc)
-      ConfigurationPass.new(name, dependencies, &proc).register(:pre)
-    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)
-    end
-  end
-  
-  class ConfigurationPassQueue
-    attr_accessor :queue
-    attr_accessor :passes
-    attr_accessor :processed_passes
-    
-    def initialize(fase)
-      @passes = GM.configuration_passes[fase.to_sym].dup
-      @processed_passes = []
-      @queue  = @passes.values
-    end
-    
-    def run(spec)
-      until @queue.empty?
-        @queue.each do |pass|
-          if run_pass(pass, spec)
-            @queue.delete(pass)
-          end
-        end
-      end
-    end
-    
-    def run_pass(pass, spec)
-      return false unless (pass.dependencies - @processed_passes).empty?
-      pass.run spec
-      @processed_passes << pass.name
-      return true
-    end
-  end
-  
   class ConfigurationPass
     
     attr_accessor :proc
@@ -67,7 +14,7 @@ module GM
     end
     
     def register(fase)
-      GM.configuration_passes[fase.to_sym][@name] = self
+      GM::App.instance.configuration_passes[fase.to_sym][@name] = self
     end
     
     def run(spec)

data/lib/gm/configuration_pass_queue.rb

@@ -0,0 +1,33 @@
+
+module GM
+  
+  class ConfigurationPassQueue
+    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
+    end
+    
+    def run(spec)
+      until @queue.empty?
+        @queue.each do |pass|
+          if run_pass(pass, spec)
+            @queue.delete(pass)
+          end
+        end
+      end
+    end
+    
+    def run_pass(pass, spec)
+      return false unless (pass.dependencies - @processed_passes).empty?
+      pass.run spec
+      @processed_passes << pass.name
+      return true
+    end
+  end
+  
+end

data/lib/gm/dsl.rb

@@ -0,0 +1,31 @@
+
+module GM
+  
+  module DSL
+    def load_pass(path)
+      if File.exist? path
+        mod = Module.new
+        mod.send :extend, DSL
+        mod.module_eval IO.read(path)
+      end
+    end
+    module_function :load_pass
+    
+    def init_pass(name, dependencies=[], &proc)
+      ConfigurationPass.new(name, dependencies, &proc).register(:init)
+    end
+    def pre_pass(name, dependencies=[], &proc)
+      ConfigurationPass.new(name, dependencies, &proc).register(:pre)
+    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)
+    end
+    def exclude_pass(name, fase=:normal)
+      GM::App.instance.exclude_pass(name, fase)
+    end
+  end
+  
+end

data/lib/passes/configatron.rb

@@ -1,4 +1,3 @@
-include GM::DSL
 
 pre_pass :configatron_defaults do |spec|
   
@@ -11,6 +10,12 @@ pre_pass :configatron_defaults do |spec|
     },
     :dependencies => [],
     
+    :rdoc => {
+      :enabled => true,
+      :extra_files => [],
+      :options => []
+    },
+    
     :author => {
       :name => nil,
       :email => nil
@@ -55,7 +60,7 @@ end
 pre_pass :configatron_exclude_passes, :configatron_local do |s|
   c = configatron
   c.excluded_passes.each do |pass|
-    GM.exclude_pass(pass)
+    exclude_pass(pass)
   end
 end
 
@@ -71,6 +76,10 @@ pass :configatron do |s|
   
   s.rubyforge_project = c.rubyforge.project
   
+  s.has_rdoc         = c.rdoc.enabled
+  s.extra_rdoc_files = c.rdoc.extra_files
+  s.rdoc_options     = c.rdoc.options
+  
   c.dependencies.each do |dependency|
     gem, requirement = dependency.strip.split(/\s+/, 2)
     s.add_dependency gem.strip, requirement.strip

data/lib/passes/defaults.rb

@@ -1,8 +1,8 @@
-include GM::DSL
 
 init_pass :defaults do |spec|
   
   spec.platform = Gem::Platform::RUBY
   spec.files = []
+  spec.test_files = []
   
 end

data/lib/passes/executables.rb

@@ -1,4 +1,3 @@
-include GM::DSL
 
 pass :executables do |spec|
   

data/lib/passes/files.rb

@@ -1,4 +1,3 @@
-include GM::DSL
 
 pass :files do |spec|
   

data/lib/passes/github.rb

@@ -1,4 +1,3 @@
-include GM::DSL
 
 post_pass :emulate_github do |spec|
   

data/lib/passes/rails.rb

@@ -1,7 +1,7 @@
-include GM::DSL
 
 pass :rails do |spec|
   
   spec.files += Dir.glob('rails/init.rb')
+  spec.files += Dir.glob('tasks/*.rake')
   
 end

data/lib/passes/specs.rb

@@ -0,0 +1,6 @@
+
+pass :specs do |spec|
+  
+  spec.test_files += Dir.glob('spec/**/*.rb')
+  
+end

data/lib/passes/tests.rb

@@ -0,0 +1,6 @@
+
+pass :tests do |spec|
+  
+  spec.test_files += Dir.glob('test/**/*.rb')
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-gm
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Simon Menke
@@ -33,6 +33,8 @@ files:
 - bin/gm
 - lib/gm/app.rb
 - lib/gm/configuration_pass.rb
+- lib/gm/configuration_pass_queue.rb
+- lib/gm/dsl.rb
 - lib/gm.rb
 - lib/passes/configatron.rb
 - lib/passes/defaults.rb
@@ -40,8 +42,10 @@ files:
 - lib/passes/files.rb
 - lib/passes/github.rb
 - lib/passes/rails.rb
+- lib/passes/specs.rb
+- lib/passes/tests.rb
 - README.textile
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/simonmenke/gm
 post_install_message: 
 rdoc_options: []