Narnach-gems 0.2.2 → 0.3.0

data/bin/gems

@@ -4,42 +4,48 @@ require 'gems'
 action = ARGV.shift.to_s.strip
 project = ARGV.shift.to_s.strip
 
+def guess_file_name!(project)
+  gems_file = ARGV.shift.to_s.strip
+  return gems_file unless gems_file.empty?
+  project + '.gems'
+end
+
 case action
 when 'install'
-  gems = Gems.new([project] + ARGV)
+  gems = Gems::Base.new([project] + ARGV)
   gems.install
 when 'uninstall'
-  gems = Gems.new([project] + ARGV)
+  gems = Gems::Base.new([project] + ARGV)
   gems.uninstall
 when 'list'
-  gems = Gems.new([project] + ARGV)
+  gems = Gems::Base.new([project] + ARGV)
   gems.list
 when 'import'
-  gems_config = GemsConfig.new(project)
-  gems_file = ARGV.shift.to_s.strip
+  gems_file = guess_file_name!(project)
+  gems_config = Gems::Config.new(project)
   gems_config.import_gems(gems_file)
 when 'export'
-  gems_config = GemsConfig.new(project)
-  gems_file = ARGV.shift.to_s.strip
+  gems_file = guess_file_name!(project)
+  gems_config = Gems::Config.new(project)
   gems_config.export_gems(gems_file)
 when 'projects'
-  gems_config = GemsConfig.new(nil)
+  gems_config = Gems::Config.new(nil)
   gems_config.project_names.each do |project|
     puts project
   end
 when 'configure'
-  gems_config = GemsConfig.new(project)
+  gems_config = Gems::Config.new(project)
   gemname = ARGV.shift
   gems_config.set_gem_options(gemname, ARGV)
 when 'add'
-  gems_config = GemsConfig.new(project)
+  gems_config = Gems::Config.new(project)
   gems_file = ARGV.shift.to_s.strip
   gems_config.add_gems(gems_file)
 when 'diff'
-  gems = Gems.new([project] + ARGV)
+  gems = Gems::Base.new([project] + ARGV)
   gems.diff_current
 when 'switch'
-  gems = Gems.new([project] + ARGV)
+  gems = Gems::Base.new([project] + ARGV)
   gems.switch_from_current
 else 'help'
   puts <<-EOS
@@ -59,13 +65,15 @@ Actions and arguments:
     only installing and uninstalling what is needed.
   list <name1> [name2 .. nameN]
     List all gems in union of projects name1..nameN.
-  import <name> <file>
-    Import all gems in <file> into project <name>.
+  import <name> [file]
+    Import all gems in [file] into project <name>.
     This will overwrite the gems currently in this project.
     The special file 'current' will use the output of `gems list` instead of a file.
-  export <name> <file>
-    Export all gems in project <name> to <file>.
+    If no [file] is provided, it is guessed by appending '.gems' to <name>.
+  export <name> [file]
+    Export all gems in project <name> to [file].
     The file will be overwritten and can be parsed by the import action.
+    If no [file] is provided, it is guessed by appending '.gems' to <name>.
   add <name> <file>
     Add the gems <file> to project <name>.
   projects

data/gems.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.name         = 'gems'
   s.summary      = "Gems is a simple tool to manage sets of RubyGems."
   s.description  = "Gems is a simple tool to manage sets of RubyGems. It can be used to install and uninstall large numbers of gems."
-  s.version      = '0.2.2'
-  s.date         = '2009-01-13'
+  s.version      = '0.3.0'
+  s.date         = '2009-09-07'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]
   s.email        = "narnach@gmail.com"
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   root_files     = %w[MIT-LICENSE README.rdoc Rakefile gems.gemspec]
   bin_files      = %w[gems]
-  lib_files      = %w[gems gems_config gems_parser gems_list]
+  gems_files     = %w[base config list parser updater]
+  lib_files      = %w[gems] + gems_files.map {|f| "gems/#{f}"}
   test_files     = %w[]
   spec_files     = %w[]
   s.test_files   = test_files.map {|f| 'test/%s_test.rb' % f} + spec_files.map {|f| 'spec/%s_spec.rb' % f}

