simonmenke-gm 0.0.6 → 0.1.0

data/README.textile

@@ -2,7 +2,9 @@ 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 the documentation go to "http://simonmenke.github.com/gm":http://simonmenke.github.com/gm
+
+For bug reports and feature requests go to "http://menke.lighthouseapp.com/projects/23688-gm":http://menke.lighthouseapp.com/projects/23688-gm
 
 h2. Todo
 

data/gm_commands/config_command.rb

@@ -0,0 +1,26 @@
+
+module GM
+  
+  class ConfigCommand < Command
+    
+    desc "Edit your global configuration."
+    
+    EMPTY_CONFIG = <<-EOC
+author:
+  name:
+  email:
+github:
+  username:
+EOC
+    
+    def run
+      path = File.expand_path('~/.gmrc')
+      unless File.exist? path
+        File.open(path, 'w+') { |f| f.write EMPTY_CONFIG }
+      end
+      system("$EDITOR '#{path}'")
+    end
+    
+  end
+  
+end

data/gm_generators/test/templates/{test/test_helper.rb → test_helper.rb.erb}

@@ -1,3 +1,4 @@
+require 'test/unit'
 
 class Test::Unit::TestCase
   

data/gm_generators/test/test_generator.rb

@@ -1,3 +1,4 @@
+if defined?(RubiGen::Base)
 
 class TestGenerator < RubiGen::Base
   
@@ -15,9 +16,11 @@ class TestGenerator < RubiGen::Base
       m.directory ''
       %w( test ).each { |path| m.directory path }
       
-      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?
+      m.template "test_helper.rb.erb", "test/test_helper.rb" unless File.exist? "test/test_helper.rb"
+      m.template "test_case.rb.erb", "test/#{@file_name}_test.rb" unless @file_name.nil?
     end
   end
   
 end
+
+end # if defined?(RubiGen::Base)

data/gm_passes/configatron.rb

@@ -45,14 +45,15 @@ configuration_pass :configatron_local, :configatron_global do |s|
   c.configure_from_yaml(File.expand_path('Gmfile'))
 end
 
-configuration_pass :configatron_normalize, :configatron_local do |s|
+configuration_pass :configatron_normalize, { :before => :configatron,
+                                             :after => :configatron_local } do |s|
   c = configatron
   
-  if c.rubyforge.project.nil?
+  if c.rubyforge.project.blank?
     c.rubyforge.project = c.general.name
   end
   
-  if c.github.project.nil?
+  if c.github.project.blank?
     c.github.project = c.general.name
   end
 end

data/lib/autotest/discover.rb

@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  "gm" if File.exist? 'Gmfile'
+end

data/lib/autotest/gm.rb

