ironment 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e22103ee32450e82906177426670ee179a4783f
-  data.tar.gz: 34771f4603e957fa89df5487e3e77135ae4cfb66
+  metadata.gz: b98178e9d9b70dce2165e1db18355670ba75cbaf
+  data.tar.gz: a5d25fafd95d58888723bbd1c09f7728d8067c7d
 SHA512:
-  metadata.gz: 481b3985f1e6603d067b9333798b970d349b5f1a42f7b0c0e030714086947819d07ededc5ddada9d67fe0d5925bcd922ef2bf8a8509987ccc36dabb2c75872b6
-  data.tar.gz: 5d6746488c1fe5066de1fca7b8d35b09d997dd65dffc2a45f47b13537a4cc1a1031f2aacebd5f0d2c3c862c01b2db2b271a32746c7824697e732e7e584391f23
+  metadata.gz: 736d4ac789d1e4780cc1ac93c5936f940f6ccec3c1a24b0ce9563eb665984eb2b2ae7cbee89e00023b01485f75292f8cedcd78b6dadbde2536f58936b83039aa
+  data.tar.gz: 05222e19c2b9ea8eba1db40aae476a03758e11e33f2515a3f3934b0e193c75b7483a76930ad5cad9db5c060d05d1a1842b88d51ef62d2553bc305b1ba1eb782b

data/README.md

@@ -43,6 +43,11 @@ $ yaourt -S ruby-ironment
 
 ## Changelog
 
+### 0.0.6
+
+* Correct an issue where an unreadable, untrusted runcom would cause a stacktrace.
+* Errors now contain the file subject (eg. *ironment: foo: No such file or directory*).
+
 ### 0.0.5
 
 * `iron exec` now handles EACCES, ENOENT & EISDIR like `iron trust` and `iron untrust` does.

data/lib/ironment/cl.rb

@@ -1,5 +1,27 @@
 class Ironment
   class CL
+    class << self
+      def rescue_common_exceptions(method_name)
+        new_name = "original_#{method_name}"
+
+        alias_method new_name, method_name
+
+        define_method method_name do |*args|
+          begin
+            send new_name, *args
+          rescue Ironment::AccessDenied => e
+            @err.puts "ironment: #{e.message}: Permission denied"
+          rescue Ironment::NoEntity=> e
+            @err.puts "ironment: #{e.message}: No such file or directory"
+          rescue Ironment::IsDirectory=> e
+            @err.puts "ironment: #{e.message}: Is a directory"
+          rescue Ironment::MalformedRuncom=> e
+            @err.puts "ironment: #{e.message}: Malformed runcom"
+          end
+        end
+      end
+    end
+
     def initialize(options = {})
       @ironment = options[:ironment] || Ironment.new(options)
       @prompter = options[:prompter] || Prompter.new
@@ -7,43 +29,31 @@ class Ironment
     end
 
     def exec_with_environment(command, *args)
-      @ironment.exec_with_environment command, *args
-    rescue Errno::EACCES
-      @err.puts "ironment: Permission denied"
-    rescue Errno::ENOENT
-      @err.puts "ironment: No such file or directory"
-    rescue Errno::EISDIR
-      @err.puts "ironment: Is a directory"
-    rescue Ironment::MalformedRuncom
-      @err.puts "ironment: Malformed runcom"
-    rescue Truster::NotTrusted => e
-      if @prompter.not_trusted e.runcom
-        exec_with_environment command, *args
-      end
-    rescue Truster::Modified => e
-      if @prompter.modified e.runcom
-        exec_with_environment command, *args
+      begin
+        @ironment.exec_with_environment command, *args
+      rescue Truster::NotTrusted => e
+        if @prompter.not_trusted e.runcom
+          exec_with_environment command, *args
+        end
+      rescue Truster::Modified => e
+        if @prompter.modified e.runcom
+          exec_with_environment command, *args
+        end
       end
     end
 
+    rescue_common_exceptions :exec_with_environment
+
     def trust(file)
       @ironment.trust file
-    rescue Errno::EACCES
-      @err.puts "ironment: Permission denied"
-    rescue Errno::ENOENT
-      @err.puts "ironment: No such file or directory"
-    rescue Errno::EISDIR
-      @err.puts "ironment: Is a directory"
     end
 
+    rescue_common_exceptions :trust
+
     def untrust(file)
       @ironment.untrust file
-    rescue Errno::EACCES
-      @err.puts "ironment: Permission denied"
-    rescue Errno::ENOENT
-      @err.puts "ironment: No such file or directory"
-    rescue Errno::EISDIR
-      @err.puts "ironment: Is a directory"
     end
+
+    rescue_common_exceptions :untrust
   end
 end

data/lib/ironment/exec.rb

@@ -0,0 +1,7 @@
+class Ironment
+  class Exec
+    def exec(command, *args)
+      Kernel.exec command, *args
+    end
+  end
+end

data/lib/ironment/executor.rb

@@ -1,7 +1,19 @@
+require "ironment/exec"
+
 class Ironment
   class Executor
+    def initialize(options = {})
+      @exec = options[:exec] || Exec.new
+    end
+
     def exec(command, *args)
-      Kernel.exec command, *args
+      @exec.exec command, *args
+    rescue Errno::EACCES
+      raise AccessDenied, command
+    rescue Errno::ENOENT
+      raise NoEntity, command
+    rescue Errno::EISDIR
+      raise IsDirectory, command
     end
   end
 end

data/lib/ironment/runcom.rb