data/lib/gems.rb

@@ -1,120 +1,4 @@
-require 'gems_config'
-require 'gems_parser'
-require 'gems_list'
+require 'gems/base'
 
-class Gems
-  attr_reader :project, :projects, :gems, :gems_config
-
-  def initialize(*projects)
-    @projects = projects.flatten
-    @project = projects.first
-    @gems_config = GemsConfig.new(@project)
-    @gems = @gems_config.gems
-  end
-
-  def diff_current
-    not_in_current = projects_gems - current_gems_list
-    in_current = current_gems_list - projects_gems
-
-    puts 'Gems unique to "%s":' % projects.join(", ")
-    print_gem_list(not_in_current)
-    puts
-    puts 'Gems unique to the current gems list:'
-    print_gem_list(in_current)
-  end
-
-  def list
-    list_name = projects.size == 1 ? 'Gems in' : 'Union of all gems in'
-    projects_list = projects.join(", ")
-    puts '%s %s:' % [list_name, projects_list]
-    print_gem_list(projects_gems)
-  end
-
-  def install
-    puts "Installing all gems and versions in '%s'" % projects.join(", ")
-    install_gems_list(projects_gems - current_gems_list)
-  end
-
-  def switch_from_current
-    puts 'Switching to %s...' % projects.join(", ")
-    to_install = projects_gems - current_gems_list
-    to_uninstall = current_gems_list - projects_gems
-
-    puts
-    puts '%s to be installed...' % (to_install.size == 1 ? '1 gem needs' : '%i gems need' % to_install.size)
-    install_gems_list(to_install) if to_install.size > 0
-
-    puts
-    puts '%s to be uninstalled...' % (to_uninstall.size == 1 ? '1 gem needs' : '%i gems need' % to_uninstall.size)
-    uninstall_gems_list(to_uninstall) if to_uninstall.size > 0
-  end
-
-  def uninstall
-    puts "Uninstalling all gems and versions in '%s'" % projects.join(", ")
-    uninstall_gems_list(projects_gems)
-  end
-
-  private
-
-  def current_gems_list
-    @current_gems_list ||= GemsParser.new('current').gems
-  end
-
-  def install_gems_list(gems)
-    results = {}
-    gems.each_gem_with_version do |gemname, versions|
-      versions.each do |version|
-        cmd = "sudo gem install --ignore-dependencies --no-rdoc --no-ri -v %s %s > /dev/null" % [version, gemname]
-        if gems_config.options_for(gemname).size > 0
-          cmd << ' -- %s' % gems_config.options_for(gemname).join(" ")
-        end
-        puts '  ' << cmd
-        result = system(cmd)
-        results['%s-%s' % [gemname, version]] = result
-      end
-    end
-    successful = results.select {|gemname, success| success}
-    unsuccessful = results.select {|gemname, success| !success}
-    if successful.size > 0
-      puts "Successfully installed: %s" % successful.map{|ary| ary[0]}.sort.join(", ")
-    end
-    if unsuccessful.size > 0
-      puts "Failed to install: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
-    end
-  end
-
-  def print_gem_list(gems)
-    gems.keys.sort.each do |gemname|
-      versions = gems[gemname].sort
-      line = "%#{gems.longest_key_length}s %s" % [gemname, versions.join(", ")]
-      if gems_config.options_for(gemname).size > 0
-        line << ' [%s]' % gems_config.options_for(gemname).join(" ")
-      end
-      puts line
-    end
-  end
-
-  def projects_gems
-    @projects_gems ||= projects.inject(GemsList.new) do |gems_list, project|
-      gems_list + GemsConfig.new(project).gems
-    end
-  end
-
-  def uninstall_gems_list(gems)
-    results = {}
-    gems.each_gem_with_version do |gemname, version|
-      cmd = "sudo gem uninstall --ignore-dependencies --executables -v %s %s > /dev/null" % [version, gemname]
-      puts '  ' << cmd
-      result = system(cmd)
-      results['%s-%s' % [gemname, version]] = result
-    end
-    successful = results.select {|gemname, success| success}
-    unsuccessful = results.select {|gemname, success| !success}
-    if successful.size > 0
-      puts "Successfully uninstalled: %s" % successful.map{|ary| ary[0]}.sort.join(", ")
-    end
-    if unsuccessful.size > 0
-      puts "Failed to uninstall: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
-    end
-  end
+module Gems
 end

