simonmenke-gm 0.1.3 → 0.1.4

data/lib/extentions/gem.rb

@@ -24,15 +24,4 @@ module Gem # :nodoc:
     end
   end
   
-  class Specification # :nodoc:
-    
-    alias_method :ruby_code_old, :ruby_code
-    
-    def ruby_code(obj)
-      obj = nil if obj.is_a? Configatron::Store
-      ruby_code_old(obj)
-    end
-    
-  end
-  
 end

data/lib/gm.rb

@@ -1,9 +1,9 @@
 
 begin
+  require 'ec'
   require 'erb'
   require 'clip'
   require 'singleton'
-  require 'configatron'
   require 'rubigen'
   require 'rubigen/scripts/generate'
 rescue LoadError
@@ -19,13 +19,12 @@ module GM
 end
 
 require File.dirname(__FILE__)+'/extentions/gem'
-require File.dirname(__FILE__)+'/extentions/configatron'
 require File.dirname(__FILE__)+'/gm/loader'
 require File.dirname(__FILE__)+'/gm/system'
+require File.dirname(__FILE__)+'/gm/helpers'
 require File.dirname(__FILE__)+'/gm/documentation'
+require File.dirname(__FILE__)+'/gm/configuration'
 require File.dirname(__FILE__)+'/gm/app'
 require File.dirname(__FILE__)+'/gm/command'
-require File.dirname(__FILE__)+'/gm/configuration_pass'
-require File.dirname(__FILE__)+'/gm/configuration_pass_queue'
-require File.dirname(__FILE__)+'/gm/dsl'
+require File.dirname(__FILE__)+'/gm/behavior'
 require File.dirname(__FILE__)+'/gm/network'

data/lib/gm/app.rb

@@ -35,28 +35,31 @@ module GM
     
     # run the app
     def run
-      load_passes
+      load_behaviors
       load_commands
       load_networks
+      
+      load_configuration('~/.gmrc')
+      load_configuration('Gmfile')
+      EC.store.validate
+      
       Command.run
     end
     
+    def load_configuration(path)
+      path = File.expand_path(path)
+      if File.exist? path
+        EC.store.configure_with_yaml(path)
+      else
+        log "Missing configuration file: #{path}"
+      end
+    end
+    
     # should we emulate github?
     def self.emulate?
       instance.emulate || false
     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)
-        ConfigurationPassQueue.new(:normal).run(s)
-        ConfigurationPassQueue.new(:finalization).run(s)
-      end
-      @gemspec.validate
-    end
-    
     def log(msg)
       puts msg
     end
@@ -71,27 +74,35 @@ module GM
     
     private
     
-    # load all passes
-    def load_passes
-      Gem.find_recent_resources('gm_passes/*.rb').uniq.each do |path|
-        GM::DSL.load_pass path
+    # load all behaviors
+    def load_behaviors
+      find_paths('gm_behaviors/*_behavior.rb').each do |path|
+        GM::Behavior.load_behavior path
       end
     end
     
     # load all networks
     def load_networks
-      Gem.find_recent_resources('gm_networks/*_network.rb').uniq.each do |path|
+      find_paths('gm_networks/*_network.rb').each do |path|
         GM::Network.load_network path
       end
     end
     
     # load all commands
     def load_commands
-      Gem.find_recent_resources('gm_commands/*_command.rb').uniq.each do |path|
+      find_paths('gm_commands/*_command.rb').each do |path|
         GM::Command.load_command path
       end
     end
     
+    def find_paths(pattern)
+      if File.exist? 'gm.gemspec'
+        Dir.glob(pattern).uniq
+      else
+        Gem.find_recent_resources(pattern).uniq
+      end
+    end
+    
   end
   
 end

data/lib/gm/behavior.rb

@@ -0,0 +1,23 @@
+
+module GM
+  
+  class Behavior
+    
+    include GM::Documentation
+    include GM::Configuration
+    include GM::Helpers
+    include GM::System
+    include GM::Loader
+    
+    desc ""
+    doc  ""
+    
+    loads :behaviors
+    
+    def run
+      
+    end
+    
+  end
+  
+end

data/lib/gm/command.rb

@@ -7,13 +7,15 @@ module GM
     attr_accessor :options
     
     include GM::Documentation
+    include GM::Configuration
+    include GM::Helpers
     include GM::System
     include GM::Loader
     
     desc ""
     doc  ""
     banner ""
-    loads :commands#, :extends => GM
+    loads :commands
     
     # build a command
     def self.run(cmd_name=nil, argv=ARGV)
@@ -63,12 +65,6 @@ module GM
     def run
     end
     
-    protected
-    
-    def app
-      GM.app
-    end
-    
   end
   
 end

data/lib/gm/configuration.rb

@@ -0,0 +1,20 @@
+
+module GM
+  
+  module Configuration
+    
+    def self.included(base)
+      base.extend GM::Configuration::ClassMethods
+    end
+    
+    module ClassMethods
+      
+      def specify_conf(&block)
+        EC.store.specify(&block)
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/gm/helpers.rb

@@ -0,0 +1,20 @@
+
+module GM
+  
+  module Helpers
+    
+    def app
+      GM.app
+    end
+    
+    def config
+      EC.store.config
+    end
+    
+    def spec
+      GM.app.gemspec
+    end
+    
+  end
+  
+end

data/lib/gm/loader.rb