@@ -24,12 +24,14 @@ class Ironment
       @file == other.file
     end
 
+    private
+
     def content
       @content ||= File.read(file)
+    rescue Errno::EACCES
+      raise AccessDenied, file
     end
 
-    private
-
     def read_pairs
       Hash[*content.split(/\n/).reject { |line|
         /^\s*#/ =~line

data/lib/ironment/version.rb

@@ -1,3 +1,3 @@
 class Ironment
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/ironment.rb

@@ -8,7 +8,12 @@ require "ironment/runcom"
 require "ironment/truster"
 
 class Ironment
-  class MalformedRuncom < StandardError; end
+  class IronmentError < StandardError; end
+
+  class MalformedRuncom < IronmentError; end
+  class AccessDenied < IronmentError; end
+  class NoEntity < IronmentError; end
+  class IsDirectory < IronmentError; end
 
   class << self
     attr_writer :runcom

data/test/cl_test.rb

@@ -5,7 +5,7 @@ def test_exception_handling(exception, message, method, *args)
   ironment = Object.new
 
   ironment.define_singleton_method method do |*|
-    raise exception
+    raise exception, args.first
   end
 
   describe "upon receiving #{exception.inspect}" do
@@ -42,10 +42,10 @@ describe Ironment::CL do
       end
     end
 
-    test_exception_handling Errno::EACCES, "ironment: Permission denied", :exec_with_environment, "foo"
-    test_exception_handling Errno::ENOENT, "ironment: No such file or directory", :exec_with_environment, "foo"
-    test_exception_handling Errno::EISDIR, "ironment: Is a directory", :exec_with_environment, "foo"
-    test_exception_handling Ironment::MalformedRuncom, "ironment: Malformed runcom", :exec_with_environment, "foo"
+    test_exception_handling Ironment::AccessDenied, "ironment: foo: Permission denied", :exec_with_environment, "foo"
+    test_exception_handling Ironment::NoEntity, "ironment: foo: No such file or directory", :exec_with_environment, "foo"
+    test_exception_handling Ironment::IsDirectory, "ironment: foo: Is a directory", :exec_with_environment, "foo"
+    test_exception_handling Ironment::MalformedRuncom, "ironment: foo: Malformed runcom", :exec_with_environment, "foo"
   end
 
   describe "#trust" do
@@ -62,9 +62,9 @@ describe Ironment::CL do
       end
     end
 
-    test_exception_handling Errno::EACCES, "ironment: Permission denied", :trust, ".envrc"
-    test_exception_handling Errno::ENOENT, "ironment: No such file or directory", :trust, ".envrc"
-    test_exception_handling Errno::EISDIR, "ironment: Is a directory", :trust, ".envrc"
+    test_exception_handling Ironment::AccessDenied, "ironment: .envrc: Permission denied", :trust, ".envrc"
+    test_exception_handling Ironment::NoEntity, "ironment: .envrc: No such file or directory", :trust, ".envrc"
+    test_exception_handling Ironment::IsDirectory, "ironment: .envrc: Is a directory", :trust, ".envrc"
   end
 
   describe "#untrust" do
@@ -81,8 +81,8 @@ describe Ironment::CL do
       end
     end
 
-    test_exception_handling Errno::EACCES, "ironment: Permission denied", :untrust, ".envrc"
-    test_exception_handling Errno::ENOENT, "ironment: No such file or directory", :untrust, ".envrc"
-    test_exception_handling Errno::EISDIR, "ironment: Is a directory", :untrust, ".envrc"
+    test_exception_handling Ironment::AccessDenied, "ironment: .envrc: Permission denied", :untrust, ".envrc"
+    test_exception_handling Ironment::NoEntity, "ironment: .envrc: No such file or directory", :untrust, ".envrc"
+    test_exception_handling Ironment::IsDirectory, "ironment: .envrc: Is a directory", :untrust, ".envrc"
   end
 end

data/test/executor_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+def test_exception_mapping(map)
+  from, to = map.flatten
+
+  describe "when exec raises #{from.to_s}" do
+    it "should raise #{to.to_s}" do
+      exec = Object.new.tap do |exec|
+        exec.define_singleton_method :exec do |*|
+          raise from
+        end
+      end
+
+      assert_raises to do
+        Ironment::Executor.new(exec: exec).exec "foo"
+      end
+    end
+  end
+end
+
+describe Ironment::Executor do
+  describe "#exec" do
+    test_exception_mapping Errno::EACCES => Ironment::AccessDenied
+    test_exception_mapping Errno::ENOENT => Ironment::NoEntity
+    test_exception_mapping Errno::EISDIR => Ironment::IsDirectory
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ironment
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jonas Amundsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -123,6 +123,7 @@ files:
 - lib/ironment/cl.rb
 - lib/ironment/cl/prompter.rb
 - lib/ironment/config.rb
+- lib/ironment/exec.rb
 - lib/ironment/executor.rb
 - lib/ironment/finder.rb
 - lib/ironment/populator.rb
@@ -131,6 +132,7 @@ files:
 - lib/ironment/version.rb
 - test/cl_test.rb
 - test/config_test.rb
+- test/executor_test.rb
 - test/finder_test.rb
 - test/ironment_test.rb
 - test/populator_test.rb
@@ -162,6 +164,7 @@ signing_key:
 specification_version: 4
 summary: Environment populator & command wrapper utility.
 test_files:
+- test/executor_test.rb
 - test/truster_test.rb
 - test/runcom_test.rb
 - test/cl_test.rb