gem-wrappers 1.2.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: e3c4b6e90e5eb8b635169e54b0c976962c082222
-  metadata.gz: 38d025a4910fed667ee8de884032a87729e549e0
 SHA512: 
-  data.tar.gz: 13d86554a5436703e8215f875811db78ecbab2b200cb01272845acc227ac850ff0e87029dd8a8974f0fd3609c6e17cf5c9c03e6fac22b5f582855c2545bc4bb8
-  metadata.gz: 3413b198ab7c93a41c7b4a1a5f27100d30dfb50fe54a918b927cdcbffe907841bbc99eff6e10267f9ecc1ca8b64912d849523450811d3fe6acb4a5d35d661e6a
+  metadata.gz: f04d42e70ec2f1b65a3167be83d17b22f08e7d419a4c8c4675140df95cee9f382dbc9a3537d64598029f3b0048e9fe2965ee692141844eb016d351147b656a83
+  data.tar.gz: 9b8d907ec0e80f40330183cf43f8f3c73aeffe51d80c1d94cc9195ba6c7e1d66c9e7ffb712bfb03d0c8b5324341d0ce15e4b12a62fe899e4982721fcc3f9387a
+SHA1: 
+  metadata.gz: 3da6f9a3645a2a752f684fa30ba1e514725505ce
+  data.tar.gz: c9c8d345caa1e083d3da736731ef61e0dc47291a

data/.travis.yml

@@ -5,10 +5,12 @@ rvm:
   - jruby
   - ruby-head
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.1
   - rbx
 notifications:
   irc:

data/Changelog.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 1.3.0
+date: 2017-07-08
+
+- add check if target files actually exist and are executable, fix #9
+- silence ivar warning in rubygems test suite, fix #7
+
+## 1.2.7
+date: 2014-10-10
+
+- improved command handling
+
+## 1.2.6.1
+date: 2014-10-10
+
+- improved output of listing executables
+
+## 1.2.6
+date: 2014-10-10
+
+- show list of executables
+- show info when `$GEM_WRAPPERS_DEBUG` is set
+
 ## 1.2.5
 date: 2014-05-27
 

data/gem-wrappers.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.extensions  = %w( ext/wrapper_generator/extconf.rb )
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("minitest")
+  s.add_development_dependency("rake", "<11")
+  s.add_development_dependency("minitest", "<6")
   # s.add_development_dependency("smf-gem")
 end

data/lib/gem-wrappers/environment.rb

@@ -17,7 +17,7 @@ module GemWrappers
     end
 
     def path_take
-      return @path_take if @path_take
+      return @path_take if defined? @path_take
       @path_take = Gem.configuration && Gem.configuration[:wrappers_path_take] || 1
       @path_take += gem_path.size
     end

data/lib/gem-wrappers/installer.rb

@@ -22,7 +22,12 @@ module GemWrappers
     def ensure
       FileUtils.mkdir_p(wrappers_path) unless File.exist?(wrappers_path)
       # exception based on Gem::Installer.generate_bin
-      raise Gem::FilePermissionError.new(wrappers_path) unless File.writable?(wrappers_path)
+      unless File.writable?(wrappers_path)
+        raise Gem::FilePermissionError.new(wrappers_path)
+      end
+      unless @environment_file
+        raise "Missing environment file for initialize!"
+      end
     end
 
     def uninstall(executable)
@@ -31,19 +36,36 @@ module GemWrappers
     end
 
     def install(executable)
-      raise "Missing environment file for initialize!" unless @environment_file
+      target_path = find_executable_path(executable)
+      unless target_path
+        warn "GemWrappers: Can not wrap missing file: #{executable}"
+        return
+      end
+      unless File.executable?(target_path)
+        warn "GemWrappers: Can not wrap not executable file: #{target_path}"
+        return
+      end
       @executable = executable
       content = ERB.new(template).result(binding)
       install_file(executable, content)
-      install_ty_formatted(executable, content)
+      install_to_formatted(executable, content)
+    end
+
+    def find_executable_path(executable)
+      return executable if File.exist?(executable)
+      ENV['PATH'].split(File::PATH_SEPARATOR).each { |dir|
+        full_path = File.join(dir, executable)
+        return full_path if File.exist?(full_path)
+      }
+      nil
     end
 
