gem_tools 0.2.5 → 0.2.6

data/README.textile

@@ -7,10 +7,6 @@ similar to GemInstaller.
 
 My blog post on why "I prefer GemTools over config:gem":http://underpantsgnome.com/2009/4/8/i-prefer-gemtools-over-config-gem
 
-h2.  FEATURES/PROBLEMS:
-
-Doesn't yet work in Windows
-
 h2.  SYNOPSIS:
 
 I use this to manage gem versions in my apps, it has a script to install gems 
@@ -44,7 +40,7 @@ See the "sample config":http://github.com/UnderpantsGnome/gem_tools/blob/master/
 
 h2.  INSTALL:
 
-  sudo gem install gem_tools
+  [sudo] gem install gem_tools
 
 h2.  TODO
 

data/README.txt

@@ -7,10 +7,6 @@ similar to GemInstaller.
 
 My blog post on why "I prefer GemTools over config:gem":http://underpantsgnome.com/2009/4/8/i-prefer-gemtools-over-config-gem
 
-h2.  FEATURES/PROBLEMS:
-
-Doesn't yet work in Windows
-
 h2.  SYNOPSIS:
 
 I use this to manage gem versions in my apps, it has a script to install gems 
@@ -44,7 +40,7 @@ See the "sample config":http://github.com/UnderpantsGnome/gem_tools/blob/master/
 
 h2.  INSTALL:
 
-  sudo gem install gem_tools
+  [sudo] gem install gem_tools
 
 h2.  TODO
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/config/gems.yml

@@ -1,164 +1,21 @@
+# this is optional
+# source: http://local_mirror.example.com 
+# gem_command: 'jruby -S gem'
 gems:
-  - name: 'authlogic'
-    version: '1.3.9'
-
-  - name: 'datanoise-actionwebservice'
-    version: '2.2.2'
-    require_name: 'actionwebservice'
-    source: 'http://gems.github.com/'
-
-  - name: 'fastercsv'
-    version: '1.5.0'
-
-  - name: 'GData'
-    version: '0.0.4'
-    require_name: 'gdata/spreadsheet'
-
-  - name: 'hpricot'
-    version: '0.8.2'
-
-  - name: 'httparty'
-    version: '0.5.0'
-
-  - name: 'newrelic_rpm'
-    version: '2.9.5'
-
-  - name: 'parseexcel'
-    version: '0.5.2'
-
-  - name: 'prawn'
-    version: '0.5.0.1'
-
-  - name: 'prawn-core'
-    version: '0.5.0.1'
-
-  - name: 'prawn-layout'
-    version: '0.2.0.1'
-
-  - name: 'rails'
-    version: '2.2.2'
-
-  - name: 'roo'
-    version: '1.2.3'
-
-  - name: 'rubaidh-google_analytics'
-    version: '1.1.4'
-    require_name: 'rubaidh/google_analytics'
-    source: 'http://gems.github.com/'
-
-  - name: 'aasm'
-    version: '2.0.5'
-
-  - name: 'rubyzip'
-    version: '0.9.1'
-    require_name: 'zip/zipfilesystem'
-
-  - name: 'serviceproxy'
-    version: '0.2.1'
-
-  - name: 'settingslogic'
-    version: '2.0.3'
-
-  - name: 'spreadsheet-excel'
-    version: '0.3.5.1'
-    require_name: 'spreadsheet/excel'
-
-  - name: 'thoughtbot-paperclip'
-    version: '2.2.7'
-    require_name: 'paperclip'
-
-  - name: 'will_paginate'
-    version: '2.2.2'
-
-  - name: 'inaction_mailer'
-    version: '0.6'
-    load: false
-
-  - name: 'capistrano-ext'
-    version: '1.2.1'
-    load: false
-
-  - name: 'chronic'
-    version: '0.2.3'
-    load: false
-
-  - name: 'whenever'
-    version: '0.3.7'
-    load: false
-
-  - name: 'soap4r'
-    version: '1.5.8'
-    load: false
-
-  - name: 'crack'
-    version: '0.1.4'
-    load: false
-
-  - name: 'ruby-debug'
-    version: '0.10.3'
-    load: false
-
-  - name: 'cucumber'
-    version: '0.6.2'
-    load: false
-
-  - name: 'cucumber-rails'
-    version: '0.2.4'
-    load: false
-
-  - name: 'database_cleaner'
-    version: '0.4.3'
-    load: false
-
-  - name: 'webrat'
-    version: '0.7.0'
-    load: false
-
-  - name: 'rspec'
-    version: '1.3.0'
-    load: false
-
-  - name: 'rspec-rails'
-    version: '1.3.2'
-    load: false
-
-  - name: 'launchy'
-    version: '0.3.5'
-    load: false
-
-  - name: 'mocha'
-    version: '0.9.5'
-    load: false
-
-  - name: 'machinist'
-    version: '1.0.6'
-    load: false
-
-  - name: 'shoulda'
-    version: '2.9.1'
-    load: false
-
-  - name: 'xml-simple'
-    version: '1.0.12'
-    load: false
-
-  - name: 'memcache'
-    version: '1.2.0'
-    load: false
-
-  - name: 'tzinfo'
-    version: '0.3.16'
-    load: false
-
-  - name: 'tmail'
-    version: '1.2.7.1'
-    load: false
-
-  - name: 'text-format'
-    version: '1.0.0'
-    load: false
-
-  - name: 'cwninja-inaction_mailer'
-    version: '0.6'
-    require_name: 'inaction_mailer'
-    load: false
+  - name: rake
+    load: true
+    version: >=0.7.3
+  - name: foo_gem
+    version: 0.0.1
+    load: true
+  # - name: postgres
+  # 	# the version to use
+  #   version: '0.7.1'
+  #   # this gem has a specfic source URL
+  #   source: 'http://mongrel.rubyforge.org/releases'
+  #   # this tells us to load not just install
+  #   load: true 
+  #   # any extra config that needs to be passed to gem install
+  #   config: '--with-pgsql-include-dir=/usr/local/pgsql/include --with-pgsql-lib-dir=/usr/local/pgsql/lib' 
+  #   # if the require name is different than the gem name
+  #   require_name: foo-bar