data/lib/gems/base.rb

@@ -0,0 +1,122 @@
+require 'gems/config'
+require 'gems/parser'
+require 'gems/list'
+
+module Gems
+  class Base
+    attr_reader :project, :projects, :gems, :gems_config
+
+    def initialize(*projects)
+      @projects = projects.flatten
+      @project = projects.first
+      @gems_config = Gems::Config.new(@project)
+      @gems = @gems_config.gems
+    end
+
+    def diff_current
+      not_in_current = projects_gems - current_gems_list
+      in_current = current_gems_list - projects_gems
+
+      puts 'Gems unique to "%s":' % projects.join(", ")
+      print_gem_list(not_in_current)
+      puts
+      puts 'Gems unique to the current gems list:'
+      print_gem_list(in_current)
+    end
+
+    def list
+      list_name = projects.size == 1 ? 'Gems in' : 'Union of all gems in'
+      projects_list = projects.join(", ")
+      puts '%s %s:' % [list_name, projects_list]
+      print_gem_list(projects_gems)
+    end
+
+    def install
+      puts "Installing all gems and versions in '%s'" % projects.join(", ")
+      install_gems_list(projects_gems - current_gems_list)
+    end
+
+    def switch_from_current
+      puts 'Switching to %s...' % projects.join(", ")
+      to_install = projects_gems - current_gems_list
+      to_uninstall = current_gems_list - projects_gems
+
+      puts
+      puts '%s to be installed...' % (to_install.size == 1 ? '1 gem needs' : '%i gems need' % to_install.size)
+      install_gems_list(to_install) if to_install.size > 0
+
+      puts
+      puts '%s to be uninstalled...' % (to_uninstall.size == 1 ? '1 gem needs' : '%i gems need' % to_uninstall.size)
+      uninstall_gems_list(to_uninstall) if to_uninstall.size > 0
+    end
+
+    def uninstall
+      puts "Uninstalling all gems and versions in '%s'" % projects.join(", ")
+      uninstall_gems_list(projects_gems)
+    end
+
+    private
+
+    def current_gems_list
+      @current_gems_list ||= Gems::Parser.new('current').gems
+    end
+
+    def install_gems_list(gems)
+      results = {}
+      gems.each_gem_with_version do |gemname, versions|
+        versions.each do |version|
+          cmd = "sudo gem install --ignore-dependencies --no-rdoc --no-ri -v %s %s > /dev/null" % [version, gemname]
+          if gems_config.options_for(gemname).size > 0
+            cmd << ' -- %s' % gems_config.options_for(gemname).join(" ")
+          end
+          puts '  ' << cmd
+          result = system(cmd)
+          results['%s-%s' % [gemname, version]] = result
+        end
+      end
+      successful = results.select {|gemname, success| success}
+      unsuccessful = results.select {|gemname, success| !success}
+      if successful.size > 0
+        puts "Successfully installed: %s" % successful.map{|ary| ary[0]}.sort.join(", ")
+      end
+      if unsuccessful.size > 0
+        puts "Failed to install: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
+      end
+    end
+
+    def print_gem_list(gems)
+      gems.keys.sort.each do |gemname|
+        versions = gems[gemname].sort
+        line = "%#{gems.longest_key_length}s %s" % [gemname, versions.join(", ")]
+        if gems_config.options_for(gemname).size > 0
+          line << ' [%s]' % gems_config.options_for(gemname).join(" ")
+        end
+        puts line
+      end
+    end
+
+    def projects_gems
+      @projects_gems ||= projects.inject(Gems::List.new) do |gems_list, project|
+        gems_list + Gems::Config.new(project).gems
+      end
+    end
+
+    def uninstall_gems_list(gems)
+      results = {}
+      gems.each_gem_with_version do |gemname, version|
+        cmd = "sudo gem uninstall --ignore-dependencies --executables -v %s %s > /dev/null" % [version, gemname]
+        puts '  ' << cmd
+        result = system(cmd)
+        results['%s-%s' % [gemname, version]] = result
+      end
+      successful = results.select {|gemname, success| success}
+      unsuccessful = results.select {|gemname, success| !success}
+      if successful.size > 0
+        puts "Successfully uninstalled: %s" % successful.map{|ary| ary[0]}.sort.join(", ")
+      end
+      if unsuccessful.size > 0
+        puts "Failed to uninstall: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
+      end
+    end
+  end
+end

data/lib/gems/config.rb

@@ -0,0 +1,123 @@
+require 'yaml'
+require 'gems/parser'
+
+module Gems
+  class Config
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    def add_gems(file)
+      new_gems = Gems::Parser.new(file).gems
+      new_gems.each do |gemname, versions|
+        versions.each do |version|
+          add_gem(gemname, version)
+        end
+      end
+      save_config
+    end
+
+    def export_gems(file)
+      File.open(file,'wb') do |f|
+        gems.sort_by{|gemname, versions| gemname}.each do |gemname, versions|
+          f.puts "%s (%s)" % [gemname, versions.join(", ")]
+        end
+      end
+    end
+
+    def import_gems(file)
+      new_gems = Gems::Parser.new(file).gems
+      self.gems = new_gems
+      save_config
+    end
+
+    def options_for(gemname)
+      gem_options[gemname] || []
+    end
+
+    def set_gem_options(gemname, options)
+      gem_options[gemname] = options
+      save_config
+    end
+
+    # Load gems.
+    #
+    # Returns a Gems::List.
+    #
+    # Old data structures are automatically converted to new data structures.
+    def gems
+      gem_data = (project['gems'] ||= Gems::List.new)
+      return gem_data if gem_data.kind_of? Gems::List
+      if gem_data.kind_of? Hash
+        project['gems'] = Gems::List.new(gem_data)
+        save_config
+        return gems
+      end
+      new_gems = Gems::List.new
+      gem_data.each do |gem_ary|
+        new_gems[gem_ary[0]] = gem_ary[1]
+      end
+      project['gems'] = new_gems
+      save_config
+      return gems
+    end
+
+    def project_names
+      projects.keys.sort
+    end
+
+    protected
+
+    def add_gem(gemname, version)
+      gems[gemname] ||= []
+      gems[gemname] << version
+      gems[gemname].uniq!
+      gems[gemname].sort!
+    end
+
+    def config
+      @config ||= config_content
+    end
+    alias_method :load_config, :config
+
+    def gem_options
+      project['gems_options'] ||= {}
+    end
+
+    def gems=(new_gems)
+      project['gems'] = new_gems
+    end
+
+    def project
+      projects[name] ||= {}
+    end
+
+    def projects
+      config['projects'] ||= {}
+    end
+
+    def save_config
+      File.open(config_file, 'wb') {|f| f.puts(config.to_yaml)}
+    end
+
+    private
+
+    def config_file
+      File.expand_path('~/.gems.yml')
+    end
+    
+    def config_content
+      YAML.load_file(config_file)
+    rescue SystemCallError, ArgumentError => e
+      {}
+    rescue TypeError => e
+      $stderr.puts "Upgrading #{config_file}"
+      require 'gems/updater'
+      updater = Gems::Updater.new(name)
+      updater.update
+      retry
+    end
+  end
+end

data/lib/gems/list.rb

@@ -0,0 +1,49 @@
+module Gems
+  class List < Hash
+    def initialize(hsh={})
+      hsh.each do |key, value|
+        self[key] = value
+      end
+    end
+
+    def -(other)
+      diff = Gems::List.new
+      self.each do |gem, versions|
+        if other.has_key?(gem)
+          other_versions = other[gem]
+          versions_unique_to_current = versions - other_versions
+          diff[gem] = versions_unique_to_current if versions_unique_to_current.size > 0
+        else
+          diff[gem] = versions
+        end
+      end
+      diff
+    end
+
+    # Returns a new Gemlist which is the union of both GemLists.
+    def +(other)
+      union = self.dup
+      other.each do |gem, versions|
+        if union.has_key? gem
+          union[gem] = (union[gem] + versions).uniq.sort
+        else
+          union[gem] = versions
+        end
+      end
+      union
+    end
+
+    def each_gem_with_version(&block)
+      raise ArgumentError, 'No block provided' unless block
+      self.each do |gemname, versions|
+        versions.each do |version|
+          block.call(gemname, version)
+        end
+      end
+    end
+
+    def longest_key_length
+      map{|key, value| key.to_s.size}.max || 0
+    end
+  end
+end

data/lib/gems/parser.rb

@@ -0,0 +1,46 @@
+module Gems
+  class Parser
+    attr_reader :file
+
+    def initialize(file)
+      @file = file
+    end
+
+    def gems
+      @gems ||= parse_gems
+    end
+
+    protected
+
+    def str
+      @str ||= read_file
+    end
+
+    private
+
+    def parse_gems
+      parsed_gems = Gems::List.new
+      str.each do |line|
+        gemname, *versions = line.split(" ")
+        next if gemname.to_s.size == 0
+        versions.each {|v| v.gsub!(/[^\d.]/,'')}
+        versions = versions.select {|v| v =~ /(\d+\.)+\d+/}
+        versions.flatten!
+        versions.compact!
+        versions.uniq!
+        next if versions.size == 0
+        parsed_gems[gemname] = versions
+      end
+      return parsed_gems
+    end
+
+    def read_file
+      if file == 'current'
+        return `gem list`
+      else
+        raise 'File does not exist: "%s"' % file unless File.exist?(file)
+        return File.read(file)
+      end
+    end
+  end
+end

data/lib/gems/updater.rb

@@ -0,0 +1,12 @@
+require 'gems/config'
+
+module Gems
+  class Updater < Gems::Config
+    def update
+      load_config
+      save_config
+    end
+  end
+end
+
+GemsList = Gems::List

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Narnach-gems
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,11 +29,14 @@ files:
 - gems.gemspec
 - bin/gems
 - lib/gems.rb
-- lib/gems_config.rb
-- lib/gems_parser.rb
-- lib/gems_list.rb
+- lib/gems/base.rb
+- lib/gems/config.rb
+- lib/gems/list.rb
+- lib/gems/parser.rb
+- lib/gems/updater.rb
 has_rdoc: true
 homepage: http://www.github.com/Narnach/gems
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -57,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Gems is a simple tool to manage sets of RubyGems.

data/lib/gems_config.rb

@@ -1,114 +0,0 @@
-require 'yaml'
-require 'gems_parser'
-
-class GemsConfig
-  attr_reader :name
-
-  def initialize(name)
-    @name = name
-  end
-
-  def add_gems(file)
-    new_gems = GemsParser.new(file).gems
-    new_gems.each do |gemname, versions|
-      versions.each do |version|
-        add_gem(gemname, version)
-      end
-    end
-    save_config
-  end
-
-  def export_gems(file)
-    File.open(file,'wb') do |f|
-      gems.sort_by{|gemname, versions| gemname}.each do |gemname, versions|
-        f.puts "%s (%s)" % [gemname, versions.join(", ")]
-      end
-    end
-  end
-
-  def import_gems(file)
-    new_gems = GemsParser.new(file).gems
-    self.gems = new_gems
-    save_config
-  end
-
-  def options_for(gemname)
-    gem_options[gemname] || []
-  end
-
-  def set_gem_options(gemname, options)
-    gem_options[gemname] = options
-    save_config
-  end
-
-  # Load gems.
-  #
-  # Returns a GemsList.
-  #
-  # Old data structures are automatically converted to new data structures.
-  def gems
-    gem_data = (project['gems'] ||= GemsList.new)
-    return gem_data if gem_data.kind_of? GemsList
-    if gem_data.kind_of? Hash
-      project['gems'] = GemsList.new(gem_data)
-      save_config
-      return gems
-    end
-    new_gems = GemsList.new
-    gem_data.each do |gem_ary|
-      new_gems[gem_ary[0]] = gem_ary[1]
-    end
-    project['gems'] = new_gems
-    save_config
-    return gems
-  end
-
-  def project_names
-    projects.keys.sort
-  end
-
-  protected
-
-  def add_gem(gemname, version)
-    gems[gemname] ||= []
-    gems[gemname] << version
-    gems[gemname].uniq!
-    gems[gemname].sort!
-  end
-
-  def config
-    @config ||= load_config
-  end
-
-  def gem_options
-    project['gems_options'] ||= {}
-  end
-
-  def gems=(new_gems)
-    project['gems'] = new_gems
-  end
-
-  def project
-    projects[name] ||= {}
-  end
-
-  def projects
-    config['projects'] ||= {}
-  end
-
-  private
-
-  def config_file
-    File.expand_path('~/.gems.yml')
-  end
-
-  def load_config
-    YAML.load_file(config_file)
-  rescue SystemCallError, ArgumentError
-    {}
-  end
-
-  def save_config
-    File.open(config_file, 'wb') {|f| f.puts(config.to_yaml)}
-  end
-end

data/lib/gems_list.rb

@@ -1,47 +0,0 @@
-class GemsList < Hash
-  def initialize(hsh={})
-    hsh.each do |key, value|
-      self[key] = value
-    end
-  end
-
-  def -(other)
-    diff = GemsList.new
-    self.each do |gem, versions|
-      if other.has_key?(gem)
-        other_versions = other[gem]
-        versions_unique_to_current = versions - other_versions
-        diff[gem] = versions_unique_to_current if versions_unique_to_current.size > 0
-      else
-        diff[gem] = versions
-      end
-    end
-    diff
-  end
-
-  # Returns a new Gemlist which is the union of both GemLists.
-  def +(other)
-    union = self.dup
-    other.each do |gem, versions|
-      if union.has_key? gem
-        union[gem] = (union[gem] + versions).uniq.sort
-      else
-        union[gem] = versions
-      end
-    end
-    union
-  end
-
-  def each_gem_with_version(&block)
-    raise ArgumentError, 'No block provided' unless block
-    self.each do |gemname, versions|
-      versions.each do |version|
-        block.call(gemname, version)
-      end
-    end
-  end
-
-  def longest_key_length
-    map{|key, value| key.to_s.size}.max || 0
-  end
-end

data/lib/gems_parser.rb

@@ -1,44 +0,0 @@
-class GemsParser
-  attr_reader :file
-
-  def initialize(file)
-    @file = file
-  end
-
-  def gems
-    @gems ||= parse_gems
-  end
-
-  protected
-
-  def str
-    @str ||= read_file
-  end
-
-  private
-
-  def parse_gems
-    parsed_gems = GemsList.new
-    str.each do |line|
-      gemname, *versions = line.split(" ")
-      next if gemname.to_s.size == 0
-      versions.each {|v| v.gsub!(/[^\d.]/,'')}
-      versions = versions.select {|v| v =~ /(\d+\.)+\d+/}
-      versions.flatten!
-      versions.compact!
-      versions.uniq!
-      next if versions.size == 0
-      parsed_gems[gemname] = versions
-    end
-    return parsed_gems
-  end
-
-  def read_file
-    if file == 'current'
-      return `gem list`
-    else
-      raise 'File does not exist: "%s"' % file unless File.exist?(file)
-      return File.read(file)
-    end
-  end
-end