gemtronics 0.3.2 → 0.4.0

data/lib/gemtronics/definition.rb

@@ -0,0 +1,88 @@
+module Gemtronics
+  # Represents the definition of a Gem.
+  class Definition < Hash
+    
+    # Get/set the name of the gem.
+    attr_accessor :name
+    # Get/set the version of the gem. Defaults to <tt>>=0.0.0</tt>
+    attr_accessor :version
+    # Get/set the source of the gem. Defaults to <tt>http://gems.rubyforge.org</tt>
+    attr_accessor :source
+    
+    # Returns true/false if the gem should be required. Defaults to <tt>true</tt>.
+    def load?
+      # method built dynamically. This is just a stub for RDoc.
+    end
+    
+    # Set whether the gem should be required.
+    def load=(x)
+      # method built dynamically. This is just a stub for RDoc.
+    end
+    
+    # Returns an Array of files that should be required. Defaults to <tt>[<name>]</tt>
+    def require_list
+      return [self.name] unless self.has_key?(:require)
+      return [self.fetch(:require)].flatten
+    end
+    
+    # Sets the names of the files that should be required.
+    def require_list=(x)
+      self.store(:require, [x].flatten)
+    end
+    
+    # Returns <tt><name>-<version></tt>.
+    # 
+    # Example:
+    #   gd = Gemtronics::Definition.new
+    #   gd.name = 'configatron'
+    #   gd.version = '2.3.0'
+    #   gd.to_s #=> 'configatron-2.3.0'
+    def to_s
+      return "#{self.name}-#{self.version}"
+    end
+    
+    # Generates an install command string.
+    # 
+    # Example:
+    #   gd = Gemtronics::Definition.new
+    #   gd.name = 'configatron'
+    #   gd.version = '2.3.0'
+    #   gd.install_command #=> 'gem install configatron --source=http://gems.rubyforge.org --version=2.3.0'
+    def install_command
+      cmd = "gem install #{self.name} --source=#{self.source}"
+      unless self.version.match(/^(\>\=|\>)/)
+        cmd << " --version=#{self.version}"
+      end
+      return cmd
+    end
+    
+    # Returns <tt>true/false</tt> depending on whether the gem
+    # is installed or not.
+    def installed?
+      begin
+        gem(self.name, self.version)
+        return true
+      rescue Gem::LoadError => e
+        return true if e.message.match(/can't activate/)
+        return false
+      end
+    end
+    
+    private
+    def self.build_method(name, defval = nil, key = name) # :nodoc:
+      define_method(name) do
+        return defval unless self.has_key?(key)
+        return self.fetch(key)
+      end
+      define_method("#{name.to_s.gsub('?', '')}=") do |x|
+        self.store(key, x)
+      end
+    end
+    
+    build_method(:name)
+    build_method(:version, '>=0.0.0')
+    build_method(:source, 'http://gems.rubyforge.org')
+    build_method(:load?, true, :load)
+    
+  end # Definition
+end # Gemtronics

data/lib/gemtronics/grouper.rb

@@ -79,15 +79,14 @@ module Gemtronics
       ind = self.gems.size
       g = {}
       self.gems.each_with_index do |gemdef, i|
-        if gemdef[:name] == name
+        if gemdef.name == name
           g = gemdef
           ind = i
           break
         end
       end
 
-      g = self.group_options.merge({:name => name, :require => [name]}.merge(g).merge(options))
-      g[:require] = [g[:require]].flatten
+      g = Gemtronics::Definition[self.group_options.merge({:name => name, :require => [name]}.merge(g).merge(options))]
       self.gems[ind] = g
       self.dependents.each do |dep|
         Gemtronics.group(dep).add(name, options)
@@ -112,7 +111,7 @@ module Gemtronics
     # now have the following gems: <tt>gem1, gem3, gem4</tt>
     def remove(name)
       self.gems.each do |g|
-        if g[:name] = name.to_s
+        if g.name = name.to_s
           self.gems.delete(g)
           break
         end
@@ -139,7 +138,7 @@ module Gemtronics
       if group
         Gemtronics.group(name.to_sym).dependents << self.name
         group.gems.dup.each do |gemdef|
-          self.add(gemdef[:name], gemdef)
+          self.add(gemdef.name, gemdef)
         end
       end
     end

data/lib/gemtronics/manager.rb

@@ -100,9 +100,9 @@ module Gemtronics
       return if group.nil?
       options = {:verbose => false}.merge(options)
       group.gems.each do |g|
-        if g[:load] == true
-          gem(g[:name], g[:version])
-          g[:require].each do |f|
+        if g.load? == true
+          gem(g.name, g.version)
+          g.require_list.each do |f|
             puts "require #{f}" if options[:verbose]
             require f
           end
@@ -138,14 +138,11 @@ module Gemtronics
       return if group.nil?
       
       group.gems.each do |g|
-        unless gem_installed?(g[:name], g[:version])
-          cmd = "gem install #{g[:name]} --source=#{g[:source]}"
-          unless g[:version].match(/^(\>\=|\>)/)
-            cmd << " --version=#{g[:version]}"
-          end
+        unless gem_installed?(g)
+          cmd = g.install_command
           puts cmd
           system cmd
-          self.installed_gems << "#{g[:name]}-#{g[:version]}"
+          self.installed_gems << g.to_s
         end
       end
     end
@@ -161,15 +158,9 @@ module Gemtronics
     end
     
     private
-    def gem_installed?(name, version) # :nodoc:
-      begin
-        return true if self.installed_gems.include?("#{name}-#{version}")
-        gem(name, version)
-        return true
-      rescue Gem::LoadError => e
-        return true if e.message.match(/can't activate/)
-        return false
-      end
+    def gem_installed?(gemdef) # :nodoc:
+      return true if self.installed_gems.include?(gemdef.to_s)
+      return gemdef.installed?
     end
     
   end # Manager

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemtronics
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -04:00
+date: 2009-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - README
 - LICENSE
 files: 
+- lib/gemtronics/definition.rb
 - lib/gemtronics/gemtronics.rb
 - lib/gemtronics/grouper.rb
 - lib/gemtronics/manager.rb