data/gem_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem_tools}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Moen"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-19}
   s.default_executable = %q{gemtools}
   s.description = %q{A lightweight tool to manage gems using a config file, similar to GemInstaller}
   s.email = %q{michael@underpantsgnome.com}

data/lib/gem_tools.rb

@@ -2,7 +2,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
-require 'ruby-debug'
 
 module GemTools
   extend self
@@ -11,6 +10,10 @@ module GemTools
     send(cmd.to_sym) rescue help
   end
 
+  def help
+    puts OPTS
+  end
+
   def setup
     require 'fileutils'
     dest_file = File.join(ARGV[1], '/config/gems.yml')
@@ -23,28 +26,21 @@ module GemTools
     end
   end
 
-  def load_gems
-    config = load_config
-    unless config['gems'].nil?
-      gems = config['gems'].reject {|gem_info| ! gem_info['load'] }
-      gems.each do |gem_info|
-        if defined?(gem)
-          gem gem_info['name'], gem_info['version']
-        else
-          require_gem gem_info['name'], gem_info['version']
-        end
-        require gem_info['require_name'] || gem_info['name']
-      end
+  def install
+    commands.each do |command|
+      ret = system command
+      # something bad happened, pass on the message
+      p $? unless ret
     end
   end
 
-  def help
-    puts OPTS
+  def dryrun
+    puts "\n#{commands.join("\n")}\n\n"
   end
 
   def to_gemfile
     config = load_config
-    
+
     if File.exist?('Gemfile')
       puts "GemFile already exists, not overwriting."
       exit 1
@@ -77,114 +73,95 @@ module GemTools
     end
   end
 
-  def load_config
-    require 'yaml'
-    require 'erb'
-    config_file = find_config
-    unless config_file
-      puts 'Could not find a gems.yml, checked . and ./config'
-      exit 1
-    end
-    YAML.load(ERB.new(File.open(config_file).read).result)
-  end
+  private
 
-  def install
-    require 'rubygems'
-    if RUBY_PLATFORM =~ /MSWIN/
-      puts "gemtools install doesn't currently work in windows. The commands you need to install the gems will be printed out for you.\n"
-      dryrun
-      return
-    else
-      commands.each do |command|
-        ret = system command
-        # something bad happened, pass on the message
-        p $? unless ret
+    def load_gems
+      config = load_config
+      unless config['gems'].nil?
+        gems = config['gems'].reject {|gem_info| ! gem_info['load'] }
+        gems.each do |gem_info|
+          if defined?(gem)
+            gem gem_info['name'], gem_info['version']
+          else
+            require_gem gem_info['name'], gem_info['version']
+          end
+          require gem_info['require_name'] || gem_info['name']
+        end
       end
     end
-  end
 
-  def dryrun
-    puts "\n#{commands.join("\n")}\n\n"
-  end
-
-  def commands
-    config = load_config
-    gems = config['gems']
-    commands = []
-
-    unless gems.nil?
-      docs = ''
-      unless OPTIONS.has_key?(:docs)
-        docs << '--no-rdoc ' unless (`rdoc --version 2> /dev/null`).nil?
-        docs << '--no-ri ' unless (`ri --version 2> /dev/null`).nil?
+    def load_config
+      require 'yaml'
+      require 'erb'
+      config_file = find_config
+      unless config_file
+        puts 'Could not find a gems.yml, checked . and ./config'
+        exit 1
       end
+      YAML.load(ERB.new(File.open(config_file).read).result)
+    end
 
