require 0.2.2 → 0.2.3

data/lib/require/tasks.rb

@@ -31,6 +31,35 @@ class Require
       $stdout.puts cmd
       system cmd
     end
+    
+    def self.install_gem(name, version = nil)
+      unless has_gem?(name, version)
+        run "gem install #{name}#{" -v '#{version}'" if version}"
+      end
+    end
+    
+    def self.has_gem?(name, version=nil)
+      if !$GEM_LIST
+        gems = {}
+        `gem list --local`.each_line do |line|
+          gems[$1.to_sym] = $2.split(/, /) if line =~ /^(.*) \(([^\)]*)\)$/
+        end
+        $GEM_LIST = gems
+      end
+      if $GEM_LIST[name.to_sym]
+        if version
+          version = version.gsub("=",'')
+          if $GEM_LIST[name.to_sym].include?(version) 
+            $stdout.puts "Gem: #{name}:#{version} already installed, skipping"
+            return true
+          end  
+        else
+          $stdout.puts "Gem: #{name} already installed, skipping"
+          return true
+        end
+      end
+      false
+    end
   end
 end
 
@@ -68,11 +97,13 @@ task :gems do
 end
 
 namespace :gems do
-  desc "Install gem dependencies"
+  desc "Install gem dependencies, use DOCS=1|0, SUDO=1|0 to bypass prompts"
   task :install do
-    Require::Tasks.set :ask_docs, :ask_sudo
+    doc_me = ENV['DOCS'].nil? ? :ask_docs : (ENV['DOCS'] == "1" ? :docs : :no_docs)
+    sudo_me = ENV['SUDO'].nil? ? :ask_sudo : (ENV['SUDO'] == "1" ? :sudo : :no_sudo)
+    Require::Tasks.set doc_me, sudo_me
     Require.all(:gem).sort { |a,b| a.name.to_s <=> b.name.to_s }.each do |dsl|
-      Require::Tasks.run "gem install #{dsl.name}#{" -v '#{dsl.version}'" if dsl.version}"
+      Require::Tasks.install_gem dsl.name, dsl.version
     end
   end
 end

data/require.rb

@@ -11,7 +11,7 @@ Require do
     name 'require'
     homepage "http://github.com/winton/#{name}"
     summary "Manage your project's dependencies with a pretty DSL"
-    version '0.2.2'
+    version '0.2.3'
   end
   
   rakefile do

data/spec/require/gemspec_spec.rb

@@ -25,7 +25,7 @@ class Require
       
       s = Require.gemspec
       s.authors.should == [ "Winton Welsh" ]
-      s.date.should == Time.utc(Date.today.year, Date.today.mon, Date.today.mday, 8)
+      s.date.should == Time.utc(Time.now.year, Time.now.mon, Time.now.mday, 8)
       s.default_executable.should == "bin"
       s.dependencies.should == [Gem::Dependency.new("rspec", Gem::Requirement.new(["= 1.3.0"]), :runtime)]
       s.email.should == 'mail@wintoni.us'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []