gemtronics 0.4.8 → 0.5.0

data/bin/gemtronics

@@ -46,7 +46,11 @@ group(:development, :dependencies => :default) do |g|
   
 end
 
-group(:test, :dependencies => :development) do |g|
+group(:test, :dependencies => :development, :load => false) do |g|
+  
+end
+
+group(:cucumber, :dependencies => :test) do |g|
   
 end
     }.strip
@@ -67,27 +71,41 @@ when 'convert'
   
   out_path = path.gsub('gems.yml', 'gemtronics.rb')
   File.open(out_path, 'w') do |f|
+    out = ''
+    
     unless top_options.empty?
-      f.puts "group(:default, #{top_options.inspect.gsub('=>', ' => ')}) do |g|"
+      out << "group(:default, #{top_options.inspect.gsub('=>', ' => ')}) do |g|\n"
     else
-      f.puts "group(:default) do |g|"
+      out << "group(:default) do |g|\n"
     end
   
     gems.each do |gemdef|
-      x = "  g.add('#{gemdef['name']}'"
+      out << "  g.add('#{gemdef['name']}'"
       options = {}
       options[:require] = gemdef['require_name'] if gemdef['require_name']
       options[:version] = gemdef['version'] if gemdef['version']
       options[:load] = false if gemdef['load'] == false
       unless options.empty?
-        x << ", #{options.inspect.gsub('=>', ' => ')})"
+        out << ", #{options.inspect.gsub('=>', ' => ')})\n"
       else
-        x << ')'
+        out << ")\n"
       end
-      f.puts x
     end
   
-    f.puts 'end'
+    out << "end\n"
+    out << %{
+
+alias_group :production, :default
+alias_group :development, :default
+
+group(:test, :dependencies => :development, :load => false) do |g|
+  
+end
+
+alias_group :cucumber, :test
+    }
+    
+    f.puts out.strip.gsub('{', '').gsub('}', '').gsub('"', '\'')
   end
   puts File.read(out_path)
 else

data/lib/gemtronics/grouper.rb

@@ -38,13 +38,12 @@ module Gemtronics
       self.gems = []
       self.dependents = []
       options = {} if options.nil?
+      deps = [options.delete(:dependencies)].flatten.compact
       self.group_options = Gemtronics::Manager::GLOBAL_DEFAULT_OPTIONS.merge(options)
-      deps = self.group_options.delete(:dependencies)
-      if deps
-        [deps].flatten.each do |dep|
-          self.dependency(dep)
-        end
+      deps.each do |dep|
+        self.dependency(dep)
       end
+      self.group_options.merge!(options)
       self
     end
     
@@ -136,6 +135,7 @@ module Gemtronics
     def dependency(name)
       group = Gemtronics::Manager.instance.groups[name.to_sym]
       if group
+        self.group_options.merge!(group.group_options)
         Gemtronics.group(name.to_sym).dependents << self.name
         group.gems.dup.each do |gemdef|
           self.add(gemdef.name, gemdef)

data/lib/gemtronics/manager.rb

@@ -28,8 +28,7 @@ module Gemtronics
     # For more information see Gemtronics::Grouper
     def group(name, options = {})
       name = name.to_sym
-      options = GLOBAL_DEFAULT_OPTIONS.merge(options)
-      g = (self.groups[name] ||= Gemtronics::Grouper.new(name, options))
+      g = (self.groups[name] ||= Gemtronics::Grouper.new(name, options || {}))
       if block_given?
         yield g
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemtronics
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors: 
 - markbates
@@ -14,7 +14,7 @@ default_executable:
 dependencies: []
 
 description: "gemtronics was developed by: markbates"
-email: ""
+email: mark@markbates.com
 executables: 
 - gemtronics
 extensions: []
@@ -31,7 +31,7 @@ files:
 - README
 - LICENSE
 has_rdoc: true
-homepage: ""
+homepage: http://www.metabates.com
 licenses: []
 
 post_install_message: