mercurial-ruby 0.7.8 → 0.7.9

data/Gemfile.lock

@@ -7,13 +7,15 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    json (1.7.7)
     metaclass (0.0.1)
     minitest (4.7.0)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     open4 (1.3.0)
     rake (10.0.4)
-    rdoc (4.0.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.9

data/lib/mercurial-ruby.rb

@@ -6,7 +6,7 @@ require 'time'
 #
 module Mercurial
   
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
   
   class Error < RuntimeError; end
   

data/lib/mercurial-ruby/diff.rb

@@ -31,6 +31,11 @@ module Mercurial
       @file_b = opts[:file_b]
       @body   = opts[:body]
       @binary = opts[:binary]
+
+      if RUBY_VERSION >= '1.9.1'
+        @file_a.force_encoding('utf-8') if @file_a
+        @file_b.force_encoding('utf-8') if @file_b
+      end
     end
     
     def file_name
@@ -43,4 +48,4 @@ module Mercurial
     
   end
   
-end
+end

data/lib/mercurial-ruby/manifest.rb

@@ -26,7 +26,11 @@ module Mercurial
     #
     def contents(revision=nil, cmd_options={})
       revision ||= 'tip'
-      hg(manifest_cmd(revision), cmd_options)
+      hg(manifest_cmd(revision), cmd_options).tap do |res|
+        if RUBY_VERSION >= '1.9.1'
+          res.force_encoding('utf-8')
+        end
+      end
     end
     
     # Returns an array of file paths from manifest that start with the specified +path+ at a specified +revision+.
@@ -55,4 +59,4 @@ module Mercurial
     end
   end
     
-end
+end

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.7.8"
+  s.version = "0.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2013-03-26}
+  s.date = %q{2013-04-14}
   s.description = %q{Ruby API for Mercurial DVCS.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "lib/styles/file_index.style",
     "mercurial-ruby.gemspec",
     "test/fixtures.rb",
+    "test/fixtures/diff_sample3.diff",
     "test/fixtures/test-repo.zip",
     "test/helper.rb",
     "test/test_blame.rb",

data/test/fixtures/diff_sample3.diff

@@ -0,0 +1,12 @@
+--- a/кодировки/виндоуз-cp1251-lf	Sun Apr 14 15:10:42 2013 -0400
++++ b/кодировки/виндоуз-cp1251-lf	Sun Apr 14 15:32:30 2013 -0400
+@@ -1,6 +1,6 @@
+-����� ��� 10 ������ �������� �� ���� �������� ���������� ��� �����������
++����� ��� 11 ������ �������� �� ���� �������� ���������� ��� �����������
+ ����� ������, ���������� � ������������ ���������� REI, ������� ����������
+ �������� ���������� �������. �� ����� �������� ���������� ��� ����� ������
+-������� ���� ��������, ������� ���������� ������������ � 2009 ����.
++������� ����� ��������, ������� ���������� ������������ � 2009 ����.
+ 
+ Windows CP1251 LF
+

data/test/helper.rb

@@ -9,8 +9,8 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require "mocha"
 require "minitest/autorun"
+require "mocha/api"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -49,4 +49,4 @@ end
 
 MiniTest::Unit.after_tests { erase_fixture_repository }
 
-MiniTest::Unit.autorun
+MiniTest::Unit.autorun

data/test/test_branch_factory.rb

@@ -52,7 +52,7 @@ describe Mercurial::BranchFactory do
 
   it "should find branch's full hash_id" do
     branch = @repository.branches.all.first
-    branch.hash_id.must_equal 'e47455b9a2383085b400d649af4360b943c6d3cf'
+    branch.hash_id.must_equal '2b03a87dbf4cb1a95b2417d8e2eac801c450b624'
   end
   
-end
+end

data/test/test_commit_factory.rb

@@ -8,8 +8,8 @@ describe Mercurial::CommitFactory do
 
   it "should find commits after specific revision" do
     commits = @repository.commits.after('2d32410d9629')
-    commits.size.must_equal 6
-    commits.map(&:hash_id).must_equal %w(88b5cc7860153671b0d3aa3c16d01ecad987490e 57a6efe309bfa6c8054084de8c26490fca8a6104 f67625ea8586cd5c4d43c883a273db3ef7f38716 9f76ea916c5100bf61f533c33a6aa9f22532d526 b6f6f764b939fc4be234574010247d40c683c322 e47455b9a2383085b400d649af4360b943c6d3cf)
+    commits.size.must_equal 8
+    commits.map(&:hash_id).must_equal %w(88b5cc7860153671b0d3aa3c16d01ecad987490e 57a6efe309bfa6c8054084de8c26490fca8a6104 f67625ea8586cd5c4d43c883a273db3ef7f38716 9f76ea916c5100bf61f533c33a6aa9f22532d526 b6f6f764b939fc4be234574010247d40c683c322 e47455b9a2383085b400d649af4360b943c6d3cf fe021a290ba17217a083a8059db9a4f3568ee619 2b03a87dbf4cb1a95b2417d8e2eac801c450b624)
   end
 
   it "should find commits before specific revision" do
@@ -82,7 +82,7 @@ describe Mercurial::CommitFactory do
   
   it "should count commits" do
     count = @repository.commits.count
-    count.must_equal 42
+    count.must_equal 44
   end
 
   it "should count range of commits" do

data/test/test_diff.rb

@@ -21,6 +21,14 @@ describe Mercurial::Diff do
   it "should have body" do
     @diff.body.strip.must_equal expected_diff.strip
   end
+
+  if RUBY_VERSION >= '1.9.1'
+    it "should return file names in UTF-8 encoding in Ruby 1.9.1 and higher" do 
+      diff = @repository.diffs.for_path('кодировки/виндоуз-cp1251-lf', 'fe021a290ba1', '2b03a87dbf4c')
+      diff.file_a.encoding.to_s.downcase.must_equal 'utf-8'
+      diff.file_b.encoding.to_s.downcase.must_equal 'utf-8'
+    end
+  end
   
 private
 
@@ -36,4 +44,4 @@ private
  require 'bundler']
   end
   
-end
+end

data/test/test_diff_factory.rb

@@ -49,6 +49,11 @@ describe Mercurial::DiffFactory do
     diff = @repository.diffs.for_path('superman.txt', 'b6f6f764b939', 'e47455b9a238', :ignore_whitespace => true)
     diff.body.must_equal diff_sample_2
   end
+
+  it "should handle files with unicode names" do
+    diff = @repository.diffs.for_path('кодировки/виндоуз-cp1251-lf', 'fe021a290ba1', '2b03a87dbf4c')
+    diff.body.must_equal diff_sample3
+  end
   
 private
 
@@ -90,5 +95,9 @@ private
  This is a superman file.
 ]
   end
