augeas 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d2dd413111560ecd6863377650e4f99e1d4be1
-  data.tar.gz: ac115f04323b69b96aba2a82a4c7f4497d81af3a
+  metadata.gz: ba9ebbb3fbea59d2f722866713c6ff12fc52d9ea
+  data.tar.gz: 6e09cb5ef788772f2cde0dbf896092f7055cb644
 SHA512:
-  metadata.gz: 4f3401fc55b371e25a2a94330ec390c69a24a56537563197086bb8edf0a0b98c0a13120faa266c53905a41fe4f94438ceabf10a43af3e971149ea9a34bf7847b
-  data.tar.gz: 49268ca68505d4260f1660b8392276f8b66e5faa827185fca4842dd18d2b92879f76dc797b79c1d55ec91c83def55119859ed81b16066aee1d8678ab6a1a7f7e
+  metadata.gz: 2171c37b81a34c693adda647b3cc4fdd6342c091cd8ce04078bda5edd672148990b7f2555a48ba007b6904da6019c570c826e251ddfd71b38729df9f127391b9
+  data.tar.gz: aa62e622d2456f7813d34dfbcf23a1b8610d826af9dae105cb301192338052480c449d1f605d764027f9a195a80c79749fa51d3adb3ae101b7c03406c0dc890b

data/README.rdoc

@@ -1,5 +1,7 @@
 = Ruby bindings for 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

data/Rakefile

@@ -1,4 +1,10 @@
 # -*- 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'
@@ -6,7 +12,7 @@ require 'rake/testtask'
 require 'rubygems/package_task'
 
 GEM_NAME='augeas'
-GEM_VERSION='0.6.0'
+GEM_VERSION='0.6.1'
 EXT_CONF='ext/augeas/extconf.rb'
 MAKEFILE="ext/augeas/Makefile"
 AUGEAS_MODULE="ext/augeas/_augeas.so"
@@ -80,7 +86,7 @@ SPEC = Gem::Specification.new do |s|
     s.summary = "Ruby bindings for augeas"
     s.authors = [ "Bryan Kearney", "David Lutterkort", "Ionut Artarisi", "Artem Sheremet" ]
     s.files = PKG_FILES
-	s.licenses = ['LGPLv2']
+    s.licenses = ['LGPLv2']
     s.required_ruby_version = '>= 1.8.7'
     s.extensions = "ext/augeas/extconf.rb"
     s.description = "Provides bindings for augeas."

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,10 @@ 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);
+#ifdef AUG_ELABEL
+    DEF_AUG_ERR(ELABEL);
+#endif
 #undef DEF_AUG_ERR
 
     /* Define the methods */

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
@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: augeas
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bryan Kearney
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake