Narnach-gems 0.1.7 → 0.2.0

data/README.rdoc

@@ -5,6 +5,9 @@ Rails code would not get into dependency issues.
 
 == Recent changes
 
+=== Version 0.2.0
+Most gems commands can now work on multiple projects at the same time. The 'gems help' command has been updated to reflect this.
+
 === Version 0.1.7
 Gem install only installs missing gems; it does not re-install gems.
 
@@ -50,36 +53,8 @@ From the project root, use rake to install:
 This will build the gem and install it for you.
 
 == Usage
-Output if 'gems help', with some changes to make them legible in RDoc:
-  Syntax:
-    gems 'action' 'arguments'
-
-  Actions and arguments:
-    install 'name'
-      Install all missing gems in project 'name'.
-    uninstall 'name'
-      Uninstall all gems in project 'name'.
-    diff 'name'
-      See difference between the current gem configuration and that of project 'name'.
-    switch 'name'
-      Switch to the exact gem configuration in project 'name'.
-      This will preserve all shared gems in the current state and in the target
-      project, only installing and uninstalling what is needed.
-    list 'name'
-      List all gems in 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'.
-      The file will be overwritten and can be parsed by the import action.
-    add 'name' 'file'
-      Add the gems 'file' to project 'name'.
-    projects
-      List all stored project names.
-    configure 'name' 'gem' [option1 option2 option3]
-      Configure a specific gem inside a project to use specific options when installing.
+See the gems help for the syntax
+  gems help
 
 == Examples
 To store your current gems as project 'dev', do the following:
@@ -88,9 +63,13 @@ To store your current gems as project 'dev', do the following:
 To switch from project 'dev' to 'server', do the following:
   gems uninstall dev
   gems install server
+It is also possible to directly switch to a project:
+  gems switch server
 To export project 'dev' to the file 'gems.dev', do the following:
   gems export dev gems.dev
 
+== Ideas / plans / todo
+
 == About
 Author:: Wes 'Narnach' Oldenbeuving (http://github.com/Narnach)
 Website:: http://github.com/Narnach/gems

data/bin/gems

@@ -6,13 +6,13 @@ project = ARGV.shift.to_s.strip
 
 case action
 when 'install'
-  gems = Gems.new project
+  gems = Gems.new([project] + ARGV)
   gems.install
 when 'uninstall'
-  gems = Gems.new project
+  gems = Gems.new([project] + ARGV)
   gems.uninstall
 when 'list'
-  gems = Gems.new project
+  gems = Gems.new([project] + ARGV)
   gems.list
 when 'import'
   gems_config = GemsConfig.new(project)
@@ -36,10 +36,10 @@ when 'add'
   gems_file = ARGV.shift.to_s.strip
   gems_config.add_gems(gems_file)
 when 'diff'
-  gems = Gems.new project
+  gems = Gems.new([project] + ARGV)
   gems.diff_current
 when 'switch'
-  gems = Gems.new project
+  gems = Gems.new([project] + ARGV)
   gems.switch_from_current
 else 'help'
   puts <<-EOS
@@ -47,18 +47,18 @@ Syntax:
   gems <action> <arguments>
 
 Actions and arguments:
-  install <name>
-    Install all missing gems in project <name>.
-  uninstall <name>
-    Uninstall all gems in project <name>.
-  diff <name>
-    See difference between the current gem configuration and that of project <name>.
-  switch <name>
-    Switch to the exact gem configuration in project <name>.
-    This will preserve all shared gems in the current state and in the target
-    project, only installing and uninstalling what is needed.
-  list <name>
-    List all gems in project <name>.
+  install <name1> [name2 .. nameN]
+    Install all missing gems in project name1..nameN.
+  uninstall <name1> [name2 .. nameN]
+    Uninstall all gems in project name1..nameN.
+  diff <name1> [name2 .. nameN]
+    See difference between the current gem configuration and that of the union of projects name1..nameN.
+  switch <name1> [name2 .. nameN]
+    Switch to gem configuration in the union of projects name1..nameN.
+    This will preserve all shared gems in the current state and in the target state,
+    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>.
     This will overwrite the gems currently in this project.

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.1.7'
-  s.date         = '2008-08-19'
+  s.version      = '0.2.0'
+  s.date         = '2008-08-26'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]
   s.email        = "narnach@gmail.com"
@@ -14,8 +14,13 @@ Gem::Specification.new do |s|
   s.bindir       = "bin"
   s.executables  = %w[gems]
   s.require_path = "lib"