+
+  def diff_sample3
+    File.open(File.join(File.dirname(__FILE__), '', 'fixtures', 'diff_sample3.diff'), 'rb'){|f| f.read}
+  end
   
 end

data/test/test_file_index.rb

@@ -24,7 +24,7 @@ describe Mercurial::FileIndex do
   end
   
   it "should count all commits" do
-    @file_index.count_all.must_equal 42
+    @file_index.count_all.must_equal 44
   end
   
   it "should count commits reachable by specific hash id" do

data/test/test_manifest.rb

@@ -35,5 +35,17 @@ describe Mercurial::Manifest do
     paths = @manifest.scan_for_path('check \ this \ out " now', '2d32410d9629')
     paths.size.must_equal 1
   end
+
+  it "should find unicode paths" do
+    paths = @manifest.scan_for_path('кодировки/виндоуз-cp1251-lf', 'fe021a290ba1')
+    paths.size.must_equal 1
+    paths[0].last.must_equal 'кодировки/виндоуз-cp1251-lf'
+  end
+
+  if RUBY_VERSION >= '1.9.1'
+    it "should return contents in UTF-8 encoding on Ruby 1.9.1 and higher" do
+      @manifest.contents.encoding.to_s.downcase.must_equal('utf-8')
+    end
+  end
   
 end

data/test/test_node.rb

@@ -30,5 +30,12 @@ describe Mercurial::Node do
     node = @repository.nodes.find('File With Whitespace.pdf', '8ddac5f6380e')
     node.contents.must_equal ''
   end
+
+  if RUBY_VERSION >= '1.9.1'
+    it "should return name in UTF-8 encoding on Ruby 1.9.1 and higher" do
+      node = @repository.nodes.find('кодировки/виндоуз-cp1251-lf', 'fe021a290ba1')
+      node.name.encoding.to_s.downcase.must_equal 'utf-8'
+    end
+  end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-26 00:00:00 -04:00
+date: 2013-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,7 @@ files:
 - lib/styles/file_index.style
 - mercurial-ruby.gemspec
 - test/fixtures.rb
+- test/fixtures/diff_sample3.diff
 - test/fixtures/test-repo.zip
 - test/helper.rb
 - test/test_blame.rb