burke 0.2.1 → 0.2.2

data/Rakefile

@@ -10,8 +10,6 @@ Burke.setup do |s|
   s.email = 'dismal.denizen@gmail.com'
   s.homepage = "http://github.com/dismaldenizen/burke"
   
-  s.dependencies.rake '~> 0.8.7'
-  
   s.has_rdoc = true
   
   s.clean = %w[.yardoc]

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/burke.rb

@@ -1,8 +1,46 @@
 require 'rubygems'
-require 'rubygems/installer'
 require 'rake'
-require 'rake/tasklib'
-require 'mash'
+require 'hashie'
+
+class Smash < Hashie::Mash
+  def initialize *args
+    super
+    @read_filters = {}
+    @write_filters = {}
+  end
+  
+  def method_missing name, *args
+    key = convert_key(name)
+    if key? key or @read_filters.key? key
+      value = self[key]
+      yield value if block_given?
+      value
+    else
+      super
+    end
+  end
+  
+  def [](key)
+    filter = @read_filters[convert_key(key)]
+    value = super(key)
+    filter.nil? ? value : filter[value]
+  end
+  
+  def []=(key, value)
+    filter = @write_filters[convert_key(key)]
+    value = filter[value] if filter
+    super(key, value)
+  end
+  
+  def read_filter key, &block
+    key = convert_key(key)
+    @read_filters[key] = block
+  end
+  
+  def write_filter key, &block
+    @write_filters[convert_key(key)] = block
+  end
+end
 
 module Burke
   VERSION = File.read(File.join(File.dirname(File.dirname(__FILE__)), 'VERSION'))
@@ -26,86 +64,7 @@ module Burke
     end
     
     def setup
-      @settings = Mash[
-        :dependencies => Mash[],
-        :docs => Mash[],
-        :rspec => Mash[:rcov => Mash[]],
-        :test => Mash[],
-        :gems => GemSettings.new,
-        :clean => [],
-        :clobber => [],
-      ]
-      
-      @settings.getter_filter :files do |v|
-        if v.nil?
-          v = Dir.glob('{lib,spec,bin}/**/*')
-          v << @settings.docs.readme
-          v << @settings.docs.license
-          v << 'Rakefile' if readable_file? 'Rakefile'
-          v << 'VERSION' if readable_file? 'VERSION'
-          v.compact
-        else
-          v
-        end
-      end
-      
-      @settings.getter_filter :version do |v|
-        if v.nil? and readable_file? 'VERSION'
-          File.read('VERSION').strip
-        else
-          v
-        end
-      end
-      
-      @settings.docs.getter_filter :readme do |v|
-        if v.nil?
-          files = Dir.glob('{readme,readme.*}', File::FNM_CASEFOLD)
-          files.reject! { |f| !readable_file? f }
-          files.first
-        else
-          v
-        end
-      end
-      
-      @settings.docs.getter_filter :license do |v|
-        if v.nil?
-          files = Dir.glob('{license,license.*,copying,copying.*,licence,licence.*}', File::FNM_CASEFOLD)
-          files.reject! { |f| !readable_file? f }
-          files.first
-        else
-          v
-        end
-      end
-      
-      @settings.docs.getter_filter :markup do |v|
-        readme = @settings.docs.readme
-        if v.nil? and readme
-          case File.extname(readme).downcase
-          when '.rdoc'
-            'rdoc'
-          when '.md', '.markdown'
-            'markdown'
-          when '.textile'
-            'textile'
-          end
-        else
-          v
-        end
-      end
-      
-      @settings.test.getter_filter :test_files do |v|
-        v or Dir['test/**/{*_{test,tc},{test,tc}_*}.rb']
-      end
-      
-      @settings.rspec.getter_filter :color do |v|
-        v.nil? ? true : v
-      end
-      
-      @settings.rspec.getter_filter :spec_files do |v|
-        v or Dir['spec/**/*_spec.rb']
-      end
-      
-      @settings.rspec.setter_filter(:ruby_opts) { |v| [*v] }
+      @settings = create_settings
       
       yield @settings
       
@@ -113,8 +72,15 @@ module Burke
         @settings.gems.platform 'ruby'
       end
       
+      generate_tasks
+      
+      return @settings
+    end
+    
+    def generate_tasks
       begin
         require 'rake/clean'
+        CLEAN.include(*@settings.clean) if @settings.clean
         CLOBBER.include(*@settings.clobber) if @settings.clobber
       rescue LoadError
       end if @tasks.include? :clean
@@ -167,8 +133,12 @@ module Burke
         require 'spec/rake/spectask'
         r = @settings.rspec
         opts = []
-        opts << "--colour" if r.color
-        opts << "--format" << r.format if r.format
+        if r.options_file
+          opts << "--options" << r.options_file
+        else
+          opts << "--colour" if r.color
+          opts << "--format" << r.format if r.format
+        end
         Spec::Rake::SpecTask.new 'spec' do |t|
           t.spec_files = r.spec_files
           t.spec_opts = opts