@@ -0,0 +1,34 @@
+require 'autotest'
+
+class Autotest::Gm < Autotest
+
+  def initialize # :nodoc:
+    super
+
+    add_exception %r%^\./(?:doc|pkg)%
+
+    clear_mappings
+
+    self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
+      impl = File.basename(filename, '.rb')
+      files_matching %r%^test/#{impl}_test.rb$%
+    end
+
+    add_mapping %r%^test/.*rb$% do |filename, _|
+      filename
+    end
+    
+    add_mapping %r%^test/test_helper.rb% do
+      files_matching %r%^test/.*_test\.rb$%
+    end
+  end
+
+  # Convert the pathname s to the name of class.
+  def path_to_classname(s)
+    sep = File::SEPARATOR
+    f = s.sub(/^test#{sep}/, '').sub(/\.rb$/, '').split(sep)
+    f = f.map { |path| path.split(/_/).map { |seg| seg.capitalize }.join }
+    f = f.map { |path| path =~ /Test$/ ? path : "#{path}Test"  }
+    f.join('::')
+  end
+end

data/lib/extentions/gem.rb

@@ -3,18 +3,19 @@ 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
+      if s[spec.name].nil? or (spec <=> s[spec.name]) == 1
         s[spec.name] = spec
       end
       s
-    end.values
+    end
     
-    specs.map do |spec|
+    specs = specs.collect do |name, spec|
       searcher.matching_files spec, path
-    end.flatten
+    end
+    
+    specs.flatten.compact
   end
   
   def self.find_recent_resources(path)

data/lib/gm/app.rb

@@ -12,6 +12,11 @@ module GM
     attr_accessor :gem_file_name
     
     def initialize # :nodoc:
+      reset!
+    end
+    
+    # reset the app
+    def reset!
       @configuration_passes = Hash.new { |h, k| h[k] = {} }
       @commands = {}
     end
@@ -65,11 +70,6 @@ module GM
       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

data/lib/gm/command.rb

@@ -19,6 +19,7 @@ module GM
     
     # load a command from a file
     def self.load_command(path)
+      return false unless File.exist?(path)
       cmd_name = File.basename(path, '.rb')
       cmd_name = cmd_name.gsub(/(^|_)([a-z])/i) { |m| $2.upcase }
       
@@ -27,22 +28,27 @@ module GM
       
       cmd_class = (mod.module_eval("GM::"+cmd_name) rescue nil)
       
-      return nil if cmd_class.nil?
+      return false if cmd_class.nil?
       
-      GM::App.instance.commands[cmd_name.to_sym] = cmd_class
+      GM.app.commands[cmd_name.to_sym] = cmd_class
     end
     
     # build a command
     def self.run(cmd_name=nil, argv=ARGV)
-      app = GM::App.instance
+      app = GM.app
+      if Array === cmd_name
+        argv = cmd_name
+        cmd_name = nil
+      end
       cmd = self.build(cmd_name, argv)
       cmd.app = app
-      cmd.options = app.options = Clip(argv) do |p|
+      clip = Clip(argv) do |p|
         app.extra_options(p)
         cmd.extra_options(p)
       end
+      cmd.options = app.options = clip
       argv.clear
-      argv.concat(cmd.options.remainder)
+      argv.concat(clip.remainder)
       cmd.argv = argv
       cmd.run
       argv
@@ -50,11 +56,15 @@ module GM
     
     # build a command
     def self.build(cmd_name=nil, argv=ARGV)
+      if Array === cmd_name
+        argv = cmd_name
+        cmd_name = nil
+      end
       if cmd_name.nil?
-        cmd_name  = (argv.detect {|i| not i =~ /^--?/ } || 'help')
+        cmd_name  = (argv.detect {|i| i !~ /^--?/ } || 'help')
         argv.delete(cmd_name)
       end
-      app         = GM::App.instance
+      app         = GM.app
       cmd_name    = "#{cmd_name}_command".camelize
       cmd_class   = app.commands[cmd_name.to_sym]
       cmd_class ||= app.commands[:HelpCommand]

data/lib/gm/configuration_pass_queue.rb

@@ -19,6 +19,8 @@ module GM
       unordered_passes = @passes.values.dup
       ordered_passes   = []
       
+      unordered_passes.each { |pass| pass.dependencies }
+      
       dependencies = Hash.new { |h,k| h[k.to_sym] = [] }
       unordered_passes.each do |pass|
         dependencies[pass.name].concat pass.dependencies.dup
@@ -54,7 +56,7 @@ module GM
     end
     
     def reset!
-      @passes = GM::App.instance.configuration_passes[@fase.to_sym].dup
+      @passes = GM.app.configuration_passes[@fase.to_sym].dup
       @queue  = nil
     end
     

data/lib/gm/dsl.rb

@@ -16,27 +16,29 @@ module GM
     end
     
     def initialization_pass(name, options={}, &proc)
-      ConfigurationPass.new(name, @description, options, &proc).register(:initialization)
-      @description = nil
+      register_pass(:initialization, name, options, &proc)
     end
     
     def configuration_pass(name, options={}, &proc)
-      ConfigurationPass.new(name, @description, options, &proc).register(:configuration)
-      @description = nil
+      register_pass(:configuration, name, options, &proc)
     end
     
     def pass(name, options={}, &proc)
-      ConfigurationPass.new(name, @description, options, &proc).register(:normal)
-      @description = nil
+      register_pass(:normal, name, options, &proc)
     end
     
     def finalization_pass(name, options={}, &proc)
-      ConfigurationPass.new(name, @description, options, &proc).register(:finalization)
-      @description = nil
+      register_pass(:finalization, name, options, &proc)
     end
     
     def exclude_pass(name, fase=:normal)
-      GM::App.instance.exclude_pass(name, fase)
+      GM.app.exclude_pass(name, fase)
+    end
+    
+    def register_pass(fase, name, options, &proc) # :nodoc:
+      pass = ConfigurationPass.new(name, @description, options, &proc).register(fase)
+      @description = nil
+      pass
     end
   end
   

data/test/command_test.rb

@@ -0,0 +1,103 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class CommandTest < Test::Unit::TestCase
+  
+  before do
+    GM.app.reset!
+  end
+  
+  context "load_command" do
+    
+    should "return klass" do
+      File.expects(:exist?).with('path/to/my_command.rb').returns(true)
+      IO.expects(:read).with('path/to/my_command.rb').returns(%{
+      module GM
+        class MyCommand ; end
+      end})
+      klass = GM::Command.load_command('path/to/my_command.rb')
+      assert_equal "GM::MyCommand", klass.to_s.split('::', 2).last
+    end
+    
+    should "return false when file doen't exist" do
+      File.expects(:exist?).with('path/to/my_command.rb').returns(false)
+      assert_equal false, GM::Command.load_command('path/to/my_command.rb')
+    end
+    
+    should "return false when file doen't contain command" do
+      File.expects(:exist?).with('path/to/my_command.rb').returns(true)
+      IO.expects(:read).with('path/to/my_command.rb').returns(%{})
+      assert_equal false, GM::Command.load_command('path/to/my_command.rb')
+    end
+    
+  end
+  
+  context "build" do
+    
+    should "return instance of HelpCommand not found" do
+      help_cmd = mock
+      help_cmd_class = mock
+      help_cmd_class.expects(:new).returns(help_cmd)
+      GM.app.commands[:HelpCommand] = help_cmd_class
+      cmd = GM::Command.build(:hello)
+      assert_equal help_cmd, cmd
+    end
+    
+    should "return new command" do
+      hello_cmd = mock
+      hello_cmd_class = mock
+      hello_cmd_class.expects(:new).returns(hello_cmd)
+      GM.app.commands[:HelloCommand] = hello_cmd_class
+      cmd = GM::Command.build(:hello)
+      assert_equal hello_cmd, cmd
+    end
+    
+    should "find command name in argv if name is nil" do
+      argv = %w( -v hello world )
+      hello_cmd = mock
+      hello_cmd_class = mock
+      hello_cmd_class.expects(:new).returns(hello_cmd)
+      GM.app.commands[:HelloCommand] = hello_cmd_class
+      cmd = GM::Command.build(argv)
+      assert_equal hello_cmd, cmd
+    end
+    
+  end
+  
+  context "run" do
+    
+    should "run command and return remaining argv" do
+      argv = %w( -v p )
+      hello_cmd = mock('hello_command') do
+        expects(:run)
+        expects(:app=).with(GM.app)
+        expects(:extra_options).with() { |value| Clip::Parser === value  }
+        expects(:options=).with()      { |value| Clip::Parser === value  }
+        expects(:argv=).with %w( p )
+      end
+      hello_cmd_class = mock('hello_command_class') do
+        expects(:new).returns(hello_cmd)
+      end
+      GM.app.commands[:HelloCommand] = hello_cmd_class
+      assert_equal %w( p ), GM::Command.run(:hello, argv)
+    end
+    
+    should "find command name in argv if name is nil" do
+      argv = %w( -v hello p )
+      hello_cmd = mock('hello_command') do
+        expects(:run)
+        expects(:app=).with(GM.app)
+        expects(:extra_options).with() { |value| Clip::Parser === value  }
+        expects(:options=).with()      { |value| Clip::Parser === value  }
+        expects(:argv=).with %w( p )
+      end
+      hello_cmd_class = mock('hello_command_class') do
+        expects(:new).returns(hello_cmd)
+      end
+      GM.app.commands[:HelloCommand] = hello_cmd_class
+      assert_equal %w( p ), GM::Command.run(argv)
+    end
+    
+  end
+  
+  
+end

data/test/configuration_pass_queue_test.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class ConfigurationPassQueueTest < Test::Unit::TestCase
+  
+  include GM::DSL
+  
+  before do
+    GM.app.reset!
+    pass(:pass_a) { |s| }
+    pass(:pass_b) { |s| }
+    pass(:pass_c, :before => :pass_a, :after => :pass_b) { |s| }
+    pass(:pass_d, :pass_a) { |s| }
+  end
+  
+  should "find passes in app" do
+    queue = GM::ConfigurationPassQueue.new(:normal)
+    assert_equal ["pass_a", "pass_b", "pass_c", "pass_d"], queue.passes.collect{ |n,v| n.to_s}.sort
+  end
+  
+  should "be in dependency order" do
+    queue = GM::ConfigurationPassQueue.new(:normal)
+    queue.order
+    assert_equal [:pass_b, :pass_c, :pass_a, :pass_d], queue.queue.collect { |pass| pass.name }
+  end
+  
+  should "not find excluded passes in app" do
+    exclude_pass(:pass_d)
+    queue = GM::ConfigurationPassQueue.new(:normal)
+    assert_equal ["pass_a", "pass_b", "pass_c"], queue.passes.collect{ |n,v| n.to_s}.sort
+  end
+  
+  context "pass_c" do
+    before {  GM.app.configuration_passes[:normal].each { |n, p| p.dependencies } }
+    should "depend on pass_b" do
+      deps = GM.app.configuration_passes[:normal][:pass_c].dependencies
+      assert_equal [:pass_b], deps
+    end
+  end
+  
+  context "pass_d" do
+    before {  GM.app.configuration_passes[:normal].each { |n, p| p.dependencies } }
+    should "depend on pass_b" do
+      deps = GM.app.configuration_passes[:normal][:pass_d].dependencies
+      assert_equal [:pass_a], deps
+    end
+  end
+  
+  context "pass_d" do
+    before {  GM.app.configuration_passes[:normal].each { |n, p| p.dependencies } }
+    should "depend on pass_b" do
+      deps = GM.app.configuration_passes[:normal][:pass_a].dependencies
+      assert_equal [:pass_c], deps
+    end
+  end
+  
+end

data/test/configuration_pass_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class ConfigurationPassTest < Test::Unit::TestCase
+  
+  include GM::DSL
+  
+  should "register with the App in the correct fase" do
+    pass = pass(:pass) { |s| }
+    assert_not_nil pass
+    assert_equal pass, GM.app.configuration_passes[:normal][:pass]
+  end
+  
+  should "have correct description" do
+    
+    desc "my pass"
+    pass_a = pass(:pass_a) { |s| }
+    pass_b = pass(:pass_b) { |s| }
+    
+    assert_equal pass_a.description, "my pass"
+    assert_equal pass_b.description, ""
+    
+  end
+  
+end

data/test/gem_extentions_test.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class GemExtentionsTest < Test::Unit::TestCase
+  
+  should "find recent files" do
+    gems  = Gem.searcher.find_all('autotest/discover.rb')
+    gems  = gems.inject({}) do |specs, spec|
+      specs[spec.name] = spec if specs[spec.name].nil? or (spec <=> specs[spec.name]) == 1
+      specs
+    end.values
+    paths = gems.collect do |gem|
+      Gem.searcher.matching_files gem, 'autotest/discover.rb'
+    end.flatten.compact
+    
+    assert_equal paths, Gem.find_recent_files('autotest/discover.rb')
+  end
+  
+  should "find_recent_resources" do
+    gems  = Gem.searcher.find_all('autotest/discover.rb')
+    gems  = gems.inject({}) do |specs, spec|
+      specs[spec.name] = spec if specs[spec.name].nil? or (spec <=> specs[spec.name]) == 1
+      specs
+    end.values
+    paths = gems.collect do |gem|
+      Gem.searcher.matching_files gem, 'autotest/discover.rb'
+    end.flatten.compact
+    
+    assert_equal paths, Gem.find_recent_resources('lib/autotest/discover.rb')
+  end
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require 'test/unit'
+require 'rubygems'
+require 'mocha'   rescue puts('please install mocha')   and exit(1)
+require 'context' rescue puts('please install context') and exit(1)
+
+require File.dirname(__FILE__)+'/../lib/gm'
+
+class Test::Unit::TestCase
+  
+  # put your helpers here
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-gm
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-15 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,28 +49,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/extentions/gem.rb
-- lib/gm/app.rb
-- lib/gm/command.rb
-- lib/gm/configuration_pass.rb
-- lib/gm/configuration_pass_queue.rb
-- lib/gm/dsl.rb
-- lib/gm.rb
-- 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/config_command.rb
 - gm_commands/create_command.rb
 - gm_commands/gen_command.rb
 - gm_commands/help_command.rb
@@ -88,23 +69,49 @@ files:
 - gm_passes/specs.rb
 - gm_passes/test.rb
 - gm_generators/bin
+- gm_generators/bin/bin_generator.rb
 - gm_generators/bin/templates
 - gm_generators/bin/templates/bin
+- gm_generators/bin/templates/bin/bin.rb
 - gm_generators/gem
+- gm_generators/gem/gem_generator.rb
 - gm_generators/gem/templates
+- gm_generators/gem/templates/Gmfile
+- gm_generators/gem/templates/README.textile
 - gm_generators/gem/templates/lib
+- gm_generators/gem/templates/lib/module.rb
 - gm_generators/mit_license
+- gm_generators/mit_license/mit_license_generator.rb
 - gm_generators/mit_license/templates
+- gm_generators/mit_license/templates/LICENSE.txt
 - gm_generators/rails
+- gm_generators/rails/rails_generator.rb
 - gm_generators/rails/templates
 - gm_generators/rails/templates/rails
+- gm_generators/rails/templates/rails/init.rb
 - gm_generators/test
 - gm_generators/test/templates
-- gm_generators/test/templates/test
-- bin/gm
-- bin/gmm
+- gm_generators/test/templates/test_case.rb.erb
+- gm_generators/test/templates/test_helper.rb.erb
+- gm_generators/test/test_generator.rb
+- test/command_test.rb
+- test/configuration_pass_queue_test.rb
+- test/configuration_pass_test.rb
+- test/gem_extentions_test.rb
+- test/test_helper.rb
 - LICENSE.txt
 - README.textile
+- bin/gm
+- bin/gmm
+- lib/autotest/discover.rb
+- lib/autotest/gm.rb
+- lib/extentions/gem.rb
+- lib/gm/app.rb
+- lib/gm/command.rb
+- lib/gm/configuration_pass.rb
+- lib/gm/configuration_pass_queue.rb
+- lib/gm/dsl.rb
+- lib/gm.rb
 has_rdoc: true
 homepage: http://github.com/simonmenke/gm
 post_install_message: 
@@ -130,6 +137,10 @@ rubyforge_project: gm
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Build gems with ease.
-test_files: []
-
+summary: Building gems the clean way.
+test_files: 
+- test/command_test.rb
+- test/configuration_pass_queue_test.rb
+- test/configuration_pass_test.rb
+- test/gem_extentions_test.rb
+- test/test_helper.rb