augeas 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d2dd413111560ecd6863377650e4f99e1d4be1
-  data.tar.gz: ac115f04323b69b96aba2a82a4c7f4497d81af3a
+  metadata.gz: b71dd4532d404d0af0b17a7bfb2c87336386be5c
+  data.tar.gz: 11ba1ab7ff33b7e8fcdca35a31114b98f669ac26
 SHA512:
-  metadata.gz: 4f3401fc55b371e25a2a94330ec390c69a24a56537563197086bb8edf0a0b98c0a13120faa266c53905a41fe4f94438ceabf10a43af3e971149ea9a34bf7847b
-  data.tar.gz: 49268ca68505d4260f1660b8392276f8b66e5faa827185fca4842dd18d2b92879f76dc797b79c1d55ec91c83def55119859ed81b16066aee1d8678ab6a1a7f7e
+  metadata.gz: 787431db47c11bab4ead53c061ad1d04d30570e73c81a6a71f25642cfd8ff9579e8041ae6dd7e0f27bc8ee533ef6705f33078acf902b282e5bbf859eeb5446a4
+  data.tar.gz: f02341ca9e1d9f42055381ba53698f5a7fc6510c3633870d40c15a114aad8315511c7a31876db18753b403521a7cfdff0bc3d50f019b16a9860342ca35e6bc2e

data/COPYING

@@ -1,9 +1,8 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
 
   When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-^L
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -89,9 +87,9 @@ libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
   For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
@@ -113,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-^L
+
                   GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
 
   Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
@@ -218,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-^L
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -269,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-^L
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -305,10 +303,10 @@ of these things:
     the user installs one, as long as the modified version is
     interface-compatible with the version that the work was made with.
 
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
 
     d) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
@@ -331,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-^L
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -372,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-^L
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.
@@ -425,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-^L
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -459,21 +456,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-^L
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
 everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
 
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
     <one line to give the library's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
@@ -490,21 +485,18 @@ notice is found.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

data/NEWS

@@ -1,3 +1,9 @@
+0.6.4 - 2015-04-09
+  - use pkg-config to lookup libxml2 header location
+
+0.6.3 - 2014-02-20
+  - clean up, restore Ruby 1.8.7 compatibility in tests
+
 0.6.0 - 2014-01-19
   - merge pull request by mapleoin (https://github.com/mapleoin):
     raise exceptions instead of returning error codes

data/README.rdoc

@@ -1,5 +1,8 @@
 = Ruby bindings for augeas
 
+{<img src="https://travis-ci.org/dotdoom/augeas.png?branch=master" alt="Travis CI build results" />}[https://travis-ci.org/dotdoom/augeas]
+{<img src="https://badge.fury.io/rb/augeas.png" alt="Gem Version" />}[http://badge.fury.io/rb/augeas]
+
 The class Augeas provides bindings to augeas [http://augeas.net] library.
 
 == Usage: Setting Data
@@ -36,7 +39,12 @@ startup; that allows setting up a custom transform.
     aug.get("/files/etc/aliases/*[name = 'postmaster']/value")
   end
 
-      
+
+== Build Dependencies
+
+To build or install this gem manually, headers for libaugeas and libxml are
+needed. Additionally the pkg-config tool has to be installed.
+
 == Deprecation Warning
 
 The Augeas API has been heavily rewritten in order to better support

data/Rakefile

@@ -1,96 +1,92 @@
 # -*- ruby -*-
+# Rakefile: build ruby augeas bindings
+#
+# See AUTHORS for the list of authors
+#
+# Distributed under the GNU Lesser General Public License v2.1 or later.
+# See COPYING for details
 
 require 'rake/clean'
 require 'rdoc/task'
 require 'rake/testtask'
 require 'rubygems/package_task'
 
-GEM_NAME='augeas'
-GEM_VERSION='0.6.0'
-EXT_CONF='ext/augeas/extconf.rb'
-MAKEFILE="ext/augeas/Makefile"
-AUGEAS_MODULE="ext/augeas/_augeas.so"
-SPEC_FILE="augeas.spec"
-AUGEAS_SRC=AUGEAS_MODULE.gsub(/.so$/, ".c")
+GEM_NAME = 'augeas'
+GEM_VERSION = '0.6.4'
+EXT_CONF = 'ext/augeas/extconf.rb'
+MAKEFILE = 'ext/augeas/Makefile'
+AUGEAS_MODULE = 'ext/augeas/_augeas.so'
+SPEC_FILE = 'augeas.spec'
+AUGEAS_SRC = AUGEAS_MODULE.gsub(/\.so$/, '.c')
 
-#
-# Building the actual bits
-#
-CLEAN.include [ "**/*~",
-                "ext/**/*.o", AUGEAS_MODULE,
-                "ext/**/depend" ]
+# Clean - remove all intermediate files / temporary files, do not touch final product.
+CLEAN.include '**/*~',
+              'ext/**/*.o',
+              MAKEFILE,
+              'ext/**/depend',
+              'ext/**/mkmf.log'
 
-CLOBBER.include [ "config.save",
-                  "ext/**/mkmf.log",
-                  MAKEFILE ]
+# Clobber - return to original state.
+CLOBBER.include AUGEAS_MODULE
 
 file MAKEFILE => EXT_CONF do |t|
-    Dir::chdir(File::dirname(EXT_CONF)) do
-         unless sh "ruby #{File::basename(EXT_CONF)}"
-             $stderr.puts "Failed to run extconf"
-             break
-         end
-    end
+	Dir::chdir(File::dirname(EXT_CONF)) do
+		unless sh 'ruby', File::basename(EXT_CONF)
+			fail 'Failed to run extconf'
+		end
+	end
 end
+
 file AUGEAS_MODULE => [ MAKEFILE, AUGEAS_SRC ] do |t|
-    Dir::chdir(File::dirname(EXT_CONF)) do
-         unless sh "make"
-             $stderr.puts "make failed"
-             break
-         end
-     end
+	Dir::chdir(File::dirname(EXT_CONF)) do
+		unless sh "make"
+			fail 'make failed'
+		end
+	end
 end
-desc "Build the native library"
+
+desc 'Build the native library'
 task :build => AUGEAS_MODULE
 
-#
-# Testing
-#
 Rake::TestTask.new(:test) do |t|
-    t.test_files = FileList['tests/tc_*.rb']
-    t.libs = [ 'lib', 'ext/augeas' ]
+	t.test_files = FileList['tests/tc_*.rb']
+	t.libs = ['lib', 'ext/augeas']
 end
 task :test => :build
 
 
-#
-# Generate the documentation
-#
 RDoc::Task.new do |rd|
-    rd.main = "README.rdoc"
-    rd.rdoc_dir = "doc/site/api"
-    rd.rdoc_files.include("README.rdoc", "ext/**/*.[ch]","lib/**/*.rb")
+	rd.main = "README.rdoc"
+	rd.rdoc_dir = "doc/site/api"
+	rd.rdoc_files.include("README.rdoc", "ext/**/*.[ch]","lib/**/*.rb")
 end
 
-#
-# Packaging
-#
 PKG_FILES = FileList[
-  "Rakefile", "COPYING","README.rdoc", "NEWS",
-  "ext/**/*.[ch]", "lib/**/*.rb", "ext/**/MANIFEST", "ext/**/extconf.rb",
-  "tests/**/*",
-  "spec/**/*"
+	"Rakefile", "COPYING","README.rdoc", "NEWS",
+	"ext/**/*.[ch]", "lib/**/*.rb", "ext/**/MANIFEST", "ext/**/extconf.rb",
+	"tests/**/*",
+	"spec/**/*"
 ]
 
 SPEC = Gem::Specification.new do |s|
-    s.name = GEM_NAME
-    s.version = GEM_VERSION
-    s.email = "dot.doom@gmail.com"
-    s.homepage = "http://augeas.net/"
-    s.summary = "Ruby bindings for augeas"
-    s.authors = [ "Bryan Kearney", "David Lutterkort", "Ionut Artarisi", "Artem Sheremet" ]
-    s.files = PKG_FILES
-	s.licenses = ['LGPLv2']
-    s.required_ruby_version = '>= 1.8.7'
-    s.extensions = "ext/augeas/extconf.rb"
-    s.description = "Provides bindings for augeas."
-    s.add_development_dependency "rake"
-    s.add_development_dependency "rdoc"
+	s.name = GEM_NAME
+	s.version = GEM_VERSION
+	s.email = "dot.doom@gmail.com"
+	s.homepage = "https://github.com/dotdoom/augeas"
+	s.summary = "Ruby bindings for augeas"
+	s.authors = File.read('AUTHORS').lines.grep(/^  /).map { |a| a[/[^<]+/].strip }.uniq
+	s.files = PKG_FILES
+  s.licenses = ['LGPL-2.1+']
+	s.required_ruby_version = '>= 1.8.7'
+	s.extensions = "ext/augeas/extconf.rb"
+	s.description = "A fork of ruby-augeas (bindings for augeas) with exceptions support."
+	s.add_development_dependency "rake"
+	s.add_development_dependency "rdoc"
 end
 
 Gem::PackageTask.new(SPEC) do |pkg|
-    pkg.need_tar = true
-    pkg.need_zip = true
+	pkg.need_tar = true
+	pkg.need_zip = true
 end
 
 task :default => [:build, :test]

data/ext/augeas/_augeas.c

@@ -25,6 +25,7 @@
 
 #include <ruby.h>
 #include <augeas.h>
+#include <errno.h>
 
 static VALUE c_augeas;
 
@@ -54,12 +55,12 @@ VALUE augeas_get(VALUE s, VALUE path) {
     const char *cpath = StringValueCStr(path);
     const char *value = NULL;
 
-	int retval = aug_get(aug, cpath, &value);
+    int retval = aug_get(aug, cpath, &value);
 
     if (retval == 1 && value != NULL) {
-		return rb_str_new(value, strlen(value));
+        return rb_str_new(value, strlen(value));
     } else {
-		return Qnil;
+        return Qnil;
     }
 }
 
@@ -94,30 +95,6 @@ VALUE augeas_set(VALUE s, VALUE path, VALUE value) {
     return INT2FIX(callValue);
 }
 
-/*
- * call-seq:
- *   set(PATH, VALUE) -> boolean
- *
- * Set the value associated with PATH to VALUE. VALUE is copied into the
- * internal data structure. Intermediate entries are created if they don't
- * exist.
- */
-VALUE augeas_set_old(VALUE s, VALUE path, VALUE value) {
-    augeas *aug = aug_handle(s);
-    const char *cpath = StringValueCStr(path) ;
-    const char *cvalue = StringValueCStrOrNull(value) ;
-
-    int callValue = aug_set(aug, cpath, cvalue) ;
-    VALUE returnValue ;
-
-    if (callValue == 0)
-        returnValue = Qtrue ;
-    else
-        returnValue = Qfalse ;
-
-    return returnValue ;
-}
-
 /*
  * call-seq:
  *   setm(BASE, SUB, VALUE) -> boolean
@@ -214,35 +191,6 @@ VALUE augeas_match(VALUE s, VALUE p) {
     return result ;
 }
 
-/*
- * call-seq:
- *       match(PATH) -> an_array
- *
- * Return all the paths that match the path expression PATH as an aray of
- * strings.
- * Raises an error if no paths were found.
- */
-VALUE augeas_match_old(VALUE s, VALUE p) {
-    augeas *aug = aug_handle(s);
-    const char *path = StringValueCStr(p);
-    char **matches = NULL;
-    int cnt, i;
-
-    cnt = aug_match(aug, path, &matches) ;
-    if (cnt < 0)
-        rb_raise(rb_eSystemCallError, "Matching path expression '%s' failed",
-                 path);
-
-    VALUE result = rb_ary_new();
-    for (i = 0; i < cnt; i++) {
-        rb_ary_push(result, rb_str_new(matches[i], strlen(matches[i])));
-        free(matches[i]) ;
-    }
-    free (matches) ;
-
-    return result ;
-}
-
 /*
  * call-seq:
  *       save() -> int
@@ -255,25 +203,6 @@ VALUE augeas_save(VALUE s) {
     return INT2FIX(callValue);
 }
 
-/*
- * call-seq:
- *       save() -> boolean
- *
- * Write all pending changes to disk
- */
-VALUE augeas_save_old(VALUE s) {
-    augeas *aug = aug_handle(s);
-    int callValue = aug_save(aug) ;
-    VALUE returnValue ;
-
-    if (callValue == 0)
-        returnValue = Qtrue ;
-    else
-        returnValue = Qfalse ;
-
-    return returnValue ;
-}
-
 /*
  * call-seq:
  *       load() -> int
@@ -286,25 +215,6 @@ VALUE augeas_load(VALUE s) {
     return INT2FIX(callValue);
 }
 
-/*
- * call-seq:
- *       load() -> boolean
- *
- * Load files from disk according to the transforms under +/augeas/load+
- */
-VALUE augeas_load_old(VALUE s) {
-    augeas *aug = aug_handle(s);
-    int callValue = aug_load(aug);
-    VALUE returnValue ;
-
-    if (callValue == 0)
-        returnValue = Qtrue ;
-    else
-        returnValue = Qfalse ;
-
-    return returnValue ;
-}
-
 /*
  * call-seq:
  *   defvar(NAME, EXPR) -> boolean
@@ -355,10 +265,7 @@ VALUE augeas_defnode(VALUE s, VALUE name, VALUE expr, VALUE value) {
     return (r < 0) ? Qfalse : INT2NUM(r);
 }
 
-/* This function returns different names for different augeas API */
-/* version specified in the +version+ argument. See augeas_init_old and */
-/* augeas_init. */
-VALUE augeas_init_split(VALUE m, VALUE r, VALUE l, VALUE f, char version) {
+VALUE augeas_init(VALUE m, VALUE r, VALUE l, VALUE f) {
     unsigned int flags = NUM2UINT(f);
     const char *root = StringValueCStrOrNull(r);
     const char *loadpath = StringValueCStrOrNull(l);
@@ -366,19 +273,11 @@ VALUE augeas_init_split(VALUE m, VALUE r, VALUE l, VALUE f, char version) {
 
     aug = aug_init(root, loadpath, flags);
     if (aug == NULL) {
-        rb_raise(rb_eSystemCallError, "Failed to initialize Augeas");
+        rb_raise(rb_eSystemCallError, "Failed to initialize Augeas (%d)", errno);
     }
     return Data_Wrap_Struct(c_augeas, NULL, augeas_free, aug);
 }
 
-VALUE augeas_init_old(VALUE m, VALUE r, VALUE l, VALUE f) {
-    return augeas_init_split(m, r, l, f, 0);
-}
-VALUE augeas_init(VALUE m, VALUE r, VALUE l, VALUE f) {
-    return augeas_init_split(m, r, l, f, 1);
-}
-
-
 VALUE augeas_close (VALUE s) {
     augeas *aug = aug_handle(s);
 
@@ -590,6 +489,7 @@ void Init__augeas() {
     DEF_AUG_FLAG(NO_LOAD);
     DEF_AUG_FLAG(NO_MODL_AUTOLOAD);
     DEF_AUG_FLAG(ENABLE_SPAN);
+    DEF_AUG_FLAG(NO_ERR_CLOSE);
 #undef DEF_AUG_FLAG
 
 /* Constants for enum aug_errcode_t */
@@ -607,8 +507,8 @@ void Init__augeas() {
     DEF_AUG_ERR(ENOSPAN);
     DEF_AUG_ERR(EMVDESC);
     DEF_AUG_ERR(ECMDRUN);
-	DEF_AUG_ERR(EBADARG);
-	DEF_AUG_ERR(ELABEL);
+    DEF_AUG_ERR(EBADARG);
+    DEF_AUG_ERR(ELABEL);
 #undef DEF_AUG_ERR
 
     /* Define the methods */

data/ext/augeas/extconf.rb

@@ -43,4 +43,6 @@ unless have_library("xml2")
   raise "libxml2 is not installed"
 end
 
+pkg_config('libxml-2.0')
+
 create_makefile(extension_name)

data/lib/augeas.rb

@@ -43,23 +43,23 @@ class Augeas
 	class CommandExecutionError   < Error; end
 	class InvalidArgumentError    < Error; end
 	class InvalidLabelError       < Error; end
-	@@error_hash = {
+	ERRORS_HASH = Hash[{
 		# the cryptic error names come from the C library, we just make
 		# them more ruby and more human
-		ENOMEM    => NoMemoryError,
-		EINTERNAL => InternalError,
-		EPATHX    => InvalidPathError,
-		ENOMATCH  => NoMatchError,
-		EMMATCH   => MultipleMatchesError,
-		ESYNTAX   => LensSyntaxError,
-		ENOLENS   => LensNotFoundError,
-		EMXFM     => MultipleTransformsError,
-		ENOSPAN   => NoSpanInfoError,
-		EMVDESC   => DescendantError,
-		ECMDRUN   => CommandExecutionError,
-		EBADARG   => InvalidArgumentError,
-		ELABEL    => InvalidLabelError,
-	}
+		:ENOMEM    => NoMemoryError,
+		:EINTERNAL => InternalError,
+		:EPATHX    => InvalidPathError,
+		:ENOMATCH  => NoMatchError,
+		:EMMATCH   => MultipleMatchesError,
+		:ESYNTAX   => LensSyntaxError,
+		:ENOLENS   => LensNotFoundError,
+		:EMXFM     => MultipleTransformsError,
+		:ENOSPAN   => NoSpanInfoError,
+		:EMVDESC   => DescendantError,
+		:ECMDRUN   => CommandExecutionError,
+		:EBADARG   => InvalidArgumentError,
+		:ELABEL    => InvalidLabelError,
+	}.map { |k, v| [(const_get(k) rescue nil), v] }].freeze
 
 	# Create a new Augeas instance and return it.
 	#
@@ -101,7 +101,7 @@ class Augeas
 		# aug_flags is a bitmask in the underlying library, we add all the
 		# values of the flags which were set to true to the default value
 		# Augeas::NONE (which is 0)
-		aug_flags = Augeas::NONE
+		aug_flags = defined?(Augeas::NO_ERR_CLOSE) ? Augeas::NO_ERR_CLOSE : Augeas::NONE
 
 		flags = {
 			:type_check => Augeas::TYPE_CHECK,
@@ -117,10 +117,10 @@ class Augeas
 		}
 		opts.each_key do |key|
 			if flags.key? key
-				aug_flags += flags[key]
+				aug_flags |= flags[key]
 			elsif key == :save_mode
 				if save_modes[opts[:save_mode]]
-					aug_flags += save_modes[opts[:save_mode]]
+					aug_flags |= save_modes[opts[:save_mode]]
 				else
 					raise ArgumentError, "Invalid save mode #{opts[:save_mode]}."
 				end
@@ -131,6 +131,13 @@ class Augeas
 
 		aug = Augeas::open3(opts[:root], opts[:loadpath], aug_flags)
 
+		begin
+			aug.send(:raise_last_error)
+		rescue
+			aug.close
+			raise
+		end
+
 		if block_given?
 			begin
 				yield aug
@@ -248,8 +255,8 @@ class Augeas
 		begin
 			run_command :augeas_save
 		rescue Augeas::CommandExecutionError => e
-			raise e, "Saving failed. Search the augeas tree in /augeas//error"+
-				"for the actual errors."
+			raise e, 'Saving failed. Search the augeas tree in /augeas//error ' <<
+				'for the actual errors.'
 		end
 
 		nil
@@ -366,11 +373,7 @@ class Augeas
 	def run_command(cmd, *params)
 		result = self.send cmd, *params
 
-		errcode = error[:code]
-		unless errcode.zero?
-			raise @@error_hash[errcode],
-				"#{error[:message]} #{error[:details]}"
-		end
+		raise_last_error
 
 		if result.kind_of? Fixnum and result < 0
 			# we raise CommandExecutionError here, because this is the error that
@@ -380,4 +383,11 @@ class Augeas
 
 		return result
 	end
+
+	def raise_last_error
+		error_cache = error
+		unless error_cache[:code].zero?
+			raise ERRORS_HASH[error_cache[:code]], "#{error_cache[:message]} #{error_cache[:details]}"
+		end
+	end
 end

data/tests/tc_augeas.rb

@@ -87,57 +87,6 @@ class TestAugeas < Test::Unit::TestCase
 		assert_equal(foo, 'bar')
 	end
 
-	def test_load
-		aug = aug_create(no_load: true)
-		assert_equal([], aug.match("/files/etc/*"))
-		aug.rm("/augeas/load/*");
-		assert_nothing_raised {
-			aug.load
-		}
-		assert_equal([], aug.match("/files/etc/*"))
-	end
-
-	def test_transform
-		aug = aug_create(no_load: true)
-		aug.clear_transforms
-		aug.transform(:lens => "Hosts.lns",
-					  :incl => "/etc/hosts")
-		assert_raise(ArgumentError) {
-			aug.transform(:name => "Fstab",
-						  :incl => [ "/etc/fstab" ],
-						  :excl => [ "*~", "*.rpmnew" ])
-		}
-		aug.transform(:lens => "Inittab",
-					  :incl => "/etc/inittab")
-		aug.transform(:lens => "Fstab.lns",
-					  :incl => "/etc/fstab*",
-					  :excl => "*~")
-		assert_equal(["/augeas/load/Fstab", "/augeas/load/Fstab/excl",
-				"/augeas/load/Fstab/incl", "/augeas/load/Fstab/lens",
-				"/augeas/load/Hosts", "/augeas/load/Hosts/incl",
-				"/augeas/load/Hosts/lens", "/augeas/load/Inittab",
-				"/augeas/load/Inittab/incl",
-				"/augeas/load/Inittab/lens"],
-				aug.match("/augeas/load//*").sort)
-		aug.load
-		assert_equal(["/files/etc/hosts", "/files/etc/inittab"],
-					 aug.match("/files/etc/*").sort)
-	end
-
-	def test_defvar
-		Augeas::create(root: "/dev/null") do |aug|
-			aug.set("/a/b", "bval")
-			aug.set("/a/c", "cval")
-			assert aug.defvar("var", "/a/b")
-			assert_equal(["/a/b"], aug.match("$var"))
-			assert aug.defvar("var", nil)
-			assert_raises(SystemCallError) {
-				aug.match("$var")
-			}
-			assert ! aug.defvar("var", "/foo/")
-		end
-	end
-
 	def test_close
 		aug = Augeas::create(:root => "/tmp", :save_mode => :newfile)
 		assert_equal("newfile", aug.get("/augeas/save"))
@@ -273,19 +222,15 @@ class TestAugeas < Test::Unit::TestCase
 			assert aug.defvar("var", "/a/b")
 			assert_equal(["/a/b"], aug.match("$var"))
 			assert aug.defvar("var", nil)
-			assert_raises(SystemCallError) {
+			assert_raises(Augeas::InvalidPathError) {
 				aug.match("$var")
 			}
-			assert ! aug.defvar("var", "/foo/")
+			assert_raises(Augeas::InvalidPathError) {
+				aug.defvar("var", "/foo/")
+			}
 		end
 	end
 
-	def test_defnode
-		aug = aug_create
-		assert aug.defnode("x", "/files/etc/hosts/*[ipaddr = '127.0.0.1']", nil)
-		assert_equal(["/files/etc/hosts/1"], aug.match("$x"))
-	end
-
 	def test_insert_before
 		aug = aug_create
 		aug.set("/parent/child", "foo")
@@ -383,20 +328,6 @@ class TestAugeas < Test::Unit::TestCase
 		assert_equal(aug.get("/files/etc/group/disk/user"), nil)
 	end
 
-	def test_setm
-		aug = aug_create
-
-		aug.setm("/files/etc/group/*[label() =~ regexp(\"rpc.*\")]",
-				 "users", "testuser1")
-		assert_equal(aug.get("/files/etc/group/rpc/users"), "testuser1")
-		assert_equal(aug.get("/files/etc/group/rpcuser/users"), "testuser1")
-
-		aug.setm("/files/etc/group/*[label() =~ regexp(\"rpc.*\")]/users",
-				 nil, "testuser2")
-		assert_equal(aug.get("/files/etc/group/rpc/users"), "testuser2")
-		assert_equal(aug.get("/files/etc/group/rpcuser/users"), "testuser2")
-	end
-
 	def test_setm_invalid_path
 		aug = aug_create
 		assert_raises (Augeas::InvalidPathError) { aug.setm("[]", "bar", "baz") }
@@ -438,16 +369,6 @@ class TestAugeas < Test::Unit::TestCase
 		assert err[:details]
 	end
 
-	def test_defvar
-		Augeas::create(:root => "/dev/null") do |aug|
-			aug.set("/a/b", "bval")
-			aug.set("/a/c", "cval")
-			assert aug.defvar("var", "/a/b")
-			assert_equal(["/a/b"], aug.match("$var"))
-			assert aug.defvar("var", nil)
-		end
-	end
-
 	def test_defvar_invalid_path
 		aug = aug_create
 		assert_raises(Augeas::InvalidPathError) { aug.defvar('var', 'F#@!$#@') }
@@ -464,20 +385,6 @@ class TestAugeas < Test::Unit::TestCase
 		assert_raises (Augeas::InvalidPathError) { aug.defnode('x', '//', nil)}
 	end
 
-	def test_span
-		aug = aug_create
-
-		aug.set("/augeas/span", "enable")
-		aug.rm("/files/etc")
-		aug.load
-
-		span = aug.span("/files/etc/ssh/sshd_config/Protocol")
-		assert_not_nil(span[:filename])
-		assert_equal(29..37, span[:label])
-		assert_equal(38..39, span[:value])
-		assert_equal(29..40, span[:span])
-	end
-
 	def test_span_no_span_info
 		aug = aug_create
 		# this error should be raised because we haven't enabled the span
@@ -510,28 +417,6 @@ class TestAugeas < Test::Unit::TestCase
 		assert_equal("enable", aug.get("/augeas/span"))
 	end
 
-	def test_set
-		aug = aug_create
-		aug.set("/files/etc/group/disk/user[last()+1]",["user1","user2"])
-		assert_equal( aug.get("/files/etc/group/disk/user[1]"),"root" )
-		assert_equal( aug.get("/files/etc/group/disk/user[2]"),"user1" )
-		assert_equal( aug.get("/files/etc/group/disk/user[3]"),"user2" )
-
-		aug.set("/files/etc/group/new_group/user[last()+1]",
-				"nuser1",["nuser2","nuser3"])
-		assert_equal( aug.get("/files/etc/group/new_group/user[1]"),"nuser1")
-		assert_equal( aug.get("/files/etc/group/new_group/user[2]"),"nuser2" )
-		assert_equal( aug.get("/files/etc/group/new_group/user[3]"),"nuser3" )
-
-		aug.rm("/files/etc/group/disk/user")
-		aug.set("/files/etc/group/disk/user[last()+1]","testuser")
-		assert_equal( aug.get("/files/etc/group/disk/user"),"testuser")
-
-		aug.rm("/files/etc/group/disk/user")
-		aug.set("/files/etc/group/disk/user[last()+1]", nil)
-		assert_equal( aug.get("/files/etc/group/disk/user"), nil)
-	end
-
 	def test_setm
 		aug = aug_create
 
@@ -587,14 +472,14 @@ class TestAugeas < Test::Unit::TestCase
 	end
 
 	def test_label
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			assert_equal 'augeas', aug.label('/augeas')
 			assert_equal 'files', aug.label('/files')
 		end
 	end
 
 	def test_rename
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			assert_raises(Augeas::InvalidLabelError) { aug.rename('/files', 'invalid/label') }
 			assert_equal 0, aug.rename('/nonexistent', 'label')
 			assert_equal ['/files'], aug.match('/files')
@@ -603,7 +488,7 @@ class TestAugeas < Test::Unit::TestCase
 	end
 
 	def test_text_store_retrieve
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			# text_store errors
 			assert_raises(Augeas::NoMatchError) { aug.text_store('Simplelines.lns', '/input', '/store') }
 
@@ -623,7 +508,7 @@ class TestAugeas < Test::Unit::TestCase
 	end
 
 	def test_context
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			aug.context = '/augeas'
 			assert_equal '/augeas', aug.get('/augeas/context')
 			assert_equal '/augeas', aug.get('context')
@@ -632,7 +517,7 @@ class TestAugeas < Test::Unit::TestCase
 	end
 
 	def test_touch
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			assert_equal [], aug.match('/foo')
 			aug.touch '/foo'
 			assert_equal ['/foo'], aug.match('/foo')
@@ -644,7 +529,7 @@ class TestAugeas < Test::Unit::TestCase
 	end
 
 	def test_clearm
-		Augeas::create(root: "/dev/null") do |aug|
+		Augeas::create(:root => "/dev/null") do |aug|
 			aug.set('/foo/a', '1')
 			aug.set('/foo/b', '2')
 			aug.clearm('/foo', '*')

metadata

@@ -1,69 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: augeas
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Bryan Kearney
 - David Lutterkort
-- Ionut Artarisi
+- Dominic Cleal
+- Raphaël Pinson
 - Artem Sheremet
+- Frederik Wagner
+- Ben
+- Ionuț Arțăriși
+- Jacob McCann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides bindings for augeas.
+description: A fork of ruby-augeas (bindings for augeas) with exceptions support.
 email: dot.doom@gmail.com
 executables: []
 extensions:
 - ext/augeas/extconf.rb
 extra_rdoc_files: []
 files:
-- Rakefile
 - COPYING
-- README.rdoc
 - NEWS
+- README.rdoc
+- Rakefile
 - ext/augeas/_augeas.c
 - ext/augeas/_augeas.h
-- lib/augeas.rb
 - ext/augeas/extconf.rb
+- lib/augeas.rb
 - tests/root/etc/group
 - tests/root/etc/hosts
 - tests/root/etc/inittab
 - tests/root/etc/ssh/sshd_config
 - tests/tc_augeas.rb
-homepage: http://augeas.net/
+homepage: https://github.com/dotdoom/augeas
 licenses:
-- LGPLv2
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -71,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for augeas