-      gem_command = config['gem_command'] || 'gem'
-      gem_dash_y = "1.0" > Gem::RubyGemsVersion ? '-y' : ''
+    def commands
+      config = load_config
+      gems = config['gems']
+      commands = []
 
-      gems.each do |gem|
-        spec, loaded, version = check_gem(gem_command, gem['name'], gem['version'])
-        # if forced
-        # or the spec version doesn't match the required version
-        # or require_gem returns false
-        #    (return false also happens if the gem has already been loaded)
-        if OPTIONS.has_key?(:force) || !spec || (! loaded || version != gem['version'])
-          gem_config = gem['config'] ? " -- #{gem['config']}" : ''
-          source = gem['source'] || config['source'] || nil
-          source = "--source #{source}" if source
-          cmd = "#{gem_command} install #{gem['path'] || gem['name']} -v #{gem['version']} #{gem_dash_y} #{source} #{docs} #{gem_config}"
-          commands << cmd
-        else
-          puts "#{gem['name']} #{gem['version']} already installed"
+      unless gems.nil?
+        docs = ''
+        unless OPTIONS.has_key?(:docs) || RUBY_PLATFORM =~ /(win|mingw)/i
+          docs << '--no-rdoc ' unless (`rdoc --version 2> /dev/null`).nil?
+          docs << '--no-ri ' unless (`ri --version 2> /dev/null`).nil?
+        end
+
+        gem_command = config['gem_command'] || 'gem'
+        gem_dash_y = "1.0" > Gem::RubyGemsVersion ? '-y' : ''
+
+        gems.each do |gem|
+          meets_reqs =
+
+          # if forced
+          # or the installed gems don't meet requirements
+          if OPTIONS.has_key?(:force) || meets_requirements?(gem['name'], gem['version'])
+            gem_config = gem['config'] ? " -- #{gem['config']}" : ''
+            source = gem['source'] || config['source'] || nil
+            source = "--source #{source}" if source
+            cmd = "#{gem_command} install #{gem['path'] || gem['name']} -v #{gem['version']} #{gem_dash_y} #{source} #{docs} #{gem_config}"
+            commands << cmd
+          else
+            puts "#{gem['name']} #{gem['version']} already installed"
+          end
         end
       end
+      commands
     end
-    commands
-  end
 
-  def check_gem(command, name, version='')
-    ENV['PATH'] ||= '/usr/bin'
-    ENV['PATH'] += ':/usr/local/bin:/usr/bin'
-    spec = YAML.load(`PATH=#{ENV['PATH']} #{command} spec #{name} 2> /dev/null`)
-    loaded = false
-    begin
-      loaded = defined?(gem) ? gem(name, version) : require_gem(name, version)
-      version = spec.version.version
-    rescue Exception => e
-      # puts e
+    def find_config
+      %w( . config ).each do |dir|
+        config_file = File.join(dir, 'gems.yml')
+        return config_file if File.exist?(config_file)
+      end
+      nil
     end
-    [spec, loaded, version]
-  end
 
-  def find_config
-    %w( . config ).each do |dir|
-      config_file = File.join(dir, 'gems.yml')
-      return config_file if File.exist?(config_file)
+    def meets_requirements?(name, version)
+      @specs ||= Gem::SourceIndex.from_installed_gems
+      @specs.find_name(name, Gem::Requirement.new(version)).empty?
     end
-    nil
-  end
 
-  def has_gem?(gem)
-    @gems ||= Gem::SourceIndex.from_installed_gems
-    @gems.search(gem['name'], gem['version']).empty?
-  end
+    def check_updates
+      config = load_config
+      gems = config['gems']
 
-  def check_updates
-    config = load_config
-    gems = config['gems']
-
-    gems.each do |gem|
-      source = gem['source'] || config['source'] || nil
-      source = "--source #{source}" if source
-      # puts "Checking #{gem['name']}"
-      out = `gem list -r #{gem['name']} #{source}`
-      ver = out.match(/\(([0-9\.]+)/)[1] #rescue 0
-      puts "#{gem['name']} #{ver} is available, #{gem['version']} installed" if ver > gem['version']
+      gems.each do |gem|
+        source = gem['source'] || config['source'] || nil
+        source = "--source #{source}" if source
+        # puts "Checking #{gem['name']}"
+        out = `gem list -r #{gem['name']} #{source}`
+        ver = out.match(/\(([0-9\.]+)/)[1] #rescue 0
+        puts "#{gem['name']} #{ver} is available, #{gem['version']} installed" if ver > gem['version']
+      end
     end
-  end
-  
-  private
-    
+
     def bundler_gem_line(gem)
       line = "gem '#{gem['name']}', '#{gem['version']}'"
       line += ", :require => '#{gem['require_name']}'" if gem['require_name']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gem_tools
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Michael Moen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -06:00
+date: 2010-02-19 00:00:00 -06:00
 default_executable: gemtools
 dependencies: []