-  s.files        = ['MIT-LICENSE', 'README.rdoc', 'Rakefile', 'bin/gems', 'lib/gems.rb', 'lib/gems_config.rb', 'lib/gems_parser.rb', 'gems.gemspec', 'lib/gems_list.rb']
-  s.test_files   = []
+  root_files     = %w[MIT-LICENSE README.rdoc Rakefile gems.gemspec]
+  bin_files      = %w[gems]
+  lib_files      = %w[gems gems_config gems_parser gems_list]
+  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}
+  s.files        = root_files + s.test_files + bin_files.map {|f| 'bin/%s' % f} + lib_files.map {|f| 'lib/%s.rb' % f}
 
   # rdoc
   s.has_rdoc         = true

data/lib/gems.rb

@@ -2,28 +2,21 @@ require 'gems_config'
 require 'gems_parser'
 require 'gems_list'
 
-class Hash
-  def longest_key_length
-    map{|key, value| key.to_s.size}.max || 0
-  end
-end
-
 class Gems
-  attr_reader :project, :gems, :gems_config
+  attr_reader :project, :projects, :gems, :gems_config
 
-  def initialize(project)
-    @project = project
+  def initialize(*projects)
+    @projects = projects.flatten
+    @project = projects.first
     @gems_config = GemsConfig.new(@project)
     @gems = @gems_config.gems
   end
 
   def diff_current
-    current_gems = GemsList.new(GemsParser.new('current').gems)
-    project_gems = GemsList.new(gems)
-    not_in_current = project_gems - current_gems
-    in_current = current_gems - project_gems
+    not_in_current = projects_gems - current_gems_list
+    in_current = current_gems_list - projects_gems
 
-    puts 'Gems unique to "%s":' % project
+    puts 'Gems unique to "%s":' % projects.join(", ")
     print_gem_list(not_in_current)
     puts
     puts 'Gems unique to the current gems list:'
@@ -31,29 +24,29 @@ class Gems
   end
 
   def list
-    puts 'Gems in "%s":' % project
-    print_gem_list(gems)
+    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'" % project
-    install_gems_list(GemsList.new(gems) - current_gems_list)
+    puts "Installing all gems and versions in '%s'" % projects.join(", ")
+    install_gems_list(projects_gems - current_gems_list)
   end
 
   def switch_from_current
-    current_gems = current_gems_list
-    project_gems = GemsList.new(gems)
-
-    to_install = project_gems - current_gems
-    to_uninstall = current_gems - project_gems
+    puts 'Switching to %s:' % projects.join(", ")
+    to_install = projects_gems - current_gems_list
+    to_uninstall = current_gems_list - projects_gems
 
     install_gems_list(to_install)
     uninstall_gems_list(to_uninstall)
   end
 
   def uninstall
-    puts "Uninstalling all gems and versions in '%s'" % project
-    uninstall_gems_list(GemsList.new(gems))
+    puts "Uninstalling all gems and versions in '%s'" % projects.join(", ")
+    uninstall_gems_list(projects_gems)
   end
 
   private
@@ -93,6 +86,12 @@ class Gems
     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|

data/lib/gems_config.rb

@@ -7,7 +7,7 @@ class GemsConfig
   def initialize(name)
     @name = name
   end
-  
+
   def add_gems(file)
     new_gems = GemsParser.new(file).gems
     new_gems.each do |gemname, versions|
@@ -41,11 +41,20 @@ class GemsConfig
     save_config
   end
 
-  # Load gems. Old data is automatically converted to new data.
+  # Load gems.
+  #
+  # Returns a GemsList.
+  #
+  # Old data structures are automatically converted to new data structures.
   def gems
-    gem_data = (project['gems'] ||= {})
-    return gem_data if gem_data.kind_of? Hash
-    new_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
@@ -59,7 +68,7 @@ class GemsConfig
   end
 
   protected
-  
+
   def add_gem(gemname, version)
     gems[gemname] ||= []
     gems[gemname] << version

data/lib/gems_list.rb

@@ -19,6 +19,19 @@ class GemsList < Hash
     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|
@@ -27,4 +40,8 @@ class GemsList < Hash
       end
     end
   end
+
+  def longest_key_length
+    map{|key, value| key.to_s.size}.max || 0
+  end
 end

data/lib/gems_parser.rb

@@ -18,7 +18,7 @@ class GemsParser
   private
 
   def parse_gems
-    parsed_gems = {}
+    parsed_gems = GemsList.new
     str.each do |line|
       gemname, *versions = line.split(" ")
       next if gemname.to_s.size == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Narnach-gems
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 -07:00
+date: 2008-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,11 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- gems.gemspec
 - bin/gems
 - lib/gems.rb
 - lib/gems_config.rb
 - lib/gems_parser.rb
-- gems.gemspec
 - lib/gems_list.rb
 has_rdoc: true
 homepage: http://www.github.com/Narnach/gems