mercurial-ruby 0.7.7 → 0.7.8

data/Gemfile

@@ -3,10 +3,8 @@ source "http://rubygems.org"
 gem "open4", "~>1.3.0"
 
 group :development do
-  gem "minitest", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-  gem "mocha", "~>0.9"
-  gem "ruby-debug", "~>0.10"
+  gem "minitest"
+  gem "bundler"
+  gem "jeweler"
+  gem "mocha"
 end

data/Gemfile.lock

@@ -1,34 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    columnize (0.3.4)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    minitest (2.3.1)
-    mocha (0.9.12)
+      rdoc
+    metaclass (0.0.1)
+    minitest (4.7.0)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
     open4 (1.3.0)
-    rake (0.9.2)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.9)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    rake (10.0.4)
+    rdoc (4.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
+  bundler
+  jeweler
   minitest
-  mocha (~> 0.9)
+  mocha
   open4 (~> 1.3.0)
-  rcov
-  ruby-debug (~> 0.10)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Ilya Sabanin
+Copyright (c) 2013 Ilya Sabanin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -16,11 +16,11 @@ Github doesn't support some YARd-specific syntax so this README can look broken.
  
 == Compatibility
 
-Tested with Mercurial versions 1.9, 1.9.1 and 2.1; Ruby version 1.8.7.
+Tested with Mercurial versions 1.9, 1.9.1, 2.1, 2.5.2; Ruby versions 1.8.7, 1.9.3 and 2.0.0.
 
 == Configuration
 
-There are several settings you can configure. Do it like this:
+There are several settings you can configure:
 
  Mercurial.configure do |conf|
    conf.hg_binary_path = "/usr/bin/hg"
@@ -70,7 +70,7 @@ weren't added to the gem as first-class citizens yet.
 
 === Built-in Caching
 
-There's a simple caching mechanism built into the gem. If you pass Rails CacheStore compatible
+There's a simple caching mechanism built into the gem. If you pass Rails CacheStore-compatible
 caching store to the Configuration block, mercurial-ruby will cache output of all hg commands
 it's executing. Then if you execute same method again and it will run the same command,
 the gem will return the output from cache.
@@ -92,6 +92,6 @@ You can provide a timeout for pretty much any command you are running. Do it lik
 
 == Copyright
 
-Copyright (c) 2012 Ilya Sabanin. See LICENSE.txt for
+Copyright (c) 2013 Ilya Sabanin. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -32,22 +32,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mercurial-ruby #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/lib/mercurial-ruby.rb

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

data/lib/mercurial-ruby/blame.rb

@@ -41,7 +41,7 @@ module Mercurial
     #
     def lines
       [].tap do |result|
-        contents.each do |line|
+        contents.each_line do |line|
           author, revision, linenum, text = line.scan(METADATA_AND_CODE_RE).first
           result << BlameLine.new(
             :author   => author,

data/lib/mercurial-ruby/commit.rb

@@ -114,7 +114,7 @@ module Mercurial
     def to_hash
       {
         'id'       => hash_id,
-        'parents'  => parents_ids.map { |p| { 'id' => p.id } },
+        'parents'  => parents_ids,
         'branch'   => branch_name,
         'tags'     => tags_names,
         'message'  => message,

data/lib/mercurial-ruby/factories/commit_factory.rb

@@ -110,7 +110,7 @@ module Mercurial
       return [] if array.empty?
 
       args = array.map{|hash| " -r#{ hash }"}
-      hg_to_array ["log#{ args } --style ?", style], {:separator => changeset_separator}, cmd_options do |line|
+      hg_to_array ["log#{ args.join('') } --style ?", style], {:separator => changeset_separator}, cmd_options do |line|
         build(line)
       end
     end

data/lib/mercurial-ruby/factories/node_factory.rb

@@ -64,30 +64,28 @@ module Mercurial
     #
     def entries_for(path, revision=nil, parent=nil)
       revision ||= 'tip'
-      entries = []
-      manifest_entries = repository.manifest.scan_for_path(path, revision)
-      manifest_entries.each do |me|
-        path_without_source = me[3].gsub(/^#{ Regexp.escape(path.without_trailing_slash) }\//, '')
-        entry_name = path_without_source.split('/').first
-        entry_path = File.join(path, entry_name).gsub(/^\//, '')
-        dir = me[3].scan(/^(#{ Regexp.escape(entry_path) }\/)/).flatten.first ? true : false
-        entry_name << '/' if dir
-        
-        entries << build(
-          :path     => entry_path,
-          :name     => entry_name,
-          :revision => revision,
-          :nodeid   => (me[0] unless dir),
-          :fmode    => dir ? nil : me[1],
-          :exec     => dir ? nil : me[2],
-          :parent   => parent
-        )
+      [].tap do |entries|
+        manifest_entries = repository.manifest.scan_for_path(path, revision)
+        manifest_entries.each do |me|
+          path_without_source = me[3].gsub(/^#{ Regexp.escape(path.without_trailing_slash) }\//, '')
+          entry_name = path_without_source.split('/').first
+          entry_path = File.join(path, entry_name).gsub(/^\//, '')
+          dir = me[3].scan(/^(#{ Regexp.escape(entry_path) }\/)/).flatten.first ? true : false
+          entry_name << '/' if dir
+          
+          if entries.select{|item| item.name == entry_name}.size == 0
+            entries << build(
+              :path     => entry_path,
+              :name     => entry_name,
+              :revision => revision,
+              :nodeid   => (me[0] unless dir),
+              :fmode    => dir ? nil : me[1],
+              :exec     => dir ? nil : me[2],
+              :parent   => parent
+            )
+          end
+        end
       end
-      
-      entries = entries.inject({}) do |hash,item|
-        hash[item.name] ||= item
-        hash 
-      end.values
     end
     
   private

data/lib/mercurial-ruby/repository.rb

@@ -161,7 +161,7 @@ module Mercurial
     #
     def paths
       {}.tap do |result|
-        shell.hg('paths').each do |line|
+        shell.hg('paths').each_line do |line|
           path, url = *line.strip.split(" = ")
           result[path] = url
         end
@@ -209,6 +209,7 @@ module Mercurial
     def no_cache
       @cache_disabled_by_override = true
       yield
+    ensure
       @cache_disabled_by_override = false
     end
     

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.7.7"
+  s.version = "0.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2013-01-22}
+  s.date = %q{2013-03-26}
   s.description = %q{Ruby API for Mercurial DVCS.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [
@@ -84,38 +84,31 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/iSabanin/mercurial-ruby}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby API for Mercurial DVCS.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<open4>, ["~> 1.3.0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9"])
-      s.add_development_dependency(%q<ruby-debug>, ["~> 0.10"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<open4>, ["~> 1.3.0"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9"])
-      s.add_dependency(%q<ruby-debug>, ["~> 0.10"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<open4>, ["~> 1.3.0"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9"])
-    s.add_dependency(%q<ruby-debug>, ["~> 0.10"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'bundler'
-require 'ruby-debug'
 
 begin
   Bundler.setup(:default, :development)

data/test/test_hook_factory.rb

@@ -14,8 +14,8 @@ describe Mercurial::HookFactory do
   it "should find all hooks" do
     hooks = @repository.hooks.all
     hooks.size.must_equal 2
-    hooks.map(&:name).must_equal ['commit', 'changegroup']
-    hooks.map(&:value).must_equal ['/Users/ilya/work/beanstalk/script/mercurial/commit.rb', '/Users/ilya/work/beanstalk/script/mercurial/changegroup.rb']
+    hooks.map(&:name).sort.must_equal ['commit', 'changegroup'].sort
+    hooks.map(&:value).sort.must_equal ['/Users/ilya/work/beanstalk/script/mercurial/commit.rb', '/Users/ilya/work/beanstalk/script/mercurial/changegroup.rb'].sort
     hooks.first.must_be_kind_of Mercurial::Hook
   end
   

data/test/test_node_factory.rb

@@ -67,14 +67,14 @@ describe Mercurial::NodeFactory do
     entries.map(&:name).sort.must_equal %w(another-boring-file something.csv subdirectory/).sort
     entries.map(&:parent).uniq.must_equal [node]
     
-    entries[0].directory?.must_equal true
-    entries[0].file?.must_equal false
-    
+    entries[0].file?.must_equal true
+    entries[0].directory?.must_equal false
+
     entries[1].file?.must_equal true
     entries[1].directory?.must_equal false
 
-    entries[2].file?.must_equal true
-    entries[2].directory?.must_equal false
+    entries[2].directory?.must_equal true
+    entries[2].file?.must_equal false
   end
   
   it "should find entries for tip revision" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 7
-  version: 0.7.7
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,14 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-22 00:00:00 -05:00
+date: 2013-03-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: open4
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
+  name: open4
+  version_requirements: *id001
   prerelease: false
-  name: minitest
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,44 +44,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: minitest
+  version_requirements: *id002
   prerelease: false
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
+  name: bundler
+  version_requirements: *id003
   prerelease: false
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,37 +72,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: jeweler
+  version_requirements: *id004
   prerelease: false
-  name: mocha
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
         - 0
-        - 9
-        version: "0.9"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
+  name: mocha
+  version_requirements: *id005
   prerelease: false
-  name: ruby-debug
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  requirement: *id007
 description: Ruby API for Mercurial DVCS.
 email: ilya.sabanin@gmail.com
 executables: []
@@ -227,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby API for Mercurial DVCS.