gem-wrappers 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd77331a83cc2f7bc061d5bec0bfa1b7fa525db4
-  data.tar.gz: c9b5fd6eec8cf8b5eaefe7aadf0eb79c32419093
+  metadata.gz: 13e6186794897ef3db5b1820064e22eb240457ea
+  data.tar.gz: 1138077c42d8823938ad6721e2f58e6bddff3e59
 SHA512:
-  metadata.gz: 7f98a163cb25c960acaa7165b6eb462f218c2b72a80c28de45cb778c3fa51069694b23c7c07820e5950bf537c72928af774acee7ea17fc1a357622bfb3278211
-  data.tar.gz: 3b9ecc914ebdb1406e2de70d14a1d933586f88c445e3fc4ad69388f599b0c884d928617896703237cd3eb0de8fc9a7ecb43cae8b6e869f3d644e196d0120ffb7
+  metadata.gz: 145a27ac7bfac5918801818cce182d93bd79193aad0b76f47fde58f4414dd50e1555fbe4ca1ae853006289fe2f1c8c3cd552c3f612c9e1966bf378b70256dbc9
+  data.tar.gz: 077e28899433286c391babbaae5b82184134aeeee8f440010405947a0b9a214fe6d6c2e6b1f207931f3c31bf3839a56313d8d8f09d0f17bdb7dc6ef815f4260e

data/Changelog.md

@@ -0,0 +1,17 @@
+# Changelog
+
+## 1.2.0
+date: 2013-12-20
+
+- Add support for generating scripts wrappers
+- Improved gems searching and tests
+
+## 1.1.0
+date: 2013-12-20
+
+- Add functionality to uninstall wrappers when gem is uninstalled
+
+## 1.0.0
+date: 2013-12-19
+
+- Stable version released

data/README.md