@@ -176,6 +146,7 @@ module Burke
         end
         
         begin
+          require 'rcov'
           require 'spec/rake/verify_rcov'
           
           desc "Run specs with RCov"
@@ -216,11 +187,11 @@ module Burke
       rescue LoadError
       end if @tasks.include? :gems
       
-      if @tasks.include? :install
+      begin
+        require 'rubygems/installer'
         GemTaskManager.install_task unless GemTaskManager::TASKS.empty?
-      end
-      
-      @settings
+      rescue LoadError
+      end if @tasks.include? :install
     end
     
     def base_gemspec
@@ -228,7 +199,7 @@ module Burke
         @base_gemspec = Gem::Specification.new
         
         attrs = Gem::Specification.attribute_names
-        attrs -= [:dependencies]
+        attrs -= [:dependencies, :development_dependencies]
         attrs += [:author]
         
         attrs.each do |attr|
@@ -236,8 +207,12 @@ module Burke
           @base_gemspec.send("#{attr}=", value) if value
         end
         
-        @settings.dependencies.each do |gem, version|
-          @base_gemspec.add_dependency gem.to_s, version
+        @settings.dependencies.each do |gem, requirements|
+          @base_gemspec.add_dependency gem.to_s, *requirements
+        end
+        
+        @settings.development_dependencies.each do |gem, requirements|
+          @base_gemspec.add_development_dependency gem.to_s, *requirements
         end
       end
       
@@ -248,10 +223,138 @@ module Burke
       @settings
     end
     
+    def create_settings
+      # TODO: put default values in getter filters
+      s = Smash.new
+      s.docs!
+      s.rspec!.rcov!
+      s.test!
+      s.gems = GemSettings.new
+      s.clean = []
+      s.clobber = []
+      
+      s.read_filter :dependencies do |v|
+        if v.nil?
+          s.dependencies = Smash.new
+          v = s.dependencies
+          begin
+            require 'bundler'
+            bundler = Bundler.load
+            deps = bundler.dependencies_for(:runtime)
+            if deps.empty?
+              deps = bundler.dependencies_for(:default)
+            end
+            deps.each do |d|
+              v[d.name] = d.requirement.to_s
+            end
+          rescue
+          end
+        end
+        v
+      end
+      
+      s.read_filter :development_dependencies do |v|
+        if v.nil?
+          s.development_dependencies = Smash.new
+          v = s.development_dependencies
+          begin
+            require 'bundler'
+            Bundler.load.dependencies_for(:development).each do |d|
+              v[d.name] = d.requirement.to_s
+            end
+          rescue
+          end
+        end
+        v
+      end
+      
+      s.read_filter :files do |v|
+        if v.nil?
+          v = Dir['{lib,spec,bin}/**/*']
+          v << s.docs.readme_file
+          v << s.docs.license_file
+          v << s.version_file
+          v << s.rakefile_file
+          v.compact.freeze
+        else
+          v
+        end
+      end
+      
+      s.read_filter :rakefile_file do |v|
+        v or find_file('rakefile').freeze
+      end
+      
+      s.read_filter :version_file do |v|
+        v or find_file('version{.*,}').freeze
+      end
+      
+      s.read_filter :version do |v|
+        if v.nil? and s.version_file
+          File.read(s.version_file).strip.freeze
+        else
+          v
+        end
+      end
+      
+      s.docs.read_filter :readme_file do |v|
+        v or find_file('readme{.*,}').freeze
+      end
+      s.docs.read_filter(:readme) { s.docs.readme_file }
+      s.docs.write_filter(:readme) { |v| s.docs.readme_file = v }
+      
+      s.docs.read_filter :license_file do |v|
+        v or find_file('{licen{c,s}e,copying}{.*,}').freeze
+      end
+      s.docs.read_filter(:license) { s.docs.license_file }
+      s.docs.write_filter(:license) { |v| s.docs.license_file = v }
+      
+      s.docs.read_filter :markup do |v|
+        readme = s.docs.readme
+        if v.nil? and readme
+          case File.extname(readme).downcase
+          when '.rdoc'
+            'rdoc'
+          when '.md', '.markdown'
+            'markdown'
+          when '.textile'
+            'textile'
+          end.freeze
+        else
+          v
+        end
+      end
+      
+      s.test.read_filter :test_files do |v|
+        v or Dir['test/**/{*_{test,tc},{test,tc}_*}.rb'].freeze
+      end
+      
+      s.rspec.read_filter :options_file do |v|
+        v or find_file('{{spec/,}{spec.opts,.specopts}}').freeze
+      end
+      
+      s.rspec.read_filter :color do |v|
+        v.nil? ? true : v
+      end
+      
+      s.rspec.read_filter :spec_files do |v|
+        v or Dir['spec/**/*_spec.rb'].freeze
+      end
+      
+      s.rspec.write_filter(:ruby_opts) { |v| [*v] }
+      
+      return s
+    end
+    
     private
     def readable_file? file
       File.readable? file and File.file? file
     end
