gem-prune 2.0.1 → 2.1.0

data/lib/gem-prune.rb

@@ -1,3 +1 @@
-module GemPrune
-  VERSION = "2.0.1"
-end
+require "gem_prune"

data/lib/gem/commands/keep_command.rb

@@ -1,8 +1,11 @@
-require 'rubygems/command'
-require 'rubygems/command_manager'
+require "rubygems/command"
+require "rubygems/command_manager"
+require "gem/prune/util"
 
 class Gem::Commands::KeepCommand < Gem::Command
 
+  include Gem::Prune::Util
+
   def initialize
     super 'keep', 'Mark a gem for keeping'
     
@@ -13,54 +16,14 @@ class Gem::Commands::KeepCommand < Gem::Command
   end
 
   def execute
-    gem = get_one_gem_name
+    keep_gem = get_one_gem_name
     load_configuration
-    gems_to_keep[gem] ||= []
-    gems_to_keep[gem]  << options[:version]
-    gems_to_keep[gem]   = gems_to_keep[gem].uniq.compact
+    entry = gems_to_keep.detect { |(gem, versions)| gem == keep_gem }
+    entry[1] << options[:version]
+    entry[1] = entry[1].uniq.compact
     save_configuration
   end
 
 private ######################################################################
 
-  def load_configuration
-    @configuration ||= begin
-      config = YAML::load_file(settings_filename)
-      config = upgrade_configuration(config) if config.first.first == "keep"
-      unpack_configuration(config)
-    end
-  end
-
-  def save_configuration
-    File.open(settings_filename, "w") do |file|
-      file.puts(YAML::dump(pack_configuration(@configuration)))
-    end
-  end
-
-  def unpack_configuration(config)
-    config.inject({}) do |memo, (gem, keep)|
-      memo.update(gem => keep)
-    end
-  end
-
-  def pack_configuration(config)
-    config.map do |gem, keep|
-      [gem, keep]
-    end.sort_by(&:first)
-  end
-
-  def upgrade_configuration(config)
-    config["keep"].map do |gem|
-      [gem, []]
-    end
-  end
-
-  def gems_to_keep
-    @configuration
-  end
-
-  def settings_filename
-    File.expand_path('~/.gem-prune')
-  end
-
 end

data/lib/gem/commands/prune_command.rb

@@ -1,11 +1,14 @@
-require 'rubygems/command'
-require 'rubygems/command_manager'
-require 'rubygems/uninstaller'
-require 'gem/prune/gem'
-require 'gem/prune/version'
+require "rubygems/command"
+require "rubygems/command_manager"
+require "rubygems/uninstaller"
+require "gem/prune/gem"
+require "gem/prune/version"
+require "gem/prune/util"
 
 class Gem::Commands::PruneCommand < Gem::Command
 
+  include Gem::Prune::Util
+
   def initialize
     super 'prune', 'Identify and remove old gems'
   end
@@ -51,42 +54,6 @@ private ######################################################################
     end
   end
 
-  def load_configuration
-    @configuration ||= begin
-      config = YAML::load_file(settings_filename)
-      config = upgrade_configuration(config) if config.first.first == "keep"
-      unpack_configuration(config)
-    end
-  end
-
-  def save_configuration
-    File.open(settings_filename, "w") do |file|
-      file.puts(YAML::dump(pack_configuration(@configuration)))
-    end
-  end
-
-  def unpack_configuration(config)
-    config.inject({}) do |memo, (gem, keep)|
-      memo.update(gem => keep)
-    end
-  end
-
-  def pack_configuration(config)
-    config.map do |gem, keep|
-      [gem, keep]
-    end.sort_by(&:first)
-  end
-
-  def upgrade_configuration(config)
-    config["keep"].map do |gem|
-      [gem, []]
-    end
-  end
-
-  def gems_to_keep
-    @configuration
-  end
-
   def mark_kept_versions
     gems.each do |name, gem|
       mark_kept(gem.versions.sort.last)
@@ -110,20 +77,8 @@ private ######################################################################
     version.dependencies.each { |v| mark_kept(v) }
   end
 
-  def versions_to_keep
-    versions_with_kept_flag(true)
-  end
-
   def versions_to_prune
-    versions_with_kept_flag(false)
-  end
-
-  def versions_with_kept_flag(value)
-    gems.map { |name, gem| gem.versions }.flatten.select { |v| v.keep == value }
-  end
-
-  def settings_filename
-    File.expand_path('~/.gem-prune')
+    gems.map { |name, gem| gem.versions }.flatten.select { |v| v.keep == false }
   end
 
 end

data/lib/gem/prune/util.rb

@@ -0,0 +1,30 @@
+module Gem; module Prune; module Util
+
+  def settings_filename
+    File.expand_path('~/.gem-prune')
+  end
+
+  def gems_to_keep
+    @configuration
+  end
+
+  def load_configuration
+    @configuration ||= File.read(settings_filename).split("\n").map do |line|
+      gem, versions = line.split(' ', 2)
+      versions = versions.to_s.gsub(/[\(\)]/, '').split(', ')
+      [gem, versions]
+    end
+  end
+
+  def save_configuration
+    File.open(settings_filename, "w") do |file|
+      formatted = @configuration.map do |gem, versions|
+        version_string = versions.length.zero? ? "" : " (%s)" % versions.join(", ")
+        "#{gem}#{version_string}"
+      end.join("\n")
+
+      file.puts formatted
+    end
+  end
+
+end; end; end

data/lib/gem_prune.rb

@@ -0,0 +1,3 @@
+module GemPrune
+  VERSION = "2.1.0"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-prune
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - |
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,9 @@ files:
 - lib/gem/commands/keep_command.rb
 - lib/gem/commands/prune_command.rb
 - lib/gem/prune/gem.rb
+- lib/gem/prune/util.rb
 - lib/gem/prune/version.rb
+- lib/gem_prune.rb
 - lib/rubygems_plugin.rb
 - spec/gem-prune_spec.rb
 - spec/spec_helper.rb