@@ -31,6 +31,18 @@ to rerun the process for all gems in `GEM_HOME` use:
 gem wrappers regenerate
 ```
 
+wrappers will be generated in `$GEM_HOME/wrappers/`.
+
+## Generating scripts wrappers
+
+It is possible to generate wrappers for custom scripts:
+
+```bash
+gem wrappers /path/to/script
+```
+
+a wrapper `$GEM_HOME/wrappers/script` will be generated.
+
 ## Showing current configuration
 
 To see paths that are used by gem run:

data/lib/gem-wrappers/command.rb

@@ -2,6 +2,7 @@ require 'rubygems/command_manager'
 require 'rubygems/installer'
 require 'rubygems/version'
 require 'gem-wrappers'
+require 'gem-wrappers/specification'
 
 class WrappersCommand < Gem::Command
   def initialize
@@ -33,6 +34,8 @@ DOC
       execute_show
     when 'regenerate'
       execute_regenerate
+    when FileExist
+      execute_regenerate([File.expand_path(subcommand)]) # TODO: File.expand_path not tested!
     else
       execute_unknown subcommand
     end
@@ -50,22 +53,16 @@ DOC
     false
   end
 
-  def execute_regenerate
-    GemWrappers.install(executables)
+  def execute_regenerate(list = executables)
+    GemWrappers.install(list)
   end
 
 private
 
   def executables
     # do not use map(&:...) - for ruby 1.8.6 compatibility
-    @executables ||= installed_gems.map{|gem| gem.executables }.inject{|sum, n| sum + n } || []
-  end
-
-  def installed_gems
-    if Gem::VERSION > '1.8' then
-      Gem::Specification.to_a
-    else
-      Gem.source_index.map{|name,spec| spec}
-    end
+    @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/command/file_exist.rb

@@ -0,0 +1,7 @@
+class WrappersCommand
+  class FileExist
+    def self.===(file)
+      File.exist?(file)
+    end
+  end
+end

data/lib/gem-wrappers/installer.rb

@@ -30,14 +30,22 @@ module GemWrappers
 
     def install(executable)
       raise "Missing environment file for initialize!" unless @environment_file
+      @executable = executable
       content = ERB.new(template).result(binding)
-      file_name = File.join(wrappers_path, executable)
+      file_name = File.join(wrappers_path, File.basename(executable))
       File.open(file_name, 'w') do |file|
         file.write(content)
       end
       File.chmod(0755, file_name)
     end
 
+    def executable_expanded
+      if File.extname(@executable) == ".rb"
+      then "ruby #{@executable}"
+      else @executable
+      end
+    end
+
     def template
       @template ||= <<-TEMPLATE
 #!/usr/bin/env bash
@@ -46,7 +54,7 @@ if
   [[ -s "<%= environment_file %>" ]]
 then
   source "<%= environment_file %>"
-  exec <%= executable %> "$@"
+  exec <%= executable_expanded %> "$@"
 else
   echo "ERROR: Missing RVM environment file: '<%= environment_file %>'" >&2
   exit 1

data/lib/gem-wrappers/specification.rb

@@ -1,15 +1,17 @@
 module GemWrappers
   module Specification
-    def self.find
-      @gem_wrappers_spec ||=
-        if Gem::Specification.respond_to?(:find_by_name)
-          Gem::Specification.find_by_name("gem-wrappers")
-        else
-          Gem.source_index.find_name("gem-wrappers").last
-        end
-    rescue Gem::LoadError
-      nil
+    def self.installed_gems
+      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-wrappers")
+      @gem_wrappers_spec ||= installed_gems.find{|spec| spec.name == name }
+    end
+
     def self.version
       find ? find.version.to_s : nil
     end

data/lib/gem-wrappers/version.rb

@@ -1,3 +1,3 @@
 module GemWrappers
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/gem-wrappers/command_test.rb

@@ -83,6 +83,28 @@ EXPECTED
       $stderr.string.must_equal("")
       $stdout.string.must_equal("")
     end
+
+    it "generates script wrapper" do
+      FileUtils.mkdir_p(@test_path)
+      test_file = File.join(@test_path, "test_file.sh")
+      File.open(test_file, "w") do |file|
+        file.puts "echo test"
+      end
+      Gem.configuration[:wrappers_environment_file] = File.join(@test_path, "environment")
+      Gem.configuration[:wrappers_path] =             File.join(@test_path, "wrappers")
+
+      subject.options[:args] = [test_file]
+      subject.execute
+
+      Gem.configuration[:wrappers_environment_file] = nil
+      Gem.configuration[:wrappers_path] = nil
+
+      File.exist?(File.join(@test_path, "environment")).must_equal(true)
+      File.exist?(File.join(@test_path, "wrappers", "test_file.sh")).must_equal(true)
+
+      $stderr.string.must_equal("")
+      $stdout.string.must_equal("")
+    end
   end
 
   it "finds gem executables" do

data/test/gem-wrappers/installer_test.rb

@@ -33,6 +33,16 @@ describe GemWrappers::Installer do
       FileUtils.rm_rf(@test_path)
     end
 
+    it "doe not prefix for .sh scripts" do
+      subject.instance_variable_set(:@executable, "/path/to/test.sh")
+      subject.executable_expanded.must_equal("/path/to/test.sh")
+    end
+
+    it "adds ruby prefix for .rb scripts" do
+      subject.instance_variable_set(:@executable, "/path/to/test.rb")
+      subject.executable_expanded.must_equal("ruby /path/to/test.rb")
+    end
+
     it "does create target dir" do
       subject.instance_variable_set(:@wrappers_path, @test_path)
       File.exist?(subject.wrappers_path).must_equal(false)
@@ -63,6 +73,62 @@ EXPECTED
       end
     end
 
+    it "creates shell script wrapper" do
+      subject.instance_variable_set(:@wrappers_path, @test_path)
+      script_path = File.join(subject.wrappers_path, "example", "test.sh")
+      FileUtils.mkdir_p(File.join(subject.wrappers_path, "example"))
+      File.open(script_path, "w") do |file|
+        file.write("echo test")
+      end
+      full_path = File.join(subject.wrappers_path, "test.sh")
+      File.exist?(full_path).must_equal(false)
+      subject.ensure
+      subject.install(script_path)
+      File.open(full_path, "r") do |file|
+        file.read.must_equal(<<-EXPECTED)
+#!/usr/bin/env bash
+
+if
+  [[ -s "/path/to/environment" ]]
+then
+  source "/path/to/environment"
+  exec #{script_path} "$@"
+else
+  echo "ERROR: Missing RVM environment file: '/path/to/environment'" >&2
+  exit 1
+fi
+EXPECTED
+      end
+    end
+
+    it "creates ruby script wrapper" do
+      subject.instance_variable_set(:@wrappers_path, @test_path)
+      script_path = File.join(subject.wrappers_path, "example", "test.rb")
+      FileUtils.mkdir_p(File.join(subject.wrappers_path, "example"))
+      File.open(script_path, "w") do |file|
+        file.write("puts :test")
+      end
+      full_path = File.join(subject.wrappers_path, "test.rb")
+      File.exist?(full_path).must_equal(false)
+      subject.ensure
+      subject.install(script_path)
+      File.open(full_path, "r") do |file|
+        file.read.must_equal(<<-EXPECTED)
+#!/usr/bin/env bash
+
+if
+  [[ -s "/path/to/environment" ]]
+then
+  source "/path/to/environment"
+  exec ruby #{script_path} "$@"
+else
+  echo "ERROR: Missing RVM environment file: '/path/to/environment'" >&2
+  exit 1
+fi
+EXPECTED
+      end
+    end
+
     it "removes wrapper" do
       subject.instance_variable_set(:@wrappers_path, @test_path)
       full_path = File.join(subject.wrappers_path, "rake")

data/test/gem-wrappers/specification_and_version_test.rb

@@ -4,6 +4,10 @@ require 'gem-wrappers/version'
 
 describe GemWrappers::Specification do
 
+  before do
+    GemWrappers::Specification.instance_variable_set(:@gem_wrappers_spec, nil)
+  end
+
   it "finds specification" do
     GemWrappers::Specification.find.name.must_equal("gem-wrappers")
   end
@@ -12,4 +16,8 @@ describe GemWrappers::Specification do
     GemWrappers::Specification.version.must_equal(GemWrappers::VERSION)
   end
 
+  it "does not find imaginary gems" do
+    GemWrappers::Specification.find("imaginary-gem").must_equal(nil)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-wrappers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,6 +48,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Changelog.md
 - Gemfile
 - LICENSE
 - README.md
@@ -56,6 +57,7 @@ files:
 - gem-wrappers.gemspec
 - lib/gem-wrappers.rb
 - lib/gem-wrappers/command.rb
+- lib/gem-wrappers/command/file_exist.rb
 - lib/gem-wrappers/environment.rb
 - lib/gem-wrappers/installer.rb
 - lib/gem-wrappers/specification.rb
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Create gem wrappers for easy use of gems in cron and other system locations.