+    
+    def find_file pattern
+      files = Dir.glob(pattern, File::FNM_CASEFOLD)
+      files.find { |f| readable_file? f }
+    end
   end
   
   class GemTaskManager

data/spec/conventional_project/Rakefile

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'burke'
+
+Burke.enable_all
+
+Burke.setup do |s|
+  s.name = 'conventional_project'
+  s.summary = 'A sample project which follows conventions'
+end
+

data/spec/conventional_project/VERSION

@@ -0,0 +1 @@
+1.2.3

data/spec/conventional_project_spec.rb

@@ -0,0 +1,36 @@
+DIR = File.dirname(File.expand_path(__FILE__))
+require File.join(DIR, 'spec_helper')
+
+describe Burke do
+  describe 'settings' do
+    context 'for example of a conventional project' do
+      before do
+        @old_pwd = Dir.pwd
+        Dir.chdir File.join(DIR, 'conventional_project')
+        mock_burke_setup
+        eval(File.read('Rakefile'))
+        @settings = Burke.test_settings
+      end
+      
+      subject { @settings }
+      
+      its(:name) { should eql 'conventional_project' }
+      
+      its(:version_file) { should eql 'VERSION' }
+      its(:rakefile_file) { should eql 'Rakefile' }
+      
+      describe 'docs' do
+        subject { @settings.docs }
+        its(:readme_file) { should eql 'README.md' }
+        its(:license_file) { should eql 'COPYING' }
+        its(:markup) { should eql 'markdown' }
+      end
+      
+      after do
+        unmock_burke_setup
+        Dir.chdir @old_pwd
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,2 +1,25 @@
-require File.join(File.dirname(__FILE__), *%w[.. lib burke])
+$LOAD_PATH << File.join(File.dirname(File.expand_path(__FILE__)), 'lib')
+require 'burke'
+
+def mock_burke_setup
+  Burke.module_eval do
+    class << self
+      attr_reader :test_settings
+      alias :old_setup :setup
+      
+      def setup
+        @test_settings = create_settings
+        yield @test_settings
+      end
+    end
+  end
+end
+
+def unmock_burke_setup
+  Burke.module_eval do
+    class << self
+      alias :setup :old_setup
+    end
+  end
+end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -14,13 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +10:00
+date: 2010-09-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -29,26 +27,44 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  requirement: *id002
+  prerelease: false
+  type: :runtime
+  name: hashie
 description: 
 email: dismal.denizen@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- lib/burke.rb
-- lib/mash.rb
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - lib/burke.rb
-- lib/mash.rb
+- spec/conventional_project_spec.rb
+- spec/conventional_project/lib/main.rb
+- spec/conventional_project/Rakefile
+- spec/conventional_project/README.md
+- spec/conventional_project/COPYING
+- spec/conventional_project/VERSION
 - spec/spec_helper.rb
-- spec/mash_spec.rb
 - README.rdoc
-- Rakefile
 - VERSION
+- Rakefile
 has_rdoc: true
 homepage: http://github.com/dismaldenizen/burke
 licenses: []
@@ -56,7 +72,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- burke 0.2.1
+- burke 0.2.2
 - --main
 - README.rdoc
 require_paths: 

data/lib/mash.rb

@@ -1,48 +0,0 @@
-class Mash < Hash
-  def initialize *args, &block
-    super
-  end
-  
-  def method_missing name, *args, &block
-    if name.to_s =~ /(.*)=/
-      self.[]=($1, *args, &block)
-    else
-      if args.empty?
-        self.[](name, &block)
-      else
-        self.[]=(name, *args, &block)
-      end
-    end
-  end
-  
-  def []=(k, *v)
-    k = k.to_s.downcase.to_sym
-    v = *v if v.one?
-    v = setter_filters[k].call v if setter_filters.has_key? k
-    super k, v
-  end
-  
-  def [](k)
-    v = super(k.to_s.downcase.to_sym)
-    v = getter_filters[k].call v if getter_filters.has_key? k
-    yield v if block_given?
-    v
-  end
-  
-  def setter_filter key, &block
-    setter_filters[key.to_sym] = block
-  end
-  
-  def getter_filter key, &block
-    getter_filters[key.to_sym] = block
-  end
-  
-  def setter_filters
-    @setter_filters ||= {}
-  end
-  
-  def getter_filters
-    @getter_filters ||= {}
-  end
-end
-

data/spec/mash_spec.rb

@@ -1,11 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
-
-describe Mash do
-  context "when representing {:num => 42}" do
-    subject { Mash[:num => 42] }
-    its(:num) { should eql 42 }
-    its(:size) { should eql 1 }
-    its(:to_hash) { should eql :num => 42 }
-  end
-end
-