ironment 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dac68a95a13d3a4b6bd5b7374ea73fedad5e60d
-  data.tar.gz: 94c783c5aade35b7a0167b3f7fddcc281eee1faf
+  metadata.gz: 0e22103ee32450e82906177426670ee179a4783f
+  data.tar.gz: 34771f4603e957fa89df5487e3e77135ae4cfb66
 SHA512:
-  metadata.gz: 74ffdf0ddf2ddb209f02ae2a88ed0a641760b43d05eedf5fdbcd8857e6dc64bfe1a827d2f16107b5bd8419e90f0b83dd8404f2a26997e5997c2bceb95081da39
-  data.tar.gz: 70f6a7f0dcebb804d9d0c83af9971b296a511a86bc996490341996afa3e5f6a1eea83138e4286fbcc09df6362145704a58c6b983a5ab27c2607fc42ea9208481
+  metadata.gz: 481b3985f1e6603d067b9333798b970d349b5f1a42f7b0c0e030714086947819d07ededc5ddada9d67fe0d5925bcd922ef2bf8a8509987ccc36dabb2c75872b6
+  data.tar.gz: 5d6746488c1fe5066de1fca7b8d35b09d997dd65dffc2a45f47b13537a4cc1a1031f2aacebd5f0d2c3c862c01b2db2b271a32746c7824697e732e7e584391f23

data/README.md

@@ -1,7 +1,7 @@
 Ironment
 ========
 
