gem-empty 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349a468f9781f3f46f9c6f00443a19f910af56a0
-  data.tar.gz: 8d643f44c77a4c93f7d98aa333f580126a77b32b
+  metadata.gz: 7f5c71134ce63c0676f82574890f682cdda5b639
+  data.tar.gz: d2e74beb3bd6d83b4803ff779ed67f46de8e709c
 SHA512:
-  metadata.gz: 86cb35d631293e0b1ae0bab92ed98811f2e88947512e64a4212f66358c770093860f6919303fdb0f71fb008261461c33643b76fbd55e91b2e68f5bdc8f87aad2
-  data.tar.gz: 83a4ee04e44e69b7bed6a4842b8f2e991b7f3b72ee79bae0122e5ccfc51c37a2e55185fb69f64545162bea9d48d4ef7312b08bb313ef01441ad7d601ad10f713
+  metadata.gz: b0dc26037a708dfecb4ab473044e84334025ef219afb7d7308c26017757ba70146b909645cc66671c91da3af8790ff30ae3be7b3093f2f193cfb614a65da97e2
+  data.tar.gz: a72f40a5c5e9eaaf445f0e834054d56d0929fb9923f2b2f5ebb792e86f90fcb557d3116ed340d6d3f0232511f13a1b708a79d9e73708db9dcbf72c30cd915c8d

data/lib/gem-empty/command.rb

@@ -4,12 +4,19 @@ require 'rubygems/uninstaller'
 require 'rubygems/version'
 require 'fileutils'
 
+# rubygems plugin to empty GEM_HOME
 class EmptyCommand < Gem::Command
   attr_reader :options
 
+  GEM_REMOVAL_ERRORS = [
+    Gem::DependencyRemovalException,
+    Gem::InstallError,
+    Gem::GemNotInHomeException,
+    Gem::FilePermissionError,
+  ]
+
   def initialize
-    super 'empty', 'Remove all gems from current GEM_HOME.'
-    @default_options = { :install_dir => Gem.dir, :force => true, :executables => true }
+    super 'empty', description
   end
 
   def arguments # :nodoc:
@@ -25,34 +32,51 @@ class EmptyCommand < Gem::Command
   end
 
   def description # :nodoc:
-    <<-DOC
-Remove all gems from current 'GEM_HOME'.
-DOC
+    "Remove all gems from current 'GEM_HOME'."
   end
 
   def execute(opts = {})
-    @options = @default_options.merge(opts)
-    uninstaller = Gem::Uninstaller.new(nil, options)
-    uninstaller.remove_all(gem_dir_specs)
+    remove_gems(opts)
+  rescue *GEM_REMOVAL_ERRORS => exception
+    alert_error "#{exception.class}: #{exception.message}"
+  end
 
-    # Remove any Git gems installed via bundler
-    FileUtils.rm_rf( File.join( options[:install_dir] ,'bundler','gems' ) )
+private
 
-  rescue Gem::DependencyRemovalException,
-         Gem::InstallError,
-         Gem::GemNotInHomeException,
-         Gem::FilePermissionError => e
+  # A method so it's evaluated as late as possible
+  # giving chance to change Gem.dir
+  def self.default_options
+    {
+      :install_dir => Gem.dir,
+      :force       => true,
+      :executables => true,
+    }
+  end
 
-    alert_error "#{e.class}: #{e.message}"
+  def remove_gems(opts)
+    @options = self.class.default_options.merge(opts)
+    remove_rubygems_gems
+    remove_bundler_gems
   end
 
-private
+  def remove_rubygems_gems
+    uninstaller = Gem::Uninstaller.new(nil, options)
+    uninstaller.remove_all(gem_dir_specs)
+  end
+
+  def remove_bundler_gems
+    FileUtils.rm_rf( File.join( gem_install_dir, 'bundler','gems' ) )
+  end
 
   def gem_dir_specs
     @gem_dir_specs ||=
     GemEmpty::Specification.installed_gems.select do |spec|
-      File.exists?( File.join( options[:install_dir], 'gems', spec.full_name ) )
+      File.exists?( File.join( gem_install_dir, 'gems', spec.full_name ) )
     end
   end
 
+  def gem_install_dir
+    options[:install_dir]
+  end
+
 end

data/lib/gem-empty/specification.rb

@@ -1,17 +1,21 @@
 module GemEmpty
+  # monkey patch rubygems specification to easily find gem version
   module Specification
     def self.installed_gems
-      if Gem::VERSION > '1.8' then
+      if
+        Gem::VERSION > '1.8'
+      then
         Gem::Specification.to_a
       else
         Gem.source_index.map{|name,spec| spec}
       end
     end
-    def self.find(name = "gem-empty")
-      @gem_empty_spec ||= installed_gems.find{|spec| spec.name == name}
+    def self.find_gem_spec(name)
+      installed_gems.find{|spec| spec.name == name}
     end
-    def self.version
-      find ? find.version.to_s : nil
+    def self.gem_loaded?(name, version)
+      spec = find_gem_spec(name)
+      spec && spec.version.to_s == version
     end
   end
 end

data/lib/gem-empty/version.rb

@@ -1,3 +1,3 @@
 module GemEmpty
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/rubygems_plugin.rb

@@ -5,10 +5,9 @@ called_path, called_version = __FILE__.match(/^(.*\/gem-empty-([^\/]+)\/lib).*$/
 
 # continue only if loaded and called versions all the same, and not shared gems disabled in bundler
 if
-  ( $:.include?(called_path) || GemEmpty::Specification.version == called_version ) and
+  ( $:.include?(called_path) || GemEmpty::Specification.gem_loaded?("gem-empty", called_version) ) and
   ( !defined?(Bundler) || ( defined?(Bundler) && Bundler::SharedHelpers.in_bundle? && !Bundler.settings[:disable_shared_gems]) )
-
+then
   require 'gem-empty/command'
   Gem::CommandManager.instance.register_command :empty
-
 end

data/test/gem-empty/specification_and_version_test.rb

@@ -9,15 +9,19 @@ describe GemEmpty::Specification do
   end
 
   it "finds specification" do
-    GemEmpty::Specification.find("gem-empty").name.must_equal("gem-empty")
+    GemEmpty::Specification.find_gem_spec("gem-empty").name.must_equal("gem-empty")
   end
 
-  it "gets specification version" do
-    GemEmpty::Specification.version.must_equal(GemEmpty::VERSION)
+  it "does not find imaginary gems" do
+    GemEmpty::Specification.find_gem_spec("imaginary-gem").must_equal(nil)
   end
 
-  it "does not find imaginary gems" do
-    GemEmpty::Specification.find("imaginary-gem").must_equal(nil)
+  it "confirms specification version" do
+    GemEmpty::Specification.gem_loaded?("gem-empty", GemEmpty::VERSION).must_equal true
+  end
+
+  it "does not confirms specification version" do
+    GemEmpty::Specification.gem_loaded?("gem-empty", "0.0.0").wont_equal true
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-empty
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michal Papis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake