rugged 0.18.0.gh.de28323 → 0.19.0

data/ext/rugged/rugged_commit.c

@@ -31,53 +31,50 @@ extern VALUE rb_cRuggedSignature;
 VALUE rb_cRuggedCommit;
 
 /*
- *	call-seq:
- *		commit.message -> msg
+ *  call-seq:
+ *    commit.message -> msg
  *
- *	Return the message of this commit. This includes the full body of the
- *	message, with the short description, detailed descritpion, and any
- *	optional footers or signatures after it.
+ *  Return the message of this commit. This includes the full body of the
+ *  message, with the short description, detailed descritpion, and any
+ *  optional footers or signatures after it.
  *
- *	In Ruby 1.9.X, the returned string will be encoded with the encoding
- *	specified in the +Encoding+ header of the commit, if available.
+ *  In Ruby 1.9+, the returned string will be encoded with the encoding
+ *  specified in the +Encoding+ header of the commit, if available.
  *
- *		commit.message #=> "add a lot of RDoc docs\n\nthis includes docs for commit and blob"
+ *    commit.message #=> "add a lot of RDoc docs\n\nthis includes docs for commit and blob"
  */
 static VALUE rb_git_commit_message_GET(VALUE self)
 {
 	git_commit *commit;
-
-#ifdef HAVE_RUBY_ENCODING_H
 	rb_encoding *encoding = rb_utf8_encoding();
 	const char *encoding_name;
-#endif
+	const char *message;
 
 	Data_Get_Struct(self, git_commit, commit);
 
-#ifdef HAVE_RUBY_ENCODING_H
+	message = git_commit_message(commit);
 	encoding_name = git_commit_message_encoding(commit);
 	if (encoding_name != NULL)
 		encoding = rb_enc_find(encoding_name);
-#endif
 
-	return rugged_str_new2(git_commit_message(commit), encoding);
+	return rb_enc_str_new(message, strlen(message), encoding);
 }
 
 /*
- *	call-seq:
- *		commit.committer -> signature
+ *  call-seq:
+ *    commit.committer -> signature
  *
- *	Return the signature for the committer of this +commit+. The signature
- *	is returned as a +Hash+ containing +:name+, +:email+ of the author
- *	and +:time+ of the change.
+ *  Return the signature for the committer of this +commit+. The signature
+ *  is returned as a +Hash+ containing +:name+, +:email+ of the author
+ *  and +:time+ of the change.
  *
- *	The committer of a commit is the person who actually applied the changes
- *	of the commit; in most cases it's the same as the author.
+ *  The committer of a commit is the person who actually applied the changes
+ *  of the commit; in most cases it's the same as the author.
  *
- *	In Ruby 1.9.X, the returned string will be encoded with the encoding
- *	specified in the +Encoding+ header of the commit, if available.
+ *  In Ruby 1.9+, the returned string will be encoded with the encoding
+ *  specified in the +Encoding+ header of the commit, if available.
  *
- *		commit.committer #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
+ *    commit.committer #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
  */
 static VALUE rb_git_commit_committer_GET(VALUE self)
 {
@@ -90,19 +87,19 @@ static VALUE rb_git_commit_committer_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.author -> signature
+ *  call-seq:
+ *    commit.author -> signature
  *
- *	Return the signature for the author of this +commit+. The signature
- *	is returned as a +Hash+ containing +:name+, +:email+ of the author
- *	and +:time+ of the change.
+ *  Return the signature for the author of this +commit+. The signature
+ *  is returned as a +Hash+ containing +:name+, +:email+ of the author
+ *  and +:time+ of the change.
  *
- *	The author of the commit is the person who intially created the changes.
+ *  The author of the commit is the person who intially created the changes.
  *
- *	In Ruby 1.9.X, the returned string will be encoded with the encoding
- *	specified in the +Encoding+ header of the commit, if available.
+ *  In Ruby 1.9+, the returned string will be encoded with the encoding
+ *  specified in the +Encoding+ header of the commit, if available.
  *
- *		commit.author #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
+ *    commit.author #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
  */
 static VALUE rb_git_commit_author_GET(VALUE self)
 {
@@ -115,14 +112,14 @@ static VALUE rb_git_commit_author_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.epoch_time -> t
+ *  call-seq:
+ *    commit.epoch_time -> int
  *
- *	Return the time when this commit was made effective. This is the same value
- *	as the +:time+ attribute for +commit.committer+, but represented as an +Integer+
- *	value in seconds since the Epoch.
+ *  Return the time when this commit was made effective. This is the same value
+ *  as the +:time+ attribute for +commit.committer+, but represented as an +Integer+
+ *  value in seconds since the Epoch.
  *
- *		commit.time #=> 1327383765
+ *    commit.time #=> 1327383765
  */
 static VALUE rb_git_commit_epoch_time_GET(VALUE self)
 {
@@ -133,13 +130,13 @@ static VALUE rb_git_commit_epoch_time_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.tree -> tree
+ *  call-seq:
+ *    commit.tree -> tree
  *
- *	Return the tree pointed at by this +commit+. The tree is
- *	returned as a +Rugged::Tree+ object.
+ *  Return the tree pointed at by this +commit+. The tree is
+ *  returned as a +Rugged::Tree+ object.
  *
- *		commit.tree #=> #<Rugged::Tree:0x10882c680>
+ *    commit.tree #=> #<Rugged::Tree:0x10882c680>
  */
 static VALUE rb_git_commit_tree_GET(VALUE self)
 {
@@ -158,13 +155,13 @@ static VALUE rb_git_commit_tree_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.tree_id -> oid
+ *  call-seq:
+ *    commit.tree_id -> oid
  *
- *	Return the tree oid pointed at by this +commit+. The tree is
- *	returned as a String object.
+ *  Return the tree oid pointed at by this +commit+. The tree is
+ *  returned as a String object.
  *
- *		commit.tree_id #=> "f148106ca58764adc93ad4e2d6b1d168422b9796"
+ *    commit.tree_id #=> "f148106ca58764adc93ad4e2d6b1d168422b9796"
  */
 static VALUE rb_git_commit_tree_id_GET(VALUE self)
 {
@@ -179,15 +176,15 @@ static VALUE rb_git_commit_tree_id_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.parents -> [commit, ...]
+ *  call-seq:
+ *    commit.parents -> [commit, ...]
  *
- *	Return the parent(s) of this commit as an array of +Rugged::Commit+
- *	objects. An array is always returned even when the commit has only
- *	one or zero parents.
+ *  Return the parent(s) of this commit as an array of +Rugged::Commit+
+ *  objects. An array is always returned even when the commit has only
+ *  one or zero parents.
  *
- *		commit.parents #=> => [#<Rugged::Commit:0x108828918>]
- *		root.parents #=> []
+ *    commit.parents #=> => [#<Rugged::Commit:0x108828918>]
+ *    root.parents #=> []
  */
 static VALUE rb_git_commit_parents_GET(VALUE self)
 {
@@ -213,15 +210,15 @@ static VALUE rb_git_commit_parents_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		commit.parent_ids -> [oid, ...]
+ *  call-seq:
+ *    commit.parent_ids -> [oid, ...]
  *
- *	Return the parent oid(s) of this commit as an array of oid String
- *	objects. An array is always returned even when the commit has only
- *	one or zero parents.
+ *  Return the parent oid(s) of this commit as an array of oid String
+ *  objects. An array is always returned even when the commit has only
+ *  one or zero parents.
  *
- *		commit.parent_ids #=> => ["2cb831a8aea28b2c1b9c63385585b864e4d3bad1", ...]
- *		root.parent_ids #=> []
+ *    commit.parent_ids #=> => ["2cb831a8aea28b2c1b9c63385585b864e4d3bad1", ...]
+ *    root.parent_ids #=> []
  */
 static VALUE rb_git_commit_parent_ids_GET(VALUE self)
 {
@@ -246,33 +243,33 @@ static VALUE rb_git_commit_parent_ids_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		Commit.create(repository, data = {}) -> oid
+ *  call-seq:
+ *    Commit.create(repository, data = {}) -> oid
  *
- *	Write a new +Commit+ object to +repository+, with the given +data+
- *	arguments, passed as a +Hash+:
+ *  Write a new +Commit+ object to +repository+, with the given +data+
+ *  arguments, passed as a +Hash+:
  *
- *	- +:message+: a string with the full text for the commit's message
- *	- +:committer+: a hash with the signature for the committer
- *	- +:author+: a hash with the signature for the author
- *	- +:parents+: an +Array+ with zero or more parents for this commit,
- *	  represented as <tt>Rugged::Commit</tt> instances, or OID +String+.
- *	- +:tree+: the tree for this commit, represented as a <tt>Rugged::Tree</tt>
- *	  instance or an OID +String+.
- *	- +:update_ref+ (optional): a +String+ with the name of a reference in the
- *	repository which should be updated to point to this commit (e.g. "HEAD")
+ *  - +:message+: a string with the full text for the commit's message
+ *  - +:committer+: a hash with the signature for the committer
+ *  - +:author+: a hash with the signature for the author
+ *  - +:parents+: an +Array+ with zero or more parents for this commit,
+ *    represented as <tt>Rugged::Commit</tt> instances, or OID +String+.
+ *  - +:tree+: the tree for this commit, represented as a <tt>Rugged::Tree</tt>
+ *    instance or an OID +String+.
+ *  - +:update_ref+ (optional): a +String+ with the name of a reference in the
+ *  repository which should be updated to point to this commit (e.g. "HEAD")
  *
- *	When the commit is successfully written to disk, its +oid+ will be
- *	returned as a hex +String+.
+ *  When the commit is successfully written to disk, its +oid+ will be
+ *  returned as a hex +String+.
  *
- *		author = {:email=>"tanoku@gmail.com", :time=>Time.now, :name=>"Vicent Mart\303\255"}
+ *    author = {:email=>"tanoku@gmail.com", :time=>Time.now, :name=>"Vicent Mart\303\255"}
  *
- *		Rugged::Commit.create(r,
- *			:author => author,
- *			:message => "Hello world\n\n",
- *			:committer => author,
- *			:parents => ["2cb831a8aea28b2c1b9c63385585b864e4d3bad1"],
- *			:tree => some_tree) #=> "f148106ca58764adc93ad4e2d6b1d168422b9796"
+ *    Rugged::Commit.create(r,
+ *      :author => author,
+ *      :message => "Hello world\n\n",
+ *      :committer => author,
+ *      :parents => ["2cb831a8aea28b2c1b9c63385585b864e4d3bad1"],
+ *      :tree => some_tree) #=> "f148106ca58764adc93ad4e2d6b1d168422b9796"
  */
 static VALUE rb_git_commit_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 {
@@ -382,7 +379,7 @@ cleanup:
 	return rugged_create_oid(&commit_oid);
 }
 
-void Init_rugged_commit()
+void Init_rugged_commit(void)
 {
 	rb_cRuggedCommit = rb_define_class_under(rb_mRugged, "Commit", rb_cRuggedObject);
 

data/ext/rugged/rugged_config.c

@@ -40,12 +40,12 @@ VALUE rugged_config_new(VALUE klass, VALUE owner, git_config *cfg)
 }
 
 /*
- *	call-seq:
- *		Config.new(path) -> new_config
+ *  call-seq:
+ *    Config.new(path) -> new_config
  *
- *	Open the file specified in +path+ as a +Rugged::Config+ file.
- *	If +path+ cannot be found, or the file is an invalid Git config,
- *	an exception will be raised.
+ *  Open the file specified in +path+ as a +Rugged::Config+ file.
+ *  If +path+ cannot be found, or the file is an invalid Git config,
+ *  an exception will be raised.
  */
 static VALUE rb_git_config_new(VALUE klass, VALUE rb_path)
 {
@@ -73,16 +73,16 @@ static VALUE rb_git_config_new(VALUE klass, VALUE rb_path)
 }
 
 /*
- *	call-seq:
- *		cfg.get(key) -> value
- *		cfg[key] -> value
+ *  call-seq:
+ *    cfg.get(key) -> value
+ *    cfg[key] -> value
  *
- *	Get the value for the given config +key+. Values are always
- *	returned as +String+, or +nil+ if the given key doesn't exist
- *	in the Config file.
+ *  Get the value for the given config +key+. Values are always
+ *  returned as +String+, or +nil+ if the given key doesn't exist
+ *  in the Config file.
  *
- *		cfg['apply.whitespace'] #=> 'fix'
- *		cfg['diff.renames'] #=> 'true'
+ *    cfg['apply.whitespace'] #=> 'fix'
+ *    cfg['diff.renames'] #=> 'true'
  */
 static VALUE rb_git_config_get(VALUE self, VALUE rb_key)
 {
@@ -98,25 +98,23 @@ static VALUE rb_git_config_get(VALUE self, VALUE rb_key)
 		return Qnil;
 
 	rugged_exception_check(error);
-
-	/* Return all config values as ASCII strings */
-	return rugged_str_new2(value, NULL);
+	return rb_str_new_utf8(value);
 }
 
 /*
- *	call-seq:
- *		cfg.store(key, value)
- *		cfg[key] = value
+ *  call-seq:
+ *    cfg.store(key, value)
+ *    cfg[key] = value
  *
- *	Store the given +value+ in the Config file, under the section
- *	and name specified by +key+. Value can be any of the following
- *	Ruby types: +String+, +true+, +false+ and +Fixnum+.
+ *  Store the given +value+ in the Config file, under the section
+ *  and name specified by +key+. Value can be any of the following
+ *  Ruby types: +String+, +true+, +false+ and +Fixnum+.
  *
- *	The config file will be automatically stored to disk.
+ *  The config file will be automatically stored to disk.
  *
- *		cfg['apply.whitespace'] = 'fix'
- *		cfg['diff.renames'] = true
- *		cfg['gc.reflogexpre'] = 90
+ *    cfg['apply.whitespace'] = 'fix'
+ *    cfg['diff.renames'] = true
+ *    cfg['gc.reflogexpre'] = 90
  */
 static VALUE rb_git_config_store(VALUE self, VALUE rb_key, VALUE rb_val)
 {
@@ -153,14 +151,14 @@ static VALUE rb_git_config_store(VALUE self, VALUE rb_key, VALUE rb_val)
 }
 
 /*
- *	call-seq:
- *		cfg.delete(key) -> true or false
+ *  call-seq:
+ *    cfg.delete(key) -> true or false
  *
- *	Delete the given +key+ from the config file. Return +true+ if
- *	the deletion was successful, or +false+ if the key was not
- *	found in the Config file.
+ *  Delete the given +key+ from the config file. Return +true+ if
+ *  the deletion was successful, or +false+ if the key was not
+ *  found in the Config file.
  *
- *	The config file is immediately updated on disk.
+ *  The config file is immediately updated on disk.
  */
 static VALUE rb_git_config_delete(VALUE self, VALUE rb_key)
 {
@@ -180,15 +178,16 @@ static VALUE rb_git_config_delete(VALUE self, VALUE rb_key)
 
 static int cb_config__each_key(const git_config_entry *entry, void *opaque)
 {
-	rb_funcall((VALUE)opaque, rb_intern("call"), 1, rugged_str_new2(entry->name, NULL));
+	rb_funcall((VALUE)opaque, rb_intern("call"), 1, rb_str_new_utf8(entry->name));
 	return GIT_OK;
 }
 
 static int cb_config__each_pair(const git_config_entry *entry, void *opaque)
 {
 	rb_funcall((VALUE)opaque, rb_intern("call"), 2,
-		rugged_str_new2(entry->name, NULL),
-		rugged_str_new2(entry->value, NULL));
+		rb_str_new_utf8(entry->name),
+		rb_str_new_utf8(entry->value)
+	);
 
 	return GIT_OK;
 }
@@ -196,23 +195,24 @@ static int cb_config__each_pair(const git_config_entry *entry, void *opaque)
 static int cb_config__to_hash(const git_config_entry *entry, void *opaque)
 {
 	rb_hash_aset((VALUE)opaque,
-		rugged_str_new2(entry->name, NULL),
-		rugged_str_new2(entry->value, NULL));
+		rb_str_new_utf8(entry->name),
+		rb_str_new_utf8(entry->value)
+	);
 
 	return GIT_OK;
 }
 
 /*
- *	call-seq:
- *		cfg.each_key { |key| block }
- *		cfg.each_key -> Iterator
+ *  call-seq:
+ *    cfg.each_key { |key| block }
+ *    cfg.each_key -> enumarator
  *
- *	Call the given block once for each key in the config file. If no block
- *	is given, an +Iterator+ is returned.
+ *  Call the given block once for each key in the config file. If no block
+ *  is given, an enumerator is returned.
  *
- *		cfg.each_key do |key|
- *			puts key
- *		end
+ *    cfg.each_key do |key|
+ *      puts key
+ *    end
  */
 static VALUE rb_git_config_each_key(VALUE self)
 {
@@ -230,18 +230,18 @@ static VALUE rb_git_config_each_key(VALUE self)
 }
 
 /*
- *	call-seq:
- *		cfg.each_pair { |key, value| block }
- *		cfg.each_pair -> Iterator
- *		cfg.each { |key, value| block }
- *		cfg.each -> Iterator
+ *  call-seq:
+ *    cfg.each_pair { |key, value| block }
+ *    cfg.each_pair -> enumerator
+ *    cfg.each { |key, value| block }
+ *    cfg.each -> enumerator
  *
- *	Call the given block once for each key/value pair in the config file.
- *	If no block is given, an +Iterator+ is returned.
+ *  Call the given block once for each key/value pair in the config file.
+ *  If no block is given, an enumerator is returned.
  *
- *		cfg.each do |key, value|
- *			puts "#{key} => #{value}"
- *		end
+ *    cfg.each do |key, value|
+ *      puts "#{key} => #{value}"
+ *    end
  */
 static VALUE rb_git_config_each_pair(VALUE self)
 {
@@ -259,14 +259,14 @@ static VALUE rb_git_config_each_pair(VALUE self)
 }
 
 /*
- *	call-seq:
- *		cfg.to_hash -> hash
+ *  call-seq:
+ *    cfg.to_hash -> hash
  *
- *	Returns the config file represented as a Ruby hash, where
- *	each configuration entry appears as a key with its
- *	corresponding value.
+ *  Returns the config file represented as a Ruby hash, where
+ *  each configuration entry appears as a key with its
+ *  corresponding value.
  *
- *		cfg.to_hash #=> {"core.autolf" => "true", "core.bare" => "true"}
+ *    cfg.to_hash #=> {"core.autolf" => "true", "core.bare" => "true"}
  */
 static VALUE rb_git_config_to_hash(VALUE self)
 {
@@ -283,13 +283,13 @@ static VALUE rb_git_config_to_hash(VALUE self)
 }
 
 /*
- *	call-seq:
- *		Config.global() -> new_config
- *		Config.open_global() -> new_config
+ *  call-seq:
+ *    Config.global() -> new_config
+ *    Config.open_global() -> new_config
  *
- *	Open the default global config file as a new +Rugged::Config+ object.
- *	An exception will be raised if the global config file doesn't
- *	exist.
+ *  Open the default global config file as a new +Rugged::Config+ object.
+ *  An exception will be raised if the global config file doesn't
+ *  exist.
  */
 static VALUE rb_git_config_open_default(VALUE klass)
 {
@@ -302,7 +302,7 @@ static VALUE rb_git_config_open_default(VALUE klass)
 	return rugged_config_new(klass, Qnil, cfg);
 }
 
-void Init_rugged_config()
+void Init_rugged_config(void)
 {
 	/*
 	 * Config