-[![Build Status](https://travis-ci.org/badeball/ironment.svg)](https://travis-ci.org/badeball/ironment)
+[![Build Status](https://travis-ci.org/badeball/ironment.svg?branch=master)](https://travis-ci.org/badeball/ironment)
 [![Code Climate](https://codeclimate.com/github/badeball/ironment/badges/gpa.svg)](https://codeclimate.com/github/badeball/ironment)
 [![Test Coverage](https://codeclimate.com/github/badeball/ironment/badges/coverage.svg)](https://codeclimate.com/github/badeball/ironment/coverage)
 
@@ -43,6 +43,11 @@ $ yaourt -S ruby-ironment
 
 ## Changelog
 
+### 0.0.5
+
+* `iron exec` now handles EACCES, ENOENT & EISDIR like `iron trust` and `iron untrust` does.
+* `iron exec` now handles malformed runcom files.
+
 ### 0.0.4
 
 * Correcting a bug under ruby-1.9.3.

data/lib/ironment/cl.rb

@@ -1,14 +1,21 @@
 class Ironment
   class CL
     def initialize(options = {})
-      @ironment = options[:ironment] || Ironment.new
+      @ironment = options[:ironment] || Ironment.new(options)
       @prompter = options[:prompter] || Prompter.new
-      @truster = options[:truster] || Truster.new
-      @stderr = options[:stderr] || $stderr
+      @err = options[:err] || $stderr
     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
@@ -20,39 +27,23 @@ class Ironment
     end
 
     def trust(file)
-      @truster.trust Runcom.new(file)
-
-      true
+      @ironment.trust file
     rescue Errno::EACCES
-      @stderr.puts "ironment: Permission denied"
-
-      false
+      @err.puts "ironment: Permission denied"
     rescue Errno::ENOENT
-      @stderr.puts "ironment: No such file or directory"
-
-      false
+      @err.puts "ironment: No such file or directory"
     rescue Errno::EISDIR
-      @stderr.puts "ironment: Is a directory"
-
-      false
+      @err.puts "ironment: Is a directory"
     end
 
     def untrust(file)
-      @truster.untrust Runcom.new(file)
-
-      true
+      @ironment.untrust file
     rescue Errno::EACCES
-      @stderr.puts "ironment: Permission denied"
-
-      false
+      @err.puts "ironment: Permission denied"
     rescue Errno::ENOENT
-      @stderr.puts "ironment: No such file or directory"
-
-      false
+      @err.puts "ironment: No such file or directory"
     rescue Errno::EISDIR
-      @stderr.puts "ironment: Is a directory"
-
-      false
+      @err.puts "ironment: Is a directory"
     end
   end
 end

data/lib/ironment/runcom.rb

@@ -34,6 +34,7 @@ class Ironment
       Hash[*content.split(/\n/).reject { |line|
         /^\s*#/ =~line
       }.map { |line|
+        raise MalformedRuncom unless line.include? "="
         line.split(/=/)
       }.flatten]
     end

data/lib/ironment/version.rb

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

data/lib/ironment.rb

@@ -8,6 +8,8 @@ require "ironment/runcom"
 require "ironment/truster"
 
 class Ironment
+  class MalformedRuncom < StandardError; end
+
   class << self
     attr_writer :runcom
 
@@ -32,6 +34,16 @@ class Ironment
     @executor.exec command, *args
   end
 
+  def trust(file)
+    @truster.trust Runcom.new file
+  end
+
+  def untrust(file)
+    @truster.untrust Runcom.new file
+  end
+
+  private
+
   def load_environment
     @finder.find.each do |runcom|
       @truster.validate runcom

data/test/cl_test.rb

@@ -1,88 +1,88 @@
 require "test_helper"
 require "stringio"
 
-def test_exception_handling(exception, method, message)
-  truster = Object.new
+def test_exception_handling(exception, message, method, *args)
+  ironment = Object.new
 
-  truster.define_singleton_method method do |*|
+  ironment.define_singleton_method method do |*|
     raise exception
   end
 
   describe "upon receiving #{exception.inspect}" do
-    it "should return false" do
-      result = Ironment::CL.new(truster: truster, stderr: StringIO.new).send(method, ".envrc")
-
-      assert_equal false, result
-    end
-
     it "should write #{message.inspect} to :stderr" do
-      stderr = StringIO.new
+      err = StringIO.new
 
-      Ironment::CL.new(truster: truster, stderr: stderr).send(method, ".envrc")
+      Ironment::CL.new(ironment: ironment, err: err).send(method, *args)
 
-      assert_includes stderr.string, message
+      assert_includes err.string, message
     end
 
     it ":stderr should end with a newline" do
-      stderr = StringIO.new
+      err = StringIO.new
 
-      Ironment::CL.new(truster: truster, stderr: stderr).send(method, ".envrc")
+      Ironment::CL.new(ironment: ironment, err: err).send(method, *args)
 
-      assert_equal "\n", stderr.string[-1]
+      assert_equal "\n", err.string[-1]
     end
   end
 end
 
 describe Ironment::CL do
-  describe "#trust" do
-    describe "when succesfully trusting a file" do
-      it "should return true" do
-        truster = Minitest::Mock.new
-        truster.expect :trust, true, [Ironment::Runcom.new(".envrc")]
+  describe "#exec_with_environment" do
+    describe "when successfully execing with a command" do
+      it "should not write to :stderr" do
+        ironment = Minitest::Mock.new
+        ironment.expect :exec_with_environment, true, ["foo"]
+
+        err = StringIO.new
+
+        Ironment::CL.new(ironment: ironment, err: err).exec_with_environment("foo")
 
-        assert_equal true, Ironment::CL.new(truster: truster).trust(".envrc")
+        assert_equal "", err.string
       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"
+  end
 
+  describe "#trust" do
+    describe "when succesfully trusting a file" do
       it "should not write to :stderr" do
         truster = Minitest::Mock.new
         truster.expect :trust, true, [Ironment::Runcom.new(".envrc")]
 
-        stderr = StringIO.new
+        err = StringIO.new
 
-        Ironment::CL.new(truster: truster, stderr: stderr).trust(".envrc")
+        Ironment::CL.new(truster: truster, err: err).trust(".envrc")
 
-        assert_equal "", stderr.string
+        assert_equal "", err.string
       end
     end
 
-    test_exception_handling Errno::EACCES, :trust, "ironment: Permission denied"
-    test_exception_handling Errno::ENOENT, :trust, "ironment: No such file or directory"
-    test_exception_handling Errno::EISDIR, :trust, "ironment: Is a directory"
+    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"
   end
 
   describe "#untrust" do
     describe "when succesfully untrusting a file" do
-      it "should return true" do
-        truster = Minitest::Mock.new
-        truster.expect :untrust, true, [Ironment::Runcom.new(".envrc")]
-
-        assert_equal true, Ironment::CL.new(truster: truster).untrust(".envrc")
-      end
-
       it "should not write to :stderr" do
         truster = Minitest::Mock.new
         truster.expect :untrust, true, [Ironment::Runcom.new(".envrc")]
 
-        stderr = StringIO.new
+        err = StringIO.new
 
-        Ironment::CL.new(truster: truster, stderr: stderr).untrust(".envrc")
+        Ironment::CL.new(truster: truster, err: err).untrust(".envrc")
 
-        assert_equal "", stderr.string
+        assert_equal "", err.string
       end
     end
 
-    test_exception_handling Errno::EACCES, :untrust, "ironment: Permission denied"
-    test_exception_handling Errno::ENOENT, :untrust, "ironment: No such file or directory"
-    test_exception_handling Errno::EISDIR, :untrust, "ironment: Is a directory"
+    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"
   end
 end

data/test/ironment_test.rb

@@ -27,4 +27,26 @@ describe Ironment do
       [finder, truster, populator, executor].each &:verify
     end
   end
+
+  describe "#trust" do
+    it "should invoke Ironment::Truster#trust with a runcom" do
+      truster = MiniTest::Mock.new
+      truster.expect :trust, nil, [Ironment::Runcom.new("foo")]
+
+      Ironment.new(truster: truster).trust "foo"
+
+      truster.verify
+    end
+  end
+
+  describe "#untrust" do
+    it "should invoke Ironment::Truster#untrust with a runcom" do
+      truster = MiniTest::Mock.new
+      truster.expect :untrust, nil, [Ironment::Runcom.new("foo")]
+
+      Ironment.new(truster: truster).untrust "foo"
+
+      truster.verify
+    end
+  end
 end

data/test/runcom_test.rb

@@ -66,6 +66,16 @@ describe Ironment::Runcom do
 
       assert_equal 0, enum.count
     end
+
+    it "should raise MalformedRuncom upon reading a malformed file" do
+      File.write(".envrc", <<-DAT.gsub(/^\s+/, ""))
+        FOO+1
+      DAT
+
+      assert_raises Ironment::MalformedRuncom do
+        Ironment::Runcom.new(".envrc").each_pair
+      end
+    end
   end
 
   describe "#==" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ironment
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jonas Amundsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.7
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement