gem-wrappers 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 8760f42ee3404a92db5666a4c13f651ea101ba65
-  metadata.gz: 3042f776a429469c017f523557261b0a453c6204
-SHA512: 
-  data.tar.gz: c90e21bcd1906252f3948f79691ecf9298eebbb6a28f620fa67b66e3b603a626d2e9635619d8389bf3c921e0651c898ae904077a6c2aa95b91c0863ebf26b7d8
-  metadata.gz: 5c32a9e16c6d3622151b46ef54fbbd0bc8e7553644e2961f32b8828322dfc4381dd6f39e79c05187defca3d4f07c533067dcea19a6e09d281d5396b455229cd1
+---
+SHA1:
+  metadata.gz: 86a58106c9a11be5ed1d3a1e7d88f2d7418b3752
+  data.tar.gz: 6df162cbfbe63de825949ad7b4138138a27f63da
+SHA512:
+  metadata.gz: 90e94c807854494b09eb8008f17dc576dbb79effe2f3c437d1269427482be4569f29312631a8b36b7253291759ab7d2adba375118de4ac9e61fc6edeff33efb3
+  data.tar.gz: 52da011fcb220741b5d40ee5300963362ff97202aa6ad71f1b1fcd8474c25f16b4953c773277ff410a41ca5c4a2724bc418574e12024ed64bd05bde4ffc6f10c

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.0
+date: 2017-09-22
+
+- add option to show full path to single file
+- list actual list of generated wrappers in show
+
 ## 1.3.2
 date: 2017-09-10
 

data/README.md

@@ -53,7 +53,7 @@ gem install unicorn
 The `unicorn` wrapper is located in `$GEM_HOME/wrappers`:
 
 ```bash
-ls `gem env gemhome`/wrappers/unicorn
+gem wrappers show unicorn
 ```
 
 ```ssh
@@ -91,7 +91,7 @@ export GEM_PATH="<%= gem_path.join(":") %>"
 export GEM_HOME="<%= gem_home %>"
 ```
 
-The path elements are calculated using this algorithm:
+The `path` elements are calculated using this algorithm:
 
 ```ruby
 ENV['PATH'].split(":").take(Gem.path.size + path_take)

data/lib/gem-wrappers.rb

@@ -1,7 +1,10 @@
+require 'rbconfig'
 require 'gem-wrappers/environment'
 require 'gem-wrappers/installer'
 
 module GemWrappers
+  class Exception < Gem::Exception ; end
+  class NoWrapper < Exception ; end
 
   def self.environment
     @environment ||= GemWrappers::Environment.new
@@ -36,18 +39,42 @@ module GemWrappers
     installer.wrappers_path
   end
 
+  def self.wrapper_path(exe)
+    file = File.join(wrappers_path, exe)
+    if executable?(file)
+      file
+    else
+      raise GemWrappers::NoWrapper, "No wrapper: #{file}"
+    end
+  end
+
+  def self.installed_wrappers
+    executables_in_directory(wrappers_path).sort.uniq
+  end
+
+  def self.gems_executables
+    # do not use map(&:...) - for ruby 1.8.6 compatibility
+    @executables ||= GemWrappers::Specification.installed_gems.map{|gem| gem.executables }.inject{|sum, n| sum + n }.uniq || []
+  end
+
   def self.environment_file
     environment.file_name
   end
 
-  private
-
   def self.ruby_executables
-    bindir = RbConfig::CONFIG["bindir"].sub(/\/+\z/, '')
-    Dir.entries(bindir).select do |file|
-      path = "#{bindir}/#{file}"
-      !File.directory?(path) && File.executable?(path)
+    executables_in_directory(RbConfig::CONFIG["bindir"].sub(/\/+\z/, ''))
+  end
+  private_class_method :ruby_executables
+
+  def self.executables_in_directory(dir)
+    Dir.entries(dir).select do |file|
+      executable?(File.join(dir, file))
     end
   end
+  private_class_method :executables_in_directory
 
+  def self.executable?(path)
+    !File.directory?(path) && File.executable?(path)
+  end
+  private_class_method :executable?
 end

data/lib/gem-wrappers/command.rb

@@ -32,7 +32,7 @@ DOC
     subcommand = args.shift || ''
     case subcommand
     when '', 'show'
-      execute_show(args)
+      args.empty? ? execute_show : execute_show_path(args.first)
     when 'regenerate'
       execute_regenerate(args)
     when FileExist
@@ -42,8 +42,12 @@ DOC
     end
   end
 
-  def execute_show(list = [])
-    list = executables if list.empty?
+  def execute_show_path(exe)
+    $stdout.puts gem_wrappers.wrapper_path(exe)
+  end
+
+  def execute_show
+    list = gem_wrappers.installed_wrappers
     $stdout.puts description
     $stdout.puts "   Wrappers path: #{gem_wrappers.wrappers_path}"
     $stdout.puts "Environment file: #{gem_wrappers.environment_file}"
@@ -57,7 +61,7 @@ DOC
   end
 
   def execute_regenerate(list = [])
-    list = executables if list.empty?
+    list = gem_wrappers.gems_executables if list.empty?
     execute_show(list) if ENV['GEM_WRAPPERS_DEBUG']
     gem_wrappers.install(list)
   end
@@ -67,11 +71,6 @@ private
   def gem_wrappers
     @gem_wrappers ||= GemWrappers
   end
-
-  def executables
-    # do not use map(&:...) - for ruby 1.8.6 compatibility
-    @executables ||= GemWrappers::Specification.installed_gems.map{|gem| gem.executables }.inject{|sum, n| sum + n } || []
-  end
 end
 
 require 'gem-wrappers/command/file_exist'

data/lib/gem-wrappers/version.rb

@@ -1,3 +1,3 @@
 module GemWrappers
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/test/gem-wrappers/command_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'pathname'
 require 'tempfile'
 require 'gem-wrappers/command'
 require 'gem-wrappers/fakes'
@@ -8,9 +9,11 @@ describe WrappersCommand do
     WrappersCommand.new
   end
 
+  let(:gems) { %w[rake ruby] }
+
   before do
-    @fake_installer = GemWrappers::Fake.new
-    subject.instance_variable_set(:@gem_wrappers, @fake_installer)
+    @fake_wrappers = GemWrappers::Fake.new(gems)
+    subject.instance_variable_set(:@gem_wrappers, @fake_wrappers)
     $stdout = StringIO.new
     $stderr = StringIO.new
   end
@@ -36,23 +39,30 @@ describe WrappersCommand do
   end
 
   it "does show" do
-    subject.options[:args] = ["show", "rake"]
+    subject.options[:args] = ["show"]
     subject.execute
 
     $stderr.string.must_equal("")
-    $stdout.string.must_equal(<<-EXPECTED)
-#{subject.description.strip}
+    $stdout.string.must_match(%r{\
+#{Regexp.escape(subject.description.strip)}
    Wrappers path: /path/to/wrappers
 Environment file: /path/to/environment
-     Executables: rake
-EXPECTED
+     Executables: rake, ruby
+})
+  end
+
+  it "does show rake" do
+    subject.options[:args] = ["show", "rake"]
+    subject.execute
+
+    $stderr.string.must_equal("")
+    $stdout.string.must_equal("/path/to/wrappers/rake\n")
   end
 
   it "regenerates wrappers" do
-    subject.instance_variable_set(:@executables, %w{rake})
-    subject.options[:args] = ['regenerate']
+    subject.options[:args] = %w{regenerate rake}
     subject.execute
-    @fake_installer.executables.must_equal(%w{rake})
+    @fake_wrappers.executables.must_equal(%w{rake})
   end
 
   describe "script wrappers" do
@@ -68,20 +78,15 @@ EXPECTED
     it "generates script wrapper full path" do
       subject.options[:args] = [@file.path]
       subject.execute
-      @fake_installer.executables.must_equal([@file.path])
+      @fake_wrappers.executables.must_equal([@file.path])
     end
 
     it "generates script wrapper relative" do
       Dir.chdir(File.dirname(@file.path)) do
         subject.options[:args] = [File.basename(@file.path)]
         subject.execute
-        @fake_installer.executables.must_equal([Pathname.new(@file.path).realpath.to_s])
+        @fake_wrappers.executables.must_equal([Pathname.new(@file.path).realpath.to_s])
       end
     end
   end
-
-  it "finds gem executables" do
-    subject.send(:executables).must_include('rake')
-  end
-
 end

data/test/gem-wrappers/fakes.rb

@@ -34,7 +34,8 @@ module GemWrappers
     end
   end
   class Fake
-    def initialize
+    def initialize(gems)
+      @gems = gems
       @executables = []
     end
     def install(executables)
@@ -52,5 +53,19 @@ module GemWrappers
     def wrappers_path
       "/path/to/wrappers"
     end
+    def wrapper_path(exe)
+      file = File.join(wrappers_path, exe)
+      if @gems.include?(exe)
+        file
+      else
+        raise GemWrappers::NoWrapper, "No wrapper: #{file}"
+      end
+    end
+    def installed_wrappers
+      @gems
+    end
+    def gems_executables
+      @gems
+    end
   end
 end

data/test/gem-wrappers_test.rb

@@ -72,7 +72,7 @@ GEMRC
       FileUtils.rm_rf(@test_path)
     end
 
-    it "installas wrappers" do
+    it "installas wrappers and finds wrapper path" do
       File.exist?(@rake_wrapper).must_equal(false)
       subject.install(%w{rake})
       File.exist?(@rake_wrapper ).must_equal(true)
@@ -87,6 +87,38 @@ GEMRC
       subject.uninstall(%w{rake})
       File.exist?(@rake_wrapper ).must_equal(false)
     end
+
+    it "finds gem executables" do
+      subject.send(:gems_executables).must_include("rake")
+    end
+
+    it "shows rake in executables" do
+      Dir.mkdir(@wrappers_path)
+      File.open(@rake_wrapper, "w") { |f| f.write("") }
+      File.chmod(0755, @rake_wrapper)
+      subject.installed_wrappers.must_equal(["rake"])
+    end
+
+    it "finds rake path" do
+      Dir.mkdir(@wrappers_path)
+      File.open(@rake_wrapper, "w") { |f| f.write("") }
+      File.chmod(0755, @rake_wrapper)
+      subject.wrapper_path("rake").must_equal(@rake_wrapper)
+    end
+
+    it "doesn't find rake path when not executable" do
+      Dir.mkdir(@wrappers_path)
+      File.open(@rake_wrapper, "w") { |f| f.write("") }
+      proc {
+        subject.wrapper_path("rak2e")
+      }.must_raise(GemWrappers::NoWrapper)
+    end
+
+    it "doesn't find rake path when missing" do
+      proc {
+        subject.wrapper_path("rak2e")
+      }.must_raise(GemWrappers::NoWrapper)
+    end
   end
 
 end

metadata

@@ -1,46 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gem-wrappers
-version: !ruby/object:Gem::Version 
-  version: 1.3.2
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2017-09-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-09-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        version: "11"
+      - !ruby/object:Gem::Version
+        version: '11'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '11'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        version: "6"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '6'
 description: 
-email: 
+email:
 - mpapis@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/wrapper_generator/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Changelog.md
@@ -66,32 +71,30 @@ files:
 - test/gem-wrappers_test.rb
 - test/test_helper.rb
 homepage: https://github.com/rvm/gem-wrappers
-licenses: 
+licenses:
 - Apache 2.0
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id003 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.17
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Create gem wrappers for easy use of gems in cron and other system locations.
-test_files: 
+test_files:
 - test/gem-wrappers/command_test.rb
 - test/gem-wrappers/environment_test.rb
 - test/gem-wrappers/fakes.rb