-    def install_ty_formatted(executable, content)
-      formated_executble = @executable_format % executable
+    def install_to_formatted(executable, content)
+      formatted_executable = @executable_format % executable
       if
-        formated_executble != executable
+        formatted_executable != executable
       then
-        install_file(formated_executble, content)
+        install_file(formatted_executable, content)
       end
     end
 

data/lib/gem-wrappers/version.rb

@@ -1,3 +1,3 @@
 module GemWrappers
-  VERSION = "1.2.7"
+  VERSION = "1.3.0"
 end

data/test/gem-wrappers/installer_test.rb

@@ -89,14 +89,52 @@ describe GemWrappers::Installer do
       end
     end
 
+    it "does not creates wrapper if target missing" do
+      subject.instance_variable_set(:@wrappers_path, @test_path)
+      script_path = File.join(subject.wrappers_path, "example", "test.ksh")
+      full_path = File.join(subject.wrappers_path, "test.ksh")
+      File.exist?(full_path).must_equal(false)
+      subject.ensure
+      mock_method = MiniTest::Mock.new
+      mock_method.expect :call, nil, ["GemWrappers: Can not wrap missing file: #{script_path}"]
+      subject.stub(:warn, mock_method) do
+        subject.install(script_path)
+      end
+      mock_method.verify
+      File.exist?(full_path).must_equal(false)
+    end
+
+    it "does not creates wrapper if file not executable" do
+      subject.instance_variable_set(:@wrappers_path, @test_path)
+      scripts_path = File.join(subject.wrappers_path, "example")
+      FileUtils.mkdir_p(scripts_path)
+      script_path = File.join(scripts_path, "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
+      mock_method = MiniTest::Mock.new
+      mock_method.expect :call, nil, ["GemWrappers: Can not wrap not executable file: #{script_path}"]
+      subject.stub(:warn, mock_method) do
+        subject.install(script_path)
+      end
+      mock_method.verify
+      File.exist?(full_path).must_equal(false)
+    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")
+      scripts_path = File.join(subject.wrappers_path, "example")
+      FileUtils.mkdir_p(scripts_path)
+      script_path = File.join(scripts_path, "test.sh")
       FileUtils.mkdir_p(File.join(subject.wrappers_path, "example"))
       File.open(script_path, "w") do |file|
         file.write("echo test")
       end
+      File.chmod(755, script_path)
       full_path = File.join(subject.wrappers_path, "test.sh")
       File.exist?(full_path).must_equal(false)
       subject.ensure
@@ -108,11 +146,15 @@ describe GemWrappers::Installer do
 
     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|
+      scripts_path = File.join(subject.wrappers_path, "example")
+      FileUtils.mkdir_p(scripts_path)
+      script_path = File.join(scripts_path, "test.rb")
+      File.open(script_path, "a") do |file|
         file.write("puts :test")
       end
+      File.chmod(755, script_path)
+      old_path = ENV['PATH']
+      ENV['PATH'] += File::PATH_SEPARATOR + scripts_path
       full_path = File.join(subject.wrappers_path, "test.rb")
       File.exist?(full_path).must_equal(false)
       subject.ensure
@@ -121,6 +163,7 @@ describe GemWrappers::Installer do
         file.read.must_equal(format_content("ruby #{script_path}"))
       end
       File.executable?(full_path).must_equal(true)
+      ENV['PATH'] = old_path
     end
 
     it "removes wrapper" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gem-wrappers
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.3.0
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,27 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-10 00:00:00 Z
+date: 2017-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id002 
-      - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "11"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id002
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "6"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: 
 email: 
 - mpapis@gmail.com
@@ -76,22 +77,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id002
+  - &id003 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id002
+  - *id003
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.17
 signing_key: 
 specification_version: 4
 summary: Create gem wrappers for easy use of gems in cron and other system locations.
-test_files: 
-- test/gem-wrappers/command_test.rb
-- test/gem-wrappers/environment_test.rb
-- test/gem-wrappers/fakes.rb
-- test/gem-wrappers/installer_test.rb
-- test/gem-wrappers/specification_and_version_test.rb
-- test/gem-wrappers_test.rb
-- test/test_helper.rb
+test_files: []
+