@@ -66,7 +66,7 @@ module GM
         options[:extends].each do |mod|
           mod.send :extend, mod
         end
-        mod.module_eval IO.read(path)
+        mod.module_eval(IO.read(path), path)
         
         unless options[:only_eval]
           cmd_class = (mod.module_eval(cmd_name) rescue nil)

data/lib/gm/network.rb

@@ -4,6 +4,8 @@ module GM
   class Network
     
     include GM::Documentation
+    include GM::Configuration
+    include GM::Helpers
     include GM::System
     include GM::Loader
     
@@ -22,12 +24,6 @@ module GM
       published_versions.include? version
     end
     
-    protected
-    
-    def app
-      GM.app
-    end
-    
   end
   
 end

data/test/gem_extentions_test.rb

@@ -28,19 +28,4 @@ class GemExtentionsTest < Test::Unit::TestCase
     assert_equal paths, Gem.find_recent_resources('lib/autotest/discover.rb')
   end
   
-  context "Gem::Specification" do
-    
-    setup do
-      configatron.reset!
-      configatron.configure_from_hash({ 'hello' => { 'world' => 'sun' } })
-      @spec = Gem::Specification.new
-    end
-    
-    should "treat Configatron::Store as nil" do
-      assert_equal 'nil', @spec.send(:ruby_code, configatron.hello)
-    end
-    
-  end
-  
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-gm
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,17 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-22 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: configatron
+  name: simonmenke-ec
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.1
+        version: 0.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: clip
@@ -49,18 +49,21 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- LICENSE.txt
-- README.textile
-- bin/gem-make
-- bin/gm
-- test/command_test.rb
-- test/configatron_test.rb
-- test/configuration_pass_queue_test.rb
-- test/configuration_pass_test.rb
-- test/gem_extentions_test.rb
-- test/system_test.rb
-- test/test_helper.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/README.textile
+- 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_case.rb.erb
+- gm_generators/test/templates/test_helper.rb.erb
+- gm_generators/test/test_generator.rb
 - gm_commands/build_command.rb
+- gm_commands/build_gemspec_command.rb
 - gm_commands/clean_command.rb
 - gm_commands/config_command.rb
 - gm_commands/create_command.rb
@@ -69,54 +72,53 @@ files:
 - gm_commands/install_command.rb
 - gm_commands/publish_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
-- gm_passes/files.rb
-- gm_passes/github.rb
-- gm_passes/gm.rb
-- gm_passes/rails.rb
-- gm_passes/rubigen.rb
-- gm_passes/specs.rb
-- gm_passes/test.rb
+- gm_behaviors/author_behavior.rb
+- gm_behaviors/bin_files_behavior.rb
+- gm_behaviors/dependencies_behavior.rb
+- gm_behaviors/executables_behavior.rb
+- gm_behaviors/general_behavior.rb
+- gm_behaviors/github_behavior.rb
+- gm_behaviors/gm_files_behavior.rb
+- gm_behaviors/lib_files_behavior.rb
+- gm_behaviors/rails_behavior.rb
+- gm_behaviors/rdoc_behavior.rb
+- gm_behaviors/rspec_behavior.rb
+- gm_behaviors/rubigen_behavior.rb
+- gm_behaviors/rubyforge_behavior.rb
+- gm_behaviors/test_behavior.rb
+- gm_behaviors/text_files_behavior.rb
 - gm_networks/github_network.rb
+- gm_networks/rubyforge_network.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_case.rb.erb
-- gm_generators/test/templates/test_helper.rb.erb
-- gm_generators/test/test_generator.rb
+- test/command_test.rb
+- test/gem_extentions_test.rb
+- test/system_test.rb
+- test/test_helper.rb
+- bin/gem-make
+- bin/gm
+- LICENSE.txt
+- README.textile
 - lib/autotest/discover.rb
 - lib/autotest/gm.rb
-- lib/extentions/configatron.rb
 - lib/extentions/gem.rb
 - lib/gm/app.rb
+- lib/gm/behavior.rb
 - lib/gm/command.rb
-- lib/gm/configuration_pass.rb
-- lib/gm/configuration_pass_queue.rb
+- lib/gm/configuration.rb
 - lib/gm/documentation.rb
-- lib/gm/dsl.rb
+- lib/gm/helpers.rb
 - lib/gm/loader.rb
 - lib/gm/network.rb
 - lib/gm/system.rb
@@ -149,9 +151,6 @@ specification_version: 2
 summary: Building gems the clean way.
 test_files: 
 - test/command_test.rb
-- test/configatron_test.rb
-- test/configuration_pass_queue_test.rb
-- test/configuration_pass_test.rb
 - test/gem_extentions_test.rb
 - test/system_test.rb
 - test/test_helper.rb

data/gm_passes/clean_file_list.rb

@@ -1,15 +0,0 @@
-
-desc "Remove dir and duplicate paths"
-
-finalization_pass :clean_file_list do |spec|
-  
-  spec.files.reject! { |path| File.directory? path }
-  spec.files.reject! { |path| File.basename(path) == '.DS_Store'  }
-  spec.files.reject! { |path| File.basename(path) == '.gitignore' }
-  spec.files.reject! { |path| path.include? '/.svn' }
-  spec.files.reject! { |path| path.include? '/.git' }
-  spec.files.uniq!
-  spec.files.compact!
-  spec.files.sort!
-  
-end