Narnach-gems 0.1.5 → 0.1.7

data/README.rdoc

@@ -5,8 +5,14 @@ Rails code would not get into dependency issues.
 
 == Recent changes
 
+=== Version 0.1.7
+Gem install only installs missing gems; it does not re-install gems.
+
+=== Version 0.1.6
+Added gems diff and gems switch commands to make it easy to compare and switch the gems of multiple projects.
+
 === Version 0.1.5
-Gem import accepts 'current' as a special file name, which will use the output
+Gems import accepts 'current' as a special file name, which will use the output
 of 'gem list' instead of a real file. This makes it easy to store the current gem configuration.
 
 === Version 0.1.4
@@ -50,9 +56,15 @@ Output if 'gems help', with some changes to make them legible in RDoc:
 
   Actions and arguments:
     install 'name'
-      Install all gems in project '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'

data/bin/gems

@@ -35,6 +35,12 @@ when 'add'
   gems_config = GemsConfig.new(project)
   gems_file = ARGV.shift.to_s.strip
   gems_config.add_gems(gems_file)
+when 'diff'
+  gems = Gems.new project
+  gems.diff_current
+when 'switch'
+  gems = Gems.new project
+  gems.switch_from_current
 else 'help'
   puts <<-EOS
 Syntax:
@@ -42,9 +48,15 @@ Syntax:
 
 Actions and arguments:
   install <name>
-    Install all gems in project <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>

data/gems.gemspec

@@ -3,7 +3,7 @@ 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.5'
+  s.version      = '0.1.7'
   s.date         = '2008-08-19'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]
@@ -14,7 +14,7 @@ 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']
+  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   = []
 
   # rdoc

data/lib/gems.rb

@@ -1,4 +1,12 @@
 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
@@ -9,28 +17,63 @@ class Gems
     @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
+
+    puts 'Gems unique to "%s":' % project
+    print_gem_list(not_in_current)
+    puts
+    puts 'Gems unique to the current gems list:'
+    print_gem_list(in_current)
+  end
+
   def list
     puts 'Gems in "%s":' % project
-    gems.each do |gemname, versions|
-      line = "%#{longest_gem_name_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
+    print_gem_list(gems)
   end
 
   def install
     puts "Installing all gems and versions in '%s'" % project
+    install_gems_list(GemsList.new(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
+
+    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))
+  end
+
+  private
+
+  def current_gems_list
+    @current_gems_list ||= GemsParser.new('current').gems
+  end
+
+  def install_gems_list(gems)
     results = {}
-    each_gem_with_version do |gemname, version|
-      cmd = "sudo gem install --ignore-dependencies --no-rdoc --no-ri -v %s %s" % [version, gemname]
-      if gems_config.options_for(gemname).size > 0
-        cmd << ' -- %s' % gems_config.options_for(gemname).join(" ")
+    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
-      puts cmd
-      result = system(cmd)
-      results['%s-%s' % [gemname, version]] = result
     end
     successful = results.select {|gemname, success| success}
     unsuccessful = results.select {|gemname, success| !success}
@@ -40,11 +83,20 @@ class Gems
     puts "Failed to install: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
   end
 
-  def uninstall
-    puts "Uninstalling all gems and versions in '%s'" % project
+  def print_gem_list(gems)
+    gems.each do |gemname, versions|
+      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 uninstall_gems_list(gems)
     results = {}
-    each_gem_with_version do |gemname, version|
-      cmd = "sudo gem uninstall --ignore-dependencies --executables -v %s %s" % [version, gemname]
+    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
@@ -56,19 +108,4 @@ class Gems
     puts
     puts "Failed to uninstall: %s" % unsuccessful.map{|ary| ary[0]}.sort.join(", ")
   end
-
-  private
-
-  def each_gem_with_version(&block)
-    raise ArgumentError, 'No block provided' unless block
-    gems.each do |gemname, versions|
-      versions.each do |version|
-        block.call(gemname, version)
-      end
-    end
-  end
-
-  def longest_gem_name_length
-    gems.map{|ary| ary[0].size}.max
-  end
 end

data/lib/gems_list.rb

@@ -0,0 +1,30 @@
+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
+
+  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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Narnach-gems
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -31,6 +31,7 @@ files:
 - lib/gems_config.rb
 - lib/gems_parser.rb
 - gems.gemspec
+- lib/gems_list.rb
 has_rdoc: true
 homepage: http://www.github.com/Narnach/gems